@xiaoso/dsh-tool-plus 0.1.9 → 0.1.10-beta.1

package/presets/tool-plus-standard.patch.yml

@@ -0,0 +1,158 @@
+# Agent preset `tool-plus-standard` — declared as one `@deepseek-ai/dsh-agent-preset` row.
+#
+# GENERATED by scripts/build-preset-patches.mjs from
+# presets/baseline/standard.patch.yml (the shipped `standard` composition of the dsh
+# release this plugin pins). Do not edit by hand: the generator is what keeps
+# our delta honest across dsh upgrades, and tests/unit/preset-patches.spec.ts
+# fails when this file and the generator disagree.
+#
+# Delta over the baseline:
+#   - tool-bash, tool-fs, tool-fs-search are removed — the host plane already serves them
+#     through this plugin's `cordis.patch.yml`, and mounting them again in the
+#     agent plane would create a per-session shadow instance
+#   - tool-pwsh is forced `disabled: true` (neither Tool Plus preset enables pwsh)
+#   - an inert `tool-plus` row documents where an agent-plane plugin row would go
+#   - everything else is the baseline, byte-equivalent
+#
+# A profile patch overriding this row BY THE ROW ID BELOW replaces the whole
+# `config`, so an override must restate `id`, `name`, `description`, `order` and
+# `plugins`. That is what `@xiaoso/dsh-tool-plus`'s settings panel writes.
+- insert:
+    - id: preset-tool-plus-standard
+      name: '@deepseek-ai/dsh-agent-preset'
+      config:
+        id: tool-plus-standard
+        name: Tool Plus 标准增强版
+        description: 标准模式全部能力 + tool-plus 增强：文件/Shell 工具集替换为 @xiaoso/dsh-tool-plus（移植 oh-my-pi：read 单参数 file_path 内联行选择器、edit 三模式、bash/grep/glob）；pwsh 默认禁用。
+        order: 20
+        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-plus
+            name: '@xiaoso/dsh-tool-plus'
+            disabled: true
+          - id: tool-pwsh
+            name: '@deepseek-ai/dsh-tool-pwsh'
+            disabled: true
+          - 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

package/lib/types/presets/install.d.ts

@@ -1,44 +0,0 @@
-import { type PresetDeps } from './paths.ts';
-import { type PresetChange } from './rewrite.ts';
-/** 一次预设动作的结果：`changed: false` 表示一个字节都没写（含幂等与失败）。 */
-export interface PresetInstallResult {
-    ok: boolean;
-    changed: boolean;
-    /** 失败/无变化的原因（给人看的一句话）。 */
-    reason?: string;
-    /** 本次落下的备份文件绝对路径（内容变化且有改写前内容时才有）。 */
-    backupPath?: string;
-    /** 实际改动清单（升级 = 冲突行改动；重置 = 整份覆盖，故为空）。 */
-    changes: PresetChange[];
-}
-/**
- * 启动补缺：`<dshHome>/.agent-presets/<id>` 目录不存在时，从包内模板整份写入
- * （`mkdir -p` + 模板目录里的每个文件）。
- *
- * 目录已存在 → 一律不碰（含"目录存在但缺文件"的情形，那种只在设置页状态里
- * 显示）。整个流程每个 id 单独 try/catch，**永不抛**。
- * @param deps - 路径注入（fs 层测试用）。
- * @returns 新建成功的 id 列表与失败原因列表（顺序均为 {@link DEFAULT_PRESET_IDS}）。
- */
-export declare function ensureDefaultPresets(deps?: PresetDeps): {
-    created: string[];
-    failed: Array<{
-        id: string;
-        reason: string;
-    }>;
-};
-/**
- * 用户在设置页对某个预设执行的动作。
- *
- * - `upgrade`：只改官方冲突行（面板上叫「最小更新」）；
- * - `reset`：用**所选模板**整份覆盖该预设（先备份）。模板由 `templateId` 指定，
- *   缺省才是同名模板 —— 面板总是把用户挑的那份模板传进来。
- *
- * 永不抛：任何异常收进 `ok: false` + `reason`。
- * @param id - 预设 id（目录名）。
- * @param action - `upgrade` 或 `reset`。
- * @param deps - 路径注入（fs 层测试用）。
- * @param templateId - `reset` 的模板来源（默认同名模板）。
- * @returns 结果（`changed: false` = 一个字节都没写）。
- */
-export declare function applyPresetAction(id: string, action: 'upgrade' | 'reset', deps?: PresetDeps, templateId?: string): PresetInstallResult;

package/lib/types/presets/paths.d.ts

