c962db28da
Merge refreshed #343 into docs/i18n-batch-cds-postmortem
2026-07-24 16:57:46 +08:00
b040c6a1c9
Merge latest master into docs/i18n-batch-core
2026-07-24 16:55:08 +08:00
33ee34b58e
fix(tui): make resume picker full-screen
2026-07-24 01:29:35 -07:00
c440217fde
refactor(tui): defer cross-process resume locking
2026-07-24 01:29:35 -07:00
54d986ed87
fix(tui): close resume handoff races
2026-07-24 01:29:35 -07:00
2ae9f4fdf3
feat(tui): add safe session resume flow
2026-07-24 01:29:35 -07:00
c53f9324bc
Merge #343 into #344
2026-07-24 15:51:35 +08:00
445bb89f03
docs(i18n): complete core batch review contract
2026-07-24 15:51:06 +08:00
5c893bcda1
Merge docs/i18n-batch-core into docs/i18n-batch-cds-postmortem
2026-07-24 11:56:13 +08:00
02c7236c91
docs(gui): client plugin loading RFC — final-state rewrite, bilingual pair
...
The loading-chain RFC (2026-07-23-client-plugin-loading-model, en/zh)
states the shipped model in its final form: two package kinds (dshClient
means plugin), one module system + one plugin governor, the end-to-end
loading flow, and hot reload with its support boundary — written for a
first-time reader, no intermediate-design narration. The two 2026-07-19
GUI RFCs defer their loading-chain sections to it and drop stale
vocabulary. config-catalog regenerated for the package rename; pairing
manifest tracks the renamed pair.
2026-07-24 02:09:42 +08:00
75d37654cb
fix(gui): address review — stale smoke case, tooltip trigger overlap, collapse contract docs
...
- The real-browser collapse smoke tracked the old chrome: visible HARNESS
text (the wordmark svg is aria-hidden now), an 'Expand sidebar' label
(renamed 'Open sidebar'), a 300px settle (default is 280), and an
immediate focus assert (rail search defers focus past the slide). The
case now tracks the brand span, polls the deferred focus, and uses the
current labels and width.
- Tooltip treated hover and focus as one trigger: leaving with the mouse
dropped the bubble of a still-focused anchor (and vice versa). The two
triggers are tracked independently; the bubble hides only after both
clear. Spec pins both orders.
- The ui-sidebar README and the bilingual collapse note still described
the retired geometry morph; both now state the slide + crossfade
contract, the fixed-width (never-conceding) sidebar, and the rail's
whale-mark/tooltip chrome.
2026-07-24 01:30:01 +08:00
ed3a6ca295
Merge remote-tracking branch 'origin/docs/i18n-batch-core' into worktree/pr344-retarget-stack
...
# Conflicts:
# docs/core-data-structures/session-query.md
# scripts/type-equiv.manifest.json
2026-07-24 00:00:04 +08:00
f7c68394a5
Merge branch 'master' into docs/i18n-prompt-v4
2026-07-23 23:26:29 +08:00
f27f8f6162
Merge commit 'refs/codex-unblock/20260723/pr570-master-initial' into worktree/pr570-merge-master-20260723
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-18-shared-persistence-write-coordinator.md
# docs/core-data-structures/persistence.md
# packages/session-persistence/session-persistence/README.md
2026-07-23 23:21:08 +08:00
6e05708ef4
Merge remote-tracking branch 'origin/master' into worktree/pr348-retarget-latest-master
2026-07-23 23:13:43 +08:00
3a87104a9a
fix(i18n): harden prompt response handling
2026-07-23 23:12:56 +08:00
d1b5f5c64f
Merge remote-tracking branch 'origin/master' into worktree/pr348-retarget-latest-master
...
# Conflicts:
# vitest.snapshot.config.ts
2026-07-23 22:46:19 +08:00
caaf4f8d18
fix(i18n): complete prompt v4 pipeline path
2026-07-23 22:41:53 +08:00
7a09ca8cd2
Merge remote-tracking branch 'origin/master' into worktree/pr540-merge-master-20260723
2026-07-23 22:34:49 +08:00
9fdbae66e7
Merge remote-tracking branch 'origin/master' into worktree/pr576-merge-master-20260723
2026-07-23 22:18:30 +08:00
c688aa486c
Merge remote-tracking branch 'origin/master' into worktree/remove-expose-internals
2026-07-23 22:08:44 +08:00
ce232f8e28
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 22:07:31 +08:00
85335acd10
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 22:00:59 +08:00
404da65595
Merge branch 'master' into worktree/web-session-titles
...
# Conflicts:
# apps/web/tests/smoke-real.e2e.ts
# packages/client/connection/tests/fixture.spec.ts
# packages/host/runtime/README.md
# packages/host/runtime/src/api-proxy.ts
2026-07-23 22:00:17 +08:00
db99f6881d
Merge remote-tracking branch 'origin/master' into worktree/pr348-retarget-latest-master
2026-07-23 21:56:10 +08:00
00191e75dd
Merge remote-tracking branch 'origin/master' into session-query-search
2026-07-23 21:55:59 +08:00
64eebc1b35
Merge branch 'master' into codex/plan-mode-active-exit
2026-07-23 21:52:23 +08:00
6046a13a29
fix(i18n): harden prompt v4 contract
2026-07-23 21:44:41 +08:00
72fdf57c00
Merge remote-tracking branch 'origin/session-query-search' into session-query-search
2026-07-23 21:34:23 +08:00
9482affc48
fix(session-query): make persisted observation non-mutating
2026-07-23 21:33:28 +08:00
c596dddfe1
fix: return stored metadata from live loads
2026-07-23 21:28:52 +08:00
f9120a944c
Merge master into session-query-search
2026-07-23 21:18:05 +08:00
c1fa985c20
Merge remote-tracking branch 'origin/master' into session-query-search
...
# Conflicts:
# docs/architecture.i18n.yaml
# packages/client/ui-sidebar/tests/sidebar-root.spec.tsx
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence/README.md
2026-07-23 21:13:29 +08:00
bd04f759a0
Merge master into worktree/pty-review-fixes
2026-07-23 21:09:10 +08:00
8e4f666238
feat(plan): add direct plan exit command
2026-07-23 21:06:03 +08:00
4e5166828b
fix: reserve cold loads across repair
2026-07-23 20:58:20 +08:00
0fa4f88683
Merge commit '679e00412906383af1d1761128f429ddd5c07345' into worktree/pr344-retarget-stack
2026-07-23 20:55:34 +08:00
0fb6a2540c
Merge commit 'fc123040d824069a679a52bac84b2e3554589436' into worktree/pty-review-fixes
2026-07-23 20:52:05 +08:00
ea019beae9
Merge branch 'master' into worktree/web-session-titles
2026-07-23 20:51:17 +08:00
26bfd37da0
Merge commit 'refs/codex-unblock/20260723/master' into worktree/pty-review-fixes
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/schema.ts
# packages/core/tools/tests/tools.spec.ts
# packages/pty/tool-pty/README.md
# packages/pty/tool-pty/src/index.ts
# packages/pty/tool-pty/src/render.ts
# packages/tasks/tool-tasks/README.md
# packages/tasks/tool-tasks/src/index.ts
2026-07-23 20:50:45 +08:00
d1f9230384
Merge branch 'master' into worktree/remove-expose-internals
2026-07-23 20:50:38 +08:00
d24a875c5d
fix(session-query): protect live reconciliation
2026-07-23 20:50:29 +08:00
ea75abd71e
docs(gui): correct client coverage lane
2026-07-23 20:45:36 +08:00
8f54ccae7f
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
2026-07-23 20:36:20 +08:00
eb0cc4eb18
refactor: drop obsolete expose-internals flag
2026-07-23 20:35:09 +08:00
846ae51aa5
Merge remote-tracking branch 'origin/docs/i18n-batch-core' into worktree/pr344-retarget-stack
2026-07-23 20:32:38 +08:00
816907ba2d
Merge remote-tracking branch 'origin/master' into refactor/eager-session-persistence
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-18-shared-persistence-write-coordinator.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/src/coordinator.ts
# packages/session-persistence/session-persistence/tests/persistence.spec.ts
2026-07-23 20:32:19 +08:00
6cb0372d86
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 20:19:50 +08:00
8930b4f5fb
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 20:19:20 +08:00
1e457b22e0
refactor(session-query): unify query service
2026-07-23 20:18:05 +08:00
Tianyi Cui