Yichen Jiang
b964e81c11
Merge remote-tracking branch 'origin/master' into worktree/session-reference
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent/src/types.ts
# packages/ui/tui/tests/harness.ts
# scripts/type-equiv.manifest.json
2026-07-21 21:57:21 +08:00
Tianyi Cui
26b3717419
Merge pull request #399 from deepseek-harness/codex/enforce-tool-cancellation
...
fix(tools): enforce cooperative cancellation
2026-07-21 21:25:53 +08:00
Yichen Jiang
8bc62e1013
Merge remote-tracking branch 'origin/master' into worktree/session-reference
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/compact/compact-basic/src/region.ts
# packages/compact/compact/README.md
# packages/compact/compact/tests/compact.spec.ts
# packages/examples/acp-demo/package.json
# packages/ui/tui/README.md
# packages/ui/tui/package.json
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-21 21:10:42 +08:00
Tianyi Cui
2c6c565647
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
2026-07-21 20:40:52 +08:00
Tianyi Cui
717fa47535
Merge pull request #455 from deepseek-harness/chore/doc-sync-single-pass
...
chore(gates): route doc-sync through the run-gates scheduler
2026-07-21 20:37:37 +08:00
Tianyi Cui
5acd0c6305
Merge commit 'refs/codex/unblock/master-current' into HEAD
...
# Conflicts:
# package.json
2026-07-21 20:31:42 +08:00
Tianyi Cui
5d2f6da843
Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into codex/enforce-tool-cancellation
...
# Conflicts:
# packages/core/scope/tests/invariant.spec.ts
# packages/ui/tui/tests/harness.ts
2026-07-21 20:27:58 +08:00
Tianyi Cui
70e50cd9be
Merge commit 'refs/codex/unblock/master-current' into HEAD
...
# Conflicts:
# docs/event-producer-consumer.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/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/agent/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-21 20:20:53 +08:00
Yichen Jiang
8c6e28cef8
fix(session): simplify reference byte limits
2026-07-21 20:16:18 +08:00
Tianyi Cui
73ccb67469
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
2026-07-21 20:03:47 +08:00
Tianyi Cui
0004b8675f
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
...
# Conflicts:
# docs/event-producer-consumer.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/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/agent/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-21 20:03:00 +08:00
Tianyi Cui
8672fa881a
Merge pull request #461 from deepseek-harness/fix/compaction-kv-cache-reuse
...
fix(compact-basic): replay conversation prefix so summarization reuses KV cache
2026-07-21 19:51:24 +08:00
Tianyi Cui
21721bf3b1
Merge branch 'master' into fix/compaction-kv-cache-reuse
...
# Conflicts:
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/src/summarizer.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
2026-07-21 19:45:43 +08:00
Tianyi Cui
1565f087cb
Merge pull request #429 from deepseek-harness/worktree/routed-model-compaction-policy
...
feat(compact): resolve policy per routed model
2026-07-21 19:33:49 +08:00
Tianyi Cui
72c6696e4f
Merge branch 'master' into worktree/routed-model-compaction-policy
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-21 19:23:54 +08:00
Tianyi Cui
99f67adb69
Merge pull request #404 from deepseek-harness/codex/invariant-service-seam
...
feat(invariants): add package-owned invariant service and runtime checks
2026-07-21 19:16:10 +08:00
Tianyi Cui
fb38e5df85
Merge branch 'master' into worktree/routed-model-compaction-policy
2026-07-21 19:12:03 +08:00
Tianyi Cui
d9342d72b1
Merge branch 'master' into codex/invariant-service-seam
2026-07-21 19:06:49 +08:00
Tianyi Cui
cd0c77daad
Merge pull request #439 from deepseek-harness/worktree/docs-pages-deploy
...
ci: deploy documentation to private GitHub Pages
2026-07-21 19:06:26 +08:00
Tianyi Cui
373bf333ac
docs: refresh config catalog for replay capacity
2026-07-21 19:05:40 +08:00
Tianyi Cui
4625cc25ed
Merge commit 'refs/codex/gh-unblock/20260721T105806/pr-439-base' into HEAD
2026-07-21 19:01:53 +08:00
Tianyi Cui
39c9bf3ef2
fix(llm-replay): publish recorded model capacity
2026-07-21 18:57:25 +08:00
Tianyi Cui
1cee25fdea
fix(tui): resolve context capacity for active model
2026-07-21 18:45:27 +08:00
Tianyi Cui
39eb6e21cd
Merge current master into invariant service seam
2026-07-21 18:35:24 +08:00
Tianyi Cui
78f8a3f5d9
Merge branch 'master' into worktree/routed-model-compaction-policy
2026-07-21 18:30:57 +08:00
Tianyi Cui
071fe76755
Merge latest master into invariant service seam
2026-07-21 18:27:46 +08:00
Yichen Jiang
f03b01d8bc
Merge remote-tracking branch 'origin/worktree/session-reference' into worktree/session-reference
2026-07-21 18:20:56 +08:00
Yichen Jiang
70b67bd559
fix(acp): preserve command reference arguments
2026-07-21 18:19:42 +08:00
Tianyi Cui
e29db14566
Merge pull request #446 from deepseek-harness/worktree/tui-session-controls
...
feat(tui): add session model controls and compact interaction views
2026-07-21 18:16:53 +08:00
Tianyi Cui
8a93072537
Merge origin/master into worktree/tui-session-controls
2026-07-21 18:12:11 +08:00
Tianyi Cui
d4b126862e
fix(ci): preserve pnpm links in packed probes
2026-07-21 18:11:24 +08:00
Tianyi Cui
0ac96409a8
Merge pull request #329 from deepseek-harness/lsp
...
RFC: LSP capability seam and model-facing query tool
2026-07-21 18:10:52 +08:00
Tianyi Cui
648036d746
Merge origin/master into lsp
2026-07-21 18:04:17 +08:00
Yichen Jiang
927c37ad1e
Merge branch 'master' into worktree/session-reference
2026-07-21 18:03:47 +08:00
Tianyi Cui
cd13f0f8b7
Merge pull request #472 from deepseek-harness/worktree/history-only-prs-368-372-374-v2
...
chore: preserve demo PR histories without changing master tree
2026-07-21 18:03:36 +08:00
Tianyi Cui
c9a8c58467
Merge origin/master into lsp
2026-07-21 17:58:46 +08:00
Tianyi Cui
4e021b4686
fix(ci): invoke npm portably on Windows
2026-07-21 17:56:15 +08:00
Tianyi Cui
f85b7cb72a
Merge PR #374 as history-only demo (tree unchanged)
2026-07-21 17:55:08 +08:00
Tianyi Cui
8a21a383ed
Merge PR #372 as history-only demo (tree unchanged)
2026-07-21 17:55:08 +08:00
Tianyi Cui
a9ac68d0fd
Merge PR #368 as history-only demo (tree unchanged)
2026-07-21 17:55:08 +08:00
Yichen Jiang
ebb62c482c
fix(session): harden cross-session references
2026-07-21 17:54:44 +08:00
Tianyi Cui
0d7ec2f8ba
Merge pull request #390 from deepseek-harness/fix/acp-subagent-cwd
...
fix(subagent-acp): resolve child cwd from the parent session
2026-07-21 17:53:40 +08:00
Tianyi Cui
5606a05e91
Merge origin/master into worktree/tui-session-controls
2026-07-21 17:46:47 +08:00
Tianyi Cui
504fbf59f3
fix(invariants): replay histories and pack companions
2026-07-21 17:46:43 +08:00
Yichen Jiang
c0d7ef22ec
fix(subagent-acp): repair the composition fixture for the merged depth budget
...
Master landed the tool-subagent depth budget while this branch was in
flight: the numeric default maxDepth now fails the mount against the
ACP provider's depthLimit: false, so the composition fixture must state
maxDepth: 'provider-managed' — the documented opt-out for a provider
whose recursion budget lives in the child harness. The fixture also
moves off the retired stdio-demo REPL onto the current app-boot driver
pattern (runLoaderSmoke + one-shot cli), and the split isDirectory
statements gain the file-not-a-directory case the single-expression
form used to cover implicitly.
2026-07-21 17:14:10 +08:00
Tianyi Cui
2e7caee96a
Merge pull request #351 from deepseek-harness/worktree/explicit-turn-signal
...
feat(core): make Agent cancellation typed and turn-scoped
2026-07-21 17:12:12 +08:00
Tianyi Cui
744eb99268
Merge branch 'master' into fix/compaction-kv-cache-reuse
2026-07-21 17:03:00 +08:00
Tianyi Cui
a2c527308e
Merge origin/master into worktree/docs-pages-deploy
2026-07-21 17:01:55 +08:00
Tianyi Cui
35bb623cf4
Merge origin/master into worktree/routed-model-compaction-policy
2026-07-21 16:54:48 +08:00
Yichen Jiang
6fe8cfb5d1
Merge branch 'fix/acp-subagent-cwd' of github.com:deepseek-harness/deepseek-harness into fix/acp-subagent-cwd
2026-07-21 16:53:46 +08:00
