Commit de3d177
Merge origin/staging into staging-v4
Resolutions:
- packages/db/migrations — no conflict by construction; the branch's 0271 was
reverted to the merge-base in the preceding commit, so staging's 0271
(a hand-written CONCURRENTLY index build) applied cleanly and the branch's
additive DDL regenerated on top as 0272. Regenerated content is byte-identical
to what it replaced, and drizzle reports no drift.
- workflow-alias-backing.{ts,test.ts} — kept deleted. The branch removed this
subsystem deliberately (ac55b1f); staging kept evolving it. Verified all
three exported symbols have zero references in the merged tree before
resolving, so nothing is left dangling.
- workspace-file-manager.ts — took HEAD for the two alias-module imports, but
KEPT staging's generateRequestId import: staging's new code at the call site
merged in cleanly and uses it, so taking our side wholesale would have
compiled to a missing binding.
- check-api-validation-contracts.ts — the route-count ratchet. Neither side's
number is right: the merge unions both sets, so the baseline is 985, measured
from the merged tree rather than picked from a side.
- bun.lock — regenerated from the merged manifests with the pinned bun (1.3.13)
rather than hand-resolved; --frozen-lockfile verifies clean.
Co-Authored-By: Claude <noreply@anthropic.com>159 files changed
Lines changed: 43525 additions & 1470 deletions
File tree
- .claude/rules
- apps
- docs
- content/docs/en/api-reference/(generated)/workflows
- realtime/src/database
- sim
- app
- (landing)
- changelog/components/changelog-actions
- components/hero
- account/settings/chat-keys
- api
- files/export/[id]
- tools/file/manage
- v1
- admin
- folders/[id]/export
- workflows
- [id]/export
- export
- import
- workspaces/[id]
- export
- import
- audit-logs
- files
- [fileId]
- knowledge
- [id]
- documents
- [documentId]
- search
- logs
- tables
- [tableId]
- columns
- rows
- [rowId]
- upsert
- workflows
- [id]
- deploy
- export
- rollback
- import
- workflows/[id]/state
- workspaces/[id]/files
- download
- selfhost/settings
- [section]
- workspace/[workspaceId]
- files
- components/file-viewer
- settings
- components
- activity-log
- copilot
- tables/[tableId]
- background
- blocks/blocks
- components
- pii
- settings
- content/library/best-gumloop-alternatives-in-2026
- ee/workspace-forking/components/fork-activity-panel
- hooks/queries
- lib
- api
- contracts
- v1
- knowledge
- tables
- server
- audio
- billing/core
- chunkers
- copilot
- tools
- handlers
- server/workflow
- vfs
- core
- security
- utils
- execution/payloads
- guardrails
- logs
- media
- posthog
- uploads
- client
- contexts/workspace
- utils
- workflows
- operations
- persistence
- variables
- public/library/best-gumloop-alternatives-in-2026
- stores
- variables
- workflows
- packages
- cli
- db
- migrations
- meta
- emcn
- src/components/toast
- testing/src/mocks
- ts-sdk
- src
- workflow-renderer
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
35 | | - | |
36 | | - | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
77 | 76 | | |
78 | 77 | | |
79 | 78 | | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | 79 | | |
87 | 80 | | |
88 | 81 | | |
| |||
110 | 103 | | |
111 | 104 | | |
112 | 105 | | |
113 | | - | |
| 106 | + | |
114 | 107 | | |
115 | 108 | | |
116 | 109 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
8 | 10 | | |
9 | 11 | | |
10 | 12 | | |
| |||
0 commit comments