Yichen Jiang
a2497a0dc1
Merge remote-tracking branch 'origin/master' into worktree/open-settings-config-file
...
# Conflicts:
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
2026-08-05 11:05:52 +08:00
xjt
7bd111b2af
Merge origin/master into xjt/proofreading-active-docs-2-apply
2026-08-05 10:57:53 +08:00
_Kerman
423f7517b6
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/core/agent/package.json
2026-08-05 10:46:01 +08:00
_Kerman
d4908eeb14
Merge remote-tracking branch 'origin/master' into xtr/trajectory-virtual-scroll
...
# Conflicts:
# apps/web/tests/chat-scroll-fixture.ts
# packages/client/runtime/README.i18n.yaml
2026-08-05 10:41:50 +08:00
_Kerman
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
pku-xht
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
pku-xht
e2b73d278c
Regenerate module graph
2026-08-05 05:34:32 +08:00
pku-xht
0ccd847ef3
Fix timer bounds and ACP teardown ownership
2026-08-05 05:24:23 +08:00
pku-xht
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
pku-xht
a49ef7581f
Fix Codex wire frames and bound grace timers
2026-08-05 04:21:29 +08:00
pku-xht
73f33c1ddf
Merge synchronized PR1 into Claude provider
...
# Conflicts:
# docs/capability-seams.md
2026-08-05 02:34:58 +08:00
pku-xht
c4650c0eab
Merge current master into Codex provider
...
# Conflicts:
# docs/capability-seams.md
2026-08-05 02:21:49 +08:00
imccyu
ca27512529
fix(packages): omit source publication payloads
2026-08-05 01:15:19 +08:00
pku-xht
96d6853a96
Preserve Claude SDK child environment
2026-08-05 01:07:58 +08:00
fz
119c55e35e
fix(workspace-context): reconcile resumed baselines
2026-08-04 23:11:15 +08:00
pku-xht
606a65740f
Merge commit 'ba21ca122496e1038993378753de863e571cdc2a' into codex/product-providers-pr2-claude-code
2026-08-04 22:52:07 +08:00
pku-xht
a93968bf93
fix(subagent-codex): await managed tree exit
2026-08-04 22:36:31 +08:00
pku-xht
32f829c4e6
fix(subagent): complete product provider lifecycle
2026-08-04 22:18:35 +08:00
_Kerman
e50c4aca03
refactor(agent-loop): start waking work directly
2026-08-04 21:02:28 +08:00
pku-xht
be56f64b7a
feat(subagent): add Claude Code provider
2026-08-04 20:57:55 +08:00
xjt
782d84116a
docs(i18n): restore first-occurrence terminology
2026-08-04 20:54:42 +08:00
Huanqi Cao
acda0e39bc
Merge remote-tracking branch 'origin/master' into feat/pwsh-tool
2026-08-04 20:39:17 +08:00
fz
207c45d15f
fix(workspace-context): deduplicate baseline on resume
2026-08-04 19:55:27 +08:00
xjt
c522053cef
Merge origin/master into xjt/proofreading-active-docs-2-apply
2026-08-04 19:51:18 +08:00
_Kerman
674278cb17
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/client/ui-conversation/src/client/queue/QueueDock.tsx
2026-08-04 19:37:51 +08:00
Hypatia May
cc89c529c6
Merge remote-tracking branch 'origin/master' into fix/landlock-runner-failure-classification
2026-08-04 19:05:33 +08:00
xjt
edb3e82c35
docs(i18n): address proofreading review findings
2026-08-04 18:42:13 +08:00
pku-xht
c09b20f96b
fix(subagent): finalize Codex provider composition
2026-08-04 18:38:05 +08:00
pku-xht
8a24a68333
Merge origin/master at 52ec34f796
2026-08-04 18:01:22 +08:00
Huanqi Cao
39b0695d48
Merge remote-tracking branch 'origin/master' into feat/pwsh-tool
...
# Conflicts:
# apps/cli/composition.md
# docs/testing.i18n.yaml
# docs/testing.md
# docs/testing.zh.md
2026-08-04 17:54:45 +08:00
Hypatia May
8c72cd3a8f
docs(sandbox): align final runner evidence
2026-08-04 17:45:12 +08:00
xjt
2db712eec7
docs(i18n): proofread active Chinese documentation
2026-08-04 17:36:14 +08:00
Yichen Jiang
e31b7221e7
feat(web): open the local settings file
2026-08-04 16:59:37 +08:00
Hypatia May
666690afe9
fix(sandbox): round 7 align spawn evidence
2026-08-04 16:55:11 +08:00
_Kerman
13fed3721f
fix(trajectory): preserve state across history prepends
2026-08-04 16:53:52 +08:00
imccyu
7f3a2dae91
fix(web): quiesce websocket teardown
2026-08-04 16:42:50 +08:00
imccyu
a36c641db6
chore(docs): refresh WebSocket API catalogs
2026-08-04 16:21:09 +08:00
Hypatia May
293fac9421
fix(sandbox): round 5 harden spawn attribution
2026-08-04 16:06:54 +08:00
pku-xht
1daa35b6e3
feat(subagent): add Codex product provider
2026-08-04 16:02:17 +08:00
_Kerman
d5527da905
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.md
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-search-render-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-search-render-card.md
# .agents/notes/implemented/feature/2026-07-30-search-render-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-read-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-read-card.md
# .agents/notes/implemented/feature/2026-07-30-web-read-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-result-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-result-card.md
# .agents/notes/implemented/feature/2026-07-30-web-result-card.zh.md
2026-08-04 15:49:07 +08:00
fz
193d918856
Merge remote-tracking branch 'origin/master' into codex/fix-headless-sigint
...
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/config/base.cordis.yml
2026-08-04 15:18:48 +08:00
fz
35710d770f
Merge remote-tracking branch 'origin/master' into codex/fix-compact-agents-reinjection
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
2026-08-04 15:11:09 +08:00
Yichen Jiang
1d2ea70e9b
feat(llm-deepseek): per-model output cap in the advisory catalog
...
A catalog entry may now carry its own `maxTokens`, matching the shape the
pi-ai adapter already exposes. Exact-model resolution prefers it over the
profile value, so capping one model no longer means capping the route.
Defaults are unchanged: an entry without a cap, and any unlisted
pass-through id, still resolve to the profile `maxTokens` (256,000), and the
shipped catalog keeps its context windows.
2026-08-04 14:53:02 +08:00
Hypatia May
ec4a070f0e
Merge remote-tracking branch 'origin/master' into fix/landlock-runner-failure-classification
2026-08-04 14:47:58 +08:00
_Kerman
8ed6a22940
fix(session): ignore balanced no-step turns
2026-08-04 14:29:18 +08:00
_Kerman
5356bd972d
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/archived/feature/2026-07-28-dsh-guided-skill-session-commands.i18n.yaml
# .agents/notes/archived/manifest.json
# .agents/notes/implemented/bug-fix/2026-07-29-human-transcript-append-origin.i18n.yaml
# .agents/notes/implemented/feature/2026-07-05-skill-system.i18n.yaml
# apps/cli/tests/snapshots/multi-turn-conversation/terminal.expected.txt
# apps/cli/tests/snapshots/queued-manual-compact/terminal.expected.txt
# apps/cli/tests/tui-keyless-smoke.e2e.ts
# apps/cli/tests/tui.snapshot.ts
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/event-producer-consumer.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/session-reference.snapshot.ts
# packages/ui/tui/tests/snapshots/conversation-streaming.expected.txt
# packages/ui/tui/tests/snapshots/details-command.expected.txt
# packages/ui/tui/tests/snapshots/details-selector.expected.txt
# packages/ui/tui/tests/snapshots/disposed-terminal.expected.txt
# packages/ui/tui/tests/snapshots/errors-and-help.expected.txt
# packages/ui/tui/tests/snapshots/status-diagnostics-narrow.expected.txt
# packages/ui/tui/tests/snapshots/status-diagnostics.expected.txt
# packages/ui/tui/tests/snapshots/surface-after-compaction-narrow.expected.txt
# packages/ui/tui/tests/snapshots/surface-after-compaction-wide.expected.txt
# packages/ui/tui/tests/snapshots/surface-before-compaction.expected.txt
# packages/ui/tui/tests/snapshots/surface-replayed-compaction.expected.txt
# packages/ui/tui/tests/snapshots/todo-plan-cleared.expected.txt
# packages/ui/tui/tests/snapshots/tool-cards-hidden-folded.expected.txt
# packages/ui/tui/tests/snapshots/untrusted-controls.expected.txt
# packages/ui/tui/tests/tui.snapshot.ts
# packages/ui/tui/tests/tui.spec.ts
2026-08-04 14:19:23 +08:00
_Kerman
e874910a76
test(session): align turn-end contract artifacts
2026-08-04 14:09:52 +08:00
Hypatia May
0cd1611023
Merge remote-tracking branch 'origin/master' into fix/landlock-runner-failure-classification
2026-08-04 13:54:37 +08:00
_Kerman
d4fa26023d
fix(agent-loop): open turns before pre-step
2026-08-04 13:49:35 +08:00
Hypatia May
f91aedd074
refactor(sandbox): defer native protocol exports (round 3)
2026-08-04 13:37:33 +08:00
