b0ee207a2a
Merge remote-tracking branch 'origin/master' into mergebot/pr908
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 22:27:37 +08:00
55ff7761b0
Merge branch 'master' into fix/page-scroll
2026-07-29 22:22:01 +08:00
8b1a8d383a
fix(host): review round 8 — platform-folded draft matching; honest slash-platform boundary; coverage-visible guards
2026-07-29 22:20:48 +08:00
98a23fc88c
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:20:09 +08:00
2b56d972eb
Merge remote-tracking branch 'origin/master' into mergebot/pr908
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-trajectory/src/client/views.module.css
2026-07-29 22:15:22 +08:00
637c5c9b7b
Merge remote-tracking branch 'origin/master' into worktree/fix-agent-loop-scheduler-quiescence
2026-07-29 22:10:52 +08:00
fd356b92c8
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:10:39 +08:00
1a21fc3a06
fix(agent-loop): quiesce scheduler failures
2026-07-29 22:10:26 +08:00
345b58d1de
Merge commit 'ddeb1cab2dcffcb4bc9f71bd3151c9b3078b5667' into worktree/retarget-pr828-20260729
2026-07-29 22:08:48 +08:00
5fb4bd66d7
Merge latest master into codex/migrate-to-oxlint
2026-07-29 22:01:25 +08:00
bb3e5c8c05
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:59:24 +08:00
3d446da9c7
docs(web): align bilingual composition wording
2026-07-29 21:57:54 +08:00
3224ad92af
fix(host): review round 7 — upgrade re-parks displaced row focus; case-folded display root; boundary notes
2026-07-29 21:57:06 +08:00
2994342f23
docs(web): align browser roster composition
2026-07-29 21:56:55 +08:00
d10dde430c
Merge origin/master at ddeb1cab2d into skill catalog hot refresh
2026-07-29 21:55:32 +08:00
915121ff40
docs(cli): remove stale source config ownership
2026-07-29 21:53:38 +08:00
80ab0aa548
docs(skill): correct invocation policy field
2026-07-29 21:51:01 +08:00
7b1e8978a9
fix(build): validate packaged spawn helpers
2026-07-29 21:49:21 +08:00
f6a16e48f2
docs(cli): record restored web and index behavior
2026-07-29 21:49:20 +08:00
32c3d1e17f
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/test-runtime/src/sessions.ts
2026-07-29 21:45:29 +08:00
16e1734444
Merge origin/master at 90bc53cc64 into skill catalog hot refresh
2026-07-29 21:43:13 +08:00
502e64c00d
Merge origin/master at ecbf75a5e7 into skill catalog hot refresh
2026-07-29 21:42:18 +08:00
a45a187a90
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr828-20260729
2026-07-29 21:42:13 +08:00
d70cfed4e8
Merge master into fix/subprocess-password-scrub
2026-07-29 21:40:50 +08:00
fe61b243d7
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr831-20260729
2026-07-29 21:40:28 +08:00
f4bc0a4a86
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:40:28 +08:00
e1984cbfd9
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr885-20260729
2026-07-29 21:40:13 +08:00
a5446e3160
Merge master into fix/subprocess-password-scrub
...
# Conflicts:
# packages/lsp/lsp-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.zh.md
2026-07-29 21:38:24 +08:00
32aaa8983e
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr885-20260729
...
# Conflicts:
# docs/development.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-primitives/src/markdown/CodeBlock.tsx
# scripts/snapshots/translation-prompt-v4/request-response.expected.json
2026-07-29 21:37:43 +08:00
98e6a0573f
fix(fs): keep one editor path contract
2026-07-29 21:37:12 +08:00
eac3b378fa
fix(host): review round 6 — progressive selection-anchored landing; anchor on actual parent entries; focus-flag hygiene
2026-07-29 21:34:30 +08:00
7f711996ff
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr828-20260729
...
# Conflicts:
# packages/hooks/README.i18n.yaml
# packages/hooks/README.zh.md
# packages/hooks/hook-protocol/README.i18n.yaml
# packages/hooks/hook-protocol/README.zh.md
# packages/hooks/hooks-claude/README.i18n.yaml
# packages/hooks/hooks-claude/README.zh.md
# packages/hooks/hooks-codex/README.i18n.yaml
# packages/hooks/hooks-codex/README.zh.md
2026-07-29 21:34:29 +08:00
754e163663
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:26:44 +08:00
44fe621f3f
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr831-20260729
...
# Conflicts:
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/README.zh.md
2026-07-29 21:25:44 +08:00
f2aa63f756
Merge branch 'master' into worktree-renameweb
2026-07-29 21:25:14 +08:00
b6552fcf3e
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# packages/context/README.i18n.yaml
# packages/context/README.md
# packages/context/README.zh.md
2026-07-29 21:24:46 +08:00
76b4563380
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:23:13 +08:00
ae4a6081be
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:22:07 +08:00
70c6ffda7e
Merge branch 'master' into fix/page-scroll
2026-07-29 21:21:25 +08:00
bf8db964d4
Merge branch 'master' into xtr/trajectory-inspection-ui
2026-07-29 21:20:38 +08:00
52d68a5383
fix(skill): retain candidates across watcher failures
2026-07-29 21:17:27 +08:00
bee0a77aad
chore: refresh generated review records
2026-07-29 21:15:48 +08:00
ea9315841f
refactor(session): exclude live-session registry foundation
2026-07-29 21:15:48 +08:00
9e2c3d3093
refactor(cli): exclude tmux context and source guard
2026-07-29 21:15:48 +08:00
f290a8b851
refactor(cli)!: one shared base config with per-surface overlays
...
`dsh` shipped two config trees that were 43 rows the same: apps/cli/cordis.yml
composed web as 74 flat rows, while the TUI booted examples/tui-agent/cordis.yml
whose single `@deepseek-ai/dsh-tui-demo` row mounted twelve plugins behind a
twenty-key pass-through Config. Neither file was what its location claimed —
apps/cli hardcoded the "example" as the product default and the "demo" bundle
was the application — and every capability change had to be made twice.
- apps/cli/base.cordis.yml holds the 43 shared rows; tui.cordis.yml and
web.cordis.yml are patch lists stating only what differs per surface
- overlays apply as SIBLING patch lists at one include level, because include
patches never cross an include boundary. Precedence: base < surface <
(--config | personal ~/.dsh/config.yaml) < launcher flag/profile patches
- `--config` now applies an overlay INSTEAD OF the personal one, so a demo or
test tree never inherits the user's route; new `--config-replace` boots a file
as the entire tree (the old `--config` behaviour). Both survive /resume
- vendor/include: index each `insert`ed row as it is added so a later patch can
configure or disable it. Upstream built the id index once before the patch
loop, leaving every surface-only row — the whole TUI front door — silently
unpatchable from user config. Logged as local modification 8
- session identity moves to dsh-agent-loop's CONFIGURED_AGENT_IDENTITIES_KEY;
dsh-tui's MAIN_SESSION_ID_KEY is deleted (only the bundle read it)
- delete examples/tui-agent, examples/cordis-agent, packages/examples/tui-demo;
TUI tests → apps/cli/tests, cordis e2e → packages/cordis/tool-cordis/tests,
examples/code-mode survives as an overlay leaf
- `dsh web` gains --config, threaded into AppCLIEntry as an extra overlay
Three latent defects surfaced and are fixed here: the TUI captured the optional
sessionQuery service once at construction and could permanently disable /resume
when it won the mount race; the session-store root silently reverted to a
project-local ./.sessions; --config-replace was dropped by the resume handoff.
Verified by booting each tree through the real Loader (TUI 55 entries, web 75,
zero unsettled) rather than reading YAML. All eight terminal snapshots replay
byte-identically; 14/14 PTY smoke, 112/112 snapshots, 25/25 doc-sync, hygiene
and lint clean.
2026-07-29 21:15:42 +08:00
e7c0a5b794
Merge origin/master: web permission sandbox, default pi-ai providers
2026-07-29 21:15:34 +08:00
8dca750c8e
Merge branch 'master' into trajectory-history-source
2026-07-29 21:12:31 +08:00
a1d752f799
feat(host): navigations land selection-anchored — crumb jumps step back a pane instead of collapsing
2026-07-29 21:12:04 +08:00
935871e38b
Merge branch 'master' into fix/page-scroll
2026-07-29 21:07:59 +08:00
de4f2a12f0
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:06:24 +08:00
imccyu