 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 |
|
 imccyu
|
de19c6ca08
|
fix(examples): run coverage subprocesses from built libs
|
2026-07-18 12:19:48 +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
|
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
|
1f58c07f1e
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default
|
2026-07-18 11:55:33 +08:00 |
|
|
Tianyi Cui
|
be62ee14ba
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
# Conflicts:
# docs/cordis-catalog/services.md
# packages/llm/llm-pi-ai/README.md
# packages/support/llm-replay/tests/llm-replay.spec.ts
|
2026-07-18 11:55:12 +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 |
|
 Yichen Jiang
|
a42c28cdc9
|
docs(rfc): refresh agent execution context pairing record
|
2026-07-18 09:00:22 +08:00 |
|
|
Yichen Jiang
|
d261a9ca3b
|
sync rfc
|
2026-07-18 08:56:46 +08:00 |
|
|
imccyu
|
b4ab7debb7
|
fix(ci): avoid unbound TypeScript reader
|
2026-07-17 23:43:20 +08:00 |
|
|
imccyu
|
df21d22e28
|
fix(examples): enforce config dependency resolution
|
2026-07-17 23:38:05 +08:00 |
|
|
Yichen Jiang
|
b50e02a2b3
|
ci: add manual pi-ai provider e2e
|
2026-07-17 23:33:30 +08:00 |
|
|
Yichen Jiang
|
be3d2076b8
|
Merge origin/master into worktree/agent-execution-context-rfc
|
2026-07-17 23:25:01 +08:00 |
|
|
imccyu
|
5ed531acba
|
ci(examples): run examples / testing from built lib/js
|
2026-07-17 23:07:51 +08:00 |
|
|
Yichen Jiang
|
eb86fce086
|
Merge remote-tracking branch 'origin/master' into worktree/fix-sqlite-file-permissions
# Conflicts:
# docs/config-catalog.md
|
2026-07-17 23:06:20 +08:00 |
|
|
Tianyi Cui
|
8d5f08892b
|
Merge pull request #366 from deepseek-harness/token-meter-service
llm: add replay token-meter service
|
2026-07-17 23:01:20 +08:00 |
|
|
Tianyi Cui
|
06ea8643ff
|
Merge newest origin/master into token-meter-service
|
2026-07-17 22:49:54 +08:00 |
|
|
Tianyi Cui
|
35ff333e51
|
docs: move website context window to token meter
|
2026-07-17 22:44:11 +08:00 |
|
|
Tianyi Cui
|
350a636ece
|
Merge pull request #278 from deepseek-harness/codex/simp-session-log-representation
Simplify session log representation
|
2026-07-17 22:41:22 +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
|
ad16d306cb
|
Merge pull request #311 from deepseek-harness/worktree/provider-routed-llm-adapters
feat(llm): route adapters by provider
|
2026-07-17 22:21:33 +08:00 |
|
|
Tianyi Cui
|
b79e7a5e30
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 22:20:06 +08:00 |
|
|
Tianyi Cui
|
b47b2ba794
|
docs: reconcile generated API after master merge
|
2026-07-17 22:17:58 +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
|
fb8a10f8ea
|
docs(mode): correct Codex plan mode prior art
|
2026-07-17 22:10:54 +08:00 |
|
|
Tianyi Cui
|
cedb78be3d
|
Merge remote-tracking branch 'origin/master' into feat/plan-mode
|
2026-07-17 22:09:44 +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
|
43cf795b2a
|
Merge pull request #330 from deepseek-harness/compact-tool-pairing
compact: move tool-pairing helpers to compact seam
|
2026-07-17 22:03:07 +08:00 |
|
|
Tianyi Cui
|
cfa5d60ccb
|
docs(website): align LLM references with provider routing
|
2026-07-17 22:02:54 +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
|
62f6251bf9
|
fix(agent-loop): reclassify pending tool calls
|
2026-07-17 21:55:10 +08:00 |
|
|
Tianyi Cui
|
e73cadb99d
|
Merge pull request #228 from deepseek-harness/feat/website-docs
feat: add docs website
|
2026-07-17 21:52:10 +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
|
e7ba36f554
|
Merge pull request #358 from deepseek-harness/worktree/fix-disposed-session-retirement
fix(session-persistence): retire disposed coordinator state
|
2026-07-17 21:42:10 +08:00 |
|
|
Tianyi Cui
|
e00d04a0c1
|
fix(website): normalize generated paths on Windows
|
2026-07-17 21:39:47 +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 |
|