989539d3ed
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
2026-07-14 15:44:40 +08:00
d83618c1dc
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
2026-07-14 15:44:33 +08:00
f119de8b2e
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
...
# Conflicts:
# packages/bash/tool-bash/README.md
2026-07-14 15:44:25 +08:00
e4a08fff9e
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
...
# Conflicts:
# packages/fs/fs-local/README.md
# packages/fs/tool-fs/README.md
2026-07-14 15:43:35 +08:00
6cbb3270c3
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
2026-07-14 15:42:52 +08:00
3707aaa72e
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
...
# Conflicts:
# packages/code-runtime/code-runtime-worker/README.md
# packages/code-runtime/code-runtime/README.md
2026-07-14 15:42:39 +08:00
6682149348
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-14 15:41:46 +08:00
eb42eeda13
Merge remote-tracking branch 'origin/master' into session-query-trace
...
# Conflicts:
# packages/session-query/session-query/README.md
# packages/support/invariants/src/index.ts
2026-07-14 14:40:26 +08:00
8590ba00a4
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/AGENTS.md
# docs/config-catalog.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/src/session-mode.ts
# packages/bash/tool-bash/README.md
# packages/code-runtime/code-runtime-worker/README.md
# packages/compact/compact/src/index.ts
# packages/core/agent-core/README.md
# packages/hooks/hooks-claude/src/config.ts
# packages/hooks/hooks-claude/src/index.ts
# packages/hooks/hooks-codex/src/config.ts
# packages/hooks/hooks-codex/src/index.ts
# packages/llm/llm/README.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/README.md
# packages/skill/skill-local/README.md
# packages/support/acp-snapshot/README.md
# packages/support/invariants/src/index.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc/README.md
# packages/ui/permission/README.md
# packages/ui/user-approval/README.md
# packages/ui/user-interaction/README.md
# packages/web/web-search-deepseek/README.md
2026-07-14 14:37:16 +08:00
1ab64dba62
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# docs/development.i18n.yaml
# docs/development.zh.md
# docs/rfc/implemented/feature/2026-06-14-acp-agent-client-protocol.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/AGENTS.md
# examples/README.md
# examples/acp-agent/README.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/sandbox-acp-agent/README.md
# examples/sandbox-acp-agent/cordis.snapshot.yml
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# packages/ui/acp-agent/src/bin.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc-agent/src/bin.ts
# scripts/verify-translation-pairing.ts
2026-07-14 12:34:14 +08:00
b5d3caf3d3
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
2026-07-14 11:58:43 +08:00
c739e32a73
Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers
2026-07-14 11:58:36 +08:00
414f696a74
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 11:58:31 +08:00
880812939c
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
2026-07-14 11:58:17 +08:00
9702c07191
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
2026-07-14 11:58:13 +08:00
c8aa2302dc
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-14 11:58:10 +08:00
0ba3f1f110
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
2026-07-14 11:58:06 +08:00
c4c8ba1b8c
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
2026-07-14 11:57:56 +08:00
7e58e9a35b
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
2026-07-14 11:57:51 +08:00
51f3a9e441
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
...
# Conflicts:
# packages/core/session/src/surface.ts
2026-07-14 11:57:39 +08:00
a50e8bc1f3
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
...
# Conflicts:
# packages/bash/bash-sandbox/README.md
# packages/sandbox/sandbox-local/README.md
2026-07-14 11:28:08 +08:00
c74f17a143
docs: audit hook compatibility limits
2026-07-14 11:22:53 +08:00
d9714fb30b
Merge remote-tracking branch 'origin/master' into session-query-trace
2026-07-14 11:16:15 +08:00
8ab39267f3
Merge remote-tracking branch 'origin/master' into codex/truncated-design
...
# Conflicts:
# docs/rfc/INDEX.md
2026-07-14 11:06:41 +08:00
30ba5bd23c
Merge remote-tracking branch 'origin/master' into codex/truncated-design
...
# Conflicts:
# docs/config-catalog.md
# docs/rfc/INDEX.md
# examples/acp-agent/README.md
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-14 10:57:29 +08:00
8780a73750
Merge branch 'master' into session-query
2026-07-14 10:53:25 +08:00
85a2140781
Merge origin/master (single-exe pipeline #253 , duplication lint #281 , side-sessions RFC)
...
Beyond line merges: python/sdk-runtime's deploy manifest gains
@deepseek-ai/dsh-mode — the single-exe closure gate
(verify-runtime-closure) requires every workspace peer of dsh-acp, and
the bridge's type-only peer edge on dsh-mode counts; the AGENTS.md
efficiency section is condensed to fit the 1820-word ceiling after
master's single-exe additions. Catalogs and graphs regenerated.
2026-07-14 10:46:09 +08:00
3b48adeabf
Merge remote-tracking branch 'origin/master' into session-query-trace-filter
...
# Conflicts:
# docs/rfc/INDEX.md
# packages/README.md
2026-07-14 10:14:57 +08:00
cb78634bf2
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/event-producer-consumer.md
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-14 09:59:21 +08:00
f570d2201e
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/config-catalog.md
# packages/hooks/hooks-codex/src/index.ts
# packages/ui/acp-agent/src/index.ts
# packages/ui/stdio-agent/src/index.ts
2026-07-14 09:51:50 +08:00
e9f0c37745
Merge remote-tracking branch 'origin/master' into session-query
...
# Conflicts:
# docs/rfc/INDEX.md
# packages/README.md
2026-07-14 08:36:06 +08:00
b398d64ab1
Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers
...
# Conflicts:
# docs/config-catalog.md
2026-07-14 05:08:05 +08:00
3f676efbd9
fix: bound local fetch timer config
2026-07-14 05:06:01 +08:00
0815ff4db4
refactor: share loader smoke harness
2026-07-14 05:00:54 +08:00
26e2fe9356
refactor: drop assembled section order echo
2026-07-14 04:41:23 +08:00
0c88df78b2
refactor: hide web provider helpers
2026-07-14 04:21:48 +08:00
3ab35de64f
refactor: prune unused web seam fields
2026-07-14 04:17:38 +08:00
c3148d46d5
refactor: narrow workflow worker surface
2026-07-14 03:52:06 +08:00
b2025337b5
refactor: hide sandbox implementation helpers
2026-07-14 03:47:32 +08:00
8c8b422f17
refactor: prune bash implementation surface
2026-07-14 03:37:51 +08:00
f9db1a6a08
refactor: hide filesystem implementation helpers
2026-07-14 03:30:23 +08:00
5e9131e824
chore: sync code runtime surface catalog
2026-07-14 03:19:33 +08:00
0236a12324
refactor: prune core tool and prompt surface
2026-07-14 02:54:30 +08:00
c378dbf36a
Merge remote-tracking branch 'origin/master' into unify-acp-example
2026-07-14 01:11:37 +08:00
e3d7bb62d8
fix(permission): address human review feedback
2026-07-14 01:09:44 +08:00
cdc3522e48
Merge remote-tracking branch 'origin/master' into unify-acp-example
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# pnpm-lock.yaml
2026-07-14 00:56:28 +08:00
d11b713e0a
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# scripts/gen-persistence-catalog.ts
# scripts/jsdoc.ts
# scripts/verify-md-wrap.ts
# scripts/verify-package-paths.ts
2026-07-14 00:47:30 +08:00
972e7cc77d
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-05-dynamic-workflows.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/code-runtime/code-runtime-worker/tests/built-lib.e2e.ts
# packages/code-runtime/code-runtime-worker/tsdown.config.ts
2026-07-14 00:40:36 +08:00
53d9634043
chore: tighten TypeScript duplication lint
2026-07-14 00:24:04 +08:00
2850b42654
Merge remote-tracking branch 'origin/master' into feat/mcp-client
2026-07-13 23:48:11 +08:00
Tianyi Cui