@carljia/omd-dsh 0.1.7 → 0.1.9

package/lib/sync.js

@@ -1,9 +1,9 @@
-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";
+import z from "@deepseek-ai/schemastery";
 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 +16,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))
@@ -250,6 +46,32 @@ async function collectSourceFiles(rootDir) {
 }
 // ── matrix ──
 const DEFAULT_MATRIX_PATH = join(PACKAGE_ROOT, "omd-matrix.default.json");
+/** Settings-namespace schema for the model matrix (see plan §5). Every field
+ *  is optional: `base` (the shipped default matrix) fills whatever the user
+ *  document omits, and extra keys (future fields) pass through untouched. */
+const TierSchema = z.object({
+    provider: z.string(),
+    model: z.string(),
+    hint: z.string(),
+    persona: z.string(),
+    maxTokens: z.number(),
+    toolFilter: z.object({
+        allow: z.array(z.string()),
+        deny: z.array(z.string()),
+        denyShell: z.boolean(),
+    }),
+});
+const ModeSchema = z.object({
+    provider: z.string(),
+    model: z.string(),
+    reasoningEffort: z.string(),
+    tiers: z.dict(TierSchema),
+});
+export const MatrixSchema = z.object({
+    version: z.number(),
+    defaults: z.object({ provider: z.string() }),
+    modes: z.dict(ModeSchema),
+});
 function parseMatrix(text) {
     try {
         const parsed = JSON.parse(text);
@@ -259,7 +81,7 @@ function parseMatrix(text) {
     catch { /* fall through */ }
     return undefined;
 }
-function readDefaultMatrix() {
+export function readDefaultMatrix() {
     if (!existsSync(DEFAULT_MATRIX_PATH))
         throw new Error("omd-dsh: missing default matrix file " + DEFAULT_MATRIX_PATH + " (broken package — reinstall @carljia/omd-dsh)");
     const parsed = parseMatrix(readFileSync(DEFAULT_MATRIX_PATH, "utf8"));
@@ -267,6 +89,27 @@ function readDefaultMatrix() {
         throw new Error("omd-dsh: malformed default matrix file " + DEFAULT_MATRIX_PATH + " (broken package — reinstall @carljia/omd-dsh)");
     return parsed;
 }
+/**
+ * Read the user's matrix file (<DSH_HOME>/omd-matrix.json) without touching
+ * the filesystem beyond the read: missing or malformed returns undefined and
+ * NEVER auto-generates — the caller decides what to fall back to (settings
+ * namespace resolved value / default matrix). This is the host row's
+ * "import CLI / legacy edits into the settings namespace" read.
+ */
+export function readMatrixFileIfExists() {
+    if (!existsSync(MATRIX_PATH))
+        return undefined;
+    try {
+        return parseMatrix(readFileSync(MATRIX_PATH, "utf8"));
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Structural equality over the small JSON matrix (stringify equality suffices). */
+export function matrixEquals(a, b) {
+    return JSON.stringify(a) === JSON.stringify(b);
+}
 function writeMatrixFile(path, text) {
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, text, "utf8");
@@ -397,8 +240,13 @@ async function locallyModified(dir, meta) {
     }
     return undefined;
 }
-export async function runSync(flags, harnessNodeModules, log = console.log) {
-    const matrix = loadMatrix(flags, log);
+/**
+ * Render and materialize the presets from an ALREADY-RESOLVED matrix. This is
+ * the shared core between the CLI file path (`runSync`) and the settings
+ * namespace path (host row): the matrix comes from the caller, everything
+ * after `loadMatrix(...)` is here.
+ */
+export async function runSyncWithMatrix(matrix, flags, log = console.log) {
     const manifest = JSON.parse(readFileSync(join(PACKAGE_ROOT, "package.json"), "utf8"));
     const sourceVersion = manifest.version;
     const presetsSourceDir = join(PACKAGE_ROOT, "presets");
@@ -473,8 +321,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 +356,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 +388,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])
@@ -547,3 +396,7 @@ export async function runSync(flags, harnessNodeModules, log = console.log) {
     const summary = ["synced", "updated", "conflicts", "orphan", "removed"].map((key) => report[key].length + " " + key).join(", ");
     log("omd-dsh sync: " + summary + (flags.dryRun ? " (dry-run)" : ""));
 }
+/** CLI / manual-fallback path: load the matrix from <DSH_HOME>/omd-matrix.json (generating/migrating it on first run), then render. */
+export async function runSync(flags, log = console.log) {
+    await runSyncWithMatrix(loadMatrix(flags, log), flags, log);
+}

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);