Tianyi Cui
|
d4b4a1537d
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
|
2026-07-18 12:55:24 +08:00 |
|
Tianyi Cui
|
e321c845dc
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-18 12:54:57 +08:00 |
|
Tianyi Cui
|
9a25e44fbb
|
test(agent-spine-demo): wait for exact agent identity
|
2026-07-18 12:54:45 +08:00 |
|
Tianyi Cui
|
03e39f7f1c
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
# Conflicts:
# docs/config-catalog.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/stdio-demo/src/index.ts
|
2026-07-18 12:42:33 +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
|
3fc6f91cea
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-18 12:07:56 +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
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
Yichen Jiang
|
46a6c77beb
|
Merge remote-tracking branch 'origin/master' into worktree/agent-loop-testkit
# Conflicts:
# packages/README.md
|
2026-07-17 19:13:37 +08:00 |
|
Tianyi Cui
|
5266905455
|
test(workspace-context): cite compacted surface source
|
2026-07-17 18:43:21 +08:00 |
|
Tianyi Cui
|
e01b5dc354
|
Merge origin/master into session-query-trace
|
2026-07-17 18:41:42 +08:00 |
|
Yichen Jiang
|
7d85d3027d
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# packages/README.md
# packages/bash/bash-local/README.md
# packages/bash/bash/README.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/examples/acp-demo/src/index.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/util/README.md
# pnpm-lock.yaml
# tsconfig.build.json
# tsconfig.json
|
2026-07-17 18:39:05 +08:00 |
|
Dudu-0223
|
a3f62478e1
|
Merge origin/master into codex/truncated-design
|
2026-07-17 18:21:54 +08:00 |
|
Hypatia May
|
3cf31113b7
|
build-review round 2: correct time-context documentation contracts
|
2026-07-17 10:47:24 +08:00 |
|
Yichen Jiang
|
98ea306c5e
|
fix(session-persistence): retire disposed coordinator state
|
2026-07-17 10:31:44 +08:00 |
|
Hypatia May
|
760dd8f5de
|
build-review round 1: add durable time refresh scheduling
|
2026-07-17 10:12:27 +08:00 |
|
Hypatia May
|
c5381de8b2
|
time-context: cover missing baselines (round 2)
|
2026-07-16 17:57:45 +08:00 |
|
Hypatia May
|
46e63a004c
|
time-context: durable per-step history (round 1)
|
2026-07-16 17:47:51 +08:00 |
|
Yichen Jiang
|
d3b959389a
|
test(support): add shared AgentLoop testkit
|
2026-07-16 17:39:53 +08:00 |
|
Yichen Jiang
|
027af418a2
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/module-graph.md
# docs/tool-catalog.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/text-turn/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.golden.json
# packages/bash/bash-local/README.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash-local/tests/executor.spec.ts
# packages/bash/bash/README.md
# packages/bash/bash/src/index.ts
# packages/bash/bash/src/types.ts
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/package.json
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/bash/tool-bash/tsconfig.json
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# pnpm-lock.yaml
|
2026-07-16 16:47:31 +08:00 |
|
Yichen Jiang
|
97190c81ba
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
|
2026-07-16 16:39:13 +08:00 |
|
Hypatia May
|
c3ddbde3c9
|
Merge remote-tracking branch 'origin/compact-tool-pairing' into token-meter-service
|
2026-07-16 16:06:27 +08:00 |
|
Tianyi Cui
|
72bb02e68e
|
refactor(workspace-context): move package to context group
|
2026-07-16 16:01:06 +08:00 |
|
Tianyi Cui
|
a3f248ff52
|
docs(workspace-context): mark deferred correctness fixes
|
2026-07-16 15:53:45 +08:00 |
|
Hypatia May
|
06e0450b8d
|
fix(token-meter): keep pressure anchors conservative
|
2026-07-16 15:26:30 +08:00 |
|
Hypatia May
|
6d96b3e4a8
|
refactor(token-meter): merge measurement snapshots (round 1)
|
2026-07-16 14:38:24 +08:00 |
|
Hypatia May
|
19a56ec542
|
fix(token-meter): reject stale config (round 2)
|
2026-07-16 13:23:20 +08:00 |
|
Hypatia May
|
5c243e8a8d
|
refactor(token-meter): simplify singleton service (round 1)
|
2026-07-16 12:58:07 +08:00 |
|