Tianyi Cui
846ae51aa5
Merge remote-tracking branch 'origin/docs/i18n-batch-core' into worktree/pr344-retarget-stack
2026-07-23 20:32:38 +08:00
_Kerman
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
Tianyi Cui
6cb0372d86
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 20:19:50 +08:00
imccyu
8930b4f5fb
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 20:19:20 +08:00
Tianyi Cui
5d854707a2
Merge remote-tracking branch 'origin/docs/i18n-batch-cds-postmortem' into worktree/pr345-retarget-stack
2026-07-23 20:18:59 +08:00
Hypatia May
1e457b22e0
refactor(session-query): unify query service
2026-07-23 20:18:05 +08:00
Tianyi Cui
d7c4822f95
Merge origin/master into worktree/web-session-titles
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
2026-07-23 20:12:40 +08:00
Tianyi Cui
a5cb16cc0e
Merge master into codex/jsonl-storage-identity
2026-07-23 20:12:26 +08:00
imccyu
0f63666522
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
2026-07-23 20:09:11 +08:00
Tianyi Cui
0f8757a8e4
Merge remote-tracking branch 'origin/docs/i18n-batch-core' into worktree/pr344-retarget-stack
2026-07-23 20:08:30 +08:00
imccyu
31c2198a98
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 20:04:03 +08:00
Turtle
b63abe80d6
docs(agent-note): add Chinese counterpart for unified-send Agent Note
...
Bilingual pair required for docs dated on/after 2026-07-14; adds the
.zh.md, the language-switcher lines, and the recorded .i18n.yaml sidecar.
2026-07-23 19:54:31 +08:00
imccyu
abe3da3656
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 19:49:26 +08:00
Tianyi Cui
86940da524
docs(i18n): refresh Agent Notes after parent merge
2026-07-23 19:48:00 +08:00
Tianyi Cui
91653be917
Merge branch 'master' into worktree/tui-file-autocomplete
2026-07-23 19:47:29 +08:00
imccyu
3f6158f2c6
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 19:46:13 +08:00
imccyu
6a896e62a1
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
2026-07-23 19:45:41 +08:00
Yichen Jiang
4bf5a85a32
Merge branch 'master' into worktree/tui-file-autocomplete
2026-07-23 19:45:08 +08:00
Tianyi Cui
a3c0b5a3b4
Merge branch 'master' into worktree/ci-subminute-stability
2026-07-23 19:43:54 +08:00
imccyu
ed6bd6d25c
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 19:38:19 +08:00
Turtle
95e75ba3e0
fix(agent-loop): balance inbox invariant on continuation-reason steer
...
The FIFO-conservation invariant fired on the loop-authored continuation
reason path: a continue-with-reason decision entered the steering FIFO
without an agent/inbox/enqueue, so its later dequeue/discard had no
matching enqueue. Emit the enqueue for that steer too, add a regression
test that mounts the invariant over a continue-with-reason turn and a
cancel, and hoist the duplicated inboxInfo helper into inbox.ts.
Found by fresh-eye review.
2026-07-23 19:37:21 +08:00
Hypatia May
a2a89bf300
fix(session-query): protect derived index permissions
2026-07-23 19:36:05 +08:00
Tianyi Cui
3b390334d3
Merge branch 'worktree/pr344-retarget-stack' into worktree/pr345-retarget-stack
2026-07-23 19:33:30 +08:00
Yichen Jiang
40ce342d81
Merge remote-tracking branch 'origin/master' into worktree/tui-file-autocomplete
...
# Conflicts:
# docs/config-catalog.md
2026-07-23 19:32:13 +08:00
Yichen Jiang
6f624c67c4
feat(web): render assistant Markdown
2026-07-23 19:18:05 +08:00
Turtle
44fd93fd06
feat(agent): unify send(target × wakeup), coalesce context/message into user/message
...
Replace send/steer/inject with one Agent.send primitive over the
(target × wakeup) matrix; followup/steer/inject become fixed-preset
alias methods on the now-abstract Agent class. Coalesce context/message
into user/message (injected context is a non-user source). Replace
agent/queued with agent/inbox/enqueue/dequeue/discard, add cancel
keepInbox, and add a FIFO-conservation invariant.
2026-07-23 19:15:45 +08:00
Tianyi Cui
e701364753
Merge branch 'worktree/pr343-retarget-latest-master' into worktree/pr344-retarget-stack
...
# Conflicts:
# docs/core-data-structures/code-runtime.md
# scripts/type-equiv.manifest.json
2026-07-23 19:10:25 +08:00
Tianyi Cui
3bd27df5a2
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 19:06:03 +08:00
Tianyi Cui
b4735dbb8c
Merge branch 'worktree/pr344-retarget-stack' into worktree/pr345-retarget-stack
2026-07-23 18:54:01 +08:00
imccyu
2b06aa0102
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
...
Restack the ask-user domain layer onto the carrier-chain architecture
branch. Conflict policy: runtime and ui-conversation take the
carrier-chain side (master sessions shape, dual-kind PendingCard,
'internal' envelope shell tests); the 'cancelled' wire code and its
semantics tests stay in apiproxy + ui-question (domain layer); the
smoke fixture keeps the nine-bundle success pass with the resident
question round over the carrier-chain first-describe shape.
2026-07-23 18:50:30 +08:00
imccyu
8e3378d08f
Merge branch 'master' into fix/web-zstd-session-logs
2026-07-23 18:46:51 +08:00
Tianyi Cui
ba40f906dc
docs(i18n): normalize core terminology
2026-07-23 18:45:56 +08:00
Tianyi Cui
45f3e260fd
Merge remote-tracking branch 'origin/master' into worktree/ci-subminute-stability
2026-07-23 18:41:43 +08:00
Tianyi Cui
7e27f1b00f
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 18:40:13 +08:00
Tianyi Cui
d2dc618e3f
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
...
# Conflicts:
# .agents/notes/implemented/process/2026-07-20-gui-testing-system.i18n.yaml
# packages/client/ui-conversation/tests/apply-inject.spec.tsx
# packages/client/ui-conversation/tests/chat-stats-bash-sample.spec.tsx
# packages/client/ui-conversation/tests/gate-branch-tails.spec.tsx
# packages/client/ui-conversation/tests/selection-survival.spec.ts
# packages/client/ui-conversation/tests/skeleton-branches.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-layout/tests/service.spec.ts
# packages/client/ui-sidebar/tests/apply.spec.tsx
# packages/client/ui-sidebar/tests/store.spec.ts
# packages/client/ui-trajectory/tests/views.spec.tsx
# packages/client/web/src/app.tsx
# packages/client/web/tests/boot.spec.tsx
# packages/host/runtime/README.md
# packages/host/runtime/tests/host-runtime.spec.ts
2026-07-23 18:39:48 +08:00
Tianyi Cui
0d87f7ee27
Merge remote-tracking branch 'origin/master' into worktree/ci-subminute-stability
2026-07-23 18:33:04 +08:00
imccyu
97428e9922
Merge branch 'master' into fix/demo-web-build
2026-07-23 18:32:50 +08:00
imccyu
d4ec819acb
Merge branch 'master' into fix/web-zstd-session-logs
2026-07-23 18:32:47 +08:00
_Kerman
7f5ba286fe
fix: keep crash repair away from live sessions
2026-07-23 18:31:37 +08:00
imccyu
ddd9e4a3bb
Merge branch 'master' into fix/demo-web-build
2026-07-23 18:29:57 +08:00
imccyu
5c53af88b3
Merge branch 'master' into fix/web-zstd-session-logs
2026-07-23 18:29:44 +08:00
Tianyi Cui
c88fade5b3
Merge branch 'master' into worktree/ci-enterprise-subminute
2026-07-23 18:29:15 +08:00
Tianyi Cui
f666c39379
fix(web): generate model-backed session titles
2026-07-23 18:20:17 +08:00
imccyu
3d80144934
docs(rfc): chinese counterpart for the chain kind addendum
2026-07-23 18:19:07 +08:00
imccyu
0d68f01f4e
docs(rfc): chain slot kind addendum to the slot system standard
2026-07-23 18:19:07 +08:00
Tianyi Cui
2c98610601
Merge branch 'master' into codex/code-mode-complete-result-card
2026-07-23 18:18:42 +08:00
Tianyi Cui
41dbd2d539
Merge branch 'worktree/ci-enterprise-subminute' into worktree/ci-subminute-stability
2026-07-23 18:13:12 +08:00
Tianyi Cui
05aeb243ba
Merge remote-tracking branch 'origin/master' into worktree/ci-enterprise-subminute
2026-07-23 18:08:23 +08:00
Yichen Jiang
c37892f753
Merge branch 'master' into worktree/tui-file-autocomplete
2026-07-23 18:07:34 +08:00
Tianyi Cui
2dc3bf6005
ci: reuse the primary Linux build
2026-07-23 18:02:17 +08:00
