Tianyi Cui
|
bfd67e54e4
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-19 01:47:42 +08:00 |
|
Tianyi Cui
|
2704cab46f
|
Merge remote-tracking branch 'origin/master' into codex/simp-shared-acp-test-launcher
|
2026-07-19 01:44:38 +08:00 |
|
Tianyi Cui
|
c866aa8ca6
|
Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory
|
2026-07-19 01:33:26 +08:00 |
|
Tianyi Cui
|
3b52d216f3
|
Merge branch 'master' into parallel-tool-call
|
2026-07-18 20:18:24 +08:00 |
|
Tianyi Cui
|
2b4641799e
|
docs: expand session persistence event catalog
|
2026-07-18 15:11:51 +08:00 |
|
Tianyi Cui
|
50f0291b93
|
Merge latest origin/master into parallel-tool-call
# Conflicts:
# docs/architecture.md
# examples/acp-agent/tests/snapshots/bash-spill/session.jsonl
# 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
# packages/core/agent-loop/src/loop.ts
|
2026-07-18 15:09:39 +08:00 |
|
Tianyi Cui
|
21ec178841
|
docs: tighten parallel tool-call prose
|
2026-07-18 14:59:26 +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
|
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
|
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
|
3e07f9b270
|
Merge latest origin/master into parallel-tool-call
|
2026-07-17 22:28:38 +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
|
911600d92e
|
Merge remote-tracking branch 'origin/master' into codex/pr265-merge-master-20260717
|
2026-07-17 22:15:28 +08:00 |
|
Tianyi Cui
|
688b95a7e5
|
Merge origin/master into parallel-tool-call
|
2026-07-17 22:13:33 +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
|
62f6251bf9
|
fix(agent-loop): reclassify pending tool calls
|
2026-07-17 21:55:10 +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
|
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
|
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 |
|
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 |
|
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
|
46e63a004c
|
time-context: durable per-step history (round 1)
|
2026-07-16 17:47:51 +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 |
|