ndomo 0.2.0 → 0.2.2

package/config/ndomo.config.json

@@ -134,6 +134,36 @@
         "model": "opencode-go/kimi-k2.7-code",
         "temperature": 0.2,
         "reasoning_effort": "high"
+      },
+      "craftsman": {
+        "model": "minimax/MiniMax-M3",
+        "temperature": 0.3,
+        "reasoning_effort": "high"
+      },
+      "warden": {
+        "model": "minimax/MiniMax-M3",
+        "temperature": 0.3,
+        "reasoning_effort": "high"
+      },
+      "ci-smith": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.1,
+        "reasoning_effort": "high"
+      },
+      "deploy-smith": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.1,
+        "reasoning_effort": "high"
+      },
+      "release-smith": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.1,
+        "reasoning_effort": "high"
+      },
+      "ops-scout": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.2,
+        "reasoning_effort": "medium"
       }
     },
     "budget": {
@@ -216,6 +246,36 @@
         "model": "opencode-go/deepseek-v4-flash",
         "temperature": 0.2,
         "reasoning_effort": "low"
+      },
+      "craftsman": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.3,
+        "reasoning_effort": "low"
+      },
+      "warden": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.3,
+        "reasoning_effort": "low"
+      },
+      "ci-smith": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.1,
+        "reasoning_effort": "low"
+      },
+      "deploy-smith": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.1,
+        "reasoning_effort": "low"
+      },
+      "release-smith": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.1,
+        "reasoning_effort": "low"
+      },
+      "ops-scout": {
+        "model": "opencode-go/deepseek-v4-flash",
+        "temperature": 0.2,
+        "reasoning_effort": "low"
       }
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ndomo",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "OpenCode multi-agent plugin. Taller de artesanos: foreman + 3 peer primaries (craftsman, warden, ranger) + specialists (scout, scribe, painter, smith, sage, guild, inspector, chronicler) + stack-smiths + ops (ci-smith, deploy-smith, release-smith, ops-scout). Caveman-native. opencode-mem integrated. DCP peer optional.",
   "type": "module",
   "license": "MIT",

package/src/cli/__tests__/install.test.ts

@@ -25,6 +25,7 @@ import {
   writeHttpBlock,
   applyPresetToFile,
   applyProviderPrefix,
+  promptHttpEnable,
   stepRegisterPlugins,
   stepCopyAgents,
   stepCopySkills,
@@ -731,3 +732,57 @@ describe("stepCopyTools", () => {
     expect(copied).toBe(0);
   });
 });
+
+// ─── Regex-based preset preserves nested YAML ──────────────────────────────
+
+describe("applyPresetToFile — nested permission preservation", () => {
+  test("preserves nested permission structure byte-for-byte", () => {
+    const testFile = join(tmpDir, "test-agent.md");
+    const original = `---
+description: Test Agent
+mode: subagent
+model: old/model
+temperature: 0.5
+permission:
+  edit: allow
+  write: ask
+  bash:
+    "*": ask
+    "ls *": allow
+---
+body content here
+`;
+    writeFileSync(testFile, original);
+    const result = applyPresetToFile(
+      testFile,
+      { model: "new/model", temperature: 0.3 } as PresetEntry,
+      false,
+    );
+    expect(result).toBe("updated");
+    const updated = readFileSync(testFile, "utf-8");
+    expect(updated).toContain("model: new/model");
+    expect(updated).toContain("temperature: 0.3");
+    // CRITICAL: permission block intact byte-for-byte
+    expect(updated).toContain("permission:");
+    expect(updated).toContain("  edit: allow");
+    expect(updated).toContain("  write: ask");
+    expect(updated).toContain("  bash:");
+    expect(updated).toContain('    "*": ask');
+    expect(updated).toContain('    "ls *": allow');
+  });
+});
+
+// ─── Non-TTY promptHttpEnable ──────────────────────────────────────────────
+
+describe("promptHttpEnable — non-TTY fallback", () => {
+  test("returns false immediately when stdin not TTY", async () => {
+    const originalIsTTY = process.stdin.isTTY;
+    Object.defineProperty(process.stdin, "isTTY", { value: false, configurable: true });
+    try {
+      const result = await promptHttpEnable();
+      expect(result).toBe(false);
+    } finally {
+      Object.defineProperty(process.stdin, "isTTY", { value: originalIsTTY, configurable: true });
+    }
+  });
+});

package/src/cli/install.ts

@@ -34,6 +34,30 @@ const die = (msg: string): never => {
   process.exit(1);
 };
 
