 Tianyi Cui
|
38213ff244
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 18:41:56 +08:00 |
|
|
Tianyi Cui
|
66c2996b36
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
# docs/rfc/implemented/testing/2026-07-08-shared-acp-snapshot-package.md
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/harness.ts
# packages/support/acp-snapshot/src/index.ts
|
2026-07-14 18:40:49 +08:00 |
|
|
Tianyi Cui
|
36a2430ec9
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
# docs/rfc/proposed/process/2026-06-20-discover-package-inventory.md
# examples/acp-agent/tests/acp.snapshot.ts
|
2026-07-14 18:38:18 +08:00 |
|
|
Tianyi Cui
|
78276c52a7
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/persistence-catalog.md
# docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
# docs/rfc/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/rfc/implemented/feature/2026-07-06-explicit-tool-order.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# docs/rfc/implemented/feature/2026-07-07-session-prefix.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/src/request-log.ts
# packages/core/agent-loop/tests/request-reconstruction.spec.ts
# packages/core/agent/src/types.ts
# packages/core/session/README.md
# packages/core/session/src/request-header.ts
# packages/core/session/src/surface.ts
# packages/core/session/src/tool-pairing.ts
# packages/core/session/src/types.ts
# packages/core/session/tests/surface.spec.ts
# packages/core/session/tests/tool-pairing.spec.ts
# packages/llm/llm/src/call-config.ts
# packages/support/acp-snapshot/src/suite.ts
# packages/support/invariants/README.md
# packages/ui/user-approval/README.md
|
2026-07-14 18:34:34 +08:00 |
|
|
Tianyi Cui
|
34a059c9bc
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
# packages/session-persistence/session-persistence-jsonl/tests/jsonl.spec.ts
# packages/session-persistence/session-persistence/src/coordinator.ts
# packages/session-persistence/session-persistence/src/index.ts
|
2026-07-14 17:24:02 +08:00 |
|
|
Tianyi Cui
|
f0fc20ca42
|
docs: align prose with runtime contracts
|
2026-07-14 16:21:41 +08:00 |
|
|
Tianyi Cui
|
29072d9830
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 15:26:40 +08:00 |
|
|
Tianyi Cui
|
a30660a63f
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
# packages/support/README.md
# packages/support/acp-snapshot/README.md
|
2026-07-14 15:26:34 +08:00 |
|
|
Tianyi Cui
|
2ef709a496
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 15:25:36 +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 |
|
|
Tianyi Cui
|
60260b5d5b
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
|
2026-07-14 15:24:54 +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 |
|
|
Tianyi Cui
|
57a5cb4c94
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 14:14:09 +08:00 |
|
|
Tianyi Cui
|
36b86fb045
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 14:08:44 +08:00 |
|
|
Tianyi Cui
|
de44558f18
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-14 14:08:44 +08:00 |
|
|
Tianyi Cui
|
539850578a
|
fix: reject legacy header deltas on append
|
2026-07-14 14:06:28 +08:00 |
|
|
Tianyi Cui
|
89d8d56785
|
docs: omit model experience for generic packages
|
2026-07-14 13:31:31 +08:00 |
|
|
Tianyi Cui
|
deee72bdfb
|
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
|
2026-07-14 13:24:54 +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
|
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
|
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
|
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
|
87a7b599a5
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
|
2026-07-14 12:12:27 +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
|
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 |
|
|
Tianyi Cui
|
8780a73750
|
Merge branch 'master' into session-query
|
2026-07-14 10:53:25 +08:00 |
|
|
Ziya
|
7756ed0869
|
docs(i18n): re-record README pair after master merge
|
2026-07-13 19:34:30 -07: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 |
|
|
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 |
|
 Hypatia May
|
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 |
|
|
Tianyi Cui
|
c378dbf36a
|
Merge remote-tracking branch 'origin/master' into unify-acp-example
|
2026-07-14 01:11:37 +08:00 |
|
|
Tianyi Cui
|
e3d7bb62d8
|
fix(permission): address human review feedback
|
2026-07-14 01:09:44 +08:00 |
|
|
Tianyi Cui
|
f95a411b0a
|
fix: record self-limiting hook snapshot
|
2026-07-14 01:09:07 +08:00 |
|
|
Tianyi Cui
|
dbf23bd7b1
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 01:05:16 +08:00 |
|
|
Tianyi Cui
|
8f99e424c4
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-14 01:04:00 +08:00 |
|
|
Tianyi Cui
|
2a75f0893a
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 01:02:41 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
461c0c598c
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
|
2026-07-14 00:54:55 +08:00 |
|