@carljia/omd-dsh 0.1.7 → 0.1.8

package/README.md

@@ -4,11 +4,13 @@ OMD 理念的 DSH 插件：两个 cordis 行 + 7 个模式 preset + 同步 CLI
 
 ## 分发：bundle + boot 行
 
-包声明 `dsh.bundle.patch` → `cordis.patch.yml`，后者注入宿主行 `@carljia/omd-dsh/boot`。该行在 profile 启动时执行与 `omd-dsh sync` 相同的内核（`lib/sync.js`）：定位 harness、渲染并复制 7 个 preset 与 `.omd-vendor/` 行模块、把行模块的 `@deepseek-ai/*` 导入改写为 harness 树的 `file://` URL、首次生成 `omd-matrix.json`。全程幂等、hash 保护、不覆盖本地修改。
+包声明 `dsh.bundle.patch` → `cordis.patch.yml`，后者注入宿主行 `@carljia/omd-dsh/boot`。该行在 profile 启动时执行与 `omd-dsh sync` 相同的内核（`lib/sync.js`）：渲染并复制 7 个 preset 与 `.omd-vendor/` 行模块、首次生成 `omd-matrix.json`。全程幂等、hash 保护、不覆盖本地修改。
+
+`.omd-vendor/` 里的行模块是**自包含 bundle**（`scripts/postbuild.mjs` 用 esbuild 把 schemastery / dsh-tools / dsh-llm / dsh-subagent 全部打进模块，唯一的例外是 `shared.js`——omd-mode 与 omd-task 共享的按 agent 键控状态，作为相对兄弟模块保持单一实例）。行模块不含任何 `@deepseek-ai/*` 导入，因此 sync **不需要知道 harness 装在哪里**，也不会出现"导入指向的树与运行进程不一致"导致的挂载失败——无论 DSH 从 npx 缓存、全局 npm 还是 profile bundles 加载 agent 机制都能工作。preset 组合里其余裸包名行（如 `@deepseek-ai/dsh-persona`）由 harness 的 loader 在运行时按宿主 base 解析。
 
 ## 行：omd-mode
 
-按模式（agent preset）固定模型路由。仅限 preset 作用域内挂载（无作用域挂载直接报错）。
+按模式（agent preset）固定模型路由。行模块是自包含 bundle，不再做 scope 守卫（bundle 内自带的 dsh-scope 副本读不到 harness 实例写入的 kScope Symbol，守卫会误报——见 docs/ARCHITECTURE.md）；请按 preset 组合挂载，误挂到全局组合会导致进程级钉模型。
 
 | 配置字段 | 含义 |
 |---|---|
@@ -24,7 +26,7 @@ OMD 理念的 DSH 插件：两个 cordis 行 + 7 个模式 preset + 同步 CLI
 1. 入口选择 == 矩阵模型 → 钉住矩阵模型（无操作）；
 2. 会话尚无任何请求（blank）且入口选择 == 挂载时的部署默认模型 → 视为未选择，钉住矩阵模型；
 3. 会话已跑过请求且刚发生 preset 切换（/mode 或 UI 选择，日志中 agent-preset/selected 在最后一次 request/header 之后）且入口选择 == 切换前的路由 → 新模式认领矩阵模型；
-4. 其余情况 → 入口选择与矩阵模型不同 = 用户显式切换：请求与 persona 变量均保持用户选择，本行在作用域 ctx 上记录 `omdModeOverride`（provider/model），omd-task 行据此把 deep tier 路由到用户选择的模型。
+4. 其余情况 → 入口选择与矩阵模型不同 = 用户显式切换：请求与 persona 变量均保持用户选择，本行在共享状态 `shared.js`（按顶层 agent 对象为键的 WeakMap）上记录用户选择，omd-task 行据此把 deep tier 路由到用户选择的模型。
 
 模型体验：persona 文本每次请求固定携带实际路由模型的声明；模式模型路由在 agent 生命周期内稳定（KV 前缀稳定）。
 
@@ -43,19 +45,19 @@ tier 差异化子代理委派（等价 OMD 的 task(category=…)）。仅限 pr
 
 模型可见参数：description（展示名）、prompt、tier（枚举见工具描述）、run_in_background（仅 continuable 模式）。工具描述枚举各 tier 的 hint 与模型，模型据此选型。
 