@@ -1,41 +0,0 @@
-/** 用户根预设目录名（`dsh-agent-presets` 的 `USER_PRESET_DIR` 同值）。 */
-export declare const PRESET_DIR_NAME = ".agent-presets";
-/** 让一个目录成为 preset 的组合文件名。 */
-export declare const COMPOSITION_FILE_NAME = "agent.cordis.yml";
-/** 组合文件旁的可选展示元数据文件名。 */
-export declare const METADATA_FILE_NAME = "preset.yml";
-/**
- * 本插件随包的两个预设 id（启动补缺只认它们）。名单的单一来源是共享契约
- * 模块 {@link BUNDLED_PRESET_IDS}，这里只做本模块语义下的别名。
- */
-export declare const DEFAULT_PRESET_IDS: readonly string[];
-/**
- * 路径解析的注入点：宿主半的每个公开函数都收它，fs 层测试据此把
- * `<dshHome>` 与包根指到临时目录，避免任何写死路径。
- */
-export interface PresetDeps {
-    /** 覆盖 `<dshHome>`；缺省走 `$DSH_HOME` → `~/.dsh`。 */
-    homeDir?: string;
-    /** 覆盖插件包根（模板目录的父目录）；缺省按 `import.meta.url` 向上探。 */
-    packageRoot?: string;
-}
-/**
- * 解析 `<dshHome>`。优先级：注入的 `homeDir` → `$DSH_HOME`（trim 后非空）
- * → `~/.dsh`，与官方 `@deepseek-ai/dsh-home-paths` 的 `defaultDshHome()` 同规则。
- * @param deps - 可选的注入覆盖。
- * @returns 绝对路径的 harness home。
- */
-export declare function dshHomeDir(deps?: PresetDeps): string;
-/** 用户根预设目录：`<dshHome>/.agent-presets`（所有 profile 共享的写入根）。 */
-export declare function userPresetRoot(deps?: PresetDeps): string;
-/** 某个预设的用户根目录：`<dshHome>/.agent-presets/<id>`。 */
-export declare function userPresetDir(id: string, deps?: PresetDeps): string;
-/**
- * 插件包根：注入的 `packageRoot` 优先，否则按 `import.meta.url` 向上探。
- * 构建后入口是 `lib/index.mjs`（`..` 即包根），源码期是
- * `src/presets/paths.ts`（`../..` 即包根），两个候选都试、取同时含
- * `package.json` 与 `presets/` 的那个；都不命中时返回 `../..` 候选。
- */
-export declare function packageRootDir(deps?: PresetDeps): string;
-/** 包内模板目录：`<包根>/presets/<id>`。 */
-export declare function templateDir(id: string, deps?: PresetDeps): string;

package/lib/types/presets/rewrite.d.ts

