35e45af081
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
2026-07-17 21:56:43 +08:00
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
487f120604
Merge latest master into codex/simp-session-log-representation
2026-07-17 21:55:29 +08:00
62f6251bf9
fix(agent-loop): reclassify pending tool calls
2026-07-17 21:55:10 +08:00
ce393ccb93
Merge master into codex/simp-session-log-representation
2026-07-17 21:51:36 +08:00
a770c8b093
Merge origin/master into compact-tool-pairing
2026-07-17 21:44:30 +08:00
ecd84f7eb9
Merge origin/master into compact-tool-pairing
2026-07-17 21:36:06 +08:00
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
e9a1f63ebd
Merge latest master into worktree-fast-gates
2026-07-17 20:39:05 +08:00
8462bdb041
Merge latest master into worktree-fast-gates
2026-07-17 20:33:24 +08:00
256300c58d
Merge branch 'master' into time-context-history
2026-07-17 20:32:55 +08:00
7caa723aeb
Merge branch 'master' into worktree-fast-gates
2026-07-17 20:22:34 +08:00
dc3f61e78b
Merge branch 'master' into time-context-history
2026-07-17 20:22:31 +08:00
322a7e0709
Merge remote-tracking branch 'origin/master' into worktree/agent-loop-testkit
2026-07-17 20:17:27 +08:00
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
46a6c77beb
Merge remote-tracking branch 'origin/master' into worktree/agent-loop-testkit
...
# Conflicts:
# packages/README.md
2026-07-17 19:13:37 +08:00
5266905455
test(workspace-context): cite compacted surface source
2026-07-17 18:43:21 +08:00
e01b5dc354
Merge origin/master into session-query-trace
2026-07-17 18:41:42 +08:00
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
a3f62478e1
Merge origin/master into codex/truncated-design
2026-07-17 18:21:54 +08:00
87e25ef1fe
fix(tui): make the color palette theme-agnostic
...
The palette used absolute 256-color indices (`38;5;252`, `48;5;236`, …)
that terminals never remap to the active scheme: near-white body text
vanished on light backgrounds and fixed dark bubble fills put default
foreground text on dark blocks. Rebuild it from the standard 16-color
ANSI foregrounds plus SGR attributes, keep body text on the terminal
default foreground, replace filled background bubbles with foreground-only
left-gutter bars, and use reverse video for the active selection so every
grouping reads on any color scheme.
2026-07-17 16:50:53 +08:00
12b7ac67ba
fix(ui): surface declarative startup failures
2026-07-17 16:44:25 +08:00
1119c537d0
feat(ui): add dedicated TUI package
...
Move the interactive pi-tui front door into @deepseek-ai/dsh-tui while keeping @deepseek-ai/dsh-stdio line-oriented for pipes. Select the terminal package in the demo app, preserve logger ownership, and cover the production Loader composition with a PTY smoke test.
2026-07-17 12:01:37 +08:00
ac893f97bb
fix(session-persistence): address permission review
2026-07-17 10:47:32 +08:00
3cf31113b7
build-review round 2: correct time-context documentation contracts
2026-07-17 10:47:24 +08:00
98ea306c5e
fix(session-persistence): retire disposed coordinator state
2026-07-17 10:31:44 +08:00
96975f3840
fix(session-persistence): create SQLite databases owner-only
2026-07-17 10:15:19 +08:00
760dd8f5de
build-review round 1: add durable time refresh scheduling
2026-07-17 10:12:27 +08:00
c5381de8b2
time-context: cover missing baselines (round 2)
2026-07-16 17:57:45 +08:00
46e63a004c
time-context: durable per-step history (round 1)
2026-07-16 17:47:51 +08:00
d3b959389a
test(support): add shared AgentLoop testkit
2026-07-16 17:39:53 +08:00
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
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
5ff491e3a2
Merge remote-tracking branch 'origin/token-meter-service' into compact-post-step-overflow-recovery
...
# Conflicts:
# docs/core-data-structures/compaction.md
# docs/rfc/implemented/architecture/2026-07-15-replay-token-meter-service.i18n.yaml
# docs/rfc/implemented/architecture/2026-07-15-replay-token-meter-service.md
# docs/rfc/implemented/architecture/2026-07-15-replay-token-meter-service.zh.md
# docs/rfc/implemented/feature/2026-06-18-compaction-capability-seam.md
# examples/coding-agent/cordis.yml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/automatic.ts
# packages/compact/compact-basic/src/config.ts
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
2026-07-16 16:18:16 +08:00
8d35092e26
fix(examples): isolate headless agent example
2026-07-16 16:12:27 +08:00
c3ddbde3c9
Merge remote-tracking branch 'origin/compact-tool-pairing' into token-meter-service
2026-07-16 16:06:27 +08:00
72bb02e68e
refactor(workspace-context): move package to context group
2026-07-16 16:01:06 +08:00
a3f248ff52
docs(workspace-context): mark deferred correctness fixes
2026-07-16 15:53:45 +08:00
17fe9e5b1e
fix(agent-loop): tighten parallel tool-call safety
2026-07-16 15:52:35 +08:00
ae73ef774d
Merge branch 'master' into codex/cli-one-shot-demo
2026-07-16 15:38:53 +08:00
bbf66b3a5b
docs(tools): trim concurrency classifier contract
2026-07-16 15:27:36 +08:00
06e0450b8d
fix(token-meter): keep pressure anchors conservative
2026-07-16 15:26:30 +08:00
d027ea0d10
refactor(compact-basic): inline automatic listeners into the service
...
Fold automatic.ts into BasicCompactService as a private
_registerAutomaticCompaction method, removing the AutomaticCompactor
structural interface the standalone module needed to avoid an import
cycle. Listener behavior is unchanged; compactIfNeeded stays
dynamically dispatched so subclass overrides are honored at event time.
2026-07-16 15:14:24 +08:00
3bed1a644f
Merge origin/master into parallel-tool-call
2026-07-16 14:56:02 +08:00
6d96b3e4a8
refactor(token-meter): merge measurement snapshots (round 1)
2026-07-16 14:38:24 +08:00
91da66e715
refactor(agent-loop): simplify parallel tool-call cap config
2026-07-16 14:36:16 +08:00
19a56ec542
fix(token-meter): reject stale config (round 2)
2026-07-16 13:23:20 +08:00
5c243e8a8d
refactor(token-meter): simplify singleton service (round 1)
2026-07-16 12:58:07 +08:00
2793325df0
refactor(compact): store tool-pairing balance once per surface cut
...
toolPairingBalancedAfter previously answered by resolving a cached
positional successor and reading its before-balance, with a null-successor
depth fallback. Both queries are the same prefix property sampled at
adjacent cuts, so the cache now holds one per-cut balance sequence
(N nodes -> N+1 cuts) plus a seq->position index; before/after differ
only by a cut offset. The successor map, the duplicate rebuild/extend
fold loops, and the non-null assertion are gone, and the running counter
is named inProgressToolCalls. Docs describing the successor mechanism
are updated in place.
2026-07-16 11:42:17 +08:00
3b1d1bfa12
refactor(agent-loop): unify tool-call scheduling on one rolling pool + factory cap default
...
Run every ordered group through the same rolling pool: an exclusive call is a
pool of one (a barrier), dropping the separate runExclusive path and the
redundant post-grouping executionMode re-query. Behavior is unchanged — the
parallel-tool-calls snapshot and the full scheduler unit suite (barriers, cap,
abort, model-order results) stay green.
Add AgentLoop.Config.maxParallelToolCalls as a factory-wide default applied to
every agent create/createAgent/resume mints (per-agent option overrides it),
forwarded through agent-core so it reaches front doors that expose no cap field
of their own. Trim the isConcurrencySafe JSDoc to the local contract and link
the parallel-tool-call RFC for the full rationale; document the field on the
canonical core-data-structures page.
2026-07-16 11:36:16 +08:00
Tianyi Cui