-**deep tier 与用户模型覆盖**：用户在 UI 显式切换模型后（omd-mode 让路并记录 `ctx.omdModeOverride`），名为 `deep` 的 tier 改用用户选择的模型（provider/model 整体替换），其余 tier 保持矩阵配置。
+**deep tier 与用户模型覆盖**：用户在 UI 显式切换模型后（omd-mode 让路并在 `shared.js` 里记录用户选择），名为 `deep` 的 tier 改用用户选择的模型（provider/model 整体替换），其余 tier 保持矩阵配置。
 
 ## CLI：omd-dsh
 
 ```
-omd-dsh <command> [--harness <路径>] [--dry-run]
+omd-dsh <command> [--dry-run]
 ```
 
-- `omd-dsh sync` — 把 presets/ 与 vendored 行模块同步到 `<DSH_HOME>/.agent-presets/`（hash 保护、orphan 报告、非管理目录零操作）。每个 preset 的 omd-mode / omd-task 行由用户矩阵 `<DSH_HOME>/omd-matrix.json` 渲染。
+- `omd-dsh sync` — 把 presets/ 与 vendored 行模块同步到 `<DSH_HOME>/.agent-presets/`（hash 保护、orphan 报告、非管理目录零操作）。每个 preset 的 omd-mode / omd-task 行由用户矩阵 `<DSH_HOME>/omd-matrix.json` 渲染。不需要任何 harness 路径配置。
 - `omd-dsh setup` — 交互式向导：先读取 DSH 已有模型，再引导逐模式/逐 tier 选择模型，写回 `<DSH_HOME>/omd-matrix.json` 并可选立即同步。
 - `omd-dsh models` — 打印发现的 DSH 模型目录（非交互）。
 
-细节见 docs/ARCHITECTURE.md 的「vendored 分发与跨树符号风险」。
+细节见 docs/ARCHITECTURE.md 的「vendored 分发与自包含 bundle」。
 
 ## 集中配置：<DSH_HOME>/omd-matrix.json
 
@@ -64,19 +66,20 @@ omd-dsh <command> [--harness <路径>] [--dry-run]
 ## 开发
 
 ```bash
-npm install     # 触发 build（tsc + postbuild）
-npm test        # vitest，39 个测试
+npm install     # 触发 build（tsc + esbuild 打包自包含 bundle）
+npm test        # vitest 全量测试
 npm pack        # prepack 自动重建，产出 tgz
 ```
 
-测试桩在 test/stubs/（dsh-scope/dsh-tools/dsh-subagent 的轻量替身），不依赖真实 harness。
+测试桩在 test/stubs/（dsh-tools/dsh-subagent 的轻量替身），不依赖真实 harness。
 
 
 ### 子代理透传语义
 
 omd-mode 对 subagentDepth > 0 的子代理一律透传（不覆盖 provider/model/变量）：
 omd-task 的 tier 模型通过显式 agentOptions 生效；顶层 agent 才被钉到模式模型
-（除非用户显式切换模型——此时顶层跟随用户选择，deep tier 通过 `ctx.omdModeOverride` 同步）。
+（除非用户显式切换模型——此时顶层跟随用户选择，deep tier 通过 `shared.js` 里
+按 agent 记录的覆盖值同步）。
 这保证「强模型顶层 + tier 差异化子代理」的优先级正确。
 
 ### toolFilter 注意

package/lib/boot.d.ts

@@ -4,12 +4,12 @@
  * omd-dsh bundle boot row: materialize the 7 OMD agent presets into the user
  * preset root (<DSH_HOME>/.agent-presets) when the profile boots, so
  * "dsh plugin add @carljia/omd-dsh" + a restart is the whole install — no
- * manual "omd-dsh sync" needed.
+ * manual "omd-dsh sync" and no harness configuration needed.
  *
  * The sync is idempotent (hash-aware, conflict-protected) and reuses the same
- * core as the "omd-dsh sync" CLI. The harness node_modules is located from
- * this module's own resolution path first (the profile exposes the harness
- * tree via its flat module fallback), then through the CLI's detection chain.
+ * core as the "omd-dsh sync" CLI. The vendored rows are self-contained
+ * bundles (see scripts/postbuild.mjs), so the sync needs no harness tree
+ * knowledge and cannot break on harness/profile layout differences.
  *
  * A sync failure is logged, not thrown: a broken omd-dsh should never brick
  * the host's boot.

