Commit Graph

329 Commits

Author SHA1 Message Date
NI0317
99aff882dc Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
# Conflicts:
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	examples/acp-agent/tests/snapshots/web-fetch/session.jsonl
2026-07-31 00:33:13 +08:00
NI0317
bbba57159d test(web): include policy context in plan review 2026-07-31 00:14:49 +08:00
NI0317
db24140dad Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-31 00:10:48 +08:00
imccyu
bf11016bc1 Merge remote-tracking branch 'origin/master' into worktree/approval-panel-max-height 2026-07-31 00:05:48 +08:00
NI0317
4bf778b4b7 Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
# Conflicts:
#	apps/web/tests/scaffold.ts
2026-07-31 00:00:43 +08:00
imccyu
f332ebab16 Merge branch 'master' into worktree/approval-panel-max-height 2026-07-30 23:57:47 +08:00
imccyu
236fd794f9 Merge branch 'master' into worktree/plan-review-layout 2026-07-30 23:57:20 +08:00
imccyu
c6c0f5de6a Merge branch 'master' into worktree/approval-panel-max-height 2026-07-30 23:49:19 +08:00
imccyu
7c086e40be Merge branch 'master' into worktree/plan-review-layout 2026-07-30 23:48:19 +08:00
NI0317
129ded523c test(web): keep policy snapshots host-independent 2026-07-30 23:34:14 +08:00
Tianyi Cui
284ec8095e Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay 2026-07-30 23:29:15 +08:00
NI0317
831d9c4ae3 Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-30 23:18:05 +08:00
NI0317
e61054c4d1 test(sandbox-policy): refresh durable context snapshots 2026-07-30 23:17:33 +08:00
imccyu
da9f02221e Merge remote-tracking branch 'origin/master' into worktree-forkweb 2026-07-30 22:53:07 +08:00
NI0317
e5ec7e2b64 Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-30 22:42:52 +08:00
Tianyi Cui
233486691f Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay 2026-07-30 22:42:42 +08:00
NI0317
afe26c27ab test(sandbox-policy): refresh merged web evidence 2026-07-30 22:24:07 +08:00
Tianyi Cui
dc5f270ae2 Merge branch 'master' into codex/queue-collapse 2026-07-30 22:18:44 +08:00
NI0317
cef62c007d Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-30 22:16:50 +08:00
NI0317
1a4349be88 test(sandbox-policy): record cache-safe policy context 2026-07-30 22:15:34 +08:00
Tianyi Cui
95293e58b6 Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay 2026-07-30 22:14:28 +08:00
imccyu
f2bbc0f453 Merge branch 'master' into worktree-forkweb 2026-07-30 22:12:50 +08:00
creatixchu
1102cfc1f3 Merge remote-tracking branch 'origin/master' into worktree/plan-review-layout 2026-07-30 22:10:56 +08:00
NI0317
9c32620e4b test(web): compare cache-safe policy wording 2026-07-30 22:09:32 +08:00
imccyu
3b370549a1 feat(client): increment forked session titles 2026-07-30 21:28:17 +08:00
imccyu
213de9a737 feat(ui-conversation): wire assistant session forks 2026-07-30 21:28:17 +08:00
imccyu
7d27c92851 test(web): cover row fork in the real app 2026-07-30 21:28:16 +08:00
imccyu
36f1489398 fix(web): address session fork review findings 2026-07-30 21:28:13 +08:00
Tianyi Cui
bdc21717c0 Merge branch 'master' into worktree/fix-macos-web-replay 2026-07-30 20:22:12 +08:00
kingwl
29d8ca5ee5 Merge remote-tracking branch 'origin/master' into codex/queue-collapse
# Conflicts:
#	packages/client/ui-conversation/README.i18n.yaml
2026-07-30 20:11:46 +08:00
creatixchu
692ada7485 Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default 2026-07-30 19:48:45 +08:00
NI0317
0592d0fcea Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-30 19:48:35 +08:00
NI0317
1e56cd6765 Merge origin/master into codex/sandbox-policy-context 2026-07-30 19:40:26 +08:00
NI0317
c54fed8a20 Merge origin/master into codex/sandbox-policy-context 2026-07-30 19:31:17 +08:00
NI0317
598d0ea769 test(sandbox-policy): record wording evidence 2026-07-30 19:30:11 +08:00
Tianyi Cui
fb30187161 fix(web): isolate replay skill discovery 2026-07-30 19:30:06 +08:00
imccyu
a1f1f9c29a Merge branch 'master' into codex/figma-context-injection-row 2026-07-30 19:20:21 +08:00
kingwl
dec8173c43 Merge remote-tracking branch 'origin/master' into codex/queue-collapse 2026-07-30 19:20:20 +08:00
kingwl
5f87c7a89c fix(web): close queue collapse review gaps 2026-07-30 19:20:13 +08:00
creatixchu
132294fe8d fix(web): register the plan-review e2e lane in the host-plane program
The lane boots the host spine through the shared scaffold, so it belongs to
tsconfig.host.json and must stay out of the client-registered apps/web project
— one program cannot hold both sides of the cordis Context merges.
2026-07-30 19:12:02 +08:00
creatixchu
2363ef01eb feat(web): render a plan review as a decision card, not a quiz
The Web composer now renders a request that declares the `plan-review` intent
as its own surface: the waiting-approval card language — amber "Plan review"
strip, the plan as the scrolling markdown body, the question as the card's
accessible name — over one decision row of Chat about it / Refuse / Approve.
Gone from that surface are the 1/1 pager, the numbered radio rows, the custom
answer row, and Skip/Submit, which made approving a plan read as sitting an
exam.

