Skip to content

Upstream sync: anomalyco/opencode dev into dev (2026-10-12) (conflicts) - #190

Closed
pminevp wants to merge 4457 commits into
devfrom
upstream-sync/2026-10-12
Closed

pminevp wants to merge 4457 commits into
devfrom
upstream-sync/2026-10-12

Conversation

@pminevp

@pminevp pminevp commented Oct 12, 2026

Copy link
Copy Markdown
Collaborator

Automated merge of anomalyco/opencode dev @ bcf23b6775 (XCOD-118).

⚠️ Merge conflicts

This branch is the upstream tip, not a merge: the workflow never resolves conflicts. Resolve it
with a normal merge commit (never squash or rebase, or upstream drops out of dev's history):

git fetch origin && git checkout upstream-sync/2026-10-12 && git merge origin/dev
# fix the files below, then record the upstream base and lag this build will report:
bun script/upstream-version.ts && bun script/upstream-sync.ts stamp --upstream bcf23b6775c79a429b1511b255d6d88ab0248d4a
git add -A && git commit --no-edit && git push
  • .gitattributes
  • .github/workflows/duplicate-issues.yml
  • .github/workflows/generate.yml
  • .github/workflows/nix-hashes.yml
  • .github/workflows/pr-standards.yml
  • .github/workflows/publish.yml
  • .github/workflows/test.yml
  • .github/workflows/triage.yml
  • .github/workflows/typecheck.yml
  • .gitignore
  • .opencode/tui.json
  • CHANGELOG.md
  • CONTRIBUTING.md
  • bun.lock
  • install
  • nix/hashes.json
  • nix/opencode.nix
  • package.json
  • packages/app/package.json
  • packages/app/playwright.config.ts
  • packages/app/src/app.tsx
  • packages/app/src/components/dialog-connect-provider.tsx
  • packages/app/src/components/dialog-select-model.tsx
  • packages/app/src/components/prompt-input-v2.tsx
  • packages/app/src/components/prompt-input.tsx
  • packages/app/src/components/prompt-input/submit.ts
  • packages/app/src/components/session/session-sortable-terminal-tab-v2.tsx
  • packages/app/src/components/session/session-sortable-terminal-tab.tsx
  • packages/app/src/components/settings-general.tsx
  • packages/app/src/components/settings-v2/dialog-settings-v2.tsx
  • packages/app/src/components/settings-v2/general.tsx
  • packages/app/src/context/highlights.tsx
  • packages/app/src/context/local-agent.ts
  • packages/app/src/context/local.tsx
  • packages/app/src/desktop-menu.test.ts
  • packages/app/src/entry.tsx
  • packages/app/src/i18n/am.ts
  • packages/app/src/i18n/ar.ts
  • packages/app/src/i18n/az.ts
  • packages/app/src/i18n/bg.ts
  • packages/app/src/i18n/bn.ts
  • packages/app/src/i18n/br.ts
  • packages/app/src/i18n/bs.ts
  • packages/app/src/i18n/ca.ts
  • packages/app/src/i18n/cs.ts
  • packages/app/src/i18n/da.ts
  • packages/app/src/i18n/de.ts
  • packages/app/src/i18n/dv.ts
  • packages/app/src/i18n/dz.ts
  • packages/app/src/i18n/el.ts
  • packages/app/src/i18n/en.ts
  • packages/app/src/i18n/es.ts
  • packages/app/src/i18n/et.ts
  • packages/app/src/i18n/fa.ts
  • packages/app/src/i18n/fi.ts
  • packages/app/src/i18n/fo.ts
  • packages/app/src/i18n/fr.ts
  • packages/app/src/i18n/hi.ts
  • packages/app/src/i18n/hr.ts
  • packages/app/src/i18n/hu.ts
  • packages/app/src/i18n/hy.ts
  • packages/app/src/i18n/id.ts
  • packages/app/src/i18n/is.ts
  • packages/app/src/i18n/it.ts
  • packages/app/src/i18n/ja.ts
  • packages/app/src/i18n/ka.ts
  • packages/app/src/i18n/km.ts
  • packages/app/src/i18n/ko.ts
  • packages/app/src/i18n/lo.ts
  • packages/app/src/i18n/lt.ts
  • packages/app/src/i18n/lv.ts
  • packages/app/src/i18n/mk.ts
  • packages/app/src/i18n/mn.ts
  • packages/app/src/i18n/ms.ts
  • packages/app/src/i18n/my.ts
  • packages/app/src/i18n/ne.ts
  • packages/app/src/i18n/nl.ts
  • packages/app/src/i18n/no.ts
  • packages/app/src/i18n/pa.ts
  • packages/app/src/i18n/pl.ts
  • packages/app/src/i18n/ro.ts
  • packages/app/src/i18n/ru.ts
  • packages/app/src/i18n/si.ts
  • packages/app/src/i18n/sk.ts
  • packages/app/src/i18n/sl.ts
  • packages/app/src/i18n/sq.ts
  • packages/app/src/i18n/sr.ts
  • packages/app/src/i18n/sv.ts
  • packages/app/src/i18n/tg.ts
  • packages/app/src/i18n/th.ts
  • packages/app/src/i18n/tk.ts
  • packages/app/src/i18n/tr.ts
  • packages/app/src/i18n/uk.ts
  • packages/app/src/i18n/ur.ts
  • packages/app/src/i18n/uz.ts
  • packages/app/src/i18n/vi.ts
  • packages/app/src/i18n/zh.ts
  • packages/app/src/i18n/zht.ts
  • packages/app/src/pages/home/home-projects-controller.tsx
  • packages/app/src/pages/home/home-sessions-view.tsx
  • packages/app/src/pages/layout.tsx
  • packages/app/src/pages/layout/helpers.ts
  • packages/app/src/pages/new-session/new-session-draft-controller.ts
  • packages/app/src/pages/session/composer/session-composer-controls.ts
  • packages/app/src/pages/session/session-side-panel.tsx
  • packages/app/src/providers/models/agent.ts
  • packages/app/src/runtime/i18n/desktop-native.ts
  • packages/app/src/runtime/platform/platform.tsx
  • packages/app/src/runtime/server/local-mode.test.ts
  • packages/app/src/runtime/server/local-mode.ts
  • packages/app/src/sessions.tsx
  • packages/app/src/sessions/sessions-model.test.ts
  • packages/app/src/sessions/sessions-model.ts
  • packages/app/src/settings/general/agents.tsx
  • packages/app/src/shell/commands/desktop-menu.ts
  • packages/app/src/shell/titlebar/model-filter.tsx
  • packages/cli/bin/lildax.cjs
  • packages/cli/bin/lunos.cjs
  • packages/cli/bin/opencode.cjs
  • packages/cli/package.json
  • packages/cli/script/build.ts
  • packages/cli/script/generate.ts
  • packages/cli/script/macos-resign.sh
  • packages/cli/script/notices.ts
  • packages/cli/script/notices/bun-LICENSE.md
  • packages/cli/script/notices/bun-lgpl.json
  • packages/cli/script/notices/spdx/Apache-2.0.txt
  • packages/cli/script/notices/spdx/CC-BY-3.0.txt
  • packages/cli/script/notices/spdx/CC0-1.0.txt
  • packages/cli/script/notices/spdx/ISC.txt
  • packages/cli/script/notices/spdx/LGPL-2.0-only.txt
  • packages/cli/script/notices/spdx/LGPL-2.1-only.txt
  • packages/cli/script/notices/spdx/MIT.txt
  • packages/cli/script/notices/spdx/Unlicense.txt
  • packages/cli/script/npm-readme.md
  • packages/cli/script/offline-bundles.ts
  • packages/cli/script/offline/INSTALL-OFFLINE.md
  • packages/cli/script/offline/tools.ts
  • packages/cli/script/package-meta.ts
  • packages/cli/script/publish.ts
  • packages/cli/script/release-checksums.ts
  • packages/cli/script/sandbox-e2e.ps1
  • packages/cli/script/sandbox-e2e.ts
  • packages/cli/script/sandbox-image.ts
  • packages/cli/src/commands/commands.ts
  • packages/cli/src/commands/handlers/agent-bundle.ts
  • packages/cli/src/commands/handlers/agent-edit.ts
  • packages/cli/src/commands/handlers/agent-run.ts
  • packages/cli/src/commands/handlers/audit.ts
  • packages/cli/src/commands/handlers/cloud-run.ts
  • packages/cli/src/commands/handlers/cloud.ts
  • packages/cli/src/commands/handlers/external.ts
  • packages/cli/src/commands/handlers/licenses.ts
  • packages/cli/src/commands/handlers/marketplace-content.ts
  • packages/cli/src/commands/handlers/marketplace.ts
  • packages/cli/src/commands/handlers/memory.ts
  • packages/cli/src/commands/handlers/sandbox.ts
  • packages/cli/src/commands/handlers/settings.ts
  • packages/codemode/package.json
  • packages/console/app/package.json
  • packages/console/core/package.json
  • packages/console/function/package.json
  • packages/console/mail/package.json
  • packages/console/support/package.json
  • packages/core/package.json
  • packages/core/src/config.ts
  • packages/core/src/config/markdown.ts
  • packages/core/src/config/plugin/external.ts
  • packages/core/src/flag/flag.ts
  • packages/core/src/installation/version.ts
  • packages/core/src/location-services.ts
  • packages/core/src/models-dev.ts
  • packages/core/src/npm.ts
  • packages/core/src/plugin.ts
  • packages/core/src/plugin/host.ts
  • packages/core/src/plugin/internal.ts
  • packages/core/src/plugin/promise.ts
  • packages/core/src/plugin/provider/kilo.ts
  • packages/core/src/plugin/provider/llmgateway.ts
  • packages/core/src/plugin/provider/nvidia.ts
  • packages/core/src/plugin/provider/opencode.ts
  • packages/core/src/plugin/provider/openrouter.ts
  • packages/core/src/plugin/provider/vercel.ts
  • packages/core/src/plugin/provider/zenmux.ts
  • packages/core/src/plugin/skill.ts
  • packages/core/src/plugin/skill/customize-lunos.md
  • packages/core/src/plugin/system-prompt/dev-cycle-mode.txt
  • packages/core/src/plugin/system-prompt/meta.txt
  • packages/core/src/plugin/system-prompt/research-mode.txt
  • packages/core/src/ripgrep/binary.ts
  • packages/core/src/skill.ts
  • packages/core/src/tool/external.ts
  • packages/core/src/tool/external.txt
  • packages/core/src/v1/config/agent.ts
  • packages/core/test/config/markdown.test.ts
  • packages/core/test/plugin/fixture.ts
  • packages/core/test/plugin/provider-kilo.test.ts
  • packages/core/test/plugin/provider-nvidia.test.ts
  • packages/core/test/plugin/provider-opencode.test.ts
  • packages/core/test/plugin/provider-zenmux.test.ts
  • packages/core/test/plugin/skill.test.ts
  • packages/desktop/electron-builder.config.test.ts
  • packages/desktop/electron-builder.config.ts
  • packages/desktop/electron.vite.config.ts
  • packages/desktop/package.json
  • packages/desktop/scripts/copy-metainfo.ts
  • packages/desktop/scripts/finalize-latest-json.ts
  • packages/desktop/scripts/prebuild.ts
  • packages/desktop/src/main/background-cli.ts
  • packages/desktop/src/main/env.d.ts
  • packages/desktop/src/main/index.ts
  • packages/desktop/src/main/ipc.ts
  • packages/desktop/src/main/menu.ts
  • packages/desktop/src/main/native/menu-actions.ts
  • packages/desktop/src/main/storage/install-state.test.ts
  • packages/desktop/src/main/updater.ts
  • packages/desktop/src/main/windows.ts
  • packages/desktop/src/main/wsl/runtime.ts
  • packages/desktop/src/main/wsl/servers.test.ts
  • packages/desktop/src/renderer/i18n/am.ts
  • packages/desktop/src/renderer/i18n/ar.ts
  • packages/desktop/src/renderer/i18n/az.ts
  • packages/desktop/src/renderer/i18n/bg.ts
  • packages/desktop/src/renderer/i18n/bn.ts
  • packages/desktop/src/renderer/i18n/br.ts
  • packages/desktop/src/renderer/i18n/bs.ts
  • packages/desktop/src/renderer/i18n/ca.ts
  • packages/desktop/src/renderer/i18n/cs.ts
  • packages/desktop/src/renderer/i18n/da.ts
  • packages/desktop/src/renderer/i18n/de.ts
  • packages/desktop/src/renderer/i18n/dv.ts
  • packages/desktop/src/renderer/i18n/dz.ts
  • packages/desktop/src/renderer/i18n/el.ts
  • packages/desktop/src/renderer/i18n/en.ts
  • packages/desktop/src/renderer/i18n/es.ts
  • packages/desktop/src/renderer/i18n/et.ts
  • packages/desktop/src/renderer/i18n/fa.ts
  • packages/desktop/src/renderer/i18n/fi.ts
  • packages/desktop/src/renderer/i18n/fo.ts
  • packages/desktop/src/renderer/i18n/fr.ts
  • packages/desktop/src/renderer/i18n/hi.ts
  • packages/desktop/src/renderer/i18n/hr.ts
  • packages/desktop/src/renderer/i18n/hu.ts
  • packages/desktop/src/renderer/i18n/hy.ts
  • packages/desktop/src/renderer/i18n/id.ts
  • packages/desktop/src/renderer/i18n/is.ts
  • packages/desktop/src/renderer/i18n/it.ts
  • packages/desktop/src/renderer/i18n/ja.ts
  • packages/desktop/src/renderer/i18n/ka.ts
  • packages/desktop/src/renderer/i18n/km.ts
  • packages/desktop/src/renderer/i18n/ko.ts
  • packages/desktop/src/renderer/i18n/lo.ts
  • packages/desktop/src/renderer/i18n/lt.ts
  • packages/desktop/src/renderer/i18n/lv.ts
  • packages/desktop/src/renderer/i18n/mk.ts
  • packages/desktop/src/renderer/i18n/mn.ts
  • packages/desktop/src/renderer/i18n/ms.ts
  • packages/desktop/src/renderer/i18n/my.ts
  • packages/desktop/src/renderer/i18n/ne.ts
  • packages/desktop/src/renderer/i18n/nl.ts
  • packages/desktop/src/renderer/i18n/no.ts
  • packages/desktop/src/renderer/i18n/pa.ts
  • packages/desktop/src/renderer/i18n/pl.ts
  • packages/desktop/src/renderer/i18n/ro.ts
  • packages/desktop/src/renderer/i18n/ru.ts
  • packages/desktop/src/renderer/i18n/si.ts
  • packages/desktop/src/renderer/i18n/sk.ts
  • packages/desktop/src/renderer/i18n/sl.ts
  • packages/desktop/src/renderer/i18n/sq.ts
  • packages/desktop/src/renderer/i18n/sr.ts
  • packages/desktop/src/renderer/i18n/sv.ts
  • packages/desktop/src/renderer/i18n/tg.ts
  • packages/desktop/src/renderer/i18n/th.ts
  • packages/desktop/src/renderer/i18n/tk.ts
  • packages/desktop/src/renderer/i18n/tr.ts
  • packages/desktop/src/renderer/i18n/uk.ts
  • packages/desktop/src/renderer/i18n/ur.ts
  • packages/desktop/src/renderer/i18n/uz.ts
  • packages/desktop/src/renderer/i18n/vi.ts
  • packages/desktop/src/renderer/i18n/zh.ts
  • packages/desktop/src/renderer/i18n/zht.ts
  • packages/desktop/src/renderer/index.tsx
  • packages/effect-drizzle-sqlite/package.json
  • packages/effect-sqlite-node/package.json
  • packages/enterprise/package.json
  • packages/function/package.json
  • packages/http-recorder/package.json
  • packages/llm/package.json
  • packages/opencode/.gitignore
  • packages/opencode/Dockerfile
  • packages/opencode/package.json
  • packages/opencode/script/build.ts
  • packages/opencode/script/postinstall.mjs
  • packages/opencode/script/publish.ts
  • packages/opencode/specs/tui-plugins.md
  • packages/opencode/src/acp/service.ts
  • packages/opencode/src/agent/agent.ts
  • packages/opencode/src/auth/index.ts
  • packages/opencode/src/cli/cmd/account.ts
  • packages/opencode/src/cli/cmd/agent.ts
  • packages/opencode/src/cli/cmd/attach.ts
  • packages/opencode/src/cli/cmd/debug/agent.handler.ts
  • packages/opencode/src/cli/cmd/debug/config.ts
  • packages/opencode/src/cli/cmd/debug/file.ts
  • packages/opencode/src/cli/cmd/debug/index.ts
  • packages/opencode/src/cli/cmd/debug/lsp.ts
  • packages/opencode/src/cli/cmd/debug/ripgrep.ts
  • packages/opencode/src/cli/cmd/debug/scrap.ts
  • packages/opencode/src/cli/cmd/debug/skill.ts
  • packages/opencode/src/cli/cmd/debug/startup.ts
  • packages/opencode/src/cli/cmd/debug/v2.ts
  • packages/opencode/src/cli/cmd/github.handler.ts
  • packages/opencode/src/cli/cmd/mcp.ts
  • packages/opencode/src/cli/cmd/models.ts
  • packages/opencode/src/cli/cmd/plug.ts
  • packages/opencode/src/cli/cmd/pr.ts
  • packages/opencode/src/cli/cmd/providers.ts
  • packages/opencode/src/cli/cmd/run.ts
  • packages/opencode/src/cli/cmd/run/runtime.ts
  • packages/opencode/src/cli/cmd/serve.ts
  • packages/opencode/src/cli/cmd/stats.ts
  • packages/opencode/src/cli/cmd/tui.ts
  • packages/opencode/src/cli/cmd/uninstall.ts
  • packages/opencode/src/cli/cmd/upgrade.ts
  • packages/opencode/src/cli/error.ts
  • packages/opencode/src/cli/ui.ts
  • packages/opencode/src/cli/upgrade.ts
  • packages/opencode/src/command/index.ts
  • packages/opencode/src/config/agent.ts
  • packages/opencode/src/config/config.ts
  • packages/opencode/src/config/managed.ts
  • packages/opencode/src/config/parse.ts
  • packages/opencode/src/config/tui-migrate.ts
  • packages/opencode/src/config/tui.ts
  • packages/opencode/src/config/variable.ts
  • packages/opencode/src/control-plane/adapters/index.ts
  • packages/opencode/src/control-plane/workspace.ts
  • packages/opencode/src/effect/app-runtime.ts
  • packages/opencode/src/effect/runtime-flags.ts
  • packages/opencode/src/index.ts
  • packages/opencode/src/installation/index.ts
  • packages/opencode/src/mcp/index.ts
  • packages/opencode/src/mcp/oauth-provider.ts
  • packages/opencode/src/permission/index.ts
  • packages/opencode/src/plugin/digitalocean.ts
  • packages/opencode/src/plugin/index.ts
  • packages/opencode/src/plugin/install.ts
  • packages/opencode/src/plugin/shared.ts
  • packages/opencode/src/plugin/tui/runtime.ts
  • packages/opencode/src/plugin/xai.ts
  • packages/opencode/src/provider/error.ts
  • packages/opencode/src/provider/provider.ts
  • packages/opencode/src/question/index.ts
  • packages/opencode/src/server/routes/instance/httpapi/api.ts
  • packages/opencode/src/server/routes/instance/httpapi/errors.ts
  • packages/opencode/src/server/routes/instance/httpapi/groups/config.ts
  • packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
  • packages/opencode/src/server/routes/instance/httpapi/groups/global.ts
  • packages/opencode/src/server/routes/instance/httpapi/groups/provider.ts
  • packages/opencode/src/server/routes/instance/httpapi/groups/question.ts
  • packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/config.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/global.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/provider.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/question.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
  • packages/opencode/src/server/routes/instance/httpapi/handlers/tui.ts
  • packages/opencode/src/server/routes/instance/httpapi/middleware/error.ts
  • packages/opencode/src/server/routes/instance/httpapi/middleware/workspace-routing.ts
  • packages/opencode/src/server/routes/instance/httpapi/server.ts
  • packages/opencode/src/server/shared/ui.ts
  • packages/opencode/src/session/llm.ts
  • packages/opencode/src/session/llm/request.ts
  • packages/opencode/src/session/processor.ts
  • packages/opencode/src/session/prompt.ts
  • packages/opencode/src/session/prompt/anthropic.txt
  • packages/opencode/src/session/prompt/default.txt
  • packages/opencode/src/session/reminders.ts
  • packages/opencode/src/session/retry.ts
  • packages/opencode/src/session/session.ts
  • packages/opencode/src/session/tools.ts
  • packages/opencode/src/share/session.ts
  • packages/opencode/src/share/share-next.ts
  • packages/opencode/src/skill/index.ts
  • packages/opencode/src/tool/apply_patch.ts
  • packages/opencode/src/tool/code-mode.ts
  • packages/opencode/src/tool/edit.ts
  • packages/opencode/src/tool/external-directory.ts
  • packages/opencode/src/tool/glob.ts
  • packages/opencode/src/tool/grep.ts
  • packages/opencode/src/tool/invalid.ts
  • packages/opencode/src/tool/lsp.ts
  • packages/opencode/src/tool/question.ts
  • packages/opencode/src/tool/read.ts
  • packages/opencode/src/tool/registry.ts
  • packages/opencode/src/tool/shell.ts
  • packages/opencode/src/tool/skill.ts
  • packages/opencode/src/tool/task.ts
  • packages/opencode/src/tool/write.ts
  • packages/opencode/test/agent/agent.test.ts
  • packages/opencode/test/agent/plan-mode-subagent-bypass.test.ts
  • packages/opencode/test/cli/account.test.ts
  • packages/opencode/test/cli/error.test.ts
  • packages/opencode/test/cli/help/__snapshots__/help-snapshots.test.ts.snap
  • packages/opencode/test/cli/help/help-snapshots.test.ts
  • packages/opencode/test/cli/mcp-add.test.ts
  • packages/opencode/test/cli/run/run-process.test.ts
  • packages/opencode/test/config/config.test.ts
  • packages/opencode/test/config/fixtures/v2-compat/read/model-object-input.jsonc
  • packages/opencode/test/config/fixtures/v2-compat/read/model-object-output.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/clear-shell-input.jsonc
  • packages/opencode/test/config/fixtures/v2-compat/update-global/clear-shell-normalized.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/clear-shell-output.jsonc
  • packages/opencode/test/config/fixtures/v2-compat/update-global/preserve-v2-json-input.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/preserve-v2-json-normalized.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/preserve-v2-json-output.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/preserve-v2-jsonc-input.jsonc
  • packages/opencode/test/config/fixtures/v2-compat/update-global/preserve-v2-jsonc-normalized.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/preserve-v2-jsonc-output.jsonc
  • packages/opencode/test/config/fixtures/v2-compat/update-global/v1-overrides-input.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/v1-overrides-normalized.json
  • packages/opencode/test/config/fixtures/v2-compat/update-global/v1-overrides-output.json
  • packages/opencode/test/config/fixtures/v2-compat/update-project/preserve-v2-input.json
  • packages/opencode/test/config/fixtures/v2-compat/update-project/preserve-v2-normalized.json
  • packages/opencode/test/config/fixtures/v2-compat/update-project/preserve-v2-output.json
  • packages/opencode/test/config/fixtures/v2-compat/update-project/v1-overrides-input.json
  • packages/opencode/test/config/fixtures/v2-compat/update-project/v1-overrides-normalized.json
  • packages/opencode/test/config/fixtures/v2-compat/update-project/v1-overrides-output.json
  • packages/opencode/test/config/markdown.test.ts
  • packages/opencode/test/config/tui.test.ts
  • packages/opencode/test/config/v2-compat.test.ts
  • packages/opencode/test/control-plane/workspace.test.ts
  • packages/opencode/test/effect/runtime-flags.test.ts
  • packages/opencode/test/event-manifest.test.ts
  • packages/opencode/test/fake/provider.ts
  • packages/opencode/test/fixture/config.ts
  • packages/opencode/test/fixture/fixture.ts
  • packages/opencode/test/fixture/tui-plugin.ts
  • packages/opencode/test/installation/installation.test.ts
  • packages/opencode/test/lib/cli-process.ts
  • packages/opencode/test/plugin/loader-shared.test.ts
  • packages/opencode/test/plugin/trigger.test.ts
  • packages/opencode/test/plugin/workspace-adapter.test.ts
  • packages/opencode/test/project/instance-bootstrap.test.ts
  • packages/opencode/test/provider/gitlab-duo.test.ts
  • packages/opencode/test/provider/provider.test.ts
  • packages/opencode/test/server/httpapi-cors.test.ts
  • packages/opencode/test/server/httpapi-error-middleware.test.ts
  • packages/opencode/test/server/httpapi-exercise/index.ts
  • packages/opencode/test/server/httpapi-listen.test.ts
  • packages/opencode/test/server/httpapi-ui.test.ts
  • packages/opencode/test/server/httpapi-workspace.test.ts
  • packages/opencode/test/session/llm-native-recorded.test.ts
  • packages/opencode/test/session/prompt.test.ts
  • packages/opencode/test/session/retry.test.ts
  • packages/opencode/test/session/tools.test.ts
  • packages/opencode/test/share/share-next.test.ts
  • packages/opencode/test/tool/__snapshots__/parameters.test.ts.snap
  • packages/opencode/test/tool/external-directory.test.ts
  • packages/opencode/test/tool/read.test.ts
  • packages/opencode/test/tool/task.test.ts
  • packages/plugin/package.json
  • packages/plugin/src/effect/tool.ts
  • packages/plugin/src/tui.ts
  • packages/plugin/src/v2/effect/README.md
  • packages/plugin/src/v2/effect/context.ts
  • packages/plugin/src/v2/effect/index.ts
  • packages/plugin/src/v2/promise/README.md
  • packages/plugin/src/v2/promise/context.ts
  • packages/plugin/src/v2/promise/index.ts
  • packages/schema/src/event-manifest.ts
  • packages/schema/src/skill.ts
  • packages/script/src/index.ts
  • packages/sdk/js/package.json
  • packages/sdk/js/src/gen/types.gen.ts
  • packages/sdk/js/src/v2/gen/sdk.gen.ts
  • packages/sdk/js/src/v2/gen/types.gen.ts
  • packages/sdk/openapi.json
  • packages/server/package.json
  • packages/session-ui/package.json
  • packages/session-ui/src/components/basic-tool.tsx
  • packages/slack/package.json
  • packages/stats/app/package.json
  • packages/stats/core/package.json
  • packages/stats/server/package.json
  • packages/storybook/.storybook/mocks/app/context/language.ts
  • packages/tui/package.json
  • packages/tui/src/app.tsx
  • packages/tui/src/attention.ts
  • packages/tui/src/component/dialog-debug.tsx
  • packages/tui/src/component/dialog-mode.tsx
  • packages/tui/src/component/dialog-model.tsx
  • packages/tui/src/component/dialog-provider.tsx
  • packages/tui/src/component/dialog-status.tsx
  • packages/tui/src/component/dialog-theme-list.tsx
  • packages/tui/src/component/dialog-workspace-list.tsx
  • packages/tui/src/component/error-component.tsx
  • packages/tui/src/component/logo.tsx
  • packages/tui/src/component/prompt/autocomplete.tsx
  • packages/tui/src/component/prompt/index.tsx
  • packages/tui/src/component/prompt/workspace.tsx
  • packages/tui/src/component/spinner.tsx
  • packages/tui/src/component/workspace-label.tsx
  • packages/tui/src/config/index.tsx
  • packages/tui/src/config/keybind.ts
  • packages/tui/src/context/local.tsx
  • packages/tui/src/context/theme.tsx
  • packages/tui/src/feature-plugins/home/footer.tsx
  • packages/tui/src/feature-plugins/home/tips-view.tsx
  • packages/tui/src/feature-plugins/sidebar/footer.tsx
  • packages/tui/src/feature-plugins/sidebar/lsp.tsx
  • packages/tui/src/feature-plugins/sidebar/mcp.tsx
  • packages/tui/src/feature-plugins/system/plugins.tsx
  • packages/tui/src/keymap.tsx
  • packages/tui/src/mini/splash.ts
  • packages/tui/src/plugin/adapters.tsx
  • packages/tui/src/routes/home.tsx
  • packages/tui/src/routes/session/footer.tsx
  • packages/tui/src/routes/session/index.tsx
  • packages/tui/src/routes/session/permission.tsx
  • packages/tui/src/routes/session/question.tsx
  • packages/tui/src/routes/session/sidebar.tsx
  • packages/tui/src/theme/index.ts
  • packages/tui/src/ui/dialog-confirm.tsx
  • packages/tui/src/ui/dialog-select.tsx
  • packages/tui/src/util/error.ts
  • packages/tui/src/util/presentation.ts
  • packages/tui/test/app-lifecycle.test.tsx
  • packages/tui/test/keybind.test.ts
  • packages/tui/test/mini/external-agent.test.ts
  • packages/tui/test/mini/external-directory-paths.test.ts
  • packages/tui/test/mini/memory-convention.test.ts
  • packages/tui/test/mini/outward-commands.test.ts
  • packages/tui/test/mini/plugin-tool-hooks.test.ts
  • packages/tui/test/mini/skill-allowed-tools.test.ts
  • packages/tui/test/mini/subagent-model.test.ts
  • packages/tui/test/mini/unknown-tool.test.ts
  • packages/ui/package.json
  • packages/ui/src/components/tabs.tsx
  • packages/ui/src/theme/themes/oc-2.json
  • packages/ui/src/theme/themes/opencode.json
  • packages/ui/vite.config.ts
  • packages/util/src/fs-util.ts
  • packages/web/src/content/docs/agents.mdx
  • packages/web/src/content/docs/index.mdx
  • packages/web/src/content/docs/mcp-servers.mdx
  • packages/web/src/content/docs/providers.mdx
  • packages/web/src/content/docs/zen.mdx
  • script/publish.ts
  • script/translate-app.ts
  • script/version.ts
  • sdks/vscode/package.json
  • services/www/src/docs/content/console/go.mdx
  • turbo.json

🔴 Upstream changed CI or release plumbing

Check each of these before merging: the fork's workflows differ from upstream on purpose.

  • 🔴 .github/actions/setup-bun/action.yml
  • 🔴 .github/workflows/check.yml
  • 🔴 .github/workflows/deploy-files.yml
  • 🔴 .github/workflows/deploy-posts.yml
  • 🔴 .github/workflows/deploy-update.yml
  • 🔴 .github/workflows/deploy-www.yml
  • 🔴 .github/workflows/deploy.yml
  • 🔴 .github/workflows/duplicate-issues.yml
  • 🔴 .github/workflows/generate.yml
  • 🔴 .github/workflows/models-snapshot.yml
  • 🔴 .github/workflows/nix-eval.yml
  • 🔴 .github/workflows/nix-hashes.yml
  • 🔴 .github/workflows/pr-standards.yml
  • 🔴 .github/workflows/publish.yml (release workflow)
  • 🔴 .github/workflows/test.yml
  • 🔴 .github/workflows/triage.yml
  • 🔴 .github/workflows/typecheck.yml
  • 🔴 .github/workflows/unlock.yml

Version lines kept automatically

Only the "version" line conflicted in 1 package.json files; the workflow kept Lunos's version in each (the one conflict it resolves by itself). Everything else in those files merged normally.

Lunos-owned paths touched by upstream

Upstream changed files that Lunos has modified on purpose (.github/lunos-owned-paths). Review these by hand, even if the merge is clean.

  • .github/actions/setup-bun/action.yml
  • .github/workflows/check.yml
  • .github/workflows/deploy-files.yml
  • .github/workflows/deploy-posts.yml
  • .github/workflows/deploy-update.yml
  • .github/workflows/deploy-www.yml
  • .github/workflows/deploy.yml
  • .github/workflows/duplicate-issues.yml
  • .github/workflows/generate.yml
  • .github/workflows/models-snapshot.yml
  • .github/workflows/nix-eval.yml
  • .github/workflows/nix-hashes.yml
  • .github/workflows/pr-standards.yml
  • .github/workflows/publish.yml
  • .github/workflows/test.yml
  • .github/workflows/triage.yml
  • .github/workflows/typecheck.yml
  • .github/workflows/unlock.yml
  • install
  • packages/cli/script/build.ts
  • packages/cli/script/publish.ts
  • packages/core/src/config/agent.ts
  • packages/core/src/config/attachments.ts
  • packages/core/src/config/command.ts
  • packages/core/src/config/compaction.ts
  • packages/core/src/config/discovery.ts
  • packages/core/src/config/experimental.ts
  • packages/core/src/config/formatter.ts
  • packages/core/src/config/lsp.ts
  • packages/core/src/config/markdown.ts
  • packages/core/src/config/mcp.ts
  • packages/core/src/config/normalize.ts
  • packages/core/src/config/plugin.ts
  • packages/core/src/config/plugin/agent.ts
  • packages/core/src/config/plugin/command.ts
  • packages/core/src/config/plugin/compaction.ts
  • packages/core/src/config/plugin/compatibility.ts
  • packages/core/src/config/plugin/entry-observer.ts
  • packages/core/src/config/plugin/external.ts
  • packages/core/src/config/plugin/formatter.ts
  • packages/core/src/config/plugin/image.ts
  • packages/core/src/config/plugin/instruction.ts
  • packages/core/src/config/plugin/location-watcher.ts
  • packages/core/src/config/plugin/mcp.ts
  • packages/core/src/config/plugin/policy.ts
  • packages/core/src/config/plugin/provider.ts
  • packages/core/src/config/plugin/reference.ts
  • packages/core/src/config/plugin/shell.ts
  • packages/core/src/config/plugin/skill-file.ts
  • packages/core/src/config/plugin/skill.ts
  • packages/core/src/config/plugin/snapshot.ts
  • packages/core/src/config/plugin/source.ts
  • packages/core/src/config/plugin/tool-output.ts
  • packages/core/src/config/plugin/websearch.ts
  • packages/core/src/config/plugin/worktree.ts
  • packages/core/src/config/provider.ts
  • packages/core/src/config/reference.ts
  • packages/core/src/config/tool-output.ts
  • packages/core/src/config/variable.ts
  • packages/core/src/config/watch.ts
  • packages/core/src/config/watcher.ts
  • packages/core/src/installation/version.ts
  • packages/core/src/npm.ts
  • packages/core/src/plugin/agent.ts
  • packages/core/src/plugin/command.ts
  • packages/core/src/plugin/command/review.txt
  • packages/core/src/plugin/hooks.ts
  • packages/core/src/plugin/host.ts
  • packages/core/src/plugin/identity.ts
  • packages/core/src/plugin/instance.ts
  • packages/core/src/plugin/internal.ts
  • packages/core/src/plugin/layer-map.example.ts
  • packages/core/src/plugin/mcp-codemode-defaults.ts
  • packages/core/src/plugin/models-dev.ts
  • packages/core/src/plugin/module.ts
  • packages/core/src/plugin/optimize.ts
  • packages/core/src/plugin/plan.ts
  • packages/core/src/plugin/promise.ts
  • packages/core/src/plugin/provider.ts
  • packages/core/src/plugin/provider/alibaba.ts
  • packages/core/src/plugin/provider/amazon-bedrock.ts
  • packages/core/src/plugin/provider/anthropic.ts
  • packages/core/src/plugin/provider/azure.ts
  • packages/core/src/plugin/provider/cerebras.ts
  • packages/core/src/plugin/provider/chatgpt.ts
  • packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
  • packages/core/src/plugin/provider/cloudflare-workers-ai.ts
  • packages/core/src/plugin/provider/cohere.ts
  • packages/core/src/plugin/provider/configured.ts
  • packages/core/src/plugin/provider/databricks.ts
  • packages/core/src/plugin/provider/deepinfra.ts
  • packages/core/src/plugin/provider/digitalocean.ts
  • packages/core/src/plugin/provider/dynamic.ts
  • packages/core/src/plugin/provider/factory.ts
  • packages/core/src/plugin/provider/gateway.ts
  • packages/core/src/plugin/provider/github-copilot.ts
  • packages/core/src/plugin/provider/gitlab.ts
  • packages/core/src/plugin/provider/google-vertex.ts
  • packages/core/src/plugin/provider/google.ts
  • packages/core/src/plugin/provider/groq.ts
  • packages/core/src/plugin/provider/kilo.ts
  • packages/core/src/plugin/provider/llmgateway.ts
  • packages/core/src/plugin/provider/lmstudio.ts
  • packages/core/src/plugin/provider/local.ts
  • packages/core/src/plugin/provider/mistral.ts
  • packages/core/src/plugin/provider/modal.ts
  • packages/core/src/plugin/provider/neon.ts
  • packages/core/src/plugin/provider/nvidia.ts
  • packages/core/src/plugin/provider/ollama.ts
  • packages/core/src/plugin/provider/openai-compatible.ts
  • packages/core/src/plugin/provider/openai.ts
  • packages/core/src/plugin/provider/opencode.ts
  • packages/core/src/plugin/provider/openrouter.ts
  • packages/core/src/plugin/provider/perplexity.ts
  • packages/core/src/plugin/provider/poe.ts
  • packages/core/src/plugin/provider/prompt-cache-key.ts
  • packages/core/src/plugin/provider/sap-ai-core.ts
  • packages/core/src/plugin/provider/sdk-factory.ts
  • packages/core/src/plugin/provider/snowflake-cortex.ts
  • packages/core/src/plugin/provider/togetherai.ts
  • packages/core/src/plugin/provider/venice.ts
  • packages/core/src/plugin/provider/vercel.ts
  • packages/core/src/plugin/provider/vllm.ts
  • packages/core/src/plugin/provider/xai.ts
  • packages/core/src/plugin/provider/zenmux.ts
  • packages/core/src/plugin/sdk.ts
  • packages/core/src/plugin/service.ts
  • packages/core/src/plugin/skill.ts
  • packages/core/src/plugin/skill/customize-opencode.md
  • packages/core/src/plugin/skill/opencode.md
  • packages/core/src/plugin/skill/report.md
  • packages/core/src/plugin/source-directory.ts
  • packages/core/src/plugin/supervisor.ts
  • packages/core/src/plugin/system-prompt/anthropic.txt
  • packages/core/src/plugin/system-prompt/gpt-astra.txt
  • packages/core/src/plugin/system-prompt/gpt.txt
  • packages/core/src/plugin/system-prompt/kimi.txt
  • packages/core/src/plugin/system-prompt/meta.txt
  • packages/core/src/plugin/system-prompt/trinity.txt
  • packages/core/src/plugin/tool-input-repair.ts
  • packages/core/src/plugin/update.ts
  • packages/core/src/plugin/variant.ts
  • packages/core/src/plugin/vcs/git.ts
  • packages/core/src/plugin/vcs/hg.ts
  • packages/core/src/plugin/verbosity.ts
  • packages/core/src/plugin/warming.ts
  • packages/core/src/plugin/websearch/exa.ts
  • packages/core/src/plugin/websearch/firecrawl.ts
  • packages/core/src/plugin/websearch/index.ts
  • packages/core/src/plugin/websearch/mcp.ts
  • packages/core/src/plugin/websearch/parallel.ts
  • packages/core/src/plugin/websearch/tavily.ts
  • packages/core/src/plugin/websearch/tinyfish.ts
  • packages/core/src/v1/config/config.ts
  • packages/desktop/AGENTS.md
  • packages/desktop/README.md
  • packages/desktop/drizzle.config.ts
  • packages/desktop/electron-builder.config.test.ts
  • packages/desktop/electron-builder.config.ts
  • packages/desktop/electron.vite.config.test.ts
  • packages/desktop/electron.vite.config.ts
  • packages/desktop/package.json
  • packages/desktop/resources/entitlements.cli.plist
  • packages/desktop/resources/entitlements.plist
  • packages/desktop/resources/windows/installer.nsh
  • packages/desktop/scripts/bench-startup.ts
  • packages/desktop/scripts/bench-variant.ps1
  • packages/desktop/scripts/copy-bundles.ts
  • packages/desktop/scripts/copy-icons.ts
  • packages/desktop/scripts/copy-metainfo.ts
  • packages/desktop/scripts/dev-electron.ts
  • packages/desktop/scripts/dev.ts
  • packages/desktop/scripts/finalize-latest-json.ts
  • packages/desktop/scripts/finalize-latest-yml.ts
  • packages/desktop/scripts/fixtures/picker/index.html
  • packages/desktop/scripts/fixtures/picker/main.ts
  • packages/desktop/scripts/migration.ts
  • packages/desktop/scripts/picker.test.ts
  • packages/desktop/scripts/picker.ts
  • packages/desktop/scripts/prebuild.ts
  • packages/desktop/scripts/predev.ts
  • packages/desktop/scripts/prepare.ts
  • packages/desktop/scripts/profile-by-source.ts
  • packages/desktop/scripts/publish.ts
  • packages/desktop/scripts/utils.ts
  • packages/desktop/scripts/windows-installer.test.ts
  • packages/desktop/src/main/apps.ts
  • packages/desktop/src/main/attachment-picker.test.ts
  • packages/desktop/src/main/attachment-picker.ts
  • packages/desktop/src/main/background-cli.ts
  • packages/desktop/src/main/constants.ts
  • packages/desktop/src/main/debug.ts
  • packages/desktop/src/main/desktop-menu-actions.ts
  • packages/desktop/src/main/desktop.ts
  • packages/desktop/src/main/draft-store.test.ts
  • packages/desktop/src/main/draft-store.ts
  • packages/desktop/src/main/env.d.ts
  • packages/desktop/src/main/extension/archive.ts
  • packages/desktop/src/main/extension/assets.ts
  • packages/desktop/src/main/extension/embeds.ts
  • packages/desktop/src/main/extension/enable-state.ts
  • packages/desktop/src/main/extension/error.ts
  • packages/desktop/src/main/extension/host.ts
  • packages/desktop/src/main/extension/index.ts
  • packages/desktop/src/main/extension/lifecycle.test.ts
  • packages/desktop/src/main/extension/lifecycle.ts
  • packages/desktop/src/main/extension/manager.test.ts
  • packages/desktop/src/main/extension/manager.ts
  • packages/desktop/src/main/extension/manifest.ts
  • packages/desktop/src/main/extension/module.ts
  • packages/desktop/src/main/extension/storage.test.ts
  • packages/desktop/src/main/extension/storage.ts
  • packages/desktop/src/main/external-url.test.ts
  • packages/desktop/src/main/files/apps.ts
  • packages/desktop/src/main/files/attachment-picker.test.ts
  • packages/desktop/src/main/files/attachment-picker.ts
  • packages/desktop/src/main/files/external-url.test.ts
  • packages/desktop/src/main/files/external-url.ts
  • packages/desktop/src/main/files/index.ts
  • packages/desktop/src/main/index.test.ts
  • packages/desktop/src/main/index.ts
  • packages/desktop/src/main/initialization.ts
  • packages/desktop/src/main/install-state.test.ts
  • packages/desktop/src/main/install-state.ts
  • packages/desktop/src/main/ipc-events.ts
  • packages/desktop/src/main/ipc-handlers/app.ts
  • packages/desktop/src/main/ipc-handlers/context.ts
  • packages/desktop/src/main/ipc-handlers/events.ts
  • packages/desktop/src/main/ipc-handlers/extensions.ts
  • packages/desktop/src/main/ipc-handlers/files.ts
  • packages/desktop/src/main/ipc-handlers/menu.ts
  • packages/desktop/src/main/ipc-handlers/storage.ts
  • packages/desktop/src/main/ipc-handlers/window.ts
  • packages/desktop/src/main/ipc-transport.test.ts
  • packages/desktop/src/main/ipc-transport.ts
  • packages/desktop/src/main/ipc.ts
  • packages/desktop/src/main/lifecycle/configure.ts
  • packages/desktop/src/main/lifecycle/deep-link.test.ts
  • packages/desktop/src/main/lifecycle/deep-link.ts
  • packages/desktop/src/main/lifecycle/desktop-initialization.ts
  • packages/desktop/src/main/lifecycle/environment.ts
  • packages/desktop/src/main/lifecycle/index.ts
  • packages/desktop/src/main/lifecycle/marks.ts
  • packages/desktop/src/main/lifecycle/onboarding.ts
  • packages/desktop/src/main/lifecycle/shutdown.ts
  • packages/desktop/src/main/logging.ts
  • packages/desktop/src/main/menu.ts
  • packages/desktop/src/main/migrate.ts
  • packages/desktop/src/main/native-translations.ts
  • packages/desktop/src/main/native/corners.ts
  • packages/desktop/src/main/native/debug.ts
  • packages/desktop/src/main/native/install-cli.ts
  • packages/desktop/src/main/native/logging.ts
  • packages/desktop/src/main/native/menu-actions.ts
  • packages/desktop/src/main/native/menu.ts
  • packages/desktop/src/main/native/translations.ts
  • packages/desktop/src/main/onboarding.ts
  • packages/desktop/src/main/paths.ts
  • packages/desktop/src/main/server.ts
  • packages/desktop/src/main/service/background-service-state.test.ts
  • packages/desktop/src/main/service/background-service-state.ts
  • packages/desktop/src/main/service/background-service.ts
  • packages/desktop/src/main/service/cli-stages.test.ts
  • packages/desktop/src/main/service/cli-stages.ts
  • packages/desktop/src/main/service/cli-version.ts
  • packages/desktop/src/main/service/desktop-cli.ts
  • packages/desktop/src/main/service/shell-env.test.ts
  • packages/desktop/src/main/service/shell-env.ts
  • packages/desktop/src/main/service/sidecar-credentials.test.ts
  • packages/desktop/src/main/service/sidecar-credentials.ts
  • packages/desktop/src/main/service/sidecar-probe.ts
  • packages/desktop/src/main/shell-env.test.ts
  • packages/desktop/src/main/shell-env.ts
  • packages/desktop/src/main/sidecar.ts
  • packages/desktop/src/main/storage/database.test.ts
  • packages/desktop/src/main/storage/database.ts
  • packages/desktop/src/main/storage/drafts.test.ts
  • packages/desktop/src/main/storage/drafts.ts
  • packages/desktop/src/main/storage/index.ts
  • packages/desktop/src/main/storage/install-state.test.ts
  • packages/desktop/src/main/storage/install-state.ts
  • packages/desktop/src/main/storage/keys.ts
  • packages/desktop/src/main/storage/legacy.test.ts
  • packages/desktop/src/main/storage/legacy.ts
  • packages/desktop/src/main/storage/migration.gen.ts
  • packages/desktop/src/main/storage/migration.ts
  • packages/desktop/src/main/storage/migration/20260906234153_drafts/migration.sql
  • packages/desktop/src/main/storage/migration/20260906234153_drafts/snapshot.json
  • packages/desktop/src/main/storage/migration/20260906234220_state/migration.sql
  • packages/desktop/src/main/storage/migration/20260906234220_state/snapshot.json
  • packages/desktop/src/main/storage/migration/20260907031611_blob-touched/migration.sql
  • packages/desktop/src/main/storage/migration/20260907031611_blob-touched/snapshot.json
  • packages/desktop/src/main/storage/migration/20260930041551_extension/migration.sql
  • packages/desktop/src/main/storage/migration/20260930041551_extension/snapshot.json
  • packages/desktop/src/main/storage/schema.ts
  • packages/desktop/src/main/storage/snapshot.ts
  • packages/desktop/src/main/storage/state.test.ts
  • packages/desktop/src/main/storage/state.ts
  • packages/desktop/src/main/storage/store.test.ts
  • packages/desktop/src/main/storage/store.ts
  • packages/desktop/src/main/storage/window-snapshot.test.ts
  • packages/desktop/src/main/storage/window-snapshot.ts
  • packages/desktop/src/main/storage/write-behind.test.ts
  • packages/desktop/src/main/storage/write-behind.ts
  • packages/desktop/src/main/store-cleanup.test.ts
  • packages/desktop/src/main/store-cleanup.ts
  • packages/desktop/src/main/store-keys.ts
  • packages/desktop/src/main/store.ts
  • packages/desktop/src/main/unresponsive.ts
  • packages/desktop/src/main/updater-controller.test.ts
  • packages/desktop/src/main/updater-controller.ts
  • packages/desktop/src/main/updater-subscriptions.test.ts
  • packages/desktop/src/main/updater-subscriptions.ts
  • packages/desktop/src/main/updater.ts
  • packages/desktop/src/main/window-registry.test.ts
  • packages/desktop/src/main/window-registry.ts
  • packages/desktop/src/main/window-state.ts
  • packages/desktop/src/main/windows.ts
  • packages/desktop/src/main/windows/appearance.ts
  • packages/desktop/src/main/windows/bootstrap.ts
  • packages/desktop/src/main/windows/defaults.ts
  • packages/desktop/src/main/windows/early.ts
  • packages/desktop/src/main/windows/headers.test.ts
  • packages/desktop/src/main/windows/headers.ts
  • packages/desktop/src/main/windows/index.ts
  • packages/desktop/src/main/windows/protocol.ts
  • packages/desktop/src/main/windows/recovery.ts
  • packages/desktop/src/main/windows/registry.test.ts
  • packages/desktop/src/main/windows/registry.ts
  • packages/desktop/src/main/windows/scheme.ts
  • packages/desktop/src/main/windows/security.ts
  • packages/desktop/src/main/windows/state.ts
  • packages/desktop/src/main/windows/unresponsive.ts
  • packages/desktop/src/main/windows/window-state.test.ts
  • packages/desktop/src/main/windows/window-state.ts
  • packages/desktop/src/main/wsl/ipc.ts
  • packages/desktop/src/main/wsl/policy.ts
  • packages/desktop/src/main/wsl/runtime.ts
  • packages/desktop/src/main/wsl/servers.test.ts
  • packages/desktop/src/main/wsl/servers.ts
  • packages/desktop/src/main/wsl/sidecar.ts
  • packages/desktop/src/main/wsl/startup.ts
  • packages/desktop/src/preload/index.ts
  • packages/desktop/src/preload/types.ts
  • packages/desktop/src/renderer/api-types.ts
  • packages/desktop/src/renderer/api.ts
  • packages/desktop/src/renderer/cli.ts
  • packages/desktop/src/renderer/desktop-app.tsx
  • packages/desktop/src/renderer/diagnostics.ts
  • packages/desktop/src/renderer/env.d.ts
  • packages/desktop/src/renderer/extensions.ts
  • packages/desktop/src/renderer/html.test.ts
  • packages/desktop/src/renderer/i18n/am.ts
  • packages/desktop/src/renderer/i18n/ar.ts
  • packages/desktop/src/renderer/i18n/az.ts
  • packages/desktop/src/renderer/i18n/bg.ts
  • packages/desktop/src/renderer/i18n/bn.ts
  • packages/desktop/src/renderer/i18n/br.ts
  • packages/desktop/src/renderer/i18n/bs.ts
  • packages/desktop/src/renderer/i18n/ca.ts
  • packages/desktop/src/renderer/i18n/cs.ts
  • packages/desktop/src/renderer/i18n/da.ts
  • packages/desktop/src/renderer/i18n/de.ts
  • packages/desktop/src/renderer/i18n/dv.ts
  • packages/desktop/src/renderer/i18n/dz.ts
  • packages/desktop/src/renderer/i18n/el.ts
  • packages/desktop/src/renderer/i18n/en.ts
  • packages/desktop/src/renderer/i18n/es.ts
  • packages/desktop/src/renderer/i18n/et.ts
  • packages/desktop/src/renderer/i18n/fa.ts
  • packages/desktop/src/renderer/i18n/fi.ts
  • packages/desktop/src/renderer/i18n/fo.ts
  • packages/desktop/src/renderer/i18n/fr.ts
  • packages/desktop/src/renderer/i18n/hi.ts
  • packages/desktop/src/renderer/i18n/hr.ts
  • packages/desktop/src/renderer/i18n/hu.ts
  • packages/desktop/src/renderer/i18n/hy.ts
  • packages/desktop/src/renderer/i18n/id.ts
  • packages/desktop/src/renderer/i18n/index.ts
  • packages/desktop/src/renderer/i18n/is.ts
  • packages/desktop/src/renderer/i18n/it.ts
  • packages/desktop/src/renderer/i18n/ja.ts
  • packages/desktop/src/renderer/i18n/ka.ts
  • packages/desktop/src/renderer/i18n/km.ts
  • packages/desktop/src/renderer/i18n/ko.ts
  • packages/desktop/src/renderer/i18n/lo.ts
  • packages/desktop/src/renderer/i18n/lt.ts
  • packages/desktop/src/renderer/i18n/lv.ts
  • packages/desktop/src/renderer/i18n/mk.ts
  • packages/desktop/src/renderer/i18n/mn.ts
  • packages/desktop/src/renderer/i18n/ms.ts
  • packages/desktop/src/renderer/i18n/my.ts
  • packages/desktop/src/renderer/i18n/ne.ts
  • packages/desktop/src/renderer/i18n/nl.ts
  • packages/desktop/src/renderer/i18n/no.ts
  • packages/desktop/src/renderer/i18n/pa.ts
  • packages/desktop/src/renderer/i18n/pl.ts
  • packages/desktop/src/renderer/i18n/ro.ts
  • packages/desktop/src/renderer/i18n/ru.ts
  • packages/desktop/src/renderer/i18n/si.ts
  • packages/desktop/src/renderer/i18n/sk.ts
  • packages/desktop/src/renderer/i18n/sl.ts
  • packages/desktop/src/renderer/i18n/sq.ts
  • packages/desktop/src/renderer/i18n/sr.ts
  • packages/desktop/src/renderer/i18n/sv.ts
  • packages/desktop/src/renderer/i18n/tg.ts
  • packages/desktop/src/renderer/i18n/th.ts
  • packages/desktop/src/renderer/i18n/tk.ts
  • packages/desktop/src/renderer/i18n/tr.ts
  • packages/desktop/src/renderer/i18n/uk.ts
  • packages/desktop/src/renderer/i18n/ur.ts
  • packages/desktop/src/renderer/i18n/uz.ts
  • packages/desktop/src/renderer/i18n/vi.ts
  • packages/desktop/src/renderer/i18n/zh.ts
  • packages/desktop/src/renderer/i18n/zht.ts
  • packages/desktop/src/renderer/index.tsx
  • packages/desktop/src/renderer/initialization.test.ts
  • packages/desktop/src/renderer/initialization.ts
  • packages/desktop/src/renderer/ipc-client.ts
  • packages/desktop/src/renderer/migration-status.tsx
  • packages/desktop/src/renderer/onboarding.tsx
  • packages/desktop/src/renderer/onboarding/index.tsx
  • packages/desktop/src/renderer/platform/files.test.ts
  • packages/desktop/src/renderer/platform/files.ts
  • packages/desktop/src/renderer/platform/index.ts
  • packages/desktop/src/renderer/platform/menu.ts
  • packages/desktop/src/renderer/platform/notifications.ts
  • packages/desktop/src/renderer/platform/storage.ts
  • packages/desktop/src/renderer/startup/deep-links.ts
  • packages/desktop/src/renderer/startup/initialization.test.ts
  • packages/desktop/src/renderer/startup/initialization.ts
  • packages/desktop/src/renderer/startup/locale-value.ts
  • packages/desktop/src/renderer/startup/locale.test.ts
  • packages/desktop/src/renderer/startup/locale.ts
  • packages/desktop/src/renderer/startup/root.ts
  • packages/desktop/src/renderer/startup/sentry.ts
  • packages/desktop/src/renderer/startup/splash.css
  • packages/desktop/src/renderer/startup/splash.tsx
  • packages/desktop/src/renderer/styles.css
  • packages/desktop/src/renderer/webview-zoom.ts
  • packages/desktop/src/renderer/window-fullscreen.ts
  • packages/desktop/src/renderer/window/fullscreen.ts
  • packages/desktop/src/renderer/window/route-storage.test.ts
  • packages/desktop/src/renderer/window/route-storage.ts
  • packages/desktop/src/renderer/window/router.tsx
  • packages/desktop/src/renderer/window/zoom.ts
  • packages/desktop/src/renderer/wsl/connections.test.ts
  • packages/desktop/src/renderer/wsl/connections.ts
  • packages/desktop/src/shared/ipc-contract.ts
  • packages/desktop/src/shared/ipc-rpc.ts
  • packages/desktop/src/shared/ipc-rpc/app.ts
  • packages/desktop/src/shared/ipc-rpc/events.ts
  • packages/desktop/src/shared/ipc-rpc/extensions.ts
  • packages/desktop/src/shared/ipc-rpc/files.ts
  • packages/desktop/src/shared/ipc-rpc/menu.ts
  • packages/desktop/src/shared/ipc-rpc/storage.ts
  • packages/desktop/src/shared/ipc-rpc/window.ts
  • packages/desktop/src/shared/ipc-transport.ts
  • packages/desktop/src/shared/window-bootstrap.test.ts
  • packages/desktop/src/shared/window-bootstrap.ts
  • packages/desktop/tsconfig.json
  • packages/opencode/package.json
  • packages/opencode/script/build.ts
  • packages/opencode/script/postinstall.mjs
  • packages/opencode/script/publish.ts
  • packages/opencode/src/cli/cmd/uninstall.ts
  • packages/opencode/src/cli/cmd/upgrade.ts
  • packages/opencode/src/cli/upgrade.ts
  • packages/opencode/src/config/config.ts
  • packages/opencode/src/index.ts
  • packages/opencode/src/installation/index.ts
  • packages/opencode/src/plugin/azure.ts
  • packages/opencode/src/plugin/cerebras.ts
  • packages/opencode/src/plugin/cloudflare.ts
  • packages/opencode/src/plugin/digitalocean.ts
  • packages/opencode/src/plugin/github-copilot/copilot.ts
  • packages/opencode/src/plugin/github-copilot/models.ts
  • packages/opencode/src/plugin/index.ts
  • packages/opencode/src/plugin/install.ts
  • packages/opencode/src/plugin/loader.ts
  • packages/opencode/src/plugin/meta.ts
  • packages/opencode/src/plugin/modal/modal.ts
  • packages/opencode/src/plugin/modal/models.ts
  • packages/opencode/src/plugin/openai/README.md
  • packages/opencode/src/plugin/openai/codex.ts
  • packages/opencode/src/plugin/openai/ws-pool.ts
  • packages/opencode/src/plugin/openai/ws.ts
  • packages/opencode/src/plugin/pty-environment.ts
  • packages/opencode/src/plugin/shared.ts
  • packages/opencode/src/plugin/snowflake-cortex.ts
  • packages/opencode/src/plugin/tui/internal.ts
  • packages/opencode/src/plugin/tui/runtime.ts
  • packages/opencode/src/plugin/xai.ts
  • packages/opencode/src/provider/provider.ts
  • packages/opencode/src/share/session.ts
  • packages/opencode/src/share/share-next.ts
  • packages/plugin/src/README.md
  • packages/plugin/src/app.ts
  • packages/plugin/src/effect/PLAN.md
  • packages/plugin/src/effect/README.md
  • packages/plugin/src/effect/agent.ts
  • packages/plugin/src/effect/aisdk.ts
  • packages/plugin/src/effect/command.ts
  • packages/plugin/src/effect/event.ts
  • packages/plugin/src/effect/index.ts
  • packages/plugin/src/effect/integration.ts
  • packages/plugin/src/effect/mcp.ts
  • packages/plugin/src/effect/model.ts
  • packages/plugin/src/effect/permission.ts
  • packages/plugin/src/effect/plugin.ts
  • packages/plugin/src/effect/provider.ts
  • packages/plugin/src/effect/reference.ts
  • packages/plugin/src/effect/registration.ts
  • packages/plugin/src/effect/rpc.ts
  • packages/plugin/src/effect/session.ts
  • packages/plugin/src/effect/shell.ts
  • packages/plugin/src/effect/skill.ts
  • packages/plugin/src/effect/storage.ts
  • packages/plugin/src/effect/tool.ts
  • packages/plugin/src/effect/vcs.ts
  • packages/plugin/src/effect/websearch.ts
  • packages/plugin/src/effect/worktree.ts
  • packages/plugin/src/example-workspace.ts
  • packages/plugin/src/example.ts
  • packages/plugin/src/host.ts
  • packages/plugin/src/index.ts
  • packages/plugin/src/options.ts
  • packages/plugin/src/promise/adapter.ts
  • packages/plugin/src/promise/agent.ts
  • packages/plugin/src/promise/aisdk.ts
  • packages/plugin/src/promise/command.ts
  • packages/plugin/src/promise/event.ts
  • packages/plugin/src/promise/index.ts
  • packages/plugin/src/promise/integration.ts
  • packages/plugin/src/promise/mcp.ts
  • packages/plugin/src/promise/model.ts
  • packages/plugin/src/promise/permission.ts
  • packages/plugin/src/promise/plugin.ts
  • packages/plugin/src/promise/provider.ts
  • packages/plugin/src/promise/reference.ts
  • packages/plugin/src/promise/registration.ts
  • packages/plugin/src/promise/rpc.ts
  • packages/plugin/src/promise/session.ts
  • packages/plugin/src/promise/shell.ts
  • packages/plugin/src/promise/skill.ts
  • packages/plugin/src/promise/storage.ts
  • packages/plugin/src/promise/tool.ts
  • packages/plugin/src/promise/types.ts
  • packages/plugin/src/promise/vcs.ts
  • packages/plugin/src/promise/websearch.ts
  • packages/plugin/src/promise/worktree.ts
  • packages/plugin/src/rpc.ts
  • packages/plugin/src/runtime-modules.ts
  • packages/plugin/src/runtime.ts
  • packages/plugin/src/shell.ts
  • packages/plugin/src/source.bun.ts
  • packages/plugin/src/source.node.ts
  • packages/plugin/src/source.package.ts
  • packages/plugin/src/source.ts
  • packages/plugin/src/storage.ts
  • packages/plugin/src/tool.ts
  • packages/plugin/src/tui.ts
  • packages/plugin/src/tui/context.ts
  • packages/plugin/src/tui/index.ts
  • packages/plugin/src/tui/plugin.ts
  • packages/plugin/src/tui/solid.ts
  • packages/plugin/src/v2/effect/README.md
  • packages/plugin/src/v2/effect/agent.ts
  • packages/plugin/src/v2/effect/aisdk.ts
  • packages/plugin/src/v2/effect/catalog.ts
  • packages/plugin/src/v2/effect/command.ts
  • packages/plugin/src/v2/effect/context.ts
  • packages/plugin/src/v2/effect/event.ts
  • packages/plugin/src/v2/effect/filesystem.ts
  • packages/plugin/src/v2/effect/index.ts
  • packages/plugin/src/v2/effect/integration.ts
  • packages/plugin/src/v2/effect/location.ts
  • packages/plugin/src/v2/effect/npm.ts
  • packages/plugin/src/v2/effect/path.ts
  • packages/plugin/src/v2/effect/plugin.ts
  • packages/plugin/src/v2/effect/reference.ts
  • packages/plugin/src/v2/effect/registration.ts
  • packages/plugin/src/v2/effect/skill.ts
  • packages/plugin/src/v2/promise/README.md
  • packages/plugin/src/v2/promise/agent.ts
  • packages/plugin/src/v2/promise/aisdk.ts
  • packages/plugin/src/v2/promise/catalog.ts
  • packages/plugin/src/v2/promise/command.ts
  • packages/plugin/src/v2/promise/context.ts
  • packages/plugin/src/v2/promise/index.ts
  • packages/plugin/src/v2/promise/integration.ts
  • packages/plugin/src/v2/promise/plugin.ts
  • packages/plugin/src/v2/promise/reference.ts
  • packages/plugin/src/v2/promise/registration.ts
  • packages/plugin/src/v2/promise/skill.ts
  • packages/plugin/src/worktree.ts
  • packages/tui/src/component/logo.tsx
  • sdks/vscode/package.json

Merge with a merge commit, not squash or rebase: otherwise the upstream commits never reach dev and the lag doesn't fall.

Tests

Waiting for the test and typecheck runs on this branch.

Upstream commits (70)

jm0ney337 and others added 30 commits October 5, 2026 14:45
Co-authored-by: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
…3338)

Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
…yco#52876)

Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
opencode-agent Bot and others added 26 commits October 11, 2026 18:08
…lyco#54674)

Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
…nomalyco#54047)

Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
@pminevp pminevp added the upstream-conflict Upstream sync PR with merge conflicts to resolve by hand (XCOD-118) label Oct 12, 2026
@pminevp pminevp closed this in #197 Oct 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream-conflict Upstream sync PR with merge conflicts to resolve by hand (XCOD-118)

Projects

None yet

Development

Successfully merging this pull request may close these issues.