97e7d68340
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cancel-tool-calls/session.jsonl
2026-08-05 10:39:18 +08:00
f09986a02b
Merge commit '6da4bd5f593e2f633df9e99721fb62e559b56012' into codex/product-providers-pr2-claude-code
2026-08-05 07:40:22 +08:00
9e91e206d4
refactor(subagent-codex): centralize cancellation settlement
2026-08-05 07:36:54 +08:00
6d8095825b
fix(subagent-claude-code): tighten provider evidence
2026-08-05 07:32:27 +08:00
80adf8c7f4
Merge commit '3e630a3bce76aedf0fe351cf7b22d1f28b7fb731' into codex/product-providers-pr2-claude-code
...
# Conflicts:
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.i18n.yaml
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.md
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.zh.md
2026-08-05 07:09:16 +08:00
2e00a93eda
fix(subagent-codex): support Windows command shims
2026-08-05 07:03:04 +08:00
ed6f0c8774
Merge commit 'ecbb7896d3deeeac0bca71cef6b0d17e5b23896b' into codex/product-providers-pr2-claude-code
...
# Conflicts:
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.i18n.yaml
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.md
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.zh.md
# docs/capability-seams.md
# docs/module-graph.md
# packages/subagent/README.i18n.yaml
# packages/subagent/README.md
# packages/subagent/README.zh.md
# scripts/gen-doc-graphs.ts
2026-08-05 06:40:45 +08:00
13d7318dac
Fix provider diagnostics and ownership docs
2026-08-05 06:12:42 +08:00
0ccd847ef3
Fix timer bounds and ACP teardown ownership
2026-08-05 05:24:23 +08:00
ecedbbda56
Merge commit '4cca942ed6ce3087d3cbe0f95a48209e51241254' into codex/product-providers-pr2-claude-code
2026-08-05 04:49:25 +08:00
075b6b0756
fix(subagent-codex): drop unused initialize metadata gate
2026-08-05 04:45:11 +08:00
17caa8a676
Merge commit 'a9cc0fddb40be295c43cb2badb4cbcb2b032556c' into codex/product-providers-pr2-claude-code
...
# Conflicts:
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.i18n.yaml
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.md
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.zh.md
# docs/core-data-structures/subprocess.i18n.yaml
# packages/subprocess/subprocess/README.i18n.yaml
2026-08-05 04:41:27 +08:00
a49ef7581f
Fix Codex wire frames and bound grace timers
2026-08-05 04:21:29 +08:00
73f33c1ddf
Merge synchronized PR1 into Claude provider
...
# Conflicts:
# docs/capability-seams.md
2026-08-05 02:34:58 +08:00
c4650c0eab
Merge current master into Codex provider
...
# Conflicts:
# docs/capability-seams.md
2026-08-05 02:21:49 +08:00
98dc55511d
Merge PR1 DeepSeek e2e into Claude provider
...
# Conflicts:
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.i18n.yaml
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.md
# .agents/notes/proposed/feature/2026-08-04-claude-code-and-codex-subagent-backends.zh.md
2026-08-05 02:17:02 +08:00
01704b9a3a
Add Codex DeepSeek credentialed e2e
2026-08-05 01:30:42 +08:00
ca27512529
fix(packages): omit source publication payloads
2026-08-05 01:15:19 +08:00
96d6853a96
Preserve Claude SDK child environment
2026-08-05 01:07:58 +08:00
34b6cb91ed
Keep provider adapters private
2026-08-05 00:26:39 +08:00
2cf637480c
Merge PR1 review fixes into Claude provider
...
# Conflicts:
# vitest.config.ts
2026-08-04 23:47:33 +08:00
46db608843
Align Codex provider review evidence
2026-08-04 23:42:35 +08:00
606a65740f
Merge commit 'ba21ca122496e1038993378753de863e571cdc2a' into codex/product-providers-pr2-claude-code
2026-08-04 22:52:07 +08:00
a93968bf93
fix(subagent-codex): await managed tree exit
2026-08-04 22:36:31 +08:00
32f829c4e6
fix(subagent): complete product provider lifecycle
2026-08-04 22:18:35 +08:00
d780902679
refactor(subagent): share provider dispose window
2026-08-04 21:25:48 +08:00
c357f94ddc
test(agent-loop): align consumers with direct wakeup
2026-08-04 21:14:34 +08:00
8dae2ee5eb
Merge PR1 Codex provider fixes into PR2
2026-08-04 21:01:32 +08:00
be56f64b7a
feat(subagent): add Claude Code provider
2026-08-04 20:57:55 +08:00
451c2929ed
fix(subagent): close terminal teardown races
2026-08-04 20:26:45 +08:00
f96acad438
fix(subagent): preserve Codex fatal and grace semantics
2026-08-04 19:55:39 +08:00
edb3e82c35
docs(i18n): address proofreading review findings
2026-08-04 18:42:13 +08:00
c09b20f96b
fix(subagent): finalize Codex provider composition
2026-08-04 18:38:05 +08:00
2db712eec7
docs(i18n): proofread active Chinese documentation
2026-08-04 17:36:14 +08:00
36b562e4e9
fix(subagent): close Codex provider review findings
2026-08-04 17:13:38 +08:00
270b8e0acc
fix(subagent): close Codex provider CI gaps
2026-08-04 16:25:38 +08:00
1daa35b6e3
feat(subagent): add Codex product provider
2026-08-04 16:02:17 +08:00
ffeccc138b
Merge branch 'feat/ripgrep-packaged-binary' into feat/pwsh-tool
...
# Conflicts:
# docs/module-graph.md
2026-08-03 20:22:16 +08:00
734c3d1f65
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# apps/cli/tests/snapshots/queued-manual-compact/terminal.expected.txt
# apps/web/tests/snapshots/queue-actions/preserved.expected.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/tests/snapshots/untrusted-controls.expected.txt
2026-08-03 17:15:34 +08:00
a597763393
fix(session): type turn/end error as one structured failure
...
TurnEndReasonMap.error now carries a single `error: LlmFailure` field:
an LlmError keeps its structured facts, any other error flattens to
errorChain text under the UNKNOWN code. Consumers read message/code
directly instead of defending against an unknown union — this also fixes
errorChain() rendering structured failures as '[object Object]' in the
TUI and ACP error paths. Document the turn-stopping contract: a
concludesTurn result never short-circuits already-submitted next-step
work (same-step additionalContexts or racing steering still runs), data
decides.
2026-08-03 16:33:23 +08:00
cb2f01f48c
refactor(agent-loop): drop the steering/message session event
...
Steer, inject, and followup now land as durable user/message events on the
session surface; the steering/message event type and its ConversationNode
kind are removed from the client projection. Update tests, docs, generated
catalogs, and agent notes to match, and align the steering e2e fixture and
prompt inventory assertions with the durable user/message landing.
2026-08-03 16:04:26 +08:00
49e90695cc
refactor(agent): complete inbox lifecycle migration
2026-08-03 12:25:33 +08:00
c183fae6f9
clarify timing projection schema cast
2026-08-03 12:04:44 +08:00
0b0de64769
bound inactive subagent timing to projection cut
2026-08-03 11:40:33 +08:00
dc1d542092
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-12-agent-scope-runtime-design.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-31-goal-owned-durable-events.i18n.yaml
# .agents/notes/implemented/feature/2026-07-19-model-facing-goal-tools.i18n.yaml
# .agents/notes/implemented/feature/2026-07-22-docked-web-goal-bar.i18n.yaml
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/session.1.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/session.1.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# 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
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/child.expected.jsonl
# examples/jsonrpc-agent/tests/snapshots/subagent-spawn/notifications.expected.jsonl
# examples/jsonrpc-agent/tests/snapshots/subagent-spawn/session.1.jsonl
# packages/acp/acp/README.i18n.yaml
# packages/acp/acp/src/index.ts
# packages/client/connection/src/client/index.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/runtime/src/client/sessions/conversation.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/runtime/tests/queue-store.spec.ts
# packages/client/ui-conversation/src/client/input/contract.ts
# packages/client/ui-goal/README.i18n.yaml
# packages/compact/compact-basic/src/index.ts
# packages/context/time-context/tests/time-context.spec.ts
# packages/context/tmux-context/tests/tmux-context.spec.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/README.md
# packages/core/agent-loop/README.zh.md
# packages/core/agent-loop/src/agent.ts
# packages/core/agent-loop/tests/agent.spec.ts
# packages/core/agent-loop/tests/loop.spec.ts
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.md
# packages/core/agent/README.zh.md
# packages/core/agent/src/types.ts
# packages/core/session/README.i18n.yaml
# packages/core/session/README.md
# packages/core/session/README.zh.md
# packages/goal/command-goal/tests/command-goal.spec.ts
# packages/goal/goal/tests/goal.spec.ts
# packages/goal/tool-goal/README.i18n.yaml
# packages/goal/tool-goal/README.md
# packages/goal/tool-goal/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/events.schema.ts
# packages/host/apiproxy/src/api/events.ts
# packages/host/apiproxy/src/api/rpc.ts
# packages/host/apiproxy/tests/api-proxy-commands.spec.ts
# packages/host/apiproxy/tests/api-proxy-projections.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# packages/pty/pty-local/tests/index.spec.ts
# packages/pty/pty-local/tests/local.spec.ts
# packages/pty/tool-pty/tests/loader-composition.spec.ts
# packages/pty/tool-pty/tests/tools.spec.ts
# packages/session-persistence/session-checkpoint-policy/src/index.ts
# packages/session-persistence/session-persistence/tests/coordinator-contract.ts
# packages/skill/tool-skill/tests/tool-skill.spec.ts
# packages/subagent/subagent-inprocess/README.i18n.yaml
# packages/subagent/subagent-inprocess/README.md
# packages/subagent/subagent-inprocess/README.zh.md
# packages/subagent/subagent-inprocess/src/index.ts
# packages/subagent/subagent-inprocess/tests/subagent-inprocess.spec.ts
# packages/support/acp-snapshot/src/harness.ts
# packages/ui/tui/tests/tui.spec.ts
2026-08-03 10:56:09 +08:00
c831c99981
keep subagent duration fix focused
2026-08-03 01:08:32 +08:00
6b6acbe0c5
Merge master into subagent usage branch
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.md
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.zh.md
# apps/web/tests/snapshots/subagent-conversation/tree.expected.md
# apps/web/tests/subagent-conversation.e2e.ts
# packages/client/ui-subagent/src/client/SubagentCatalogAction.tsx
2026-08-02 23:37:17 +08:00
b30686d634
show subagent usage and active duration
2026-08-02 23:31:24 +08:00
1ea72962eb
Merge master into fix/subagent-stack-end-result
2026-08-02 23:13:00 +08:00
a24f9b06e7
refactor(subagent): drop speculative effect rollback
...
The PR moved child scope-effect registration into the contribution-installation try/catch solely to cover a hypothetical throw, while documenting that Context.effect cannot reject for the live unpublished scope passed to apply. The change therefore added control-flow and rollback implications for a failure mode the API does not expose, without changing observable behavior.
Keep the rollback boundary focused on contribution installers, which are the operations that can actually fail and leave recorded installations to unwind. Register the child-scope cleanup effect immediately after that boundary, as before; its disposer still converges with contribution removal through the registry idempotence rules.
This is a behavior-preserving removal of unnecessary code. The focused activation-setup-registry suite passes all 11 tests, the subagent TypeScript project checks cleanly, and the staged diff passes whitespace validation.
2026-08-02 20:25:39 +08:00
_Kerman