 Tianyi Cui
|
72596afe08
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-15 15:08:25 +08:00 |
|
|
Tianyi Cui
|
c2c38b18c4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
|
2026-07-15 15:08:10 +08:00 |
|
|
Tianyi Cui
|
130140feda
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 15:07:35 +08:00 |
|
|
Tianyi Cui
|
10f50c1b55
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
|
2026-07-15 15:07:11 +08:00 |
|
|
Tianyi Cui
|
af267aa8c0
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-15 15:04:47 +08:00 |
|
|
Tianyi Cui
|
a2acfb858e
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-15 15:04:47 +08:00 |
|
|
Tianyi Cui
|
188698723c
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-15 15:04:47 +08:00 |
|
|
Tianyi Cui
|
17693d20c4
|
Merge remote-tracking branch 'origin/codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
# packages/support/acp-snapshot/src/suite.ts
|
2026-07-15 15:04:29 +08:00 |
|
|
Tianyi Cui
|
649865043d
|
docs: preserve prose cleanup in session simplification
|
2026-07-15 14:59:20 +08:00 |
|
|
Tianyi Cui
|
cb177090f9
|
docs: refresh subagent config catalog
|
2026-07-14 23:53:23 +08:00 |
|
|
Tianyi Cui
|
ed3654da00
|
docs: reconcile hidden internals with prose standard
|
2026-07-14 23:38:53 +08:00 |
|
|
Tianyi Cui
|
d3d5b66d08
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 23:22:44 +08:00 |
|
|
Tianyi Cui
|
7db59c27c4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 23:22:43 +08:00 |
|
|
Tianyi Cui
|
4c461f86a3
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-14 23:22:43 +08:00 |
|
|
Tianyi Cui
|
10fd0b4504
|
docs: align unified identity translation
|
2026-07-14 23:22:37 +08:00 |
|
|
Tianyi Cui
|
22289065f8
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 23:19:59 +08:00 |
|
|
Tianyi Cui
|
18a643f543
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 23:19:58 +08:00 |
|
|
Tianyi Cui
|
9ed59df02b
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-14 23:19:52 +08:00 |
|
|
Tianyi Cui
|
b656bef59a
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/module-graph.md
|
2026-07-14 23:19:41 +08:00 |
|
|
Tianyi Cui
|
380a4d6dbc
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-14 23:16:41 +08:00 |
|
|
Tianyi Cui
|
332edfeee7
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 23:16:41 +08:00 |
|
|
Tianyi Cui
|
3b26fb8e1e
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-14 23:16:41 +08:00 |
|
|
Tianyi Cui
|
7fd7064c27
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 23:16:40 +08:00 |
|
|
Tianyi Cui
|
f06d623030
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
|
2026-07-14 23:16:23 +08:00 |
|
|
Tianyi Cui
|
101e8cbeb6
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
|
2026-07-14 23:09:21 +08:00 |
|
|
Tianyi Cui
|
1fbb1cb229
|
docs: address cookbook translation review
|
2026-07-14 22:50:20 +08:00 |
|
 Ziya
|
3d0ad3db3e
|
docs(i18n): cookbook batch — six bilingual pairs via the committed pipeline
六篇 cookbook 全部配对（adding-a-package / adding-a-tool /
adding-a-vendored-package / adding-an-llm-adapter /
extension-cookbook / responding-to-pr-review-on-a-stack）：译文由
进仓流水线产出（translation-prompt.md 全占位符渲染 + 5 组金标
few-shot），双侧语言切换行齐备，六篇加入 manifest required（15）。
另补 prompt 的 When translating into English 一节（此前为占位）：
标点/术语双向绑定/主语显化/惯用语概念还原/语域，与
translation-rules 的中文先行条款一致。
|
2026-07-14 07:23:53 -07:00 |
|
|
Tianyi Cui
|
528f9cba62
|
fix: default time context to system zone
|
2026-07-14 21:45:54 +08:00 |
|
|
Tianyi Cui
|
64a3933270
|
docs: refresh config catalog after parent merge
|
2026-07-14 19:03:07 +08:00 |
|
|
Tianyi Cui
|
18abf87107
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
# Conflicts:
# docs/rfc/implemented/architecture/2026-07-05-prompt-variables-and-tool-guidance-ownership.md
# packages/subagent/subagent-subprocess/src/index.ts
# packages/subagent/tool-subagent/src/index.ts
|
2026-07-14 19:02:27 +08:00 |
|
|
Tianyi Cui
|
93dc0f30a9
|
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
# packages/core/agent-loop/tests/agent.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
|
2026-07-14 18:58:29 +08:00 |
|
|
Tianyi Cui
|
8a5ebb1cde
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-06-approval-seam.md
# packages/ui/acp/README.md
# packages/ui/acp/src/index.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
|
2026-07-14 18:55:51 +08:00 |
|
|
Tianyi Cui
|
83271191d1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/architecture/2026-06-18-agent-lifecycle-and-ownership-seams.md
# docs/rfc/implemented/architecture/2026-06-20-branded-ids.md
# docs/rfc/implemented/simplification/2026-06-20-remove-agent-boundary-mirror-events.md
# docs/rfc/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio-agent/src/stdio-chat.ts
# packages/ui/stdio-agent/tests/stdio-chat.spec.ts
# packages/util/brand/src/index.ts
|
2026-07-14 18:51:24 +08:00 |
|
|
Tianyi Cui
|
f28b1bb4bf
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/compaction.md
# packages/compact/compact/src/index.ts
|
2026-07-14 18:45:25 +08:00 |
|
|
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
|
d9d9487e0e
|
docs: align time-context prose standard
|
2026-07-14 17:44:32 +08:00 |
|
|
Tianyi Cui
|
498de7f042
|
Merge remote-tracking branch 'origin/master' into codex/time-context-plugin
|
2026-07-14 17:26:20 +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
|
a9d74932b1
|
feat: add optional time context plugin
|
2026-07-14 16:04:34 +08:00 |
|
|
Tianyi Cui
|
ab6faf78ba
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 15:41:34 +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
|
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 |
|