Yichen Jiang
2e6abdf8a7
Merge remote-tracking branch 'origin/master' into worktree/tui-session-title-search
2026-07-28 11:12:56 +08:00
Yichen Jiang
968e4d5312
Merge remote-tracking branch 'origin/master' into worktree/tui-session-title-search
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-21-cross-session-references.i18n.yaml
# .agents/notes/implemented/feature/2026-07-21-cross-session-references.md
# .agents/notes/implemented/feature/2026-07-21-cross-session-references.zh.md
# packages/context/session-reference/README.i18n.yaml
# packages/context/session-reference/README.md
# packages/context/session-reference/README.zh.md
# packages/context/session-reference/src/index.ts
2026-07-28 11:11:57 +08:00
Tianyi Cui
cee7462994
Merge remote-tracking branch 'origin/master' into worktree/sdk-public-api
2026-07-28 11:06:00 +08:00
Yichen Jiang
a43a2032ec
fix(tui): search session references by title
2026-07-28 11:05:53 +08:00
Tianyi Cui
e98c180062
Merge branch 'master' into worktree/change-scope-trim-20260728
2026-07-28 10:59:00 +08:00
Tianyi Cui
629f1c638b
Merge branch 'master' into worktree/sdk-public-api
2026-07-28 02:11:10 +08:00
Tianyi Cui
3b5be72086
fix(sdk): narrow TypeScript client interface
2026-07-28 01:41:32 +08:00
Tianyi Cui
1a623946b9
Merge current master with codex/fix-acp-snapshot-refresh-volatiles
2026-07-28 01:36:32 +08:00
Tianyi Cui
a1401349d8
Merge remote-tracking branch 'origin/master' into worktree/change-scope-trim-20260728
2026-07-28 01:26:55 +08:00
Tianyi Cui
f6a850b107
Merge remote-tracking branch 'origin/master' into worktree/change-scope-trim-20260728
2026-07-28 01:21:25 +08:00
Tianyi Cui
9ebd0075e9
Merge master into fix/pty-handoff-grace
2026-07-28 01:19:58 +08:00
Tianyi Cui
2b539346c8
Merge remote-tracking branch 'origin/master' into worktree/change-scope-trim-20260728
2026-07-28 01:12:16 +08:00
Chinesezjc
d0be242138
Merge branch 'master' into fix/worker-timer-clamp
2026-07-28 01:12:16 +08:00
Chinesezjc
ca676178b5
Merge branch 'master' into fix/worker-timer-clamp
2026-07-28 01:06:22 +08:00
Tianyi Cui
9cd87f91cc
Merge origin/master into worktree/change-scope-trim-20260728
2026-07-28 01:03:15 +08:00
Tianyi Cui
2a562236d0
Merge remote-tracking branch 'origin/master' into worktree/pr784-merge-20260728
2026-07-28 01:02:49 +08:00
Tianyi Cui
a5ed3a5cfc
refactor(dev-infra): narrow change scope report
2026-07-28 01:02:43 +08:00
Tianyi Cui
00b6aff3fc
docs(notes): seal corrected archive inputs
2026-07-28 00:58:33 +08:00
imccyu
730657375f
Merge branch 'master' into worktree/web-session-model-selector
2026-07-28 00:56:56 +08:00
Tianyi Cui
98e953596d
docs(notes): normalize archive inputs before sealing
2026-07-28 00:56:48 +08:00
Tianyi Cui
c0b9734494
Merge remote-tracking branch 'origin/master' into worktree/pr784-merge-20260728
2026-07-28 00:52:23 +08:00
Chinesezjc
57a117b7bb
Merge remote-tracking branch 'origin/master' into fix/worker-timer-clamp
2026-07-28 00:49:21 +08:00
Tianyi Cui
9c6de3644e
Merge branch 'master' into archive-agent-notes-sweep-2
2026-07-28 00:49:13 +08:00
Tianyi Cui
7b140eb136
docs(notes): archive superseded session-prefix note after master retarget
...
The rebase onto master picked up #585 (agent-loop message machine), which
removed the request-only session-prefix seam; the unified sourced-message
decision now owns the mechanism and the note's own banner declares the
seam removed. Archive the triplet and rewrite the skill-system note's
catalog mechanism against the shipped agent/step sourced injection,
keeping the archived note as the intentional historical citation.
Re-checked the other notes master added or amended (provider retry
policies, request-error retry action, observable state machine, OTel
telemetry, dependabot): their supersessions were already executed
upstream in the same PRs; no further active note qualifies.
2026-07-28 00:42:33 +08:00
imccyu
94af1589a9
Merge branch 'master' into worktree/web-session-model-selector
2026-07-28 00:40:08 +08:00
imccyu
af70af4020
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
2026-07-28 00:39:24 +08:00
Tianyi Cui
177b7c3286
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
2026-07-28 00:37:26 +08:00
Tianyi Cui
88aa3f8959
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
2026-07-28 00:33:36 +08:00
Chinesezjc
30f0ac90f7
Merge remote-tracking branch 'origin/master' into fix/worker-timer-clamp
2026-07-28 00:33:02 +08:00
Tianyi Cui
b1dc759fee
Merge remote-tracking branch 'origin/master' into worktree/pr762-merge-20260728
2026-07-28 00:29:00 +08:00
Tianyi Cui
cc8f6a30c0
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
...
# Conflicts:
# docs/architecture.i18n.yaml
# packages/core/agent-loop/src/agent.ts
2026-07-28 00:23:27 +08:00
Chinesezjc
3dc3e59b38
Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace
2026-07-28 00:17:25 +08:00
Tianyi Cui
cc5201a408
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-28 00:08:43 +08:00
Chinesezjc
0982cc4fc0
Merge remote-tracking branch 'origin/master' into fix/worker-timer-clamp
2026-07-28 00:08:32 +08:00
Tianyi Cui
59122b9e85
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-28 00:06:16 +08:00
Tianyi Cui
c982cf7805
refactor(dev-infra): narrow worktree hook safety checks
2026-07-28 00:05:31 +08:00
Tianyi Cui
4a45981e76
Merge remote-tracking branch 'origin/master' into worktree/pr743-merge-20260727
...
# Conflicts:
# examples/tui-agent/tests/snapshots/cordis-dynamic-toolchain/terminal.expected.txt
# packages/ui/tui/tests/snapshots/cordis-tools-pending.expected.txt
2026-07-28 00:03:56 +08:00
Tianyi Cui
f2c0021941
docs(notes): aggressive archive sweep of low-value decision records
...
Archive 21 implemented triplets whose shipped decisions are complete and
whose bodies no longer guide future work (one-off UI chrome, generator
applications whose scripts are self-explanatory, superseded implementation
detail, process history owned by current contracts/skills). Delete 4
rejected triplets whose premises are obsolete: the DeepReadonly proposal
(dev-invariants note now carries the alternative inline), the collapse
tool-owned presentation proposal (superseded by the shipped render-intent
union), retire-mid-turn-steering (steering is now load-bearing across
plan-mode/apiproxy/TUI), and single-session-ACP (automation-only ACP
resolved the question; multi-session isolation is pinned by tests).
Repair every inbound link: retarget intentional historical citations to
archived paths, replace decision-current citations with the surviving
authority, and fix the stale example-execute-over-tsx pointer in
pnpm-workspace.yaml. Re-record pairing sidecars and seal the archive
manifest (append-only; existing seals unchanged).
2026-07-28 00:00:51 +08:00
Tianyi Cui
064cea4ebe
Merge remote-tracking branch 'origin/master' into worktree/pr743-merge-20260727
...
# Conflicts:
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/session-query-spill/session.jsonl
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
2026-07-27 23:59:33 +08:00
Chinesezjc
201fdbe34d
Merge remote-tracking branch 'origin/master' into fix/worker-timer-clamp
2026-07-27 23:57:06 +08:00
Tianyi Cui
752d4b9204
Merge updated origin/master into feat/tui-master-port
2026-07-27 23:56:54 +08:00
Tianyi Cui
f6a450102e
Merge updated origin/master into feat/tui-master-port
2026-07-27 23:55:53 +08:00
Tianyi Cui
95bba22f84
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-27 23:47:28 +08:00
Chinesezjc
7111675b01
Merge remote-tracking branch 'origin/master' into fix/worker-timer-clamp
2026-07-27 23:45:05 +08:00
Tianyi Cui
5175ab4019
Merge branch 'master' into worktree/agent-note-supersession-check-20260727
2026-07-27 23:44:06 +08:00
Tianyi Cui
1c1e52bd3f
Merge updated PR branch into agent-loop CI fix
2026-07-27 23:42:12 +08:00
Tianyi Cui
fe22273e28
fix(agent-loop): await final session flush
2026-07-27 23:41:27 +08:00
Tianyi Cui
18835ca838
Merge updated origin/master into feat/tui-master-port
2026-07-27 23:39:59 +08:00
Tianyi Cui
35697a4529
Merge origin/master into Agent Note supersession checks
2026-07-27 23:39:18 +08:00
Tianyi Cui
6241eb6044
Require Agent Note supersession checks
2026-07-27 23:38:49 +08:00
