[marius-kilocode]

Merge with 'Create a merge commit'. Do not squash or rebase.

Release

Item	Value
Release	v2.1.1 (tag ba546ec1598, 2026-10-20)
Release commit (merged)	e9ac459c2e6, parent of the tag, on upstream/dev
Upstream range	9d90d892dcb..e9ac459c2e6 (v2.1.0 to v2.1.1): 13 commits, 65 files, harness change 28 files +692/-142
Sync merge	b80adececc8 chore(upstream): sync v2.1.1 (e9ac459c2e6). pinned() resolves v2.1.1 / e9ac459c2e6
Lag before	3 releases (v2.1.1, v2.1.2, v2.1.3), 2.2 days
Lag after	2 releases (v2.1.2, v2.1.3), 2 days. Next sync: v2.1.2 (c600cddc68f), then v2.1.3 (37d973754ba)

Commits in this PR:

1. b80adececc8 the sync merge (script/upstream/merge.ts --version v2.1.1 --base-branch HEAD).
2. 3c4b1fdf849 merge of origin/v2 (fix(gateway): restore enterprise policy and organization modes #15372 landed while the branch was being verified, and the progress map history reads origin/v2). Clean merge, no conflicts.
3. 8c577dc5eae docs(migration): refresh the v2 baseline at v2.1.1.

Upstream content: TUI dialogs under the opt-in new-designs experiment (model switcher, free model picker, settings and export dialogs; prioritizeFavorites and sortModelOptions move to model-options.tsx), models.dev refresh broadcast server-wide, provider variants built after package normalization, bundled models.dev snapshot refresh, provider icons, stats and console docs.

Conflicts

All 15 were resolved by the tooling. None hit a Kilo patch, so no plugin-first decision was needed.

File	Kind	Resolution
bun.lock	content	Kept ours, regenerated with bun 1.4.2. Delta vs origin/v2: only workspace version strings
packages/{app,console/app,desktop,function,gui-extensions,session-ui,web}/package.json, packages/stats/{app,core,server}/package.json, sdks/vscode/package.json	modify/delete	Kept deleted (skipFiles: product areas that Kilo removed)
packages/stats/app/src/routes/{index.tsx,model-catalog.ts,model-catalog.test.ts}	modify/delete	Kept deleted (skipFiles)

No new upstream workflows. script/check-workflows.ts is unchanged (3 active workflows, 28 removed).

Shared files touched

Upstream changed these Kilo-patched shared files. All merged without conflict, and the Kilo lines are unchanged:

• package.json, packages/cli/package.json, packages/core/package.json, packages/tui/package.json: version bump only (rung 3 entries in shared-patches.json, unchanged).
• bun.lock: generated, not counted.

check-shared-patches: 42 files, 275 marked lines, 39 unmarked lines, 0 deleted, all at their limits (no change). No limits to lower.

Kilo-diff check

• git diff --no-renames --name-status 9d90d892dcb origin/v2 and ... e9ac459c2e6 HEAD, measured at head 8c577dc5eae against origin/v2 2663e72e7f8: identical file lists (3,740 entries).

• Per-file added and removed lines are identical except for:

  • bun.lock: workspace versions only.
  • The 14 skip-file deletions: the removed content follows upstream's new content (version 2.0.32 to 2.1.0, stats lab logos).
  • migration-tracking/technical-notes/baseline/pinned-v2-baseline.md: the baseline refresh (see Tests).

  All three are intended.

• git diff --stat origin/v2 HEAD -- 'packages/kilo-*' 'packages/*/src/kilocode' .github .kilo script: empty.

• git merge-tree against the open v2 PRs (feat(vscode): reuse the v1 extension on the v2 server #15370, feat(marketplace): add skill and MCP discovery and installation #15353, feat(vscode): reuse the v1 extension UI on v2 data #15349, docs(migration): record branch-name generation findings #15345, docs(migration): list v1 to v2 client breaking changes #15291, docs(migration): record the client, identity and sync-gate decisions of 2026-10-20 #15290, docs(migration): drop the v1 fixtures and session-policy units #15286): the conflict sets are identical to the conflict sets against origin/v2. The sync adds no conflicts. No open PR touches the upstream-changed TUI dialog, models.dev or provider files.

• Gateway work (accounts, enterprise policy and organization modes fix(gateway): restore enterprise policy and organization modes #15372, models, costs, errors) is untouched. bun dev models --standalone: the kilo/ list (16 models) is identical on this branch and on origin/v2.

Checks

All runs used bun 1.4.2 (packageManager), after bun install --linker hoisted --frozen-lockfile.

Check	Result
bun run check (root)	pass, 28/28 tasks, 0 cached
check-workflows, check-opencode-annotations (71 shared files vs e9ac459c2e6), check-shared-patches	pass
find-reset-candidates --dry-run	0 candidates (only the removed workflows are listed as missing)
packages/protocol and packages/client check:generated	pass, no drift
progress.ts twice + --check	identical output, up to date (93/9829). The map does not change
v2-baseline.ts --checks (CI mirror)	all pass except test (13 known host failures, see below) and lint:effect-patterns (27 errors, unchanged, not run by CI)

Tests

Per package with isolated OPENCODE_TEST_HOME and XDG_*, on this branch and on origin/v2 a1e74c10d7d:

Package	Sync branch	origin/v2
kilo-gateway-core	100 pass	100 pass
kilo-plugin	127 pass	127 pass
core	6,682 pass, 13 fail	6,681 pass, 13 fail (same 13)
cli	338 pass, 1 fail	338 pass, 1 fail (same)
server	87 pass	87 pass
tui	1,559 pass	1,559 pass
plugin	9 pass	9 pass

After the origin/v2 merge, turbo test (--force) has 25/26 tasks pass. core has 6,693 pass and 13 fail (the same 13). kilo-plugin has 173 pass, kilo-gateway-core 101, kilo-cli 53, cli 339.

New failures: none. All failures are host-specific and fail the same way on origin/v2:

• 7 shell-scan cases: macOS bash 3.2 (already in the baseline).
• 6 Session.shell cases: 5 s timeouts when the login shell is fish. With SHELL=/bin/zsh the file passes 9/9.
• debug paths command (cli): fails only when OPENCODE_TEST_HOME is set. It passes without that variable and in the turbo run.

Baseline delta: pinned-v2-baseline.md now has a v2.1.1 capture (the doc still described v2.0.30). The 23 ripgrep cases are no longer red (rg is on PATH). The Session.shell login-shell cases are new to the doc but are not new failures. No test was skipped or edited.

Self-test

Fresh KILO_V2_PROFILE for each run, signed out:

• bun dev run --standalone --model kilo/kilo-auto/free "Reply with only the word ok.": answered ok, no level=ERROR log lines. Pass (on the sync merge and again on the final head).
• TUI in the VS Code terminal harness (--mode none): the home screen loads; the model picker lists the Kilo Gateway models with Auto Free selected; one prompt answered ok through Auto Free · Kilo Gateway; /connect lists Kilo Gateway; logs is empty. Pass.
• TUI re-check on the final head (after the origin/v2 merge): the home screen shows Auto Free · Kilo Gateway, the picker lists the Kilo models, and the permission prompt works. The free model asked to run find / for a file question; the call was rejected. A follow-up @file prompt was not confirmed because the harness call timed out. The TUI answered fully on the sync merge commit, and the CLI run answered on the final head.
• bun dev models --standalone: the kilo/ list is identical to origin/v2. Other providers differ only because of upstream's models.dev snapshot refresh (81b2d7a1b93), for example deprecated amazon-bedrock entries and the opencode free list.

Tooling gaps

• merge.ts --base-branch HEAD prints "Open a PR from sync-v2-1-1 into sync-v2-1-1". With an in-place merge, it should name v2. This is cosmetic.
• The progress map history reads origin/v2, so progress.ts --check turned stale when origin/v2 moved during verification. The fix was to merge origin/v2. This is expected, but the sync procedure does not mention it.
• No manual merge steps were needed.

Follow-ups

• Next syncs: v2.1.2 (c600cddc68f), then v2.1.3 (37d973754ba), each in its own PR.

[github-actions]

➖ v2 migration progress: 1% → 1% (0 done, 0 total, 0 dropped; 95/9829 cells)

Placement: 0 new marked lines in shared files, 0 new kilo_port annotations, 0 new core-internal imports.

Ratchets: 25 core-internal imports (base 25); shared patches by rung 25 seam, 17 patch (base 25 seam, 17 patch).

No change to the progress map.

Full map · how cells close

[kilo-code-bot]

Code Review Summary

Status: 1 Issue Found | Recommendation: Merge after a minor PR-body correction

Overview

Severity	Count
CRITICAL	0
WARNING	0
SUGGESTION	1

Sync verification (Kilo patches before vs after, 9d90d892dcb..origin/v2 against e9ac459c2e6..HEAD): changed file lists are identical, and all 674,574 +/- lines match per file except bun.lock (workspace versions 2.0.32 → 2.1.0), the 14 kept-deleted skip-file product areas, and the intended pinned-v2-baseline.md refresh. No kilocode_change line was lost or altered, no Kilo-owned path changed except that baseline doc, no workflows were added, and no test was skipped or removed. Upstream changes are additive where Kilo seams touch them: DialogSelect new optional props and widened action title (used by kilocode/gateway.tsx, dialog-integration.tsx), unchanged DialogExportOptions props (used by routes/session/index.tsx), models-dev refresh publish now { global: true } (matching the existing credential/wellknown pattern), and the provider variant fix confined to upstream's config/opencode plugins.

Issue Details (click to expand)

SUGGESTION

File	Line	Issue
PR body	-	"Kilo-diff check" claims identical file lists of 3,733 entries and that per-file counts match "except for bun.lock and the 14 skip-file deletions", but against the current base (2663e72e7f8) both diffs list 3,740 entries, and migration-tracking/technical-notes/baseline/pinned-v2-baseline.md also differs (+41/-5 lines), even though that refresh is described in the Baseline delta section. Updating the numbers and the exception list keeps the evidence reproducible.

Files Reviewed (52 files)

• CHANGELOG.md
• bun.lock
• migration-tracking/technical-notes/baseline/pinned-v2-baseline.md
• package.json
• packages/ai/package.json
• packages/cli/package.json
• packages/client/package.json
• packages/codemode/package.json
• packages/core/package.json
• packages/core/src/config/plugin/provider.ts
• packages/core/src/models-dev.ts
• packages/core/src/models-dev/snapshot.txt
• packages/core/src/plugin/provider/opencode.ts
• packages/core/test/config/provider.test.ts
• packages/core/test/models.test.ts
• packages/core/test/plugin/provider-opencode.test.ts
• packages/http-recorder/package.json
• packages/httpapi-codegen/package.json
• packages/latex/package.json
• packages/merman/package.json
• packages/plugin-browser/package.json
• packages/plugin/package.json
• packages/plugins/figma/package.json
• packages/protocol/package.json
• packages/schema/package.json
• packages/sdk/package.json
• packages/server/package.json
• packages/simulation/package.json
• packages/theme/package.json
• packages/tui/package.json
• packages/tui/src/component/dialog-config.tsx
• packages/tui/src/component/dialog-model-free.tsx
• packages/tui/src/component/dialog-model.tsx
• packages/tui/src/component/dialog-theme-list.tsx
• packages/tui/src/component/model-options.tsx
• packages/tui/src/ui/dialog-export-options.tsx
• packages/tui/src/ui/dialog-export-result.tsx
• packages/tui/src/ui/dialog-select.tsx
• packages/tui/src/ui/dialog.tsx
• packages/tui/test/cli/cmd/tui/model-options.test.ts
• packages/ui/package.json
• packages/ui/src/assets/icons/provider/meituan.svg
• packages/ui/src/assets/icons/provider/meta.svg
• packages/ui/src/assets/icons/provider/reflection.svg
• packages/ui/src/assets/icons/provider/stepfun.svg
• packages/ui/src/components/provider-icons/sprite.svg
• packages/ui/src/components/provider-icons/types.ts
• packages/util/package.json
• services/update/package.json
• services/www/src/docs/content/console/api/budgets.mdx
• services/www/src/docs/content/console/api/index.mdx
• services/www/src/docs/content/console/members.mdx

---

_{Reviewed by deepseek-flash-latest · Input: 80.3K · Output: 15.7K · Cached: 1.5M}

_{Review guidance: REVIEW.md from base branch v2}