+/** Stream a child process, returning stdout/stderr. On non-zero exit, die() with truncated output. */
+async function streamSpawn(
+  cmd: string[],
+  opts: { cwd?: string; label?: string; nothrow?: boolean } = {},
+): Promise<{ exitCode: number; stdout: string; stderr: string }> {
+  const spawnOpts: { cwd?: string; stdout: "pipe"; stderr: "pipe" } = {
+    stdout: "pipe",
+    stderr: "pipe",
+  };
+  if (opts.cwd !== undefined) spawnOpts.cwd = opts.cwd;
+  const proc = Bun.spawn(cmd, spawnOpts);
+  const [stdout, stderr, exitCode] = await Promise.all([
+    new Response(proc.stdout).text(),
+    new Response(proc.stderr).text(),
+    proc.exited,
+  ]);
+  if (exitCode !== 0 && !opts.nothrow) {
+    const truncate = (s: string) => (s.length > 1024 ? s.slice(0, 1024) + "\n... [truncated]" : s);
+    const label = opts.label ?? cmd.join(" ");
+    die(`${label} failed (exit ${exitCode})\nstderr:\n${truncate(stderr)}\nstdout:\n${truncate(stdout)}`);
+  }
+  return { exitCode, stdout, stderr };
+}
+
 // ─── Path traversal protection ────────────────────────────────────────────────
 const SAFE_NAME_RE = /^[a-zA-Z0-9_-]+$/;
 
@@ -181,59 +205,23 @@ export async function stepInstallDeps(projectRoot: string, dryRun: boolean): Pro
     info("[dry-run] would run: bun install --frozen-lockfile");
     return;
   }
