 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
|
91ad787ef4
|
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:26:33 +08:00 |
|
|
Tianyi Cui
|
cb0bc7ee89
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 12:26:14 +08:00 |
|
|
Tianyi Cui
|
a25c0f084f
|
fix: totalize configured startup failures
|
2026-07-14 12:25:30 +08:00 |
|
|
Tianyi Cui
|
06b01852d5
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 12:12:48 +08:00 |
|
|
Tianyi Cui
|
3ba92e70ad
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
|
2026-07-14 12:12:48 +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
|
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
|
f47ac06f46
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
|
2026-07-14 12:12:28 +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
|
a6e59ecad9
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
|
2026-07-14 12:12:27 +08:00 |
|
|
Tianyi Cui
|
36e4481c19
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
|
2026-07-14 12:12:27 +08:00 |
|
|
Tianyi Cui
|
f729d71010
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
|
2026-07-14 12:12:27 +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
|
b5d3caf3d3
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
|
2026-07-14 11:58:43 +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
|
880812939c
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
|
2026-07-14 11:58:17 +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
|
0ba3f1f110
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
|
2026-07-14 11:58:06 +08:00 |
|
|
Tianyi Cui
|
c4c8ba1b8c
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 11:57:56 +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 |
|
|
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 |
|
|
Ziya
|
1d288f1bca
|
docs(i18n): address ds-review-bot round-2 — switcher placeholders, regex anchor, contract completeness
新增 {{source_filename}}/{{source_filename_zh}} 占位符：切换行指令
可执行化，新配对（源文件尚无切换行）也必须生成（critical）。加粗
后空格规则限定于拉丁字母/数字，不再与全角标点规则冲突。日期匹配
锚定 basename 开头，release-notes-2026-* 类文件不再误判。金标
development.zh 补回 RFC 指引句与 agent 首现括注、pre-push 描述改
为 check:pre-push 调度器实况。术语表补回单文件可执行 RFC 配对在用
的 5 行（VFS/deploy root/peer dependency/serving surface/wheel）。
双语 README 的门禁清单补第 4 条（日期分界强制配对）。
|
2026-07-13 20:37:21 -07:00 |
|
|
Tianyi Cui
|
545c7d57d3
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 11:35:51 +08:00 |
|
|
Tianyi Cui
|
3746c37882
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 11:35:29 +08:00 |
|
|
Tianyi Cui
|
7d6ef0a472
|
fix: contain config failure observers
|
2026-07-14 11:33:36 +08:00 |
|