kingwl
63183b2f5d
Merge remote-tracking branch 'origin/master' into feature/subagent-policy-inheritance
...
# Conflicts:
# docs/module-graph.md
2026-07-27 19:46:19 +08:00
Chinesezjc
109fe533ba
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 19:45:54 +08:00
_Kerman
a11d4211a6
docs: refresh event consumer graph
2026-07-27 19:10:01 +08:00
_Kerman
9152858fd7
fix(agent-loop): preserve deferred message boundaries
2026-07-27 18:58:27 +08:00
Turtle
4c5f92e0fd
feat(tui): personal TUI rework, integrating upstream model reasoning-effort selection
...
Consolidates the personal dsh-tui customizations (module split into
components/session/extension, prompt template + running-glyph indicator,
copyable transcript, tool-card headers, timing placement, XML tool output,
status/footer rework) and ports upstream's model reasoning-effort selector
(Shift+Tab effort cycling, effort-aware /model, footer, and /status) onto
the personal module layout.
2026-07-27 18:55:13 +08:00
Turtle
5d2329e207
feat(skills): bundle and harden personal maintenance workflows
2026-07-27 18:53:30 +08:00
kingwl
33a235cd6b
Merge remote-tracking branch 'origin/master' into feature/subagent-policy-inheritance
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-06-sandbox.i18n.yaml
2026-07-27 18:39:26 +08:00
kingwl
6adb14b56d
feat(telemetry): adopt from the construction boundary — constructor seeds never re-export
...
A cursor-less adoption (process restart + resume, fork, seam-module
reload) replayed the session's full log from seq 0, re-exporting
history that already left the process — a resume re-billed its entire
stored log on every restart, and a fork re-shipped the parent's prefix
under the child's id, doubling query-time counts on OTLP backends with
no native ingest dedupe.
dsh-session now exposes the fact the constructor already validated but
discarded: Session.firstLiveSeq, the constructor-seed length — the
first seq appended in this process. header.seedLength cannot serve
here: it is the durable fork-lineage boundary, and a resumed session's
constructor seed is its full stored log while the header keeps the
original fork value (llm-replay and session-query-sqlite depend on
that meaning). Constructor seeds also never publish on the
session/event firehose, so adoption replaying them was inconsistent
with the system's own publication semantics.
Adoption's cursor-less fallback starts at firstLiveSeq; seed events
still feed the chunk projection, so mid-step continuations re-drop
after a resume. Fork streams are no longer self-contained: records now
carry session.seed_length (with the existing session.parent_id) so
receivers stitch the child's stream onto the parent's. Accepted cost,
consistent with at-most-once delivery and recorded in the revival
Agent Note: a resume no longer backfills records a previous process
failed to deliver — a deployment with that requirement needs the
deferred outbox, not replay.
Pinned red-first: seeded adoption exports nothing (assertion reversed
from the prior seed-readback test, obsolete behavior changed with its
test), resume-shaped seed rebuilds the projection without exporting,
and fork records carry the stitch attributes.
2026-07-27 18:35:03 +08:00
_Kerman
98238ceace
fix(agent-loop): settle rejected admission context
2026-07-27 18:32:07 +08:00
Tianyi Cui
6c8bf0a522
fix: address human review — default providerName dsh-sdk; raise composition-e2e deadline
...
- subagent-sdk: the default registry name becomes `dsh-sdk` (the bare
`sdk` read ambiguously in configs); READMEs, config catalog, fixture,
and suites follow. The Loader fixture now omits providerName to exercise
the shipped default end to end.
- loader-composition.e2e: two full harness runtimes boot in sequence, so
the default 30s loader-smoke window times out under host load; raise the
subprocess deadline to 120s with matching vitest headroom (the
real-model.e2e precedent).
2026-07-27 18:25:18 +08:00
Chinesezjc
e7ea62f522
Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace
2026-07-27 18:17:37 +08:00
Chinesezjc
e6fe489485
Merge remote-tracking branch 'origin/master' into fix/worker-timer-clamp
2026-07-27 18:12:39 +08:00
_Kerman
ff7792b17c
docs(agent): document next-step acceptance window
2026-07-27 18:07:51 +08:00
NI0317
8cec221dab
Merge remote-tracking branch 'origin/master' into feature/cordis-temporary-tools
2026-07-27 17:45:01 +08:00
_Kerman
52174e32cb
refactor(agent): clarify turn lifecycle event names
2026-07-27 17:38:42 +08:00
Chinesezjc
a2e3c1b242
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 17:29:59 +08:00
_Kerman
7d5cc498d3
docs(agent): call agent step an extension point
2026-07-27 17:24:20 +08:00
Tianyi Cui
1ee8029bc6
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
2026-07-27 17:24:20 +08:00
Yichen Jiang
7f4905c4bf
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
2026-07-27 17:18:29 +08:00
_Kerman
db16732101
Merge remote-tracking branch 'origin/master' into xtr/agent-loop-message-machine
2026-07-27 17:18:12 +08:00
Hypatia May
74b26adcac
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-workspace/README.i18n.yaml
# packages/client/ui-workspace/README.md
# packages/client/ui-workspace/README.zh.md
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/tests/client-handler.spec.ts
2026-07-27 17:17:31 +08:00
Yichen Jiang
c47553f9f3
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
2026-07-27 17:13:24 +08:00
Yichen Jiang
c0009e4603
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/index.ts
# packages/client/runtime/src/client/sessions/conversation.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
2026-07-27 17:09:25 +08:00
_Kerman
749927ecd8
fix: reconcile agent loop merge integration
2026-07-27 17:04:22 +08:00
Tianyi Cui
24d2384294
Merge branch 'master' into sdk/ts-client-and-subagent
2026-07-27 17:01:20 +08:00
imccyu
0052ea49ff
Merge branch 'master' into feature/delete-workspace
2026-07-27 16:59:28 +08:00
imccyu
f3ce520317
Merge branch 'master' into worktree/web-session-model-selector
2026-07-27 16:58:35 +08:00
NI0317
b4a1304489
Rename Cordis tools for temporary plugins
...
Clarify process-local lifecycle semantics and refresh generated documentation, demos, and snapshots.
2026-07-27 16:57:26 +08:00
Chinesezjc
3d93b709b7
Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace
2026-07-27 16:57:25 +08:00
Yichen Jiang
2ad8a6e87f
Merge branch 'master' into worktree/skill-catalog-hot-refresh
2026-07-27 16:57:16 +08:00
Chinesezjc
0236e175aa
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 16:56:49 +08:00
Hypatia May
2846f84bf1
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
2026-07-27 16:55:56 +08:00
Yichen Jiang
55d7b71de3
Merge remote-tracking branch 'origin/master' into worktree/skill-catalog-hot-refresh
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-07-27 16:51:36 +08:00
Yichen Jiang
b76659aa57
feat(skill): hot-refresh skill catalogs
2026-07-27 16:50:56 +08:00
_Kerman
bd40eec770
Merge remote-tracking branch 'origin/master' into xtr/agent-loop-message-machine
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/session.i18n.yaml
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/README.md
# packages/core/agent-loop/README.zh.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/README.i18n.yaml
# packages/core/agent/tests/llm-target.spec.ts
# packages/core/session/tests/request-header.spec.ts
2026-07-27 16:48:38 +08:00
Chinesezjc
8461952f33
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# docs/core-data-structures/session.i18n.yaml
2026-07-27 16:47:26 +08:00
Tianyi Cui
21fe97d19d
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
2026-07-27 16:40:07 +08:00
Tianyi Cui
9801a0d102
fix(tool-web): bound HTML conversion work
2026-07-27 16:40:02 +08:00
Chinesezjc
37e2b5d85a
Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace
2026-07-27 16:39:42 +08:00
imccyu
9249c5504e
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
2026-07-27 16:16:17 +08:00
imccyu
6583f896cf
fix: module-graph
2026-07-27 16:12:02 +08:00
kingwl
fa8fffda6d
Merge remote-tracking branch 'origin/master' into feature/subagent-policy-inheritance
...
# Conflicts:
# docs/cordis-catalog/services.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-07-27 16:09:30 +08:00
NI0317
c171ecc60b
Merge remote-tracking branch 'origin/master' into feature/delete-workspace
2026-07-27 16:07:11 +08:00
Tianyi Cui
ae18216199
Merge remote-tracking branch 'origin/master' into worktree/pr683-retarget-20260727
2026-07-27 16:03:33 +08:00
NI0317
dcf06e8272
Merge remote-tracking branch 'origin/master' into feature/delete-workspace
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
2026-07-27 15:54:51 +08:00
Yichen Jiang
39c60d5d64
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-20-routed-model-context-and-compaction-policy.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-20-routed-model-context-and-compaction-policy.md
# .agents/notes/implemented/architecture/2026-07-20-routed-model-context-and-compaction-policy.zh.md
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/tests/adapter.spec.ts
2026-07-27 15:49:09 +08:00
Tianyi Cui
bfdaf7600b
Merge remote-tracking branch 'origin/master' into worktree/pr674-retarget-20260727
...
# Conflicts:
# docs/cookbook/adding-an-llm-adapter.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm/README.i18n.yaml
2026-07-27 15:48:17 +08:00
Yichen Jiang
181ac52f8e
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/tests/fake-api.ts
# packages/client/runtime/tests/session.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
2026-07-27 15:41:01 +08:00
Hypatia May
de67a695ca
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
2026-07-27 15:34:41 +08:00
Tianyi Cui
f6de42a886
Merge remote-tracking branch 'origin/master' into worktree/pr674-retarget-20260727
2026-07-27 15:30:30 +08:00