Approve and Refuse answer with the asker's own option labels and keep its
descriptions as tooltips; Chat about it cancels the request so the composer
returns and the user can simply say what they want. Copy is bilingual under the
existing `question` namespace.

The shape choice lives inside the single composer entry rather than a second
chain registration, so the two surfaces cannot race the same carrier, and
`planReviewOf` falls back to the generic flow for any request it cannot render
as a card — the client sits downstream of a wire boundary and every request
must stay answerable.
2026-07-30 19:09:35 +08:00
creatixchu
f5ab6d94a8 Merge remote-tracking branch 'origin/master' into worktree/approval-panel-max-height 2026-07-30 18:59:06 +08:00
NI0317
ad8ce3904b test(web): drive policy experiment through commands 2026-07-30 18:54:46 +08:00
NI0317
5dabddb164 test(web): anchor policy experiment on durable state 2026-07-30 18:52:33 +08:00
NI0317
87a4aaa32e feat(sandbox-policy): describe enforced file families 2026-07-30 18:51:29 +08:00
creatixchu
5e4922a761 Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
# Conflicts:
#	apps/cli/cordis.yml
#	packages/host/README.i18n.yaml
2026-07-30 18:41:41 +08:00
creatixchu
12b55adf6b fix(web): keyboard reach and resting metrics on the approval scroll region
Review follow-ups on the approval takeover:

The scroll region is now a tab stop (tabIndex + named role="group"). The
question composer's scroll body needs none — its option rows are focusable and
pull the container along — but this one holds nothing but text, so a
keyboard-only user could reach the buttons and never the command's tail, and
approve what they could not finish reading.

The action row's padding reproduces the 14px gap it had inside the body: the
flex gap of 6 plus its 8px top margin, neither of which reaches it now that the
row sits outside the scroll region. The resting card is unchanged again.
2026-07-30 18:35:20 +08:00
creatixchu
33bb266932 Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden 2026-07-30 18:29:37 +08:00
kingwl
cdd1074805 Merge remote-tracking branch 'origin/master' into codex/queue-collapse
# Conflicts:
#	packages/client/ui-conversation/README.i18n.yaml
2026-07-30 18:21:07 +08:00
creatixchu
14482fcef1 fix(web): keep the approval scenario's goldens platform-neutral
The answered-transcript golden captured the OS's own refusal of the denied
first attempt — "bash: notes.txt: Operation not permitted" on macOS against
"bash: line 1: notes.txt: Read-only file system" on Linux — so it passed
locally and failed the Linux snapshot lane.

The scenario now keeps one golden (the waiting panel, platform-neutral) and
asserts the answered state on the world instead: the decided outcome, the file
the escalated command actually wrote, DONE, the panel gone, and the composer
re-enabled. The file assertion is stronger evidence than the transcript dump
it replaces — it proves the grant reached the executor.
2026-07-30 18:11:05 +08:00