package/lib/boot.js

@@ -1,16 +1,16 @@
-import { runSync, resolveHarnessFromSelf, resolveHarness } from "./sync.js";
+import { runSync } from "./sync.js";
 /**
  * @module @carljia/omd-dsh/boot
  *
  * omd-dsh bundle boot row: materialize the 7 OMD agent presets into the user
  * preset root (<DSH_HOME>/.agent-presets) when the profile boots, so
  * "dsh plugin add @carljia/omd-dsh" + a restart is the whole install — no
- * manual "omd-dsh sync" needed.
+ * manual "omd-dsh sync" and no harness configuration needed.
  *
  * The sync is idempotent (hash-aware, conflict-protected) and reuses the same
- * core as the "omd-dsh sync" CLI. The harness node_modules is located from
- * this module's own resolution path first (the profile exposes the harness
- * tree via its flat module fallback), then through the CLI's detection chain.
+ * core as the "omd-dsh sync" CLI. The vendored rows are self-contained
+ * bundles (see scripts/postbuild.mjs), so the sync needs no harness tree
+ * knowledge and cannot break on harness/profile layout differences.
  *
  * A sync failure is logged, not thrown: a broken omd-dsh should never brick
  * the host's boot.
@@ -32,12 +32,7 @@ function log(ctx, level, message) {
 }
 export async function apply(ctx) {
     try {
-        const harness = resolveHarnessFromSelf() ?? resolveHarness({ harness: undefined, dryRun: false, verbose: false });
-        if (harness === undefined) {
-            log(ctx, "error", "omd-dsh: cannot locate the DSH harness node_modules — presets were not synced. Run `omd-dsh sync --harness <path>` once to point it at the harness, then restart.");
-            return;
-        }
-        await runSync({ harness: undefined, dryRun: false, verbose: false }, harness, (message) => log(ctx, "info", message));
+        await runSync({ dryRun: false, verbose: false }, (message) => log(ctx, "info", message));
     }
     catch (error) {
         log(ctx, "error", "omd-dsh: preset sync failed: " + (error instanceof Error ? error.message : String(error)));

package/lib/cli.js

@@ -2,7 +2,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { createInterface } from "node:readline/promises";
-import { runSync, resolveHarness, loadMatrix, saveMatrix, dshHome, MATRIX_PATH, } from "./sync.js";
+import { runSync, loadMatrix, saveMatrix, dshHome, MATRIX_PATH, } from "./sync.js";
 /**
  * omd-dsh CLI
  *
@@ -15,7 +15,9 @@ import { runSync, resolveHarness, loadMatrix, saveMatrix, dshHome, MATRIX_PATH,
  *
  * The sync core lives in ./sync.js and is also invoked automatically by the
  * bundle boot row (lib/boot.js), so `dsh plugin add @carljia/omd-dsh` + restart
- * installs the presets without this CLI.
+ * installs the presets without this CLI. The vendored rows are self-contained
+ * bundles: no `--harness` flag exists because the sync needs no harness tree
+ * knowledge.
  */
 function usage() {
     return [
@@ -25,7 +27,6 @@ function usage() {
         "    setup    interactive: discover DSH models, then guide per-mode/tier model selection",
         "    models   print the discovered DSH model catalog",
         "  options:",
-        "    --harness <path>  node_modules dir of the DSH harness install (saved locally after first use; otherwise auto-detected)",
         "    --dry-run         (sync) print planned writes without touching the filesystem",
         "    --verbose         (sync) print per-file detail",
     ].join("\n");
@@ -73,7 +74,7 @@ function splitModel(answer) {
     }
     return { provider: "deepseek-official", model: a };
 }
-async function runSetup(flags, harnessNodeModules) {
+async function runSetup(flags) {
     const matrix = loadMatrix(flags);
     const { models, currentDefault } = discoverModels();
     console.log("omd-dsh setup: 发现 DSH 已有模型：");
@@ -112,12 +113,7 @@ async function runSetup(flags, harnessNodeModules) {
     const syncNow = await ask("是否立即同步到 " + join(dshHome(), ".agent-presets") + "? [Y/n] ");
     rl.close();
     if (syncNow === "" || /^y/i.test(syncNow)) {
-        if (harnessNodeModules === undefined) {
-            console.error("omd-dsh setup: 无法定位 DSH harness node_modules，跳过同步。首次请运行 `omd-dsh sync --harness <路径>`（之后会自动缓存，无需重复指定）。");
-        }
-        else {
-            await runSync(flags, harnessNodeModules);
-        }
+        await runSync(flags);
     }
     else {
         console.log("omd-dsh setup: 已跳过同步；稍后运行 `omd-dsh sync` 生效。");
@@ -130,9 +126,7 @@ async function main() {
     let command = "";
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
-        if (arg === "--harness")
-            flags.harness = argv[++i];
-        else if (arg === "--dry-run")
+        if (arg === "--dry-run")
             flags.dryRun = true;
         else if (arg === "--verbose")
             flags.verbose = true;
@@ -163,16 +157,10 @@ async function main() {
         return;
     }
     if (command === "setup") {
-        await runSetup(flags, resolveHarness(flags));
-        return;
-    }
-    const harnessNodeModules = resolveHarness(flags);
-    if (harnessNodeModules === undefined || !existsSync(join(harnessNodeModules, "@deepseek-ai", "dsh-scope", "package.json"))) {
-        console.error("omd-dsh sync: cannot locate the DSH harness node_modules.\n  - ensure the dsh executable is on PATH, or\n  - pass --harness <path to the harness node_modules directory> (saved for later runs).\n\n" + usage());
-        process.exitCode = 2;
+        await runSetup(flags);
         return;
     }
-    await runSync(flags, harnessNodeModules);
+    await runSync(flags);
 }
 main().catch((error) => {
     console.error("omd-dsh failed: " + (error instanceof Error ? error.message : String(error)));

package/lib/index.js

@@ -1,5 +1,4 @@
 import z from "@deepseek-ai/schemastery";
-import { scopeOf } from "@deepseek-ai/dsh-scope";
 import { setModeOverride } from "./shared.js";
 /**
  * @module @carljia/omd-dsh
@@ -81,10 +80,10 @@ function presetSwitchedAfterLastRequest(session) {
     return lastSwitch > lastHeader;
 }
 function apply(ctx, config) {
-    if (scopeOf(ctx) === undefined) {
-        throw new Error("omd-mode: refusing to mount outside a scoped context (mode '" + config.mode + "'). " +
-            "Mount this row inside an agent preset; a global mount would pin the model for every agent in the process.");
-    }
+    // 无 scope 守卫：本行以自包含 bundle（.omd-vendor/omd-mode.mjs）分发，bundle 内
+    // 自带的 dsh-scope 副本永远读不到 harness 实例写入的 kScope Symbol，守卫会误报
+    // （曾导致全部 omd preset 挂载失败）。preset 挂载由 harness 的 loader 保证作用域；
+    // 若误挂到全局组合，后果（进程级钉模型）立即可见。见 docs/ARCHITECTURE.md。
     const pinned = config.provider !== undefined && config.model !== undefined
         ? {
             provider: config.provider,

package/lib/mode.js

@@ -1,5 +1,4 @@
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { scopeOf } from "@deepseek-ai/dsh-scope";
 /**
  * @module @carljia/omd-dsh/mode
  *
@@ -127,9 +126,7 @@ async function executeSwitch(ctx, invocation) {
     }
 }
 function apply(ctx) {
-    if (scopeOf(ctx) === undefined) {
-        throw new Error("omd-mode-switch: refusing to mount outside a scoped context; mount this row inside an agent preset");
-    }
+    // 无 scope 守卫：见 src/index.ts 的说明（自包含 bundle 无法读取 harness 的 kScope）。
     ctx.inject(["commands"], (commandCtx) => {
         commandCtx.commands.register({
             name: "mode",

package/lib/plan.js

@@ -1,6 +1,5 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { basename, join } from "node:path";
-import { scopeOf } from "@deepseek-ai/dsh-scope";
 /**
  * @module @carljia/omd-dsh/plan
  *
@@ -96,9 +95,7 @@ function planModeActive(events) {
     return active;
 }
 function apply(ctx) {
-    if (scopeOf(ctx) === undefined) {
-        throw new Error("omd-plan: refusing to mount outside a scoped context; mount this row inside an agent preset");
-    }
+    // 无 scope 守卫：见 src/index.ts 的说明（自包含 bundle 无法读取 harness 的 kScope）。
     // Scoped .md-only write guard: the planner may write/edit only markdown
     // files, keeping it read-only for every other path. The plan file itself is
     // written by this row via node:fs (not through the model's write/edit tools),

package/lib/startwork.js

@@ -1,6 +1,5 @@
 import { access, readFile } from "node:fs/promises";
 import { isAbsolute, join } from "node:path";
-import { scopeOf } from "@deepseek-ai/dsh-scope";
 /**
  * @module @carljia/omd-dsh/startwork
  *
@@ -129,9 +128,7 @@ async function executeStartWork(ctx, invocation) {
     }
 }
 function apply(ctx) {
-    if (scopeOf(ctx) === undefined) {
-        throw new Error("omd-start-work: refusing to mount outside a scoped context; mount this row inside an agent preset");
-    }
+    // 无 scope 守卫：见 src/index.ts 的说明（自包含 bundle 无法读取 harness 的 kScope）。
     ctx.inject(["commands"], (commandCtx) => {
         commandCtx.commands.register({
             name: "start-work",

package/lib/sync.d.ts

@@ -1,15 +1,20 @@
 /**
  * omd-dsh sync core — materialize the OMD presets into <DSH_HOME>/.agent-presets.
  *
- * Shared by the CLI (\`omd-dsh sync\`) and the bundle boot row (\`dsh plugin add\`
- * + restart): locate the DSH harness node_modules, render each preset's
- * omd-mode / omd-task rows from the user's model matrix, copy the presets and
- * vendored row modules into .agent-presets, and rewrite the vendored modules'
- * bare @deepseek-ai/* imports to absolute file:// URLs into the harness tree so
- * the rows share ONE module instance with the harness (scope symbols etc.).
+ * Shared by the CLI (`omd-dsh sync`) and the bundle boot row (`dsh plugin add`
+ * + restart): render each preset's omd-mode / omd-task rows from the user's
+ * model matrix, and copy the presets plus the vendored row modules into
+ * .agent-presets.
+ *
+ * The vendored rows are SELF-CONTAINED bundles (see scripts/postbuild.mjs):
+ * every dependency is bundled in and they carry no @deepseek-ai imports, so
+ * the sync needs NO harness tree knowledge — the rows work regardless of
+ * whether the harness's agent machinery loads from an npx cache, a profile,
+ * or a global npm install, and no `--harness` configuration is ever needed.
+ * Bare package rows in the preset compositions (e.g. @deepseek-ai/dsh-persona)
+ * are resolved by the harness's own loader at runtime against the host base.
  */
 export type SyncFlags = {
-    harness?: string;
     dryRun: boolean;
     verbose: boolean;
 };
@@ -43,20 +48,6 @@ export declare const VENDOR_SOURCES: string[];
 /** User-owned model matrix: lives under DSH_HOME, never inside the package or the repo. */
 export declare const MATRIX_PATH: string;
 export declare function dshHome(): string;
-/**
- * Resolve the DSH harness node_modules:
- *   1. --harness flag (and cache it for later);
- *   2. auto-detect via the dsh executable on PATH;
- *   3. fall back to the locally cached value.
- */
-export declare function resolveHarness(flags: SyncFlags): string | undefined;
-/**
- * Resolve the harness node_modules from THIS module's own location, walking up
- * the Node resolution path for @deepseek-ai/dsh-scope. This is the reliable
- * anchor when the package runs as a bundle inside a DSH profile: the profile's
- * flat module fallback (or its hoisted node_modules) exposes the harness tree.
- */
-export declare function resolveHarnessFromSelf(): string | undefined;
 export declare function loadMatrix(flags: SyncFlags, log?: (msg: string) => void): Matrix;
 export declare function saveMatrix(m: Matrix): void;
-export declare function runSync(flags: SyncFlags, harnessNodeModules: string, log?: (msg: string) => void): Promise<void>;
+export declare function runSync(flags: SyncFlags, log?: (msg: string) => void): Promise<void>;

package/lib/sync.js

@@ -1,9 +1,8 @@
-import { promises as fs, existsSync, mkdirSync, realpathSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import { promises as fs, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { createHash } from "node:crypto";
-import { basename, dirname, join, relative, resolve } from "node:path";
+import { dirname, join, relative, resolve } from "node:path";
 import { homedir } from "node:os";
-import { execFileSync } from "node:child_process";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
 export const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 export const VENDOR_SOURCES = ["omd-mode.mjs", "omd-task.mjs", "omd-ulw.mjs", "omd-plan.mjs", "omd-start-work.mjs", "omd-mode-switch.mjs", "shared.js"];
 /** User-owned model matrix: lives under DSH_HOME, never inside the package or the repo. */
@@ -16,210 +15,6 @@ const TASK_FENCE = { start: "# [omd-dsh:task:start]", end: "# [omd-dsh:task:end]
 const RENAMED_FROM = { "omd-architect": "omd-ultraworker" };
 function sha256(text) { return createHash("sha256").update(text).digest("hex"); }
 export function dshHome() { return process.env.DSH_HOME !== undefined && process.env.DSH_HOME !== "" ? resolve(process.env.DSH_HOME) : join(homedir(), ".dsh"); }
-function findNodeModules(start) {
-    let current = resolve(start);
-    for (;;) {
-        if (basename(current) === "node_modules")
-            return current;
-        const parent = dirname(current);
-        if (parent === current)
-            return undefined;
-        current = parent;
-    }
-}
-function harnessCachePath() { return join(dshHome(), "omd-dsh-harness.json"); }
-/** Read the cached harness node_modules, ignoring a stale/missing entry. */
-function readCachedHarness() {
-    try {
-        const p = harnessCachePath();
-        if (!existsSync(p))
-            return undefined;
-        const parsed = JSON.parse(readFileSync(p, "utf8"));
-        const nm = parsed && typeof parsed === "object" ? parsed.harnessNodeModules : undefined;
-        if (typeof nm !== "string" || nm === "")
-            return undefined;
-        if (!existsSync(join(nm, "@deepseek-ai", "dsh-scope", "package.json")))
-            return undefined;
-        return nm;
-    }
-    catch {
-        return undefined;
-    }
-}
-/** Persist the resolved harness node_modules for later runs (best-effort). */
-function writeCachedHarness(harnessNodeModules) {
-    try {
-        writeFileSync(harnessCachePath(), JSON.stringify({ harnessNodeModules }, null, 2) + "\n", "utf8");
-    }
-    catch { /* best-effort */ }
-}
-/**
- * Resolve the DSH harness node_modules:
- *   1. --harness flag (and cache it for later);
- *   2. auto-detect via the dsh executable on PATH;
- *   3. fall back to the locally cached value.
- */
-export function resolveHarness(flags) {
-    let nm;
-    if (flags.harness !== undefined) {
-        nm = findNodeModules(flags.harness);
-        if (nm !== undefined) {
-            try {
-                nm = realpathSync(nm);
-                writeCachedHarness(nm);
-            }
-            catch { /* keep nm as-is */ }
-        }
-        return nm;
-    }
-    nm = locateHarnessViaDsh() ?? locateHarnessViaNpxCache() ?? readCachedHarness();
-    if (nm !== undefined) {
-        try {
-            nm = realpathSync(nm);
-        }
-        catch { /* keep */ }
-    }
-    return nm;
-}
-/**
- * Resolve the harness node_modules from THIS module's own location, walking up
- * the Node resolution path for @deepseek-ai/dsh-scope. This is the reliable
- * anchor when the package runs as a bundle inside a DSH profile: the profile's
- * flat module fallback (or its hoisted node_modules) exposes the harness tree.
- */
-export function resolveHarnessFromSelf() {
-    let dir = dirname(fileURLToPath(import.meta.url));
-    for (;;) {
-        const nm = join(dir, "node_modules");
-        const scopeDir = join(nm, "@deepseek-ai", "dsh-scope");
-        if (existsSync(join(scopeDir, "package.json"))) {
-            try {
-                const real = realpathSync(scopeDir);
-                return findNodeModules(real);
-            }
-            catch {
-                return nm;
-            }
-        }
-        const parent = dirname(dir);
-        if (parent === dir)
-            return undefined;
-        dir = parent;
-    }
-}
-function locateHarnessViaDsh() {
-    const candidates = [];
-    try {
-        const probe = process.platform === "win32" ? "where.exe" : "which";
-        const out = execFileSync(probe, ["dsh"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
-        for (const line of out.split(/\r?\n/)) {
-            const t = line.trim();
-            if (t !== "")
-                candidates.push(t);
-        }
-    }
-    catch { /* dsh not on PATH */ }
-    for (const candidate of candidates) {
-        let real = candidate;
-        try {
-            real = realpathSync(candidate);
-        }
-        catch { /* keep */ }
-        const nm = findNodeModules(real);
-        if (nm !== undefined && existsSync(join(nm, "@deepseek-ai", "dsh-scope", "package.json")))
-            return nm;
-    }
-    return undefined;
-}
-/** Candidate npx cache roots where a non-global DSH install may live. */
-function npxCacheRoots() {
-    const roots = [];
-    if (process.platform === "win32") {
-        const localAppData = process.env.LOCALAPPDATA;
-        if (localAppData)
-            roots.push(join(localAppData, "npm-cache", "_npx"));
-        const appData = process.env.APPDATA;
-        if (appData)
-            roots.push(join(appData, "npm-cache", "_npx"));
-    }
-    else {
-        roots.push(join(homedir(), ".npm", "_npx"));
-    }
-    return roots;
-}
-/**
- * Best-effort scan of the npx cache for a DSH install whose node_modules
- * carries @deepseek-ai/dsh-scope. Picks the most recently touched one.
- */
-function locateHarnessViaNpxCache() {
-    const matches = [];
-    for (const root of npxCacheRoots()) {
-        let entries;
-        try {
-            entries = readdirSync(root);
-        }
-        catch {
-            continue;
-        }
-        for (const entry of entries) {
-            const nm = join(root, entry, "node_modules");
-            if (!existsSync(join(nm, "@deepseek-ai", "dsh-scope", "package.json")))
-                continue;
-            let mtime = 0;
-            try {
-                mtime = statSync(join(root, entry)).mtimeMs;
-            }
-            catch { /* keep 0 */ }
-            matches.push({ nm, mtime });
-        }
-    }
-    matches.sort((a, b) => b.mtime - a.mtime);
-    return matches.length > 0 ? matches[0].nm : undefined;
-}
-function resolveHarnessModule(harnessNodeModules, specifier) {
-    const segments = specifier.split("/");
-    const scope = segments[0].startsWith("@") ? segments[0] + "/" + segments[1] : segments[0];
-    const subpath = scope === specifier ? "" : specifier.slice(scope.length + 1);
-    const pkgDir = join(harnessNodeModules, ...scope.split("/"));
-    const manifestPath = join(pkgDir, "package.json");
-    if (!existsSync(manifestPath))
-        throw new Error("omd-dsh: cannot resolve \"" + specifier + "\" -- no package.json at " + manifestPath);
-    const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
-    let entry;
-    const exportsMap = manifest.exports;
-    if (subpath === "" && exportsMap !== undefined && exportsMap["."] !== undefined) {
-        const dot = exportsMap["."];
-        if (typeof dot === "string")
-            entry = dot;
-        else if (typeof dot === "object" && dot !== null) {
-            entry = dot.node ?? dot.import ?? dot.default;
-            if (typeof entry === "object" && entry !== null)
-                entry = entry.node ?? entry.import ?? entry.default;
-        }
-    }
-    if (entry === undefined && subpath === "")
-        entry = manifest.module ?? manifest.main;
-    if (entry === undefined)
-        entry = subpath === "" ? "index.js" : subpath;
-    else if (subpath !== "")
-        entry = join(entry, subpath);
-    let resolvedPath = resolve(pkgDir, entry);
-    try {
-        resolvedPath = realpathSync(resolvedPath);
-    }
-    catch { /* keep */ }
-    if (!existsSync(resolvedPath))
-        throw new Error("omd-dsh: resolved entry \"" + entry + "\" for \"" + specifier + "\" does not exist at " + resolvedPath);
-    return pathToFileURL(resolvedPath).href;
-}
-function rewriteImports(sourceText, harnessNodeModules) {
-    const specifierPattern = /@deepseek-ai\/[A-Za-z0-9@._/-]+/g;
-    return sourceText.split(/\r?\n/).map((line) => {
-        if (!line.trimStart().startsWith("import"))
-            return line;
-        return line.replace(specifierPattern, (s) => resolveHarnessModule(harnessNodeModules, s));
-    }).join("\n");
-}
 function readMeta(dir) {
     const metaPath = join(dir, ".omd-meta.json");
     if (!existsSync(metaPath))
@@ -397,7 +192,7 @@ async function locallyModified(dir, meta) {
     }
     return undefined;
 }
-export async function runSync(flags, harnessNodeModules, log = console.log) {
+export async function runSync(flags, log = console.log) {
     const matrix = loadMatrix(flags, log);
     const manifest = JSON.parse(readFileSync(join(PACKAGE_ROOT, "package.json"), "utf8"));
     const sourceVersion = manifest.version;
@@ -473,8 +268,9 @@ export async function runSync(flags, harnessNodeModules, log = console.log) {
             if (!existsSync(sourceFile)) {
                 throw new Error("omd-dsh sync: missing vendored source " + sourceFile + " -- run \`npm run build\` first");
             }
-            let sourceText = await fs.readFile(sourceFile, "utf8");
-            sourceText = rewriteImports(sourceText, harnessNodeModules);
+            // Self-contained bundles: copied verbatim, no import rewriting, no
+            // harness tree knowledge (see the module doc comment).
+            const sourceText = await fs.readFile(sourceFile, "utf8");
             const sourceHash = sha256(sourceText);
             const destFile = join(vendorTargetDir, vendorName);
             let action = "synced";
@@ -507,7 +303,7 @@ export async function runSync(flags, harnessNodeModules, log = console.log) {
         }
         if (!flags.dryRun && VENDOR_SOURCES.length > 0) {
             await fs.mkdir(vendorTargetDir, { recursive: true });
-            await fs.writeFile(join(vendorTargetDir, ".omd-meta.json"), JSON.stringify({ source: "omd-dsh", sourceVersion, harnessNodeModules, files: nextVendorFiles }, null, 2) + "\n", "utf8");
+            await fs.writeFile(join(vendorTargetDir, ".omd-meta.json"), JSON.stringify({ source: "omd-dsh", sourceVersion, files: nextVendorFiles }, null, 2) + "\n", "utf8");
         }
     }
     if (existsSync(agentPresetsRoot)) {
@@ -539,7 +335,7 @@ export async function runSync(flags, harnessNodeModules, log = console.log) {
     }
     log("omd-dsh sync: DSH_HOME=" + dshHome());
     log("omd-dsh sync: matrix=" + MATRIX_PATH + " (customize the model matrix any time with \`omd-dsh setup\`)");
-    log("omd-dsh sync: harness node_modules=" + harnessNodeModules);
+    log("omd-dsh sync: vendored rows are self-contained bundles (no harness tree dependency)");
     log("omd-dsh sync: source version=" + sourceVersion + (flags.dryRun ? " (dry-run)" : ""));
     for (const key of ["synced", "updated", "skipped", "conflicts", "orphan", "removed"])
         for (const line of report[key])

package/lib/task.js

@@ -1,7 +1,6 @@
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { assertSubagentMaxDepth } from "@deepseek-ai/dsh-subagent";
-import { scopeOf } from "@deepseek-ai/dsh-scope";
 import { modeOverrideFor } from "./shared.js";
 /**
  * @module @carljia/omd-dsh/task
@@ -136,9 +135,7 @@ function resolveTier(config, requested) {
     throw new Error("omd_task: choose a tier for this task -- valid tiers: " + tierNames.join(", "));
 }
 function apply(ctx, config) {
-    if (scopeOf(ctx) === undefined) {
-        throw new Error("omd-task: refusing to mount outside a scoped context; mount this row inside an agent preset");
-    }
+    // 无 scope 守卫：见 src/index.ts 的说明（自包含 bundle 无法读取 harness 的 kScope）。
     const invalid = configError(config);
     if (invalid !== undefined)
         throw new Error(invalid);