-  const proc = Bun.spawn(["bun", "install", "--frozen-lockfile"], {
+  const frozen = await streamSpawn(["bun", "install", "--frozen-lockfile"], {
     cwd: projectRoot,
-    stdout: "pipe",
-    stderr: "pipe",
+    label: "bun install --frozen-lockfile",
+    nothrow: true,
   });
-  await proc.exited;
-  if (proc.exitCode !== 0) {
+  if (frozen.exitCode !== 0) {
     // Fallback to non-frozen
     warn("frozen lockfile failed, retrying without --frozen-lockfile...");
-    const proc2 = Bun.spawn(["bun", "install"], {
+    await streamSpawn(["bun", "install"], {
       cwd: projectRoot,
-      stdout: "pipe",
-      stderr: "pipe",
+      label: "bun install",
     });
-    await proc2.exited;
-    if (proc2.exitCode !== 0) {
-      die("bun install failed");
-    }
   }
   ok("Dependencies installed");
 }
 
-/** Step 2: Build TypeScript. */
-export async function stepBuild(projectRoot: string, dryRun: boolean): Promise<void> {
-  info("Building TypeScript...");
-  if (dryRun) {
-    info("[dry-run] would run: bun run build (or tsc)");
-    return;
-  }
-  // Check for build script in package.json
-  const pkgPath = join(projectRoot, "package.json");
-  let hasBuild = false;
-  try {
-    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-    hasBuild = typeof pkg.scripts?.build === "string";
-  } catch {
-    // no package.json — try tsc
-  }
-
-  const cmd = hasBuild ? ["bun", "run", "build"] : ["bun", "run", "--bun", "tsc"];
-  const proc = Bun.spawn(cmd, {
-    cwd: projectRoot,
-    stdout: "pipe",
-    stderr: "pipe",
-  });
-  await proc.exited;
-  if (proc.exitCode !== 0) {
-    die(`Build failed (exit ${proc.exitCode})`);
-  }
-  ok("Build complete");
-}
-
-/** Step 3+4: Copy agents with timestamped backup. */
+/** Step 2: Copy agents with timestamped backup. */
 export function stepCopyAgents(
   projectRoot: string,
   configDir: string,
@@ -289,7 +277,7 @@ export function stepCopyAgents(
   return copied;
 }
 
-/** Step 5: Copy skills with timestamped backup. */
+/** Step 3: Copy skills with timestamped backup. */
 export function stepCopySkills(
   projectRoot: string,
   configDir: string,
@@ -354,125 +342,60 @@ export function stepCopySkills(
 // ─── Preset application ──────────────────────────────────────────────────────
 
 /**
- * Parse YAML frontmatter from an agent .md file.
- * Returns { frontmatter: Record<string, string>, body: string, raw: string }.
- * Frontmatter is between the first two '---' lines.
- */
-export function parseFrontmatter(content: string): {
-  frontmatter: Record<string, string>;
-  body: string;
-  startIdx: number;
-  endIdx: number;
-} {
-  const lines = content.split("\n");
-  let startIdx = -1;
-  let endIdx = -1;
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (line !== undefined && line.trim() === "---") {
-      if (startIdx === -1) {
-        startIdx = i;
-      } else {
-        endIdx = i;
-        break;
-      }
-    }
-  }
-
-  if (startIdx === -1 || endIdx === -1) {
-    return { frontmatter: {}, body: content, startIdx: -1, endIdx: -1 };
-  }
-
-  const fm: Record<string, string> = {};
-  for (let i = startIdx + 1; i < endIdx; i++) {
-    const line = lines[i];
-    if (line === undefined) continue;
-    const colonIdx = line.indexOf(":");
-    if (colonIdx > 0) {
-      const key = line.slice(0, colonIdx).trim();
-      const value = line.slice(colonIdx + 1).trim();
-      fm[key] = value;
-    }
-  }
-
-  const body = lines.slice(endIdx + 1).join("\n");
-  return { frontmatter: fm, body, startIdx, endIdx };
-}
-
-/**
- * Serialize frontmatter + body back to a string.
- */
-export function serializeFrontmatter(frontmatter: Record<string, string>, body: string): string {
-  const fmLines = Object.entries(frontmatter).map(([k, v]) => `${k}: ${v}`);
-  return `---\n${fmLines.join("\n")}\n---\n${body}`;
-}
-
-/**
- * Apply preset values to an agent .md file's frontmatter.
- * Handles reasoningEffort 3-tier insert fallback:
- *   1. Update existing reasoningEffort line
- *   2. Insert after temperature (if present)
- *   3. Insert after model (if present)
- *   4. Insert after opening ---
+ * Apply preset values to an agent .md file's frontmatter using regex-targeted
+ * line replacement. Preserves YAML structure 100% (including nested permission
+ * blocks) by only touching top-level (0-indent) key lines.
  */
 export function applyPresetToFile(
   filePath: string,
   preset: PresetEntry,
   dryRun: boolean,
 ): "updated" | "skipped" {
-  const content = readFileSync(filePath, "utf-8");
-  const { frontmatter, body, startIdx, endIdx } = parseFrontmatter(content);
+  let content = readFileSync(filePath, "utf-8");
 
-  if (startIdx === -1 || endIdx === -1) {
+  // Find frontmatter bounds (first --- block at file start)
+  const fmMatch = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
+  if (!fmMatch || !fmMatch[1] || !fmMatch[2]) {
     warn(`No frontmatter found in ${basename(filePath)}, skipping`);
     return "skipped";
   }
-
+  const fmBody = fmMatch[1];
+  const body = fmMatch[2];
+  let newFmBody = fmBody;
   let changed = false;
 
-  // Apply model
-  if (preset.model) {
-    frontmatter["model"] = preset.model;
-    changed = true;
-  }
-
-  // Apply temperature
-  if (preset.temperature !== undefined) {
-    frontmatter["temperature"] = String(preset.temperature);
-    changed = true;
-  }
-
-  // Apply reasoningEffort (snake_case → camelCase)
-  if (preset.reasoning_effort) {
-    frontmatter["reasoningEffort"] = preset.reasoning_effort;
-    changed = true;
+  // Update or insert each preset field at top-level (0 indent)
+  const fields: Array<{ yamlName: string; value: string | undefined }> = [
+    { yamlName: "model", value: preset.model },
+    { yamlName: "temperature", value: preset.temperature !== undefined ? String(preset.temperature) : undefined },
+    { yamlName: "reasoningEffort", value: preset.reasoning_effort },
+  ];
+
+  for (const field of fields) {
+    if (field.value === undefined) continue;
+    // Match line at start-of-line (no indent), so we don't touch nested keys
+    const lineRegex = new RegExp(`^${field.yamlName}:.*$`, "m");
+    if (lineRegex.test(newFmBody)) {
+      newFmBody = newFmBody.replace(lineRegex, `${field.yamlName}: ${field.value}`);
+      changed = true;
+    } else {
+      // Append at end of frontmatter (top-level, 0 indent)
+      const sep = newFmBody.endsWith("\n") ? "" : "\n";
+      newFmBody = newFmBody + sep + `${field.yamlName}: ${field.value}\n`;
+      changed = true;
+    }
   }
 
   if (!changed) {
     return "skipped";
   }
 
-  // Serialize back preserving order: model, temperature, reasoningEffort, then others
-  const ordered: Record<string, string> = {};
-  const priority = ["model", "temperature", "reasoningEffort"];
-  for (const key of priority) {
-    if (frontmatter[key] !== undefined) {
-      ordered[key] = frontmatter[key];
-    }
-  }
-  for (const [key, value] of Object.entries(frontmatter)) {
-    if (!(key in ordered)) {
-      ordered[key] = value;
-    }
-  }
-
+  const newContent = `---\n${newFmBody}---\n${body}`;
   if (dryRun) {
-    info(`[dry-run] would update ${basename(filePath)}: model=${preset.model ?? "(keep)"}, temp=${preset.temperature ?? "(keep)"}, effort=${preset.reasoning_effort ?? "(keep)"}`);
+    info(`[dry-run] would update ${basename(filePath)}`);
   } else {
-    writeFileSync(filePath, serializeFrontmatter(ordered, body));
+    writeFileSync(filePath, newContent);
   }
-
   return "updated";
 }
 
@@ -522,7 +445,7 @@ export function applyProviderPrefix(
   return updated;
 }
 
-/** Step 5.5: Apply preset + optional provider prefix override. */
+/** Step 3.5: Apply preset + optional provider prefix override. */
 export function stepApplyPreset(
   configDir: string,
   configJson: NdomoConfig,
@@ -583,7 +506,7 @@ export function stepApplyPreset(
   }
 }
 
-// ─── Step 6: Copy config files ───────────────────────────────────────────────
+// ─── Step 4: Copy config files ───────────────────────────────────────────────
 export function stepCopyConfig(
   projectRoot: string,
   configDir: string,
@@ -632,7 +555,7 @@ export function stepCopyConfig(
   }
 }
 
-// ─── Step 6.5: Register plugins in opencode.json ─────────────────────────────
+// ─── Step 4.5: Register plugins in opencode.json ─────────────────────────────
 export function stepRegisterPlugins(
   configDir: string,
   configJson: NdomoConfig,
@@ -694,7 +617,7 @@ export function stepRegisterPlugins(
   ok(`Registered ${allPlugins.length} ndomo plugin(s) in opencode.json`);
 }
 
-// ─── Step 6.6: Install ndomo package (3 strategies) ──────────────────────────
+// ─── Step 4.6: Install ndomo package (3 strategies) ──────────────────────────
 
 function isSymlink(p: string): boolean {
   try {
@@ -732,14 +655,13 @@ async function strategyFileDep(
     writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, 2) + "\n");
 
     // Run bun install
-    const proc = Bun.spawn(["bun", "install", "--no-frozen-lockfile"], {
+    const result = await streamSpawn(["bun", "install", "--no-frozen-lockfile"], {
       cwd: configDir,
-      stdout: "pipe",
-      stderr: "pipe",
+      label: "bun install (file: dep)",
+      nothrow: true,
     });
-    await proc.exited;
 
-    if (proc.exitCode === 0 && existsSync(nmNdomo) && !isSymlink(nmNdomo)) {
+    if (result.exitCode === 0 && existsSync(nmNdomo) && !isSymlink(nmNdomo)) {
       ok("ndomo installed via bun (file: dep) — real copy, no symlink");
       return true;
     }
@@ -759,28 +681,26 @@ async function strategyBunLink(projectRoot: string, configDir: string): Promise<
 
   try {
     // bun link in project root (registers package)
-    const proc1 = Bun.spawn(["bun", "link"], {
+    const linkResult = await streamSpawn(["bun", "link"], {
       cwd: projectRoot,
-      stdout: "pipe",
-      stderr: "pipe",
+      label: "bun link",
+      nothrow: true,
     });
-    await proc1.exited;
 
-    if (proc1.exitCode !== 0) {
+    if (linkResult.exitCode !== 0) {
       warn("bun link in project root failed");
       return false;
     }
 
     // bun link ndomo in config dir (links package)
-    const proc2 = Bun.spawn(["bun", "link", "ndomo"], {
+    const linkNdomo = await streamSpawn(["bun", "link", "ndomo"], {
       cwd: configDir,
-      stdout: "pipe",
-      stderr: "pipe",
+      label: "bun link ndomo",
+      nothrow: true,
     });
-    await proc2.exited;
 
     const nmNdomo = join(configDir, "node_modules", "ndomo");
-    if (proc2.exitCode === 0 && existsSync(nmNdomo)) {
+    if (linkNdomo.exitCode === 0 && existsSync(nmNdomo)) {
       ok("ndomo linked via bun link (managed symlink)");
       warn("bun link uses symlinks — run 'bun run dev:bust' if cache goes stale");
       return true;
@@ -867,7 +787,7 @@ export async function stepInstallPackage(
   }
 }
 
-// ─── Step 6.7: Copy custom tools ─────────────────────────────────────────────
+// ─── Step 4.7: Copy custom tools ─────────────────────────────────────────────
 // npm distribution: tools live inside the installed ndomo package, so symlink
 // dance (used in old repo-based install) is obsolete. Copy .ts files directly.
 export function stepCopyTools(
@@ -924,7 +844,7 @@ export function stepCopyTools(
   return copied;
 }
 
-// ─── Step 7: Inject preset name into ndomo.json ──────────────────────────────
+// ─── Step 5: Inject preset name into ndomo.json ──────────────────────────────
 export function stepInjectPreset(configDir: string, preset: string, dryRun: boolean): void {
   const ndomoJsonPath = join(configDir, "ndomo.json");
 
@@ -947,7 +867,7 @@ export function stepInjectPreset(configDir: string, preset: string, dryRun: bool
   }
 }
 
-// ─── Step 8: Optional DCP install ────────────────────────────────────────────
+// ─── Step 6: Optional DCP install ────────────────────────────────────────────
 export async function stepInstallDcp(dryRun: boolean): Promise<void> {
   info("Installing @tarquinen/opencode-dcp (AGPL-3.0)...");
   if (dryRun) {
@@ -955,12 +875,11 @@ export async function stepInstallDcp(dryRun: boolean): Promise<void> {
     return;
   }
 
-  const proc = Bun.spawn(["opencode", "plugin", "@tarquinen/opencode-dcp", "--global"], {
-    stdout: "pipe",
-    stderr: "pipe",
+  const result = await streamSpawn(["opencode", "plugin", "@tarquinen/opencode-dcp", "--global"], {
+    label: "opencode plugin dcp",
+    nothrow: true,
   });
-  await proc.exited;
-  if (proc.exitCode === 0) {
+  if (result.exitCode === 0) {
     ok("DCP plugin installed");
   } else {
     warn("DCP plugin install failed (non-fatal)");
@@ -1016,6 +935,10 @@ export function writeHttpBlock(projectRoot: string, httpConfig: HttpConfig, dryR
  * Returns true if user accepts, false otherwise.
  */
 export async function promptHttpEnable(): Promise<boolean> {
+  if (!process.stdin.isTTY) {
+    info("Non-TTY stdin — skipping HTTP prompt (use --enable-http to enable)");
+    return false;
+  }
   console.log("");
   console.log("[?] Enable ndomo HTTP server? Allows programmatic plan/task control via API.");
   console.log("    Recommended for users integrating ndomo with other tools (port 4097, auth required).");
@@ -1231,24 +1154,21 @@ export async function runInstall(args: string[]): Promise<void> {
     info("Skipping dependency installation (--skip-deps)");
   }
 
-  // Step 2: Build
-  await stepBuild(projectRoot, flags.dryRun);
-
-  // Step 3+4: Copy agents
+  // Step 2: Copy agents
   mkdirSync(join(configDir, "agent"), { recursive: true });
   mkdirSync(join(configDir, "skills"), { recursive: true });
   stepCopyAgents(projectRoot, configDir, backupDir, flags.dryRun);
 
-  // Step 5: Copy skills
+  // Step 3: Copy skills
   stepCopySkills(projectRoot, configDir, backupDir, flags.dryRun);
 
-  // Step 5.5: Apply preset
+  // Step 3.5: Apply preset
   stepApplyPreset(configDir, configJson, flags.preset, flags.provider, flags.dryRun);
 
-  // Step 6: Copy config
+  // Step 4: Copy config
   stepCopyConfig(projectRoot, configDir, backupDir, flags.dryRun);
 
-  // Step 6.5: Register plugins
+  // Step 4.5: Register plugins
   // Reload config from configDir (just copied)
   let installedConfig: NdomoConfig = {};
   const ndomoJsonPath = join(configDir, "ndomo.json");
@@ -1260,16 +1180,16 @@ export async function runInstall(args: string[]): Promise<void> {
   }
   stepRegisterPlugins(configDir, installedConfig, backupDir, flags.dryRun);
 
-  // Step 6.6: Install package
+  // Step 4.6: Install package
   await stepInstallPackage(projectRoot, configDir, flags.dryRun);
 
-  // Step 6.7: Copy tools (npm distribution — no symlink)
+  // Step 4.7: Copy tools (npm distribution — no symlink)
   stepCopyTools(projectRoot, configDir, flags.dryRun);
 
-  // Step 7: Inject preset
+  // Step 5: Inject preset
   stepInjectPreset(configDir, flags.preset, flags.dryRun);
 
-  // Step 8: Optional DCP
+  // Step 6: Optional DCP
   if (flags.withDcp) {
     await stepInstallDcp(flags.dryRun);
   }