@@ -1,86 +0,0 @@
-/**
- * preset 组合改写：纯函数，文本进文本出，零 I/O。
- *
- * 一个预设要"支持本插件的工具"，只需让官方 4 个冲突行 id 处于「不存在」或
- * `disabled: true` 状态（插件已在宿主面全局接管这 4 个工具；预设里再挂一份
- * 会造成 per-session 影子实例）。本模块只做这一件事：
- *
- * - 只认**顶层**行 `- id: <target>`（`-` 在第 0 列），嵌套子行一律不碰；
- * - 行块已有 `disabled: true` → no-op；`disabled: false`（或任何非 `true`
- *   标量）→ 就地改成 `true`；没有 `disabled` → 在行块末尾追加一行
- *   `  disabled: true`（缩进与行内其它键对齐）；行块不存在 → 不动；
- * - 注释、空行、缩进、CRLF/LF、YAML 顺序、用户的本地调参全部逐字节保留；
- * - 输出与输入逐字节相同时 `changes` 为空——调用方以字节相等判定是否写盘
- *   （preset 代际以 `agent.cordis.yml` 的 mtime 为键，白写一次就白造一代）；
- * - 文本不构成顶层行列表 → `shape: 'unrecognized'`，一律不改写。
- *
- * `PresetChange.action` 的 `'absent'` 供 RPC 摘要层描述"这行本来就不挂"，
- * 改写本身只报告真实发生的改动（否则"幂等时 changes 为空"不成立）。
- * @module @xiaoso/dsh-tool-plus/presets/rewrite
- */
-/** 默认冲突行 id：官方 standard / ptc / cordis 挂的 4 个官方工具行。 */
-export declare const PRESET_CONFLICT_IDS: readonly string[];
-/** 一次改写实际发生的一处改动。 */
-export interface PresetChange {
-    /** 行 id（`- id: <id>` 的值）。 */
-    id: string;
-    /** `disabled` = 行块末尾追加了禁用键；`flipped` = 既有禁用键被改成 `true`。 */
-    action: 'disabled' | 'flipped' | 'absent';
-}
-/** 改写结果：最终文本 + 实际改动清单。 */
-export interface PresetRewriteResult {
-    text: string;
-    changes: PresetChange[];
-}
-/** 只读判定：给设置页状态用。 */
-export interface PresetAnalysis {
-    /** 仍挂着冲突行的 id（缺 `disabled` 或值不是 `true`），按 conflictIds 顺序。 */
-    conflicts: string[];
-    /** 无冲突且形状可识别。 */
-    clean: boolean;
-    /** `unrecognized` = 文本不构成顶层行列表，一律不处理。 */
-    shape: 'ok' | 'unrecognized';
-}
-/**
- * 把官方冲突行改写成"不存在或 disabled: true"。
- *
- * `changes` 只含真实发生的改动（幂等跑第二次必为空）；`shape: 'unrecognized'`
- * 时原文本原样返回。
- * @param text - `agent.cordis.yml` 的原文。
- * @param conflictIds - 冲突行 id，缺省 {@link PRESET_CONFLICT_IDS}。
- * @returns 最终文本与实际改动清单。
- */
-export declare function rewritePresetComposition(text: string, conflictIds?: readonly string[]): PresetRewriteResult;
-/**
- * 只读判定：该组合还有哪些冲突行没被禁用。
- * @param text - `agent.cordis.yml` 的原文。
- * @param conflictIds - 冲突行 id，缺省 {@link PRESET_CONFLICT_IDS}。
- * @returns 冲突清单、是否干净、形状结论。
- */
-export declare function analyzePresetComposition(text: string, conflictIds?: readonly string[]): PresetAnalysis;
-/** 一个顶层行块的只读视图：id + 它自己的键值对（供比差/展示，不用于改写）。 */
-export interface PresetRowView {
-    id: string;
-    /** 行内顶层键值对，顺序与文件一致；值为去引号、去尾随注释后的原文。 */
-    keys: {
-        key: string;
-        value: string;
-    }[];
-    /**
-     * 整个行块按缩进展开出的叶子（点号路径，列表项带 `[i]`），供比差用。
-     * 只比顶层键是不够的：真实漂移常常藏在 `config.thresholdRatio` 这类嵌套键里。
-     */
-    leaves: {
-        path: string;
-        value: string;
-    }[];
-}
-/**
- * 只读读出顶层行的键值对与展开叶子。形状不可识别时返回 undefined（不猜、不修）。
- *
- * 与 {@link analyzePresetComposition} 共用同一套扫描器（`splitLines` /
- * `detectShape` / `scanRows`）：解析只有一份，差异视图与改写视图永远同源。
- * @param text - `agent.cordis.yml` 原文。
- * @returns 逐行视图，或形状不可识别时的 undefined。
- */
-export declare function readPresetRows(text: string): PresetRowView[] | undefined;

package/presets/install-presets.mjs

