Repository navigation
Commit ebff11e
committed
chore: merge upstream/dev
Merge upstream/dev into the fork.
Conflict resolution:
- packages/core/src/session/info.ts: upstream replaced
`Location.Ref.make({...})` with a plain `location` object and now reads
`workspaceID` as `row.workspace_id ?? undefined` (no `Workspace.ID.make`
branding, `Workspace` and `Location` imports removed). Took upstream's
shape and kept the fork's `roots: row.roots?.length ? row.roots : undefined`
from the session roots feature.
Post-merge fixes (no conflict markers, but broken by upstream changes):
- packages/core/src/session/projector.ts: `projectFork` still called
`Workspace.ID.make(...)` for the fork `destination` workspace, but
upstream dropped the `Workspace` import. Use
`destination.location.workspaceID ?? null` instead, matching how the
other projections in the file write `workspace_id`.
- mise.toml: upstream bumped `packageManager` to bun@1.4.4 and the build
script (packages/script) now requires `^1.4.4`, so `make build-single`
failed under the pinned bun 1.4.2. Bump the mise pin to 1.4.4.
- bun.lock: refreshed with `bun install` after upstream's dependency
changes (e.g. the new `@pierre/highlights` dependency, which was
missing and broke the app/ui/session-ui typechecks until installed).
Verification:
- `bun run check` passes for all 34 packages.
- `make build-single` gets past typecheck and the app build and starts
building cli-darwin-arm64.
- Fork tests (`make tests`) were not run as part of this merge.255 files changed
Lines changed: 4778 additions & 2437 deletions
File tree
- .github/workflows
- infra
- nix
- packages
- ai
- src
- protocols
- utils
- providers
- route
- test
- app
- e2e
- performance/timeline
- regression
- src/shell
- commands
- titlebar
- test-browser/fixtures
- client
- src
- effect
- api
- generated
- promise/generated
- test
- cli
- src/services
- test
- codemode
- console/app
- src
- component
- i18n
- routes/go
- containers/bun-node
- core
- src
- codemode
- config
- plugin
- database
- filesystem
- mcp
- models-dev
- permission
- persistent-pty
- plugin
- provider
- skill
- pty
- session
- runner
- tool
- plugin
- v1/config
- worktree
- test
- config
- fixture
- plugin
- pty
- desktop
- function
- gui-extensions
- http-recorder
- httpapi-codegen
- latex
- merman
- plugin-browser
- plugins/figma
- plugin
- protocol
- src
- groups
- schema
- src
- config
- sdk
- server
- src
- handlers
- middleware
- test
- session-ui
- component-tests
- src
- components
- pierre
- simulation
- stats
- app
- core
- src/domain
- server
- storybook/.storybook
- theme
- tui
- src
- component
- config
- context
- plugin
- routes/session
- util
- test
- util
- ui
- src/context
- test
- util
- src
- effect
- web
- patches
- sdks/vscode
- services
- update
- www
- public
- src/docs/content
- cli
- console
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
88 | | - | |
| 88 | + | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
| 110 | + | |
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
5 | 61 | | |
6 | 62 | | |
7 | 63 | | |
| |||
0 commit comments