Skip to content

chore: merge upstream v1.17.15 - #13

Merged
quickbeard merged 31 commits into
mainfrom
sync-upstream-1.17.15
Jul 9, 2026
Merged

quickbeard merged 31 commits into
mainfrom
sync-upstream-1.17.15

Conversation

@quickbeard

Copy link
Copy Markdown
Owner

Merges upstream tag v1.17.15 (30 commits since the 1.17.14 sync) into main.

Upstream highlights

  • fix(llm): classify zai token limit overflow
  • fix(core): ensure relevant files survive compaction
  • fix(core): expand home-relative permission paths
  • fix(config): handle unavailable config directories
  • feat(codemode): sync v2 implementation
  • deps: upgrade OpenTUI to v0.4.3
  • Several desktop/web app fixes (session tab persistence, theme apply on select, cmd-k v2 styles, model context tooltip, traffic-light position)

Conflict resolution

  • 29 × package.json: version-only conflicts (1.17.14 vs 1.17.15) — took upstream's version per DIVERGENCES.md; fork bin key (codev-code) and release script preserved.
  • bun.lock: regenerated with bun install (never hand-merged); codev-code bin mapping verified.

Verification

  • bun turbo typecheck: 30/30 packages pass.
  • CLI boots from source (--version).
  • Spot-checked divergences intact: global.ts app constant, scriptName("codev"), provider-picker filters, share default disabled, updater targeting codev-code, PUBLISH_NAME.

🤖 Generated with Claude Code

simonklee and others added 30 commits July 6, 2026 13:01
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: James Long <jlongster@users.noreply.github.com>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
# Conflicts:
#	bun.lock
#	packages/app/package.json
#	packages/cli/package.json
#	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/desktop/package.json
#	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/package.json
#	packages/plugin/package.json
#	packages/sdk/js/package.json
#	packages/server/package.json
#	packages/session-ui/package.json
#	packages/slack/package.json
#	packages/stats/app/package.json
#	packages/stats/core/package.json
#	packages/stats/server/package.json
#	packages/tui/package.json
#	packages/ui/package.json
#	packages/web/package.json
#	sdks/vscode/package.json
@quickbeard
quickbeard merged commit 6c7fbae into main Jul 9, 2026
0 of 4 checks passed
@quickbeard
quickbeard deleted the sync-upstream-1.17.15 branch July 9, 2026 03:14
quickbeard added a commit that referenced this pull request Jul 9, 2026
* deps: upgrade OpenTUI to v0.4.3 (#35226)

* chore: generate

* chore: update nix node_modules hashes

* feat(codemode): sync v2 implementation (#35574)

* chore: generate

* sync release versions for v1.17.14

* feat(data): improved model usage section

* fix(data): refine model trend charts

* chore: generate

* feat(app): align cmd k menu with v2 styles (#35152)

Co-authored-by: Brendan Allan <git@brendonovich.dev>

* fix(config): handle unavailable config directories (#35632)

Co-authored-by: James Long <jlongster@users.noreply.github.com>

* feat(app): visual improvements (#35134)

* chore: generate

* feat(app): reintroduce model context tooltip in model selector (#35087)

* chore: generate

* feat(app): change traffic light position, fix sequoia bug (#35081)

* fix(app): apply settings themes on select (#35011)

Co-authored-by: Jay <53023+jayair@users.noreply.github.com>

* fix(app): persist session tab info (#34934)

* chore: generate

* fix(app): show unread for pending questions (#34684)

Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>

* fix(app): prioritize shortcuts in terminal (#35668)

* chore: generate

* fix(app): hide markdown task markers (#35670)

* feat(data): redesign model efficiency

* chore: generate

* fix(core): expand home-relative permission paths (#35737)

* chore: generate

* fix(core): ensure relevant files survive compaction (#35636)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>

* fix(llm): classify zai token limit overflow (#35671)

* release: v1.17.15

---------

Co-authored-by: Simon Klee <hello@simonklee.dk>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: opencode <opencode@sst.dev>
Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>
Co-authored-by: Aarav Sareen <96787824+arvsrn@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: James Long <longster@gmail.com>
Co-authored-by: James Long <jlongster@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Dustin Deus <deusdustin@gmail.com>
Co-authored-by: 冯基魁 <56265583+fengjikui@users.noreply.github.com>
quickbeard added a commit that referenced this pull request Jul 9, 2026
* deps: upgrade OpenTUI to v0.4.3 (#35226)

* chore: generate

* chore: update nix node_modules hashes

* feat(codemode): sync v2 implementation (#35574)

* chore: generate

* sync release versions for v1.17.14

* feat(data): improved model usage section

* fix(data): refine model trend charts

* chore: generate

* feat(app): align cmd k menu with v2 styles (#35152)


* fix(config): handle unavailable config directories (#35632)


* feat(app): visual improvements (#35134)

* chore: generate

* feat(app): reintroduce model context tooltip in model selector (#35087)

* chore: generate

* feat(app): change traffic light position, fix sequoia bug (#35081)

* fix(app): apply settings themes on select (#35011)


* fix(app): persist session tab info (#34934)

* chore: generate

* fix(app): show unread for pending questions (#34684)


* fix(app): prioritize shortcuts in terminal (#35668)

* chore: generate

* fix(app): hide markdown task markers (#35670)

* feat(data): redesign model efficiency

* chore: generate

* fix(core): expand home-relative permission paths (#35737)

* chore: generate

* fix(core): ensure relevant files survive compaction (#35636)


* fix(llm): classify zai token limit overflow (#35671)

* release: v1.17.15

---------
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants