 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
|
c5e32955f8
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 12:39:44 +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
|
85a1bbc7d5
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-14 12:36:59 +08:00 |
|
|
Tianyi Cui
|
dc67def3f3
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 12:34:31 +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
|
7299cc4b3b
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
1818f2e719
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
3c691bbc55
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
dae5fb9fb6
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
5c5875ab7e
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
e218e36e88
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
bbeeaed43c
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
|
2026-07-14 12:12:40 +08:00 |
|
|
Tianyi Cui
|
38041c43a4
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 12:12:39 +08:00 |
|
|
Tianyi Cui
|
fa9f8a794c
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
|
2026-07-14 12:12:39 +08:00 |
|
|
Tianyi Cui
|
2d55c249e9
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
|
2026-07-14 12:12:28 +08:00 |
|
|
Tianyi Cui
|
75caa2490f
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
|
2026-07-14 12:12:28 +08:00 |
|
|
Tianyi Cui
|
7cec4115ef
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
|
2026-07-14 12:12:28 +08:00 |
|
|
Tianyi Cui
|
87a7b599a5
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
|
2026-07-14 12:12:27 +08:00 |
|
|
Tianyi Cui
|
b0e9c595b7
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
|
2026-07-14 12:12:27 +08:00 |
|
|
Tianyi Cui
|
0f86a00299
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
|
2026-07-14 11:58:39 +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
|
6a0466583b
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
|
2026-07-14 11:58:21 +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
|
99db6e88ed
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 11:56:52 +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 |
|
|
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
|
99d2d5a092
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 11:53:55 +08:00 |
|
|
Tianyi Cui
|
795371a209
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/acp-agent/tests/hooks.e2e.ts
# packages/support/acp-snapshot/src/harness.ts
|
2026-07-14 11:53:45 +08:00 |
|
 Ziya
|
53556f9712
|
Merge remote-tracking branch 'upstream/master' into docs/i18n-capability
|
2026-07-13 20:51:12 -07:00 |
|
|
Tianyi Cui
|
fd5ee06a97
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 11:49:56 +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
|
34fe20962f
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
# Conflicts:
# packages/core/session/src/surface.ts
|
2026-07-14 11:39:11 +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 |
|
|
Tianyi Cui
|
c74f17a143
|
docs: audit hook compatibility limits
|
2026-07-14 11:22:53 +08:00 |
|
 Hypatia May
|
d9714fb30b
|
Merge remote-tracking branch 'origin/master' into session-query-trace
|
2026-07-14 11:16:15 +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 |
|
|
Dudu-0223
|
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 |
|
|
Tianyi Cui
|
8780a73750
|
Merge branch 'master' into session-query
|
2026-07-14 10:53:25 +08:00 |
|
|
Dudu-0223
|
6c57e6036d
|
docs(spill): clarify forked spill namespace
|
2026-07-14 10:40:53 +08:00 |
|
|
Tianyi Cui
|
a52d85b3d7
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 10:35:30 +08:00 |
|
|
Tianyi Cui
|
0c19d69507
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# packages/core/agent-loop/README.md
|
2026-07-14 10:35:15 +08:00 |
|
|
Ziya
|
472fbb992b
|
Merge remote-tracking branch 'upstream/master' into docs/i18n-capability
# Conflicts:
# docs/i18n/README.i18n.yaml
# docs/i18n/terminology.md
# scripts/translation-pairing.manifest.json
|
2026-07-13 19:31:51 -07:00 |
|
|
Tianyi Cui
|
e150806171
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-14 10:30:04 +08:00 |
|
|
Tianyi Cui
|
816b6e4c68
|
fix: restore exact config sessions on loop reload
|
2026-07-14 10:25:49 +08:00 |
|
|
Hypatia May
|
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 |
|
|
Ziya
|
bbb3955565
|
docs(i18n): classifier rule in the prompt; absorb PR #275 terminology rows
prompt 增补量词规则（数词修饰名词必须带量词：three-package seam→
由三个 package 构成的 seam），来自 jingtingxiang 对 v4-pro/GPT-5.4/
Opus-4.6 对照测试的质量评审。按 #275 收录三行术语：Cookbook→实操
手册（文档标题用语）、task id 保留英文（禁「任务 id」）、companion
tool→配套工具。#275 内容自此全部涵盖。
|
2026-07-13 19:14:10 -07:00 |
|