Tianyi Cui
32ed403500
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/loop.ts
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
2026-07-14 17:30:34 +08:00
Tianyi Cui
f0fc20ca42
docs: align prose with runtime contracts
2026-07-14 16:21:41 +08:00
Tianyi Cui
b79520ab87
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
...
# Conflicts:
# packages/web/tool-web/README.md
# packages/web/web/README.md
2026-07-14 15:56:42 +08:00
Tianyi Cui
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
Tianyi Cui
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
Tianyi Cui
6682149348
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-14 15:41:46 +08:00
Tianyi Cui
a5e1717059
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 15:31:20 +08:00
Tianyi Cui
e3767c64d9
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 15:31:13 +08:00
Tianyi Cui
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
Tianyi Cui
908603ad73
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 15:26:46 +08:00
Tianyi Cui
443526285e
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
...
# Conflicts:
# docs/persistence-catalog.md
# packages/bash/bash/src/session-mode.ts
2026-07-14 15:25:26 +08:00
Hypatia May
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
Tianyi Cui
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
Hypatia May
dbe65e1d13
Unify session surface validation
2026-07-14 13:49:36 +08:00
Tianyi Cui
6b0de58b1c
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
2026-07-14 12:46:55 +08:00
Tianyi Cui
faf438df58
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 12:46:39 +08:00
Tianyi Cui
253f707c35
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/cordis-catalog/services.md
2026-07-14 12:41:47 +08:00
Tianyi Cui
7d40a9a0c5
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 12:39:44 +08:00
Tianyi Cui
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
Tianyi Cui
49e45ff184
fix: reject legacy fallback headers
2026-07-14 12:32:44 +08:00
Tianyi Cui
414f696a74
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 11:58:31 +08:00
Tianyi Cui
c8aa2302dc
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-14 11:58:10 +08:00
Tianyi Cui
7e58e9a35b
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
2026-07-14 11:57:51 +08:00
Tianyi Cui
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
Tianyi Cui
e2ba1e61da
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 11:56:47 +08:00
Tianyi Cui
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
Dudu-0223
5ab8f2e328
docs: correct fs/observed concurrency-safety wording
...
The read tool's isConcurrencySafe rationale called the fs/observed recorder
"commutative" and said concurrent reads "converge to one observed version",
overstating the guarantee: the WeakMap record is last-writer-wins. Safety comes
from write/edit re-checking the version in their in-lock CAS (a stale
observation only forces a later edit to fail closed with FS_STALE_VERSION), as
the RFC already states. Align the read comment, the ToolDefinition JSDoc, both
READMEs, and the regenerated catalogs.
2026-07-14 11:56:27 +08:00
Tianyi Cui
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
Tianyi Cui
633a18269d
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 11:53:59 +08:00
Tianyi Cui
4d5fb2cb1d
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
...
# Conflicts:
# docs/core-data-structures/session.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/core/session/README.md
# packages/core/session/src/index.ts
# packages/core/session/src/surface.ts
# packages/core/session/tests/surface.spec.ts
# scripts/type-equiv.manifest.json
2026-07-14 11:49:46 +08:00
Tianyi Cui
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
Dudu-0223
8ab39267f3
Merge remote-tracking branch 'origin/master' into codex/truncated-design
...
# Conflicts:
# docs/rfc/INDEX.md
2026-07-14 11:06:41 +08:00
Tianyi Cui
7d30906ee4
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
2026-07-14 10:54:25 +08:00
Tianyi Cui
288023dac1
docs: define local subagent lineage
2026-07-14 10:51:36 +08:00
Dudu-0223
6c57e6036d
docs(spill): clarify forked spill namespace
2026-07-14 10:40:53 +08:00
Tianyi Cui
14ed3a9914
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 07:30:06 +08:00
Tianyi Cui
99b5f04c9b
fix: use unified identity for bash ownership
2026-07-14 07:26:46 +08:00
Tianyi Cui
3ab35de64f
refactor: prune unused web seam fields
2026-07-14 04:17:38 +08:00
Tianyi Cui
8c8b422f17
refactor: prune bash implementation surface
2026-07-14 03:37:51 +08:00
Tianyi Cui
01da49a3ab
refactor: prune code runtime surface
2026-07-14 03:07:41 +08:00
Tianyi Cui
0236a12324
refactor: prune core tool and prompt surface
2026-07-14 02:54:30 +08:00
Tianyi Cui
225796c90d
refactor: hide the concrete agent loop
2026-07-14 02:32:35 +08:00
Tianyi Cui
709cc7200e
refactor: unify agent and session identity
2026-07-14 01:59:21 +08:00
Tianyi Cui
d7de8a8d13
refactor: narrow compaction surface
2026-07-14 01:24:20 +08:00
Tianyi Cui
1123e946c0
refactor: simplify session log representation
2026-07-13 23:56:10 +08:00
Tianyi Cui
148046b9c8
docs: rebalance prose cleanup and add trimming skill
2026-07-13 23:27:00 +08:00
Yichen Jiang
aa62b5109a
Fix workspace context review findings
2026-07-13 16:31:03 +08:00
Yichen Jiang
351a2e42b3
fix(tasks): close background task review findings
2026-07-13 16:29:50 +08:00
Tianyi Cui
c45d7927cf
docs: tighten prose audit after master retarget
2026-07-13 16:24:32 +08:00
Yichen Jiang
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
Tianyi Cui
Hypatia May
Dudu-0223
Yichen Jiang