Tianyi Cui
4b1528bcec
Merge retargeted parent into Claude Code subagent provider
2026-08-06 21:38:47 +08:00
Yichen Jiang
5e139ac64e
Merge remote-tracking branch 'origin/master' into claude/unified-environment-credentials-c8841a
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-20-dsh-cli-personal-config.i18n.yaml
# .agents/notes/implemented/feature/2026-07-20-dsh-cli-personal-config.md
# .agents/notes/implemented/feature/2026-07-20-dsh-cli-personal-config.zh.md
# apps/cli/config/base.cordis.yml
# apps/cli/package.json
# apps/cli/reference/README.i18n.yaml
# apps/cli/reference/README.md
# apps/cli/reference/README.zh.md
# apps/cli/src/app-cli-entry.ts
# apps/cli/src/args.ts
# apps/cli/src/bin.ts
# apps/cli/src/config.ts
# apps/cli/src/dump-config.ts
# apps/cli/src/headless.ts
# apps/cli/src/web.ts
# apps/cli/tests/args.spec.ts
# apps/cli/tests/built-bin.e2e.ts
# apps/cli/tests/headless-shutdown.e2e.ts
# apps/cli/tsconfig.json
# docs/user/guide/config.i18n.yaml
# docs/user/guide/config.md
# docs/user/guide/config.zh.md
# examples/mcp-memory/README.i18n.yaml
# examples/mcp-memory/README.md
# examples/mcp-memory/README.zh.md
# packages/bundle/web-app/cordis.patch.yml
# packages/cordis/repository-plugin/README.i18n.yaml
# packages/cordis/repository-plugin/README.md
# packages/cordis/repository-plugin/README.zh.md
# packages/credentials/credentials-local/README.i18n.yaml
# packages/credentials/credentials-local/README.md
# packages/credentials/credentials-local/README.zh.md
# packages/ui/app-boot/README.i18n.yaml
# packages/ui/app-boot/README.md
# packages/ui/app-boot/README.zh.md
# packages/ui/app-boot/src/index.ts
# packages/ui/app-boot/tests/config-reload.spec.ts
# packages/ui/app-boot/tests/user-patches.spec.ts
# pnpm-lock.yaml
2026-08-06 21:34:45 +08:00
Tianyi Cui
0748ebee39
Merge latest master into Codex subagent provider
2026-08-06 21:26:31 +08:00
ZiyaZhang
4767285694
Merge remote-tracking branch 'upstream/master' into feat/web-workspace-file-links
...
# Conflicts:
# apps/cli/package.json
# pnpm-lock.yaml
2026-08-06 06:24:53 -07:00
ZiyaZhang
f00a44fd44
refactor(web): move the produced-files row into its own plugin package
...
ui-conversation now owns only the conversation.chat.turnTail hole; the row,
its derivation, and its copy live in @deepseek-ai/dsh-client-ui-deliverables,
composed in or out by one cordis.yml line.
2026-08-06 06:21:19 -07:00
Yichen Jiang
18fe174897
feat(agent-presets): compose each session's agent from a preset cordis.yml
...
A preset is a directory holding one `agent.cordis.yml`. Mounting it under an
agent's scope context during `setup(agentCtx)` gives that one session its own
tools and prompt sections while every other live session keeps its own.
No registry gains a tier. `dsh-tools` and `dsh-system-prompt` already file
registrations into the calling context's scope layer, and entry contexts chain
to the context a subtree was plugged into, so a composition mounted under
`agent.ctx` is that agent's alone and unwinds with it.
The mount audits itself because a directly-plugged subtree is absent from
`ctx.loader.entries()` and no boot audit covers it. It rejects an unscoped
target, a row that never became usable, and a row that published a service into
the root service realm — that last one is process-global rather than
per-session, and its collision with the next session surfaces as an unhandled
rejection `setup` never observes, leaving a half-composed agent that looks
healthy. The package invariant re-checks that rule on every service
notification, since a row publishing from a timer would escape a one-shot audit.
Raises the `packages/README.md` word ceiling from 920 to 980: the group table
must enumerate every group, and the new `preset/` row is necessary content.
Design: .agents/notes/implemented/architecture/2026-08-03-per-session-agent-presets.md
2026-08-06 21:03:18 +08:00
fz
6030af63fd
Merge branch 'codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
...
# Conflicts:
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
2026-08-06 20:17:41 +08:00
Turtle
a51b88d2aa
Merge remote-tracking branch 'origin/master' into feat/profile-plugin-management
...
# Conflicts:
# apps/cli/src/headless.ts
# docs/event-producer-consumer.md
# packages/host/apiproxy/README.i18n.yaml
2026-08-06 20:03:22 +08:00
pku-xht
cd59acd6f6
refactor(schedule): simplify request zone authority
2026-08-06 19:33:19 +08:00
Turtle
b9f81dcd5d
Merge latest feedback base into telemetry stack
...
# Conflicts:
# packages/telemetry/session-telemetry/src/coordinator.ts
2026-08-06 19:24:55 +08:00
Turtle
f10b354c80
Merge remote-tracking branch 'origin/master' into codex/dsh-badge-plugin
...
# Conflicts:
# docs/event-producer-consumer.md
2026-08-06 18:58:51 +08:00
Turtle
4dede454ed
fix: address dsh badge review feedback
2026-08-06 18:54:53 +08:00
Turtle
da732cad72
Merge remote-tracking branch 'origin/master' into task/command-feedback-master
2026-08-06 18:38:35 +08:00
Turtle
f8c3d3fff4
Merge updated feedback base into telemetry stack
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-23-session-telemetry-otel-revival.i18n.yaml
# .agents/notes/implemented/feature/2026-07-23-session-telemetry-otel-revival.zh.md
# .agents/notes/implemented/feature/2026-07-28-feedback-command.i18n.yaml
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/package.json
# packages/feedback/command-feedback/README.i18n.yaml
# packages/telemetry/README.i18n.yaml
# packages/telemetry/README.md
# packages/telemetry/README.zh.md
# packages/telemetry/session-telemetry-otel/README.i18n.yaml
# packages/telemetry/session-telemetry-otel/README.md
# packages/telemetry/session-telemetry-otel/README.zh.md
# packages/telemetry/session-telemetry-otel/package.json
# packages/telemetry/session-telemetry-otel/src/index.ts
# packages/telemetry/session-telemetry-otel/tests/otel.spec.ts
# packages/telemetry/session-telemetry/README.i18n.yaml
# packages/telemetry/session-telemetry/README.zh.md
# pnpm-lock.yaml
2026-08-06 18:08:45 +08:00
Turtle
ab94a2f7d6
refactor(telemetry): centralize the default mode
2026-08-06 17:39:43 +08:00
Yichen Jiang
66b136e6e3
Merge remote-tracking branch 'origin/master' into worktree/provider-credential-lifecycle
...
# Conflicts:
# packages/client/ui-models/README.i18n.yaml
# packages/client/ui-models/README.md
# packages/client/ui-models/README.zh.md
# packages/client/ui-models/src/client/ModelsSection.tsx
# packages/client/ui-models/src/client/ProviderEditor.tsx
2026-08-06 16:54:33 +08:00
Yichen Jiang
bce4a038c9
Merge remote-tracking branch 'origin/master' into claude/unified-environment-credentials-c8841a
...
# Conflicts:
# docs/config-catalog.md
# packages/llm/llm-pi-ai/src/config.ts
# packages/llm/llm-pi-ai/src/index.ts
# packages/llm/llm-pi-ai/tests/sdk-options.spec.ts
2026-08-06 16:52:19 +08:00
Turtle
ccb0842cfc
fix(telemetry): fail closed outside full mode
2026-08-06 16:27:27 +08:00
Turtle
928c99876e
feat: add optional dsh badge skill provider
2026-08-06 16:03:29 +08:00
Turtle
96ac51f0c8
Merge origin/master into task/command-feedback-master
2026-08-06 16:02:25 +08:00
Turtle
b10368a8d5
refactor(telemetry): strongly type sharing mode
2026-08-06 15:34:36 +08:00
Yichen Jiang
a6a0788108
Merge remote-tracking branch 'origin/master' into claude/unified-environment-credentials-c8841a
2026-08-06 15:28:40 +08:00
Turtle
4e8067e8d5
refactor(telemetry): replay feedback sessions without buffering
2026-08-06 14:57:30 +08:00
Chinesezjc
ecb17ac3ae
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# examples/acp-agent/tests/snapshots/todo-write/session.jsonl
# packages/client/ui-conversation/README.i18n.yaml
2026-08-06 13:04:33 +08:00
Yichen Jiang
98b894f8eb
Merge remote-tracking branch 'origin/master' into claude/web-llm-pi-ai-config-385e24
...
# Conflicts:
# docs/event-producer-consumer.md
2026-08-06 13:03:40 +08:00
Yichen Jiang
af652c949f
fix(web): recover provider credential lifecycle
2026-08-06 12:09:14 +08:00
creatixchu
851fe793c4
Merge remote-tracking branch 'origin/master' into worktree/context-source-cards
...
# Conflicts:
# packages/client/runtime/src/client/sessions/transcript-adapter.ts
# packages/client/ui-conversation/README.i18n.yaml
2026-08-06 12:03:15 +08:00
Chinesezjc
8985284f85
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# docs/core-data-structures/session.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-06 12:00:33 +08:00
fz
576f17ce99
Merge branch 'codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
2026-08-06 11:48:30 +08:00
Chinesezjc
c337215bae
feat(todo): carry the parallel-active count through ToolRow's summarySuffix
...
Rebuild the todo row's parallel summary on the shared ToolRow that master
introduced: planSummary still returns the active name and the remaining
count separately, and the row hands the count to a new non-shrinking
summarySuffix slot so a narrow row clips the summary text before the count.
An error row drops the suffix, whose collapsed summary is the failure line.
Re-record the ACP todo-write transcript for the parallel prompt, regenerate
the config catalog for the required allowParallelInProgress field, and
re-record the bilingual pairing hashes.
2026-08-06 11:42:31 +08:00
imccyu
e5810d450e
Merge remote-tracking branch 'origin/master' into mergebot/pr1667
2026-08-06 11:42:14 +08:00
creatixchu
d0d8cd5365
Merge remote-tracking branch 'origin/master' into worktree/context-source-cards
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-08-06 11:29:50 +08:00
creatixchu
6747c2d44d
Merge remote-tracking branch 'origin/master' into worktree/context-source-cards
...
# Conflicts:
# .agents/notes/implemented/simplification/2026-07-31-web-ui-no-steer-entry-or-interjection-chrome.i18n.yaml
# .agents/notes/implemented/simplification/2026-07-31-web-ui-no-steer-entry-or-interjection-chrome.md
# .agents/notes/implemented/simplification/2026-07-31-web-ui-no-steer-entry-or-interjection-chrome.zh.md
# apps/web/tests/seeded-history.e2e.ts
# apps/web/tests/snapshots/queue-actions/layout.expected.md
# docs/core-data-structures/core.i18n.yaml
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/tests/history-fold.spec.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
# packages/context/workspace-context/src/index.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/skill/tool-skill/README.i18n.yaml
# packages/skill/tool-skill/README.md
# packages/skill/tool-skill/README.zh.md
# packages/skill/tool-skill/src/index.ts
# packages/skill/tool-skill/tests/tool-skill.spec.ts
2026-08-06 11:28:48 +08:00
Yichen Jiang
a358d9d68a
Merge remote-tracking branch 'origin/master' into claude/unified-environment-credentials-c8841a
...
# Conflicts:
# examples/headless-agent/tests/headless.snapshot.ts
# examples/headless-agent/tests/snapshots/missing-credential/stream-json.expected.jsonl
# packages/llm/llm-deepseek/tests/adapter.spec.ts
2026-08-06 10:52:32 +08:00
Yichen Jiang
17c86bbb25
Merge remote-tracking branch 'origin/master' into claude/web-llm-pi-ai-config-385e24
...
# Conflicts:
# packages/llm/llm-pi-ai/tests/adapter.spec.ts
# packages/llm/llm/README.i18n.yaml
2026-08-06 10:47:36 +08:00
imccyu
e89b1e612f
fix(session): address restore review feedback
2026-08-06 10:40:32 +08:00
imccyu
28df863bdd
docs(jsonl): refresh generated catalogs
2026-08-06 10:40:31 +08:00
imccyu
03983ff986
perf(jsonl): scan decoded frames incrementally
2026-08-06 10:40:31 +08:00
fz
de8ec21f80
Merge remote-tracking branch 'origin/codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-24-workspace-context.i18n.yaml
# .agents/notes/implemented/feature/2026-06-24-workspace-context.md
# .agents/notes/implemented/feature/2026-06-24-workspace-context.zh.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/README.md
# packages/context/workspace-context/README.zh.md
# packages/context/workspace-context/src/index.ts
# packages/context/workspace-context/src/state.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
2026-08-06 10:37:43 +08:00
Turtle
0556c989b5
docs: regenerate config catalog for the web-app surfaceContext field
2026-08-06 09:35:51 +08:00
Turtle
af5f528903
Merge remote-tracking branch 'origin/master' into feat/profile-plugin-management
...
# Conflicts:
# apps/cli/src/headless.ts
# packages/host/apiproxy/README.i18n.yaml
2026-08-06 06:55:42 +08:00
Turtle
07d24b005f
docs: profile scheme across guides, notes, and generated catalogs; Agent Note
...
Update every doc referencing base.cordis.yml/web.cordis.yml, --config, -p, or
$DSH_HOME/config.yaml to the profile vocabulary with bilingual counterparts
re-recorded; regenerate the catalogs and graphs; add the
profile-plugin-bundles Agent Note recording the design and its rejected
alternatives.
2026-08-06 06:29:06 +08:00
pku-xht
d61059364e
feat(schedule): add absolute-time reminders
2026-08-06 15:03:48 +08:00
imccyu
ede74b1926
fix(session-persistence): invalidate stale preparations
2026-08-06 04:11:58 +08:00
imccyu
2b9428f35d
fix(session-persistence): satisfy preparation gates
2026-08-06 04:11:57 +08:00
imccyu
e089ef92d8
docs: document session preparation flow
2026-08-06 04:11:57 +08:00
imccyu
59df683ef1
fix(token-meter): bound projection state via logged shadow prices
...
The contextBreakdown and contextPressure units carried the full priced
surface, so each session's persisted projection checkpoint grew without
bound. A surface replacement is now priced by the shadow-price event
logged directly before it — compact/summary for compaction, the new
compact/prune from tool-result pruning (priced through the injected
token meter) — and the unit states shrink to a fixed handful of numbers.
Regenerate the persistence/cordis/module/config catalogs.
2026-08-06 02:50:38 +08:00
Chinesezjc
eb3b635796
docs(tools): widen the ungated language-prose list and correct three JSDoc claims
2026-08-06 01:38:26 +08:00
Chinesezjc
24cfe8f777
docs(code-runtime): name python in the reference page and complete the ungated-edit list
2026-08-06 00:22:05 +08:00
Chinesezjc
b2c1872799
docs(tools): cite per-character Unicode ages and the ungated seam edit
2026-08-06 00:07:10 +08:00
