Tianyi Cui
|
2db38ecf05
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/contract-regressions.spec.ts
|
2026-07-18 14:52:34 +08:00 |
|
Tianyi Cui
|
7d34e33b9e
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-18 14:51:21 +08:00 |
|
Tianyi Cui
|
d2426fed5d
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/src/agent.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent-loop/tests/loop.spec.ts
# website/zh-CN/api/harness/events.md
|
2026-07-18 14:50:55 +08:00 |
|
Tianyi Cui
|
30a3a6db58
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-18 14:48:20 +08:00 |
|
Tianyi Cui
|
f62ba61077
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-18 14:48:20 +08:00 |
|
Tianyi Cui
|
a9734b9868
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-18 14:48:20 +08:00 |
|
Tianyi Cui
|
cde31a18a7
|
Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory
|
2026-07-18 14:48:14 +08:00 |
|
Tianyi Cui
|
a42c77f883
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-18 14:27:53 +08:00 |
|
Tianyi Cui
|
0f85ae0a9d
|
fix(subagent): identify lifecycle runs explicitly
|
2026-07-18 14:26:14 +08:00 |
|
Tianyi Cui
|
5af8b38b36
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/testing.md
|
2026-07-18 14:05:54 +08:00 |
|
Tianyi Cui
|
a8150815ba
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# packages/subagent/subagent-acp/package.json
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
# pnpm-lock.yaml
# website/zh-CN/api/harness/agents.md
|
2026-07-18 14:01:03 +08:00 |
|
Tianyi Cui
|
b5b456cad4
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-18 13:53:50 +08:00 |
|
Tianyi Cui
|
db7905688c
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-18 13:53:49 +08:00 |
|
Tianyi Cui
|
9e1975b080
|
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-18 13:47:53 +08:00 |
|
Tianyi Cui
|
93a4bebbb5
|
Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory
|
2026-07-18 13:43:12 +08:00 |
|
Tianyi Cui
|
aacedf2700
|
Merge current master into debug-pangwenjie
# Conflicts:
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/core-data-structures/tools.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-06-30-interception-seams.md
# docs/tool-execution-pipeline.md
# packages/core/agent-loop/src/agent.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/loop.spec.ts
# packages/core/agent/README.md
# packages/core/tools/src/index.ts
# scripts/gen-doc-graphs.ts
|
2026-07-18 13:39:12 +08:00 |
|
Tianyi Cui
|
6f01d4d099
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
# examples/coding-agent/tests/code-mode.e2e.ts
# examples/coding-agent/tests/harness.ts
# examples/coding-agent/tests/resume.e2e.ts
# examples/cordis-agent/tests/harness.ts
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/compact/compact-basic/tests/compact-loop-repro.spec.ts
# packages/cordis/tool-cordis/tests/integration.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/guard/repeat-tool-guard/tests/repeat-tool-guard.spec.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/hooks/hooks-codex/tests/bridge.spec.ts
# packages/hooks/hooks-codex/tests/coverage.spec.ts
# packages/todo/tool-todo/tests/integration.spec.ts
|
2026-07-18 12:33:49 +08:00 |
|
Tianyi Cui
|
35473c2701
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.golden.jsonl
# packages/ui/acp/README.md
# packages/ui/acp/src/index.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
|
2026-07-18 12:25:33 +08:00 |
|
Tianyi Cui
|
59dc310bb5
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/coding-agent/tests/code-mode.e2e.ts
# examples/coding-agent/tests/coding-task.e2e.ts
# examples/coding-agent/tests/compaction.e2e.ts
# examples/coding-agent/tests/full-loop.e2e.ts
# examples/coding-agent/tests/todo-write.e2e.ts
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/compact/compact-basic/tests/compact-loop-repro.spec.ts
# packages/context/time-context/tests/time-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/cordis/tool-cordis/tests/integration.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/agent.ts
# packages/core/agent-loop/src/index.ts
# packages/core/agent-loop/tests/agent.spec.ts
# packages/core/agent-loop/tests/cancel.spec.ts
# packages/core/agent-loop/tests/config-session-id.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent-loop/tests/coverage-edges.spec.ts
# packages/core/agent-loop/tests/interception.spec.ts
# packages/core/agent-loop/tests/loop.spec.ts
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent-loop/tests/request-cache.e2e.ts
# packages/core/agent-loop/tests/request-reconstruction.spec.ts
# packages/core/agent-loop/tests/resume.spec.ts
# packages/core/agent-loop/tests/scope-lifecycle.spec.ts
# packages/core/agent-loop/tests/tool-order.spec.ts
# packages/core/agent-loop/tests/turn-stop.spec.ts
# packages/core/agent/src/types.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/fs/tool-fs/tests/fs-tools.e2e.ts
# packages/guard/repeat-tool-guard/tests/repeat-tool-guard.spec.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/hooks/hooks-codex/tests/bridge.spec.ts
# packages/hooks/hooks-codex/tests/coverage.spec.ts
# packages/subagent/subagent-fork/tests/multi-subagent.spec.ts
# packages/subagent/subagent-fork/tests/subagent-fork.spec.ts
# packages/subagent/subagent-inprocess/tests/structured.spec.ts
# packages/subagent/subagent-inprocess/tests/subagent-inprocess.spec.ts
# packages/subagent/subagent-spawn/tests/spawn.e2e.ts
# packages/subagent/subagent-spawn/tests/subagent-spawn.spec.ts
# packages/todo/tool-todo/tests/integration.spec.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/acp/tests/edges.spec.ts
# packages/workflow/workflow-workerthread/tests/integration.spec.ts
|
2026-07-18 12:21:15 +08:00 |
|
Tianyi Cui
|
7c65e12a42
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
# Conflicts:
# docs/rfc/implemented/feature/2026-06-18-compaction-capability-seam.md
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/compact/compact/README.md
# packages/compact/compact/src/index.ts
|
2026-07-18 12:07:34 +08:00 |
|
Tianyi Cui
|
1900466c83
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
# Conflicts:
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/session.jsonl
|
2026-07-18 12:00:40 +08:00 |
|
Tianyi Cui
|
df2432cae2
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
# examples/acp-agent/tests/escalation.e2e.ts
# packages/support/README.md
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/harness.ts
# packages/support/acp-snapshot/tests/harness.spec.ts
|
2026-07-18 11:58:15 +08:00 |
|
Tianyi Cui
|
7a9e4a3203
|
Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory
|
2026-07-18 11:51:58 +08:00 |
|
imccyu
|
5ed531acba
|
ci(examples): run examples / testing from built lib/js
|
2026-07-17 23:07:51 +08:00 |
|
Tianyi Cui
|
06ea8643ff
|
Merge newest origin/master into token-meter-service
|
2026-07-17 22:49:54 +08:00 |
|
Tianyi Cui
|
f943bc8d4c
|
Merge latest origin/master into token-meter-service
|
2026-07-17 22:38:46 +08:00 |
|
Tianyi Cui
|
7a2d5cd28d
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 22:33:42 +08:00 |
|
Tianyi Cui
|
1c6a36e4a3
|
Merge origin/master into token-meter-service
|
2026-07-17 22:22:55 +08:00 |
|
Tianyi Cui
|
b79e7a5e30
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 22:20:06 +08:00 |
|
Tianyi Cui
|
847a1a1a5a
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/session/README.md
# packages/core/session/tests/tool-pairing.spec.ts
# website/zh-CN/api/harness/sessions.md
|
2026-07-17 22:07:37 +08:00 |
|
Tianyi Cui
|
578e89a29e
|
Merge current master into codex/simp-session-log-representation
|
2026-07-17 22:01:08 +08:00 |
|
Tianyi Cui
|
35e45af081
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
|
2026-07-17 21:56:43 +08:00 |
|
Tianyi Cui
|
53680ee6bc
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/context/time-context/tests/time-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/session/README.md
# packages/core/session/src/types.ts
# packages/core/session/tests/surface.spec.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/hooks/hooks-codex/tests/coverage.spec.ts
# packages/session-query/session-query/tests/session-query.spec.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/tests/harness.ts
|
2026-07-17 21:56:10 +08:00 |
|
Tianyi Cui
|
24bd0f3832
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:55:51 +08:00 |
|
Tianyi Cui
|
487f120604
|
Merge latest master into codex/simp-session-log-representation
|
2026-07-17 21:55:29 +08:00 |
|
Tianyi Cui
|
ce393ccb93
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 21:51:36 +08:00 |
|
Tianyi Cui
|
644245f581
|
Merge latest master into feat/website-docs
|
2026-07-17 21:47:19 +08:00 |
|
Tianyi Cui
|
a770c8b093
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:44:30 +08:00 |
|
Tianyi Cui
|
ecd84f7eb9
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:36:06 +08:00 |
|
Tianyi Cui
|
a385b3e465
|
Merge remote-tracking branch 'origin/master' into codex/pr358-merge-master-20260717
# Conflicts:
# docs/event-producer-consumer.md
# packages/session-persistence/session-persistence/README.md
|
2026-07-17 21:35:43 +08:00 |
|
Tianyi Cui
|
447a4ef9fb
|
Merge latest master into feat/website-docs
|
2026-07-17 21:25:24 +08:00 |
|
Tianyi Cui
|
d447a7efb8
|
Merge branch 'master' into feat/website-docs
|
2026-07-17 21:19:33 +08:00 |
|
Tianyi Cui
|
92b8abdd88
|
Merge remote-tracking branch 'origin/master' into codex/pr199-merge-master-20260717
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-17 21:13:43 +08:00 |
|
Tianyi Cui
|
e9a1f63ebd
|
Merge latest master into worktree-fast-gates
|
2026-07-17 20:39:05 +08:00 |
|
Tianyi Cui
|
8462bdb041
|
Merge latest master into worktree-fast-gates
|
2026-07-17 20:33:24 +08:00 |
|
Tianyi Cui
|
256300c58d
|
Merge branch 'master' into time-context-history
|
2026-07-17 20:32:55 +08:00 |
|
Tianyi Cui
|
7caa723aeb
|
Merge branch 'master' into worktree-fast-gates
|
2026-07-17 20:22:34 +08:00 |
|
Tianyi Cui
|
dc3f61e78b
|
Merge branch 'master' into time-context-history
|
2026-07-17 20:22:31 +08:00 |
|
Tianyi Cui
|
322a7e0709
|
Merge remote-tracking branch 'origin/master' into worktree/agent-loop-testkit
|
2026-07-17 20:17:27 +08:00 |
|
Yichen Jiang
|
559939623a
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/capability-seams.md
# packages/cordis/tool-cordis/src/api-catalog.ts
|
2026-07-17 19:16:15 +08:00 |
|