Yichen Jiang
a64f5c34ea
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
2026-08-08 01:56:58 +08:00
Yichen Jiang
25d959aa08
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.md
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.zh.md
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.md
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.zh.md
# THIRD_PARTY_NOTICES.md
# apps/cli/composition.md
# apps/cli/config/base.cordis.yml
# apps/cli/package.json
# apps/cli/src/app-cli-entry.ts
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
# apps/web/tests/built-boot.snapshot.ts
# apps/web/tests/navigation-panes.e2e.ts
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/bundle/README.i18n.yaml
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/src/http-bridge.ts
# packages/client/connection/src/index.ts
# packages/client/connection/tests/fixture.spec.ts
# packages/client/connection/tests/node-half.spec.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/runtime/src/client/contract/session.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.module.css
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/src/client/index.ts
# packages/client/ui-conversation/src/client/input/contract.ts
# packages/client/ui-conversation/src/client/input/facade.ts
# packages/client/ui-conversation/src/client/input/hub.ts
# packages/client/ui-conversation/src/client/locales.ts
# packages/client/ui-conversation/src/client/service.ts
# packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/apply-inject.spec.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-conversation/tests/input-scenarios.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-trajectory/tests/views.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/rpc.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# packages/llm/llm-pi-ai/README.i18n.yaml
# packages/llm/llm-pi-ai/README.md
# packages/llm/llm-pi-ai/README.zh.md
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/components/content.ts
# packages/ui/tui/src/components/transcript.ts
# packages/ui/tui/tests/tui.spec.ts
# pnpm-lock.yaml
2026-08-08 01:56:29 +08:00
Tianyi Cui
e46b082fee
test(snapshot): derive compaction replay from logs
2026-08-08 01:32:27 +08:00
Tianyi Cui
f00f45e3f9
Merge origin/master at f1402327fa
2026-08-07 23:57:23 +08:00
Tianyi Cui
3dfb16008d
docs(config): align environment and credential contracts
...
Code already treats $DSH_HOME/.env as ordinary launch environment and stores managed credentials in .credentials.yaml, but public docs still described the old store, old precedence, removed literal adapter keys, and the deleted TUI. That directed users to the wrong file and overstated the supported configuration surface.
Update the existing English and Chinese owners in place, document inherited > managed > project > user credential resolution, and record the loadLayeredEnv export. Regenerate only pairing records and the source-line catalog; add no new section or site route.
2026-08-07 22:04:04 +08:00
imccyu
bb61dc13f2
refactor(api): colocate gateway and remote assembly
2026-08-07 21:47:17 +08:00
imccyu
eca3090dfa
fix: docs
2026-08-07 21:47:16 +08:00
imccyu
9b63d72c94
fix(typert): harden remote reflection boundaries
2026-08-07 21:47:15 +08:00
imccyu
9400926bdf
feat(goal): add TypeRT gateway example
2026-08-07 21:47:14 +08:00
imccyu
64a963da0b
feat: add TypeRT remote gateway infrastructure
2026-08-07 21:47:14 +08:00
Yichen Jiang
209fb4d355
Merge remote-tracking branch 'origin/master' into worktree/default-model-persistence
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
2026-08-07 18:18:40 +08:00
imccyu
a6ae15c0f6
Merge remote-tracking branch 'origin/master' into feat/web-workspace-file-links
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/host/apiproxy/src/native-path-opener.ts
2026-08-07 16:49:20 +08:00
Yichen Jiang
dfaf3c288e
Merge remote-tracking branch 'origin/master' into claude/unified-environment-credentials-c8841a
...
# Conflicts:
# apps/web/tests/models-settings.e2e.ts
# docs/config-catalog.md
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/README.zh.md
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-pi-ai/src/config.ts
# packages/llm/llm-pi-ai/src/index.ts
2026-08-07 15:54:13 +08:00
Yichen Jiang
d03d3ab70b
Merge remote-tracking branch 'origin/master' into worktree/default-model-persistence
...
Carries two edits beyond conflict resolution, both forced by what master
brought in:
- `CustomProviderCard`: master added front-end key validation and a
component-level `keyValue` (already trimmed) while still writing
`apiKeyEnv` unconditionally. Kept this branch's blank-key rule and its
committed-profile retry gate, and adopted master's single `keyValue` so
the component has one spelling of the key rather than two.
- `docs/user/guide/providers`: master merged #1810 , whose default-model
section still taught overriding the `api-gateway` row in
`$DSH_HOME/config.yaml` — the behavior this branch replaced. Rewritten
for the settings section the picker now writes, plus the review fix from
#1810 replacing the colloquial 挂着 in the opener.
2026-08-07 15:44:57 +08:00
Turtle
a5a135e269
Merge branch 'task/command-feedback-master' into codex/otel-feedback-levels
2026-08-07 15:28:12 +08:00
Turtle
d9a3ae4c3a
Merge remote-tracking branch 'origin/master' into task/command-feedback-master
2026-08-07 15:28:07 +08:00
Yichen Jiang
bb43ff4f37
feat(ui): make a session that cannot send refuse to accept one
...
A default naming a route the Models page has since removed left the
composer saying 选择模型 while the input still accepted a message, which
then failed inside the adapter mid-turn.
`session.prompt` now refuses with `model-unavailable` before opening a
turn. That is the enforcement boundary: the method stays callable no
matter what a client disables. `session.models` reports the same fact as
`routable`, and ui-model pushes a block through the new
`ctx.conversation.blocks` registry so the bar renders the disabled
textarea it already renders without a workspace, carrying the blocker's
own reason. The push direction is forced — ui-model already depends on
ui-conversation, so ui-conversation cannot read it back.
The gate is `routable`, not "matches no advertised group": catalog
membership is advisory, so a route serving a model it stopped advertising
is missing from the groups yet perfectly usable, and `null` before the
first load never blocks so a slow Host cannot lock a working composer.
The scaffold gains a route-only adapter for fixture-less keyless
scenarios. Registering zero providers is a test artifact — every product
composition mounts one — and the goldens that froze the seat's fallback
label now show the model those scenarios actually route to.
2026-08-07 15:26:42 +08:00
Turtle
9ff11943bb
Merge remote-tracking branch 'origin/task/command-feedback-master' into codex/otel-feedback-levels
...
# Conflicts:
# docs/event-producer-consumer.md
2026-08-07 14:42:21 +08:00
Turtle
5e5664e668
Merge remote-tracking branch 'origin/master' into task/command-feedback-master
...
# Conflicts:
# .agents/notes/proposed/architecture/2026-07-27-session-projection-and-command-log.i18n.yaml
# apps/cli/config/base.cordis.yml
# apps/cli/package.json
# packages/README.i18n.yaml
# pnpm-lock.yaml
2026-08-07 14:40:42 +08:00
Yichen Jiang
d5c5e7f2e9
Merge remote-tracking branch 'origin/master' into worktree/charming-swartz-83bf33
...
# Conflicts:
# apps/web/tests/models-settings.e2e.ts
# docs/config-catalog.md
# 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/ProviderEditor.tsx
# packages/client/ui-models/tests/provider-form.spec.tsx
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/README.zh.md
# packages/llm/llm-deepseek/src/index.ts
2026-08-07 14:12:17 +08:00
Yichen Jiang
d63c70bcf1
Merge remote-tracking branch 'origin/master' into worktree/default-model-persistence
...
# Conflicts:
# apps/web/tests/models-settings.e2e.ts
# 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.module.css
# packages/client/ui-models/src/client/ModelsSection.tsx
2026-08-07 13:54:15 +08:00
Yichen Jiang
9679597204
feat(ui-models): tag the provider rows this deployment declared
...
A row's stored profile could not tell a hand-declared gateway from a
shipped provider whose models someone narrowed — both look identical from
outside the adapter — so the Models page had no way to mark the routes a
deployment added itself.
The directory entry now carries `declared`, answered by the owning adapter
against its own installed catalog, and the page renders a Custom tag from
it. Absence stays "this adapter draws no such distinction" rather than
"shipped", so a route no adapter claims is labelled neither way.
Also records the default-route work's Agent Note and the e2e evidence for
all three changes: the composer switch writing the section, and the Models
page declaring a route with its own reasoning effort.
2026-08-07 13:49:47 +08:00
Yichen Jiang
ddacc8de45
Merge pull request #1735 from deepseek-harness/worktree/provider-credential-lifecycle
...
fix(web): recover provider credential lifecycle
2026-08-07 13:27:18 +08:00
Chinesezjc
a9e040a126
Merge pull request #1080 from deepseek-harness/feat/py-types-code-mode
...
feat(tools): render a Python SDK and dispatch Code Mode by runtime language
2026-08-07 13:14:41 +08:00
Yichen Jiang
545080105f
Merge branch 'master' into worktree/charming-swartz-83bf33
2026-08-07 11:37:57 +08:00
Yichen Jiang
abd2e2973b
Merge branch 'master' into worktree/provider-credential-lifecycle
2026-08-07 11:37:41 +08:00
Yichen Jiang
6edd98e2b2
Merge branch 'master' into worktree/provider-credential-lifecycle
2026-08-07 11:28:22 +08:00
Yichen Jiang
91e9d5afa2
Merge branch 'master' into worktree/charming-swartz-83bf33
2026-08-07 11:28:05 +08:00
Chinesezjc
0567727410
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# apps/cli/config/base.cordis.yml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-07 11:27:24 +08:00
Chinesezjc
20651af6a6
Merge branch 'master' into feat/py-types-code-mode
2026-08-07 11:23:41 +08:00
fz
16beccf423
Merge branch 'codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
2026-08-06 22:42:35 +08:00
Yichen Jiang
fe31cd7609
Merge remote-tracking branch 'origin/master' into claude/unified-environment-credentials-c8841a
...
# Conflicts:
# apps/cli/src/profile-boot.ts
# apps/cli/src/web.ts
2026-08-06 22:34:46 +08:00
Yichen Jiang
45d78c9272
fix(llm-pi-ai): refuse an unusable API key before the header is built
2026-08-06 22:12:50 +08:00
Yichen Jiang
5514dd2bd6
fix(llm-deepseek): refuse an API key no header can carry
2026-08-06 21:39:57 +08:00
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
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
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
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
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