@@ -1,143 +0,0 @@
-#!/usr/bin/env node
-/**
- * Install the Tool Plus agent-preset templates into a DSH home.
- *
- * Everything preset-related lives in THIS one folder:
- *
- *   presets/
- *     install-presets.mjs      <- this script (self-locating, no cwd dependency)
- *     tool-plus-standard/      <- 标准增强版 preset template
- *     tool-plus-ptc/           <- PTC 增强版 preset template
- *
- * Each template directory is copied verbatim into
- * `${DSH_HOME:-~/.dsh}/.agent-presets/<id>/` — the roster folder every running
- * DSH scans for agent presets. New/changed presets are picked up on the next
- * Host restart.
- *
- * RE-ENTRANT BY DESIGN (safe to run any number of times):
- *
- *   target file missing              -> install it
- *   target file byte-identical       -> report "up-to-date", touch nothing
- *   target file differs (user edit)  -> SKIP and keep the local edit,
- *                                       unless --force restores the canonical copy
- *   unknown extra files in target    -> left alone (never destroys unrelated data)
- *
- * Exit codes: 0 = all targets installed or up-to-date;
- *             1 = at least one target was skipped (stale local edits exist —
- *                 rerun with --force to normalize) or a hard error occurred.
- *
- * Usage:
- *   node presets/install-presets.mjs [--force] [--dry-run] [--home <dir>]
- *
- *   --force       overwrite differing target files with the packaged copies
- *   --dry-run     report what would happen; write nothing (exit code still reflects skips)
- *   --home <dir>  override the DSH home (defaults to $DSH_HOME, then ~/.dsh);
- *                 use this to try the installer against an isolated home
- */
-
-import { readdirSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const scriptDir = dirname(fileURLToPath(import.meta.url));
-const PRESET_ROOT = "agent-presets";
-
-/* ── argument parsing ────────────────────────────────────────────────────── */
-
-const args = process.argv.slice(2);
-/** @type {{ force: boolean, dryRun: boolean, home?: string }} */
-const options = { force: false, dryRun: false };
-for (let i = 0; i < args.length; i++) {
-  const arg = args[i];
-  if (arg === "--force") options.force = true;
-  else if (arg === "--dry-run" || arg === "-n") options.dryRun = true;
-  else if (arg === "--home") {
-    const value = args[++i];
-    if (value === undefined) fail("--home requires a directory argument");
-    options.home = value;
-  } else if (arg === "--help" || arg === "-h") {
-    console.log(readFileSync(new URL(import.meta.url), "utf8").match(/\/\*\*[\s\S]*?\*\//)?.[0]
-      ?.replace(/^\/\*\*/, "").replace(/\*\/$/, "").replace(/^\s*\* ?/gm, "").trim() ?? "");
-    process.exit(0);
-  } else fail(`unknown argument: ${arg}`);
-}
-
-function fail(message) {
-  console.error(`install-presets: ${message}`);
-  process.exit(1);
-}
-
-/* ── locate source templates and target home ─────────────────────────────── */
-
-const sources = readdirSync(scriptDir, { withFileTypes: true })
-  .filter((entry) => entry.isDirectory())
-  .map((entry) => join(scriptDir, entry.name))
-  .filter((dir) => exists(join(dir, "preset.yml")) && exists(join(dir, "agent.cordis.yml")))
-  .sort();
-if (sources.length === 0) fail(`no preset template directories found beside this script (${scriptDir})`);
-
-const dshHome = resolve(options.home ?? process.env.DSH_HOME ?? join(homedir(), ".dsh"));
-const targetRoot = join(dshHome, `.${PRESET_ROOT}`);
-
-/* ── re-entrant install: per-file copy / up-to-date / skip (+ --force) ───── */
-
-let skipped = 0;
-console.log(`DSH home : ${dshHome}`);
-console.log(`Target   : ${targetRoot}${options.dryRun ? "  (dry-run, nothing written)" : ""}`);
-console.log("");
-
-for (const sourceDir of sources) {
-  const presetId = sourceDir.slice(scriptDir.length + 1).replaceAll("\\", "/");
-  const targetDir = join(targetRoot, presetId);
-  const files = readdirSync(sourceDir).sort();
-
-  mkdirSync(targetDir, { recursive: true });
-
-  for (const file of files) {
-    const sourcePath = join(sourceDir, file);
-    const targetPath = join(targetDir, file);
-    const sourceBytes = readFileSync(sourcePath);
-
-    if (exists(targetPath)) {
-      const targetBytes = readFileSync(targetPath);
-      if (sourceBytes.equals(targetBytes)) {
-        report(presetId, file, "up-to-date");
-        continue;
-      }
-      if (!options.force) {
-        report(presetId, file, "SKIPPED (local edit preserved; rerun with --force)");
-        skipped++;
-        continue;
-      }
-      report(presetId, file, "restored (--force)");
-      if (!options.dryRun) writeFileSync(targetPath, sourceBytes);
-      continue;
-    }
-    report(presetId, file, "installed");
-    if (!options.dryRun) writeFileSync(targetPath, sourceBytes);
-  }
-}
-
-console.log("");
-if (skipped > 0) {
-  console.log(`${skipped} file(s) skipped: local edits differ from the packaged templates.`);
-  console.log("Rerun with --force to overwrite them with the canonical copies.");
-  process.exit(1);
-}
-console.log("All presets installed or already up-to-date.");
-
-/* ── helpers ─────────────────────────────────────────────────────────────── */
-
-function exists(path) {
-  try {
-    readFileSync(path);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function report(presetId, file, action) {
-  console.log(`  ${presetId}/${file}: ${action}`);
-}

package/presets/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "@xiaoso/dsh-tool-plus-presets",
-  "version": "0.1.8",
-  "description": "RETIRED (2026-09-20): the preset templates now ship inside @xiaoso/dsh-tool-plus and are installed automatically on first start. This package no longer receives new versions. Do not install it separately.",
-  "license": "MIT",
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "agent-preset",
-    "preset-installer",
-    "cli",
-    "coding-agent",
-    "agent-tools"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xiaoso456/dsh-tool-plus.git",
-    "directory": "presets"
-  },
-  "homepage": "https://github.com/xiaoso456/dsh-tool-plus#readme",
-  "bugs": {
-    "url": "https://github.com/xiaoso456/dsh-tool-plus/issues"
-  },
-  "type": "module",
-  "private": true,
-  "publishConfig": {
-    "access": "public",
-    "tag": "deprecated-do-not-publish"
-  },
-  "bin": {
-    "dsh-tool-plus-presets": "./install-presets.mjs"
-  },
-  "files": [
-    "install-presets.mjs",
-    "tool-plus-standard",
-    "tool-plus-ptc"
-  ],
-  "engines": {
-    "node": ">=20"
-  }
-}