@mzzsfy/dsh-shell-select 0.3.1 → 0.4.0

package/README.md

@@ -2,14 +2,18 @@
 
 Windows shell 链接管:禁用官方 `pwsh` 工具与执行器,替换为可配置多客户端的 `shell` 工具——pwsh / git bash / cmd / WSL / 任意第三方实现,自定义路径,多个客户端并存,设默认,模型经工具参数按名选择。
 
+**宿主要求 ≥ 0.1.7-rc.1**:预设面用 preset-* 声明行(patch 引用 `@deepseek-ai/dsh-agent-preset`,0.1.7 起提供);装到更旧宿主会因该包缺失导致组合树加载失败——0.1.5 及以下请勿安装本包。
+
 ## 工作方式
 
-- bundle 补丁按 id 禁用官方 `tool-pwsh`、`pwsh-sandbox` 两行,插入本包主行(`ctx.shell` 执行器 + `shell` 工具 + 设置节 + 浏览器设置页路由)与 guard 哨兵行;卸载本包即补丁消失,官方行自动复位。
+- **运行时接管**:bundle 补丁不静态禁用官方 `tool-pwsh`、`pwsh-sandbox` 两行——boot 期官方 pwsh 链先服务,主行(`ctx.shell` 执行器 + `shell` 工具 + systemPrompt 段)apply 落定后经 `entry.update` 运行时禁用官方两行(dsh-market 同款,内存态不持久),再挂载执行器接管。本包任意死法(import 崩/apply 崩/被禁/卸载)下官方行保持启用,官方 pwsh 链自服务,系统不出现 shell 全灭窗口;重启后由行树声明态收敛。web 行(设置页数据通道,`inject: ['webServer', 'settings']` 声明式门控——服务就绪才激活)与 guard 哨兵行同 patch 插入。
+- 配置事实源 = 主行 Config(dsh 0.1.7 settings 面以 profile 条目为存储,ns `shell-select`);自带设置页经 `settings.configure({ auto: false })` 抑制原生自动页,写路径 `settings.replace`,配置变更由 cordis 行重载活生效(工具描述随行重建即时更新)。
 - client 半区 `dsh.client.inject` 声明(官方机制,dsh-client-file-upload 等官方包同款):保证 client 运行时模块表中 `primitives`/`slots` 面在场;primitives 另有 try/catch 降级自绘兜底。
 - 本包执行器完整实现官方 `ctx.shell` seam(`resolve`/`run`/`start`/`runFor`/`startFor`/`entryFor`/`sandboxMode`),结构官方 PwshLocalExecutor 同构(实例状态/方法全公有——cordis 服务代理会把经 `ctx.shell` 调用的方法 `this` 重定向到阴影对象,`#` 私有触发品牌检查错误)。
-- preset 面收口:web 面把 agent 平面后移到每会话 agent preset,内置 standard 预设在 win32 重新声明官方 `pwsh` 工具行,bundle 补丁对 preset 组合树不可达。本包自带预设 `shell-select`(standard 全量副本 − tool-pwsh 行,`presets/shell-select/`),经补丁覆写 `agent-presets` 行接入:win32 默认预设切到本包预设(POSIX 保持 standard,行为与上游一致),`roots` 指向本包 presets 目录;`agent-presets.default` 的 settings 值恒优先于补丁缺省,用户显式选择不被劫持。上游预设漂移由 `test/preset-drift.test.mjs` 逐行守卫,升级后按官方实文对表。
+- preset 面收口(0.1.7 架构):agent 面整体移入会话预设(preset-* 声明行内联 roster,web 表面在根组合树禁用全部 agent 工具行)。本包 patch insert 自带预设 `shell-select`(standard 内联 roster 全量 − tool-pwsh 行,逐项同构官方 standard.patch.yml)并覆写 `agent-preset-registry` 的 default:win32 默认预设切到本包预设(POSIX 保持 standard,行为与上游一致)。用户显式选择其他预设恒优先——官方 minimal/cordis/ptc 预设自带 persistent pwsh 终端链,显式选用时不在接管范围。上游预设漂移由 `test/preset-drift.test.mjs` 逐行守卫,升级后按官方实文对表。
 - 沙箱语义官方同构:`danger-full-access` 直跑;受限模式经 `ctx.sandbox.confine` 包装并按官方方言分类拒绝/runner 失败,权限模型不变。
-- 死态自愈:用户 patch 层禁用主行的窗口内,guard 哨兵(id 含 `/`,市场不写该层)代挂官方 `dsh-tool-pwsh` + `dsh-pwsh-sandbox` 恢复 host 面服务与 boot 组合(预载失败退避重试,至多 3 次),任一方复活先卸代挂。哨兵/复活让位语义逐项同构 `dsh-llm-pi-gateway`。边界:cordis 服务按 fiber 树解析,代挂对 agent preset 作用域不可见,死态窗口新会话的 preset tool-pwsh 行拒挂(报错清晰)属预期。
+- 死态自愈:用户 patch 层禁用主行的窗口(接管中 runtime-disable 残留)内,guard 哨兵(id 含 `/`,市场不写该层)代挂官方 `dsh-tool-pwsh` + `dsh-pwsh-sandbox` 恢复 host 面服务与 boot 组合(预载失败退避重试,至多 3 次),任一方复活先卸代挂。哨兵/复活让位语义逐项同构 `dsh-llm-pi-gateway`。边界:cordis 服务按 fiber 树解析,代挂对 agent preset 作用域不可见,死态窗口新会话的 preset tool-pwsh 行拒挂(报错清晰)属预期。
+- escape hatch(用户想用官方 pwsh 链):market 禁用 shell-select 或 user patch 写 `- id: shell-select / disabled: true`——主行退场后官方行保持启用自服务,重启后官方自然回归;删除禁行重启即恢复接管。(官方两行带平台表达式,行级 `disabled: false` 与宿主默认启用同形,不作让位信号。)
 - POSIX 上本包全部行停用,官方 bash 链不受影响。
 
 ## 工具
@@ -28,7 +32,7 @@ Windows shell 链接管:禁用官方 `pwsh` 工具与执行器,替换为可配
 - 非终端意图回退简版行:摘要 + 可展开原文 + 检查按钮。
 - 图标取官方 `dsh-client-ui-primitives`(StateDot/IconApi/IconInspect/Chevron),模块表缺席时降级自绘。
 
-## 配置(settings 命名空间 `shell-select`)
+## 配置(行条目 `shell-select`,settings 面同名 ns)
 
 ```yaml
 shell-select:
@@ -84,6 +88,8 @@ env 优先级(同键高右):内置覆盖集(NO_COLOR/PAGER/GIT_PAGER)< 条目 `e
       name: '@mzzsfy/dsh-shell-select'
     - id: shell-select/guard
       name: '@mzzsfy/dsh-shell-select/guard'
+    - id: shell-select/web
+      name: '@mzzsfy/dsh-shell-select/web'
 ```
 
 测试:`node --test "test/*.test.mjs"`(包目录内)。

package/cordis.patch.yml

@@ -1,43 +1,192 @@
 # shell-select bundle patch:Windows shell 链零感知接管(同构 dsh-llm-pi-gateway)。
-# 官方 tool-pwsh 与 pwsh-sandbox 行按 id 禁用,本包主行提供 ctx.shell 执行器、
-# shell 工具、settings 节与浏览器半区路由;卸载本 bundle 即 patch 消失,官方行
-# 自动复位。POSIX 官方 bash 链(tool-bash/bash-sandbox)一律不碰。
+# 官方 tool-pwsh 与 pwsh-sandbox 行【不再静态禁用】:主行 apply 落定后经
+# entry.update 运行时禁用(dsh-market 同款,内存态不持久),本包任意死法
+# (import 崩/apply 崩/被禁/卸载)下官方 pwsh 链保持启用自服务,系统不出现
+# shell 全灭窗口(不变式与场景见 运行时接管-BDD.md)。主行提供 ctx.shell
+# 执行器、shell 工具与 systemPrompt 段,web 行提供设置页数据通道,guard 行
+# 哨兵自愈(死窗=接管中主行被禁的内存残留)。
 #
 # 平台门控:本包全部 insert 行在非 win32 停用(host 半区 apply 内另有平台早退,
-# 双重防护)。官方行禁用两平台皆写 true:POSIX 上这两行本就被 dsh-base 平台
-# 表达式停用,重复写 true 为幂等;绝不可写 false,否则会在 POSIX 强行启用。
+# 双重防护)。POSIX 官方 bash 链(tool-bash/bash-sandbox)与本包零接触;官方
+# pwsh 两行在 POSIX 本就被 dsh-base 平台表达式停用,Linux 行为与无本包逐字
+# 一致。接管空间判定:官方两行 win32 平台默认 disabled=false(启用),与用户
+# 显式启用在行树不可区分,凡非 true 即接管空间;POSIX 显式启用场景被 apply
+# 平台早退拦截,不会越过宿主平台门控强启官方行。
 #
-# 死态窗口:市场 UI 开关只即时禁用主行(bundle 移出 bundles 仅下次 boot 生效),
-# 窗口内官方行仍被本 patch 禁用——guard 行(id 含 "/",市场行写入对其拒绝)
-# 探测死态后代挂官方插件自愈,任一方复活先卸代挂。
+# escape hatch(用户想用官方 pwsh 链):market 禁用 shell-select,或 user patch
+# 写 `- id: shell-select / disabled: true`——主行退场后官方行保持启用自服务
+# (接管中被禁由 guard 代挂),重启后官方自然回归;删除禁行重启即恢复接管。
 #
 # 哨兵自愈与复活让位语义逐项同构 packages/dsh-llm-pi-gateway 的 guard/takeover,
 # 差异仅两处:官方代挂对象为 tool-pwsh + pwsh-sandbox 两行;行配置读官方
 # `shell` settings 节(pwsh-sandbox 经其 Config 消费,保持官方 pwshPath 配置)。
 #
-# preset 面:web 面把 agent 平面后移到每会话 agent preset,内置 standard 预设
-# 在 win32 重新声明 tool-pwsh 行,bundle patch 对 preset 组合树不可达。收口方式:
-# 本包自带 preset(standard 全量副本 − tool-pwsh 行,见 presets/shell-select/),
-# 经 agent-presets 行覆写接入——roots 指向本包 presets 目录(default 'user' 承接
-# schema 缺省),default 在 win32 切到本包预设、POSIX 保持 standard(本包行在
-# POSIX 全停用,行为须与上游逐字一致)。路径表达式由 ctx.baseUrl(profile 目录)
-# 推 node_modules/@mzzsfy/dsh-shell-select/presets/:bundle 必经 profile node_modules
-# 解析(resolveBundleDir 顺序),本 patch 在执行即证目录在。default 仅为 settings
-# `agent-presets.default` 缺省(config.default 是其 base),用户显式选择恒优先;
-# 上游行更名/缺行时 patch 告警跳过,行为自然回落 standard。
-
-- id: pwsh-sandbox
-  disabled: true
-
-- id: tool-pwsh
-  disabled: true
-
-- id: agent-presets
-  name: '@deepseek-ai/dsh-agent-presets'
+# preset 面:0.1.7 起 agent 面整体移入预设(preset-* 声明行内联 roster,旧
+# agent-presets roots 挂载机制已移除)。本包 patch insert 自带预设声明
+# (standard 全量 − tool-pwsh 行,逐项同构 dsh-web-app presets/standard.patch.yml)
+# 并覆写 agent-preset-registry 的 default——win32 切到本包预设、POSIX 保持
+# standard(本包行在 POSIX 全停用,行为须与上游逐字一致)。用户显式选择恒优先;
+# 上游 standard 漂移由 test/preset-drift.test.mjs 守卫,升级后须对表。
+
+# ── 预设面(0.1.7 架构):声明本包预设并接管 default ─────────────────────────
+# 0.1.7 的 agent 面整体移入预设:web 表面在根组合树禁用全部 agent 工具行,
+# 由 preset-* 声明行(@deepseek-ai/dsh-agent-preset,config.plugins 内联 roster)
+# 决定每个会话的工具面。旧架构的 agent-presets 行(roots 目录挂载)已不存在,
+# 覆写它只会得到 "patch: entry not found" 且 default 保持 standard——standard
+# 内联 roster 的 tool-pwsh(win32 启用)即模型工具面,pwsh 未被接管。
+# 收口 = 两段:insert 本包预设声明(standard 全量 − tool-pwsh),覆写
+# agent-preset-registry 的 default(patch 语义为整体替换 config,须逐键重述)。
+# win32 default 切到本包预设;POSIX 保持 standard(本包行在 POSIX 全停用,
+# 行为须与上游逐字一致)。用户显式选择其他预设恒优先;官方 minimal/cordis/ptc
+# 预设自带 persistent pwsh 链,显式选用时不在接管范围(README 已标注)。
+
+- insert:
+    - id: preset-shell-select
+      name: '@deepseek-ai/dsh-agent-preset'
+      disabled: !!js process.platform !== 'win32'
+      config:
+        id: shell-select
+        name: Shell 管理
+        order: 2
+        plugins:
+          - id: persona
+            name: '@deepseek-ai/dsh-persona'
+            config:
+              suffix: Your working directory is {{cwd}}.
+              prefix: >-
+                You are a coding agent powered by the {{model}} model.
+          - id: agent-instructions
+            name: '@deepseek-ai/dsh-agent-instructions'
+            config:
+              maxBytes: 65536
+          - id: tool-bash
+            name: '@deepseek-ai/dsh-tool-bash'
+            disabled: !!js process.platform === 'win32'
+          - id: tool-fs
+            name: '@deepseek-ai/dsh-tool-fs'
+          - id: tool-fs-search
+            name: '@deepseek-ai/dsh-tool-fs-search'
+            config:
+              sampleOverCapGlobResults: false
+          - id: tool-jobs
+            name: '@deepseek-ai/dsh-tool-jobs'
+          - id: skill-filesystem
+            name: '@deepseek-ai/dsh-skill-filesystem'
+          - id: tool-skill
+            name: '@deepseek-ai/dsh-tool-skill'
+          - id: command-goal
+            name: '@deepseek-ai/dsh-command-goal'
+          - id: tool-goal
+            name: '@deepseek-ai/dsh-tool-goal'
+          - id: planning
+            name: cordis:group
+            group: true
+            isolate:
+              planMode: true
+            config:
+              - id: plan-mode
+                name: '@deepseek-ai/dsh-plan-mode'
+                config:
+                  section: |
+                    You are in plan mode. Stay in plan mode until exit_plan_mode succeeds or the user switches the session mode. Imperative language to implement changes means plan the implementation, not execute it. A user's conversational agreement — including an answer confirming something you asked — approves nothing and does not end plan mode; fold the confirmed decision into the plan and submit it through exit_plan_mode.
+
+                    Explore first. Use non-mutating reads, searches, static analysis, and checks to ground the plan in the actual repository. Do not edit or write files, change configuration, run formatters or code generation that rewrites tracked files, commit, or otherwise carry out the plan. Prefer existing functions and patterns over new machinery.
+
+                    The tool catalog stays the same across modes for request-cache stability. These plan-mode rules override any later tool description or guidance that suggests using mutation tools; those tools remain listed to keep the tool catalog unchanged. Do not use todo_write to track this planning phase: it tracks implementation after an approved plan, while the plan itself belongs in exit_plan_mode.
+
+                    Resolve discoverable facts by inspection. Use ask_user_question only for user-owned choices or material ambiguity that inspection cannot answer. Do not ask the user where code lives or how current behavior works when you can find out.
+
+                    Make the plan decision-complete: state the goal and success criteria; group implementation changes by subsystem; identify public API, schema, and data-flow changes; cover edge cases, failure modes, tests, acceptance criteria, and explicit assumptions. Keep it concise enough to review but detailed enough that another engineer can implement it without making design decisions.
+
+                    When ready, call exit_plan_mode with the complete plan markdown, starting with a # title. Make exit_plan_mode the only and final tool call in that assistant response: it presents the plan for approval, and implementation begins only in a later step after approval. Do not paste the final plan as a plain reply or ask "should I proceed?" through prose or ask_user_question. If review rejects it, incorporate the feedback and present again. If the review channel is unavailable or aborted, stay in plan mode and ask the user to switch modes manually; do not proceed with implementation.
+          - id: compaction
+            name: cordis:group
+            group: true
+            isolate:
+              compaction: true
+              toolResultPruner: true
+            config:
+              - id: compaction-basic
+                name: '@deepseek-ai/dsh-compaction-basic'
+              - id: command-compact
+                name: '@deepseek-ai/dsh-command-compact'
+              - id: tool-result-pruner
+                name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
+                config:
+                  thresholdChars: 8192
+                  headChars: 4096
+                  tailChars: 1024
+          - id: delegation
+            name: cordis:group
+            group: true
+            isolate:
+              workflowEngine: true
+            config:
+              - id: tool-subagent-control
+                name: '@deepseek-ai/dsh-tool-subagent-control'
+              - id: tool-subagent-list-agents
+                name: '@deepseek-ai/dsh-tool-subagent-control/list-agents'
+              - id: tool-subagent
+                name: '@deepseek-ai/dsh-tool-subagent'
+                config:
+                  provider: spawn
+                  toolName: subagent
+                  modelSelectionSettings: true
+                  backgroundMode: continuable
+              - id: tool-subagent-fork
+                name: '@deepseek-ai/dsh-tool-subagent'
+                config:
+                  provider: fork
+                  toolName: subagent_fork
+                  backgroundMode: continuable
+              - id: tool-subagent-codex
+                name: '@deepseek-ai/dsh-tool-subagent'
+                disabled: true
+                config:
+                  provider: codex
+                  toolName: subagent_codex
+                  backgroundMode: one-shot
+                  maxDepth: provider-managed
+              - id: tool-subagent-claude-code
+                name: '@deepseek-ai/dsh-tool-subagent'
+                disabled: true
+                config:
+                  provider: claude-code
+                  toolName: subagent_claude_code
+                  backgroundMode: one-shot
+                  maxDepth: provider-managed
+              - id: workflow-ptc
+                name: '@deepseek-ai/dsh-workflow-ptc'
+                config:
+                  provider: spawn
+              - id: tool-workflow
+                name: '@deepseek-ai/dsh-tool-workflow'
+              - id: tool-ralph
+                name: '@deepseek-ai/dsh-tool-ralph'
+                disabled: true
+                config:
+                  subagentProvider: spawn
+                  maxRounds: 64
+          - id: tool-ask-user
+            name: '@deepseek-ai/dsh-tool-ask-user'
+          - id: tool-todo
+            name: '@deepseek-ai/dsh-tool-todo'
+            config:
+              allowParallelInProgress: true
+          - id: tool-web
+            name: '@deepseek-ai/dsh-tool-web'
+            config:
+              fetch: true
+              searchTimeoutMs: 60000
+          - id: present
+            name: '@deepseek-ai/dsh-tool-present'
+          - id: tool-plugin-manager
+            name: '@deepseek-ai/dsh-plugin-manager/tools'
+            disabled: true
+
+- id: agent-preset-registry
   config:
     default: !!js "process.platform === 'win32' ? 'shell-select' : 'standard'"
-    roots:
-      - path: !!js decodeURIComponent(new URL('node_modules/@mzzsfy/dsh-shell-select/presets/', ctx.baseUrl).pathname).replace(/^\/([A-Za-z]:)/, '$1')
 
 - insert:
     - id: shell-select
@@ -46,3 +195,6 @@
     - id: shell-select/guard
       name: '@mzzsfy/dsh-shell-select/guard'
       disabled: !!js process.platform !== 'win32'
+    - id: shell-select/web
+      name: '@mzzsfy/dsh-shell-select/web'
+      disabled: !!js process.platform !== 'win32'

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@mzzsfy/dsh-shell-select",
   "description": "Windows shell 接管:替换默认 pwsh 工具为可配置多客户端的 shell 工具(git bash/WSL/cmd/pwsh,自定义路径,默认客户端,模型按名选择)",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "type": "module",
-  "main": "src/executor.mjs",
+  "main": "src/index.js",
   "exports": {
-    ".": "./src/executor.mjs",
+    ".": "./src/index.js",
+    "./executor": "./src/executor.mjs",
     "./guard": "./src/guard.js",
+    "./web": "./src/web-routes.mjs",
     "./client": "./src/client.js",
     "./package.json": "./package.json"
   },
@@ -23,7 +25,8 @@
         "@deepseek-ai/dsh-client-ui-primitives",
         "@deepseek-ai/dsh-client-ui-conversation"
       ]
-    }
+    },
+    "hostMin": "0.1.7-rc.1"
   },
   "scripts": {
     "test": "node --test \"test/*.test.mjs\"",
@@ -39,27 +42,30 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-agent-preset": ">=0.1.7-rc.1",
     "@deepseek-ai/dsh-http-proxy": ">=0.1.5-rc.2",
     "@deepseek-ai/dsh-jobs": ">=0.1.5-rc.2",
     "@deepseek-ai/dsh-llm": ">=0.1.5-rc.2",
     "@deepseek-ai/dsh-sandbox": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": ">=0.1.7-rc.1",
     "@deepseek-ai/dsh-shell": ">=0.1.5-rc.2",
     "@deepseek-ai/dsh-subprocess": ">=0.1.5-rc.2",
     "@deepseek-ai/dsh-timeout": ">=0.1.5-rc.2",
     "@deepseek-ai/dsh-tools": ">=0.1.5-rc.2",
-    "@deepseek-ai/schemastery": "^3.18.2"
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-http-proxy": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-jobs": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-shell": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-subprocess": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-timeout": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-http-proxy": "0.1.5-rc.2 || 0.1.5-rc.3",
+    "@deepseek-ai/dsh-jobs": "0.1.5-rc.2 || 0.1.5-rc.3",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2 || 0.1.5-rc.3",
+    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.2 || 0.1.5-rc.3",
+    "@deepseek-ai/dsh-scope": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-shell": "0.1.5-rc.2 || 0.1.5-rc.3",
+    "@deepseek-ai/dsh-subprocess": "0.1.5-rc.2 || 0.1.5-rc.3",
+    "@deepseek-ai/dsh-timeout": "0.1.5-rc.2 || 0.1.5-rc.3",
     "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
-    "@deepseek-ai/schemastery": "3.18.2",
+    "@deepseek-ai/schemastery": "3.18.4",
     "js-yaml": "4.3.2"
   },
   "files": [

package/src/apply-state.mjs

@@ -1,11 +1,15 @@
 // apply 生命周期旗标:guard 据此识别本行功能性停摆。
 // pending = apply 进行中或中途崩溃;active = 全部装配落定;inactive = 声明式早退。
 // 中途崩溃停留 pending,guard 对 pending 保守不代挂(不越权重启他人)。
+// takeoverTrace 记录运行时接管序列的事件轨迹(guard-status 只读暴露,排障用),
+// append 式:决策/禁用/退场/挂载/回滚各节点一行,每次 apply 重置。
 
 let state = 'pending'
+let takeoverTrace = []
 
 export function beginShellSelectApply() {
   state = 'pending'
+  takeoverTrace = []
 }
 
 export function endShellSelectApplyActive() {
@@ -19,3 +23,12 @@ export function endShellSelectApplyInactive() {
 export function shellSelectApplyState() {
   return state
 }
+
+export function recordTakeover(event) {
+  takeoverTrace = [...takeoverTrace, { at: new Date().toISOString(), ...event }]
+  if (takeoverTrace.length > 32) takeoverTrace = takeoverTrace.slice(-32)
+}
+
+export function shellSelectTakeoverTrace() {
+  return takeoverTrace
+}