Repository navigation
Commit 0675c07
committed
Merge remote-tracking branch 'upstream/dev' into dev
Brings in 397 upstream commits (merge base 64ca766, upstream tip
7524e5f "chore(infra): untrack zen buckets and trust dns now that they
are retained (anomalyco#62940)").
Big upstream change: the hosted web code was reorganized. services/www
(84 files) and packages/console (76 files) became one services/site, and
services/changelog and packages/function moved to services/share and
packages/stats. The fork changed none of those files, so git followed the
renames without help. packages/posts no longer exists upstream.
One file conflicted.
Conflict resolution
===================
- script/generate.ts: upstream changed the line `services/www` to
`services/site`. The fork had added a `packages/client` generate step on
the line right above it, so both edits touched neighboring lines. Kept
both: the generate steps are now protocol, client and site, followed by
the fork's formatter (prettier on the files that generation touched,
because upstream's ./script/format.ts runs `prettier --write .`, and the
repo is not prettier-clean). The client step is not required, since
`make tests` runs check:generated for the client, but it saves a
manual `cd packages/client && bun run generate`.
Fixes for upstream changes that did not conflict
================================================
- core/test/tool-cancel.test.ts (fork test): upstream's Tool now depends
on a new feature-flag service (Flag), which needs Config. The test failed
with "Unbound layer node: @opencode/Location". It now uses upstream's
shared toolNodeReplacements() helper (test Config, passthrough Image,
test Permission) in place of its own Permission mock.
- core/test/plugin/retitle.test.ts (fork test): session.generate now
returns `tokens` and `cost` as well as `text`, so the test's fake model
reply includes them.
Leftover folders
================
packages/posts and services/www stayed on disk as untracked build output
(.astro, .turbo, node_modules, generated JSON). Their own .gitignore files
went away with the folders, so git showed them as untracked. Upstream
changed no ignore rules. Deleted both folders.
Not exercised
=============
This merge added no upstream database migrations, so the migration merge
drivers did not run. The registry still ends at m59 (20261030054400_job)
and the snapshot id is unchanged.
Verification
============
- bun turbo typecheck: 34/34 packages (35 before: www and posts are now
one package, site)
- oxlint: 0 errors
- bun script/migration.ts --check: no schema changes
- make tests: generated-file checks (protocol, client) pass; tui 196,
core 476, schema 7, sdk 3 pass, 0 fail. The TUI output still prints
"unexpected request: /api/session/..." lines; those are known noise and
the tests pass.3,893 files changed
Lines changed: 386585 additions & 74373 deletions
File tree
- .github
- assets
- release
- workflows
- .opencode
- agent
- skills/app-e2e-tests
- infra
- packages
- ai
- src
- protocols
- providers
- route
- transport
- schema
- test
- provider-options
- provider
- app
- component-tests
- e2e
- regression
- service-worker
- user-story
- utils
- perf
- fixtures
- src
- components-lab
- composer
- attachments
- editor
- history
- suggestions
- home
- projects
- sessions
- start
- new-session
- location
- workspace
- providers
- catalog
- connect
- models
- runtime
- i18n
- persistence
- plugin
- server
- servers/connect
- session
- commands
- composer
- header
- requests
- timeline
- settings
- about
- appearance
- experimental
- general
- keybinds
- models
- providers
- servers
- workspaces
- shell
- commands
- errors
- notifications
- routes
- state
- tabs
- titlebar
- usage
- voice
- workspaces
- files
- selection
- test-browser
- fixtures
- client
- src
- effect/api
- promise/generated
- test
- cli
- script
- src
- acp
- commands/handlers
- auth
- debug
- run
- services
- util
- test
- acp
- run
- codemode
- script
- src
- interpreter
- stdlib
- vm
- compiler
- prelude
- runtime
- snapshot
- stdlib
- test
- fixtures
- lib
- test262
- vm
- console
- app
- .opencode/agent
- public
- script
- src
- asset
- brand
- lander
- component
- context
- i18n
- lib
- routes
- api
- brand
- changelog
- data
- docs
- download
- [channel]
- enterprise
- go
- legal
- privacy-policy
- terms-of-service
- oauth/opencode
- stats
- s
- t
- zen
- style
- token
- test
- resource
- core
- src
- codemode
- config
- plugin
- database
- migration
- github-copilot
- chat
- responses
- tool
- mcp
- plugin
- provider
- skill
- session
- runner
- shell
- tool
- plugin
- util
- v1/config
- test
- codemode
- config
- effect
- filesystem
- fixture
- github-copilot
- lib
- plugin
- util
- desktop
- src
- main
- files
- ipc-handlers
- lifecycle
- native
- plugin
- service
- storage
- windows
- renderer
- onboarding
- platform
- startup
- window
- function/src
- gui-plugins
- src
- browser
- i18n
- btw
- i18n
- context
- debug
- details
- i18n
- file
- i18n
- goal
- microsoft-office
- i18n
- pairing
- review
- i18n
- ssh
- terminal
- i18n
- updater
- i18n
- wsl
- http-recorder/script
- plugin-browser
- src
- test
- plugin/src/gui
- posts
- public
- script
- src
- components
- content/posts
- layouts
- pages
- styles
- process-daemon
- npm
- src
- daemon
- service
- transport
- tests
- support
- protocol
- src/groups
- schema
- src
- config
- test
- script
- src
- test
- sdk
- script
- test
- server
- src
- handlers
- test
- fixture
- session-ui
- component-tests
- src
- components
- context
- message
- pierre
- sources
- storybook
- timeline
- tools
- v2/components
- stats
- app
- script
- src
- asset
- fonts
- component
- context
- i18n
- lib
- og
- routes
- [lab]
- api
- compare
- stats/api
- test
- core/src/domain
- stories/mocks
- app
- context
- hooks
- gui-plugins
- tui
- src
- component
- config
- context
- mini
- plugin
- routes/session
- ui
- test
- cli/tui
- component
- fixture/plugin/dialog-throw
- mini
- ui
- src
- components
- file-icons
- context
- data-display
- line-comment
- project-avatar
- feedback/toast
- forms
- inline-input
- search-list
- select
- typeahead
- hooks
- i18n
- overlays
- dialog
- mcp-sign-in
- tooltip
- theme
- typography/text-shimmer
- util/src
- effect
- web
- src
- components
- content/docs
- ar
- bs
- da
- de
- es
- fr
- it
- ja
- ko
- nb
- pl
- pt-br
- ru
- th
- tr
- zh-cn
- zh-tw
- pages
- [locale]
- salesforce
- script
- services
- changelog
- .wrangler/state/v3/cache
- default/blobs
- miniflare-CacheObject
- public
- changelog
- fonts
- src
- test
- files
- src
- site
- perf
- public
- apps
- arcade3d
- basis
- draco
- layers
- arcade404
- audio
- layers
- avatars
- brand
- badges
- files
- screenshots
- docs
- assets
- cli
- email
- font
- film
- vendor
- logos
- companies
- providers
- tools
- wordmarks
- media
- card-hover
- angled-continue
- angled
- cinematic-continue
- cinematic
- card-loops
- features
- focused
- heroes
- more
- press-media/thumbs
- press-media
- frames
- thumbs
- press/anomaly
- product-videos
- card-hover
- angled-continue
- angled
- cinematic-continue
- cinematic
- card-loops
- features
- focused
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 | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
File renamed without changes.
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
203 | 203 | | |
204 | 204 | | |
205 | 205 | | |
206 | | - | |
| 206 | + | |
207 | 207 | | |
208 | 208 | | |
209 | 209 | | |
| |||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 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 | + | |
This file was deleted.
0 commit comments