pku-xht
0891465ee0
Merge origin/master into codex/send-one-turn
2026-07-20 11:52:30 +08:00
Tianyi Cui
247526d4ca
fix(acp): adapt compaction wiring to token meter
2026-07-20 11:47:17 +08:00
Turtle
33fadcf08d
Drop the draft-PR requirement; delegation is just: use a subagent
2026-07-20 11:46:16 +08:00
Tianyi Cui
80cdcce085
Merge origin/master into codex/acp-agent-auto-compaction
2026-07-20 11:45:13 +08:00
kingwl
2e7cdddb89
Merge remote-tracking branch 'origin/master' into cross-family-fs-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.md
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.zh.md
# docs/capability-seams.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# docs/rfc/INDEX.md
# examples/acp-agent/README.md
# examples/acp-agent/fs.cordis.snapshot.yml
# examples/acp-agent/fs.cordis.yml
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-context/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/workspace-edit/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.expected.json
# packages/bash/bash/src/index.ts
# packages/bash/tool-bash/package.json
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/fs/README.md
# packages/fs/tool-fs/src/edit.ts
# packages/fs/tool-fs/src/write.ts
# packages/sandbox/README.md
# pnpm-lock.yaml
2026-07-20 11:44:37 +08:00
Yichen Jiang
58a8612118
Merge branch 'master' into worktree/acp-default-fs-suite
2026-07-20 11:43:11 +08:00
Tianyi Cui
884c168edc
Merge codex/commands into codex/goal-commands
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-model-facing-goal-tools.i18n.yaml
# .agents/notes/implemented/feature/2026-07-19-model-facing-goal-tools.md
# .agents/notes/implemented/feature/2026-07-19-model-facing-goal-tools.zh.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/model-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.expected.jsonl
# packages/goal/tool-goal/README.md
2026-07-20 11:41:53 +08:00
Tianyi Cui
ee1af10c52
docs(acp): note per-model compaction config
2026-07-20 11:38:55 +08:00
Turtle
4d037613b1
Drop worktree/branch mechanics from the delegation instruction; just use a subagent
2026-07-20 11:31:27 +08:00
Tianyi Cui
2dd3b1dfba
fix(commands): harden registry and UI ordering
2026-07-20 11:27:10 +08:00
NI0317
e9b76e40e1
Revert "docs(ui): add desktop workbench screenshots for PR review"
...
This reverts commit 723f0b96b2afbb7bc11a7687a736eca4521798fa.
2026-07-20 11:23:47 +08:00
kingwl
48f19044de
Merge remote-tracking branch 'origin/master' into chore/import-landlock-run
...
Conflict: doc-budgets manifest — master raised the AGENTS.md ceiling to 1600
(superseding this branch's 1377 bump for the native/ line), take master's
values.
2026-07-20 11:11:09 +08:00
NI0317
a321567473
docs(ui): add desktop workbench screenshots for PR review
2026-07-20 11:05:28 +08:00
NI0317
37a03df733
fix(ui): pin dock rows, verb labels on live tools, dedupe reject
...
Auto placement floated the new docks to the top of the main pane; every
dock now owns an explicit grid row (and the layout regression guards
them). Live tool rows use the streamed kind verb like persisted rows,
and the approval card's fallback reject is omitted when the request
already carries a reject option.
2026-07-20 10:58:21 +08:00
Turtle
f2206a3f28
Address review: fix exception path, recursion stop, terminology, anchor, description
2026-07-20 10:55:03 +08:00
Turtle
3a20b4c551
dsh-translate-docs: delegate translation writing to a subagent worktree with a draft PR
2026-07-20 10:48:58 +08:00
NI0317
d3ac437616
feat(ui): queue prompts, in-conversation approval cards, docked plan
...
Prompts submitted while a turn runs queue above the composer (edit,
remove, auto-send on completion; interruption or a failure pauses the
queue with an explicit resume). Permission requests and elicitations
route from the ACP client in main to renderer cards with the request
options — pending cards replay when the renderer reloads, replacing
the blocking OS dialogs. The task plan docks above the composer instead
of scrolling inside the thread, multi-line user bubbles trim their
padding lines, and a turn that ends abnormally shows an inline error
line in the transcript.
2026-07-20 10:46:00 +08:00
NI0317
91554b05f1
test(ui): cover seqless todo/write snapshots in the trace graph
2026-07-20 10:27:59 +08:00
NI0317
cdb5524632
feat(ui): render todo plans and streamed tool kinds in both views
...
todo/write events fold into plan targets: the chat transcript and
trajectory show a checklist card (done counts, active item), and live
ACP plan updates render the same card while the turn streams — the
task list was previously invisible on both paths. Tool rows label
themselves with the streamed ACP kind verb (read/edit/search/run…)
instead of a generic noun, and touched-file locations open in the OS
editor from the expanded row.
2026-07-20 10:25:11 +08:00
Yichen Jiang
5833d70447
Merge remote-tracking branch 'origin/master' into worktree/docs-website
...
# Conflicts:
# .agents/notes/implemented/process/2026-07-13-documentation-site-projection.md
# docs/AGENTS.md
# docs/rfc/INDEX.md
# docs/user/develop/basic/index.zh.md
# docs/user/develop/basic/tool.zh.md
# docs/user/develop/framework/index.zh.md
# docs/user/develop/framework/service.zh.md
# docs/user/develop/practice/index.zh.md
# docs/user/guide/index.zh.md
# docs/user/guide/quickstart.zh.md
# knip.json
# package.json
# pnpm-lock.yaml
# scripts/doc-typecheck.ts
# scripts/gen-website-api.ts
# scripts/translation-pairing.manifest.json
# scripts/verify-type-equiv.ts
# website/zh-CN/api/cordis/context.md
# website/zh-CN/api/cordis/events.md
# website/zh-CN/api/cordis/fiber.md
# website/zh-CN/api/cordis/registry.md
# website/zh-CN/api/cordis/service.md
# website/zh-CN/api/harness/agent-loop.md
# website/zh-CN/api/harness/agents.md
# website/zh-CN/api/harness/approval.md
# website/zh-CN/api/harness/bash-env.md
# website/zh-CN/api/harness/bash.md
# website/zh-CN/api/harness/code-runtime.md
# website/zh-CN/api/harness/compact.md
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/fs.md
# website/zh-CN/api/harness/llm.md
# website/zh-CN/api/harness/permission.md
# website/zh-CN/api/harness/sandbox.md
# website/zh-CN/api/harness/session-persistence.md
# website/zh-CN/api/harness/session-query.md
# website/zh-CN/api/harness/sessions.md
# website/zh-CN/api/harness/skills.md
# website/zh-CN/api/harness/spill-store.md
# website/zh-CN/api/harness/subagents.md
# website/zh-CN/api/harness/system-prompt.md
# website/zh-CN/api/harness/tasks.md
# website/zh-CN/api/harness/token-meter.md
# website/zh-CN/api/harness/tools.md
# website/zh-CN/api/harness/user-interaction.md
# website/zh-CN/api/harness/web.md
# website/zh-CN/api/harness/workflows.md
# website/zh-CN/api/index.md
# website/zh-CN/design/effects-coeffects.md
# website/zh-CN/design/index.md
# website/zh-CN/guide/config.md
2026-07-20 10:21:36 +08:00
Tianyi Cui
38abe7cac6
Merge codex/goal-session into codex/commands
2026-07-20 09:37:24 +08:00
Tianyi Cui
3eed132488
Merge codex/goal-tools into codex/goal-session
2026-07-20 09:34:05 +08:00
Tianyi Cui
6f4f459c73
test(goal): cover terminal update validation
2026-07-20 09:30:51 +08:00
Tianyi Cui
cf05624b9f
Merge codex/goal-session into codex/commands
2026-07-20 09:11:50 +08:00
Tianyi Cui
979fbbd961
fix(goal): harden driver cancellation settlement
2026-07-20 09:07:15 +08:00
Tianyi Cui
69daf1c147
Merge codex/goal-tools into codex/goal-session
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.i18n.yaml
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.md
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.zh.md
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/goal/goal/tests/goal.spec.ts
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/goals.md
2026-07-20 08:58:37 +08:00
Tianyi Cui
89f9900be1
fix(goal): preserve interactive human turns
2026-07-20 08:50:51 +08:00
Tianyi Cui
134199c00f
Merge codex/goal-domain into codex/goal-tools
2026-07-20 08:41:44 +08:00
Tianyi Cui
3c2e07a92d
fix(goal): make publication reentrancy-safe
2026-07-20 08:38:28 +08:00
Tianyi Cui
3b0b0cefeb
feat: implement bounded LLM request recovery
2026-07-20 03:34:19 +08:00
Tianyi Cui
d91684d2bb
Merge codex/ralph-tool into codex/goal-rfc-rollup
2026-07-20 02:41:50 +08:00
Tianyi Cui
06dbe09692
Merge codex/goal-commands into codex/ralph-tool
2026-07-20 02:41:45 +08:00
Tianyi Cui
64b84c9ef0
Merge codex/commands into codex/goal-commands
2026-07-20 02:41:39 +08:00
Tianyi Cui
e5bec9b1b9
Merge codex/goal-session into codex/commands
2026-07-20 02:41:35 +08:00
Tianyi Cui
d2cd315506
Merge codex/goal-tools into codex/goal-session
2026-07-20 02:41:29 +08:00
Tianyi Cui
1a14b60569
test(goal): close terminal pause e2e
2026-07-20 02:38:14 +08:00
Tianyi Cui
e1c07cbabf
fix(workflow): include Ralph in clean builds
2026-07-20 02:38:14 +08:00
Tianyi Cui
fffd8474ad
docs(agent-note): record implemented goal execution stack
2026-07-20 02:19:36 +08:00
Tianyi Cui
478678ad25
Merge codex/goal-commands into codex/ralph-tool
2026-07-20 02:05:43 +08:00
Tianyi Cui
e958c222a2
docs(agent-note): normalize goal command heading
2026-07-20 02:01:56 +08:00
Tianyi Cui
512ef2a18e
docs(invariants): refresh installer API catalogs
2026-07-20 02:00:40 +08:00
Tianyi Cui
55fd1919a1
Merge remote-tracking branch 'origin/codex/invariant-package-registration-gate' into codex/package-invariant-checks
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-19-package-owned-invariant-service.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-19-package-owned-invariant-service.md
# .agents/notes/implemented/architecture/2026-07-19-package-owned-invariant-service.zh.md
# packages/support/invariants/README.md
2026-07-20 01:54:20 +08:00
Tianyi Cui
e80fc3e61b
fix(invariants): join package checks at startup
2026-07-20 01:53:09 +08:00
Tianyi Cui
e2b8e2b1eb
Merge codex/goal-commands into codex/ralph-tool
2026-07-20 01:52:57 +08:00
Tianyi Cui
caaa1364ec
test(invariants): bound global companion topology
2026-07-20 01:51:28 +08:00
Tianyi Cui
fdce57cf4a
Merge codex/commands into codex/goal-commands
2026-07-20 01:43:32 +08:00
Tianyi Cui
4f1a0fe015
Merge codex/goal-session into codex/commands
2026-07-20 01:30:43 +08:00
Tianyi Cui
b21193ded5
Merge codex/goal-tools into codex/goal-session
2026-07-20 01:21:40 +08:00
Tianyi Cui
dddebe6755
Merge codex/goal-domain into codex/goal-tools
2026-07-20 01:12:37 +08:00
Tianyi Cui
af4313ec11
Merge rfc/loop into codex/goal-domain
2026-07-20 01:04:15 +08:00
pku-xht
Tianyi Cui
Turtle
kingwl
Yichen Jiang
NI0317