e3767c64d9
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 15:31:13 +08:00
440afff96e
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# packages/ui/stdio-agent/README.md
2026-07-14 15:27:32 +08:00
908603ad73
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 15:26: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
0f86a00299
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
2026-07-14 11:58:39 +08:00
414f696a74
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 11:58:31 +08:00
c8aa2302dc
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-14 11:58:10 +08:00
0567ff85cb
Merge branch 'codex/simp-drop-assembled-section-order' into codex/simp-drop-unused-schema-default
2026-07-14 11:58:01 +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
e2ba1e61da
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 11:56:47 +08:00
4cdbe564d8
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/config-catalog.md
2026-07-14 11:56:35 +08:00
9272d2871b
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
2026-07-14 11:56:09 +08:00
633a18269d
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 11:53:59 +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
54bd21cf58
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
2026-07-14 11:27:35 +08:00
0d24cb14cb
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 11:27:12 +08:00
c1fb97c63a
fix: surface config startup failures
2026-07-14 11:23:38 +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
0e97d4e13b
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 10:01:45 +08:00
00462f80a6
docs: expose agent ownership in Cordis catalog
2026-07-14 10:01:36 +08:00
14ed3a9914
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 07:30:06 +08:00
03f91a5471
fix: retain local subagent completion identity
2026-07-14 07:29:40 +08:00
99b5f04c9b
fix: use unified identity for bash ownership
2026-07-14 07:26:46 +08:00
863116daaf
fix: retain dynamic tool schema defaults
2026-07-14 05:23:17 +08:00
26e2fe9356
refactor: drop assembled section order echo
2026-07-14 04:41:23 +08:00
582a8ba288
refactor: drop unconsumed skill provider events
2026-07-14 04:32:40 +08:00
3ab35de64f
refactor: prune unused web seam fields
2026-07-14 04:17:38 +08:00
8c8b422f17
refactor: prune bash implementation surface
2026-07-14 03:37:51 +08:00
01da49a3ab
refactor: prune code runtime surface
2026-07-14 03:07:41 +08:00
0236a12324
refactor: prune core tool and prompt surface
2026-07-14 02:54:30 +08:00
225796c90d
refactor: hide the concrete agent loop
2026-07-14 02:32:35 +08:00
709cc7200e
refactor: unify agent and session identity
2026-07-14 01:59:21 +08:00
d7de8a8d13
refactor: narrow compaction surface
2026-07-14 01:24:20 +08:00
eed43abe66
docs: address final model experience review
2026-07-14 00:22:52 +08:00
20402b637c
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/rfc/proposed/feature/2026-07-08-interactive-side-sessions.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# examples/coding-agent/tests/keyless-smoke.e2e.ts
# packages/ui/acp/src/index.ts
2026-07-13 23:44:44 +08:00
148046b9c8
docs: rebalance prose cleanup and add trimming skill
2026-07-13 23:27:00 +08:00
d77f797d89
docs: replace model experience tables with sections
2026-07-13 22:26:33 +08:00
646f3d2d0c
docs: apply verbatim model experience guidance repo-wide
2026-07-13 21:33:23 +08:00
aa62b5109a
Fix workspace context review findings
2026-07-13 16:31:03 +08:00
c45d7927cf
docs: tighten prose audit after master retarget
2026-07-13 16:24:32 +08:00
ba329b16ce
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/module-graph.md
# docs/rfc/INDEX.md
# packages/core/agent-core/tests/agent-core.spec.ts
# pnpm-lock.yaml
2026-07-13 16:18:44 +08:00
e2bc79a0ef
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/tool-catalog.md
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-core/tests/agent-core.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/index.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/core/agent/tests/agent.spec.ts
# packages/subagent/subagent/README.md
# packages/subagent/subagent/src/index.ts
# packages/subagent/tool-subagent/README.md
# packages/subagent/tool-subagent/src/index.ts
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
2026-07-13 15:57:17 +08:00
c6ba5f1d26
Merge origin/master (agent-scope runtime #224 , session-query, run-gates CI harness)
...
Conflict resolution beyond line merges: the ACP bridge's mode/set
re-notify moved inside master's new containment finally (a throwing
presenter must not desync the picker), and session/new keeps the modes
advertisement beside master's plain object return. dsh-mode's boundary
flush moved off the session/event feed onto the loop's interception
seams (agent/prompt-submit / agent/turn-continuation): master's scoped
dispatch made post-commit session observers observe-only — an append
from one re-enters the publishing append — while the two waterfalls
fire outside any log emit and bracket the same boundaries; mode.spec's
boundary helper now dispatches those seams via agentEvents, and the
containment tests stub only the mode/set append. Catalogs, doc graphs,
and the module graph regenerated.
2026-07-13 15:12:11 +08:00
Tianyi Cui