@noir-ai/cli 1.0.0-beta.1 → 1.2.0-beta.2

package/dist/bin.js

@@ -7,15 +7,20 @@ import {
   handleError,
   inferExitCode,
   info,
-  init,
   isInteractive,
   log,
   serve,
-  table
-} from "./chunk-UXT7YWQY.js";
+  table,
+  warn
+} from "./chunk-I3L3KNJM.js";
+import {
+  init
+} from "./chunk-7WKKZ452.js";
 
 // src/bin.ts
+import { realpathSync } from "fs";
 import { pathToFileURL } from "url";
+import { SUPPORTED_HOSTS } from "@noir-ai/adapters";
 import { NOIR_VERSION as NOIR_VERSION3 } from "@noir-ai/core";
 import { Command, Option } from "commander";
 
@@ -58,7 +63,7 @@ async function probeDaemon(opts = {}) {
       return { running: false };
     }
     const body = await res.json().catch(() => null);
-    if (!body || body.ok !== true) {
+    if (body?.ok !== true) {
       if (opts.verbose) process.stderr.write("noir: daemon probe: /health body not ok\n");
       return { running: false };
     }
@@ -95,7 +100,7 @@ async function connectClient(client, url, opts) {
 async function callToolParse(client, opts, name, args) {
   const result = await client.callTool({ name, arguments: args }).catch((err) => failDaemonDown(opts, err));
   const block = result.content?.[0];
-  if (!block || block.type !== "text" || typeof block.text !== "string") {
+  if (block?.type !== "text" || typeof block.text !== "string") {
     failDaemonDown(opts, new Error(`tool '${name}' returned no text content`));
   }
   const text = block.text;
@@ -183,10 +188,10 @@ function failTool(label, envelope, opts) {
 function toHit(raw) {
   const h = raw ?? {};
   return {
-    path: typeof h["path"] === "string" ? h["path"] : "<unknown>",
-    score: typeof h["score"] === "number" ? h["score"] : 0,
-    snippet: typeof h["snippet"] === "string" ? h["snippet"] : "",
-    source: typeof h["source"] === "string" ? h["source"] : ""
+    path: typeof h.path === "string" ? h.path : "<unknown>",
+    score: typeof h.score === "number" ? h.score : 0,
+    snippet: typeof h.snippet === "string" ? h.snippet : "",
+    source: typeof h.source === "string" ? h.source : ""
   };
 }
 async function contextSearch(opts) {
@@ -422,7 +427,7 @@ async function daemonStatus(opts) {
   } catch {
     health = null;
   }
-  if (!health || health.ok !== true) {
+  if (health?.ok !== true) {
     clearDaemonRecord();
     fail(
       EXIT.DAEMON_DOWN,
@@ -553,15 +558,15 @@ function toHit2(raw) {
   const h = raw ?? {};
   const arr = (v) => Array.isArray(v) ? v.filter((x) => typeof x === "string") : [];
   return {
-    id: typeof h["id"] === "string" ? h["id"] : "",
-    type: typeof h["type"] === "string" ? h["type"] : "",
-    score: typeof h["score"] === "number" ? h["score"] : 0,
-    content: typeof h["content"] === "string" ? h["content"] : "",
-    concepts: arr(h["concepts"]),
-    files: arr(h["files"]),
-    ts: typeof h["ts"] === "number" ? h["ts"] : 0,
-    importance: typeof h["importance"] === "number" ? h["importance"] : 0,
-    source: typeof h["source"] === "string" ? h["source"] : ""
+    id: typeof h.id === "string" ? h.id : "",
+    type: typeof h.type === "string" ? h.type : "",
+    score: typeof h.score === "number" ? h.score : 0,
+    content: typeof h.content === "string" ? h.content : "",
+    concepts: arr(h.concepts),
+    files: arr(h.files),
+    ts: typeof h.ts === "number" ? h.ts : 0,
+    importance: typeof h.importance === "number" ? h.importance : 0,
+    source: typeof h.source === "string" ? h.source : ""
   };
 }
 function failTool2(label, envelope, opts) {
@@ -612,8 +617,8 @@ async function memorySave(opts) {
   const content = await resolveContent(opts);
   const files = splitCsv(opts.files);
   const args = { content };
-  if (typeof opts.type === "string" && opts.type.length > 0) args["type"] = opts.type;
-  if (files !== void 0) args["files"] = files;
+  if (typeof opts.type === "string" && opts.type.length > 0) args.type = opts.type;
+  if (files !== void 0) args.files = files;
   const res = await callDaemonTool(opts, "memory_save", args);
   if (res.ok !== true) failTool2("memory save", res, opts);
   const id = typeof res.id === "string" ? res.id : "";
@@ -654,7 +659,7 @@ function renderObservation(obs, opts) {
     if (obs[key] !== void 0) rows.push({ Field: key, Value: obs[key] });
   }
   if (rows.length > 0) table(rows, ["Field", "Value"], opts);
-  const content = obs["content"];
+  const content = obs.content;
   if (typeof content === "string") log(`
 ${content}`, opts);
 }
@@ -664,9 +669,9 @@ async function memorySessions(opts) {
   const sessions = Array.isArray(res.sessions) ? res.sessions.map((raw) => {
     const s = raw ?? {};
     return {
-      id: typeof s["id"] === "string" ? s["id"] : "",
-      count: typeof s["count"] === "number" ? s["count"] : 0,
-      lastTs: typeof s["lastTs"] === "number" ? s["lastTs"] : 0
+      id: typeof s.id === "string" ? s.id : "",
+      count: typeof s.count === "number" ? s.count : 0,
+      lastTs: typeof s.lastTs === "number" ? s.lastTs : 0
     };
   }) : [];
   const data = { sessions };
@@ -711,8 +716,8 @@ async function memoryConsolidate(opts) {
   const types = splitCsv(opts.types);
   const limit = parseLimit2(opts.limit, "memory consolidate", opts);
   const args = {};
-  if (types !== void 0) args["types"] = types;
-  if (limit !== void 0) args["limit"] = limit;
+  if (types !== void 0) args.types = types;
+  if (limit !== void 0) args.limit = limit;
   const res = await callDaemonTool(
     opts,
     "memory_consolidate",
@@ -735,15 +740,15 @@ async function memoryConsolidate(opts) {
       const l = lessons[i];
       if (l === void 0) continue;
       const obs = l ?? {};
-      const id = typeof obs["id"] === "string" ? obs["id"] : `<lesson ${i + 1}>`;
-      const content = typeof obs["content"] === "string" ? obs["content"] : "";
+      const id = typeof obs.id === "string" ? obs.id : `<lesson ${i + 1}>`;
+      const content = typeof obs.content === "string" ? obs.content : "";
       log(`- ${id}: ${content}`, opts);
     }
     return;
   }
   const env = res;
-  const reason = (typeof env["reason"] === "string" ? env["reason"] : void 0) ?? (typeof env["error"] === "string" ? env["error"] : void 0) ?? "unknown";
-  const logged = env["logged"] === true || env["degraded"] === true;
+  const reason = (typeof env.reason === "string" ? env.reason : void 0) ?? (typeof env.error === "string" ? env.error : void 0) ?? "unknown";
+  const logged = env.logged === true || env.degraded === true;
   const suffix = logged ? " (logged)" : "";
   fail(EXIT.ERROR, `memory consolidate did not run: ${reason}${suffix}`, opts);
 }
@@ -751,7 +756,10 @@ async function memoryConsolidate(opts) {
 // src/commands/skills.ts
 import { claudeAdapter } from "@noir-ai/adapters";
 import { loadProjectInfo as loadProjectInfo4 } from "@noir-ai/core";
-import { discoverBuiltin, emitSkillsToDir } from "@noir-ai/skills";
+import {
+  discoverAll,
+  emitSkillsToDir
+} from "@noir-ai/skills";
 var CATEGORY = {
   "noir-brainstorm": "discovery",
   "noir-intake": "discovery",
@@ -790,9 +798,9 @@ function categoryOf(name) {
   if (mapped !== void 0) return mapped;
   return name.replace(/^noir-/, "") || "general";
 }
-function toRow(s) {
+function toRow(s, kind = "builtin") {
   const description = typeof s.frontmatter.description === "string" ? s.frontmatter.description : "";
-  return { name: s.name, category: categoryOf(s.name), description };
+  return { name: s.name, category: categoryOf(s.name), description, kind };
 }
 function truncate(text, max) {
   if (text.length <= max) return text;
@@ -803,30 +811,39 @@ function truncate(text, max) {
 }
 async function skillsList(opts) {
   let builtins;
+  let integrations;
   try {
-    builtins = discoverBuiltin();
+    const all = discoverAll();
+    builtins = all.builtins;
+    integrations = all.integrations;
   } catch (err) {
     fail(
       EXIT.ERROR,
-      `skills list: could not discover builtin skills (${err instanceof Error ? err.message : String(err)})`,
+      `skills list: could not discover skills (${err instanceof Error ? err.message : String(err)})`,
       opts
     );
   }
-  const rows = builtins.map(toRow);
+  const rows = [
+    ...builtins.map((b) => toRow(b, "builtin")),
+    ...integrations.map((i) => toRow(i, "integration"))
+  ];
   const data = { count: rows.length, skills: rows };
   if (opts.json === true) {
     process.stdout.write(`${JSON.stringify({ ok: true, data })}
 `);
     return;
   }
-  log(`noir skills \u2014 ${rows.length} builtin skill${rows.length === 1 ? "" : "s"}`, opts);
+  const intCount = integrations.length;
+  const banner = intCount > 0 ? `noir skills \u2014 ${rows.length} skill${rows.length === 1 ? "" : "s"} (${builtins.length} builtin, ${intCount} integration${intCount === 1 ? "" : "s"})` : `noir skills \u2014 ${rows.length} builtin skill${rows.length === 1 ? "" : "s"}`;
+  log(banner, opts);
   table(
     rows.map((r) => ({
       Skill: r.name,
+      Kind: r.kind,
       Category: r.category,
       Description: truncate(r.description, 80)
     })),
-    ["Skill", "Category", "Description"],
+    ["Skill", "Kind", "Category", "Description"],
     opts
   );
 }
@@ -850,10 +867,12 @@ async function skillsSync(opts) {
   }
   const dir = claudeAdapter.skillsDir({ root });
   const summary = await emitSkillsToDir(dir);
+  const pruned = summary.pruned ?? [];
   const data = {
     emitted: summary.emitted,
     references: summary.references,
-    dir
+    dir,
+    pruned
   };
   if (opts.json === true) {
     process.stdout.write(`${JSON.stringify({ ok: true, data })}
@@ -864,6 +883,12 @@ async function skillsSync(opts) {
     `Synced ${summary.emitted.length} Noir skill${summary.emitted.length === 1 ? "" : "s"} to ${dir}.`,
     opts
   );
+  if (pruned.length > 0) {
+    warn(
+      `Pruned ${pruned.length} stale noir-* skill dir${pruned.length === 1 ? "" : "s"}: ${pruned.join(", ")}`,
+      opts
+    );
+  }
 }
 
 // src/commands/status.ts
@@ -876,7 +901,7 @@ async function tryTool(caller, name) {
   }
 }
 function pickStore(s) {
-  if (!s || s.ok !== true) return null;
+  if (s?.ok !== true) return null;
   return {
     docCount: s.docCount,
     vecCount: s.vecCount,
@@ -890,7 +915,7 @@ function describeEmbedder2(e) {
   return `${e.kind} \xB7 ${model} (${e.dim}-dim)`;
 }
 function pickContext(c) {
-  if (!c || c.ok !== true) return null;
+  if (c?.ok !== true) return null;
   return {
     docCount: c.docCount,
     vecCount: c.vecCount,
@@ -900,7 +925,7 @@ function pickContext(c) {
   };
 }
 function pickWorkflow(w) {
-  if (!w || w.ok !== true) return null;
+  if (w?.ok !== true) return null;
   return {
     taskId: w.taskId,
     phase: w.phase,
@@ -911,7 +936,7 @@ function pickWorkflow(w) {
   };
 }
 function pickMemory(m) {
-  if (!m || m.ok !== true || !Array.isArray(m.sessions)) return null;
+  if (m?.ok !== true || !Array.isArray(m.sessions)) return null;
   let observations = 0;
   for (const s of m.sessions) observations += s.count;
   return { sessions: m.sessions.length, observations };
@@ -1186,15 +1211,20 @@ function toStatusOptions(g) {
     input: g.input !== false
   };
 }
+function parseHost(raw) {
+  if (raw === void 0) return void 0;
+  return raw;
+}
 function createProgram() {
   const program2 = new Command();
   program2.name("noir").description("Noir \u2014 discipline, context, and memory layer for agentic CLIs.").version(NOIR_VERSION3, "-v, --version").addOption(new Option("--json", "emit machine-readable JSON to stdout")).addOption(new Option("--no-input", "never prompt; error if input is required")).addOption(new Option("--quiet", "suppress non-essential diagnostics")).addOption(new Option("--verbose", "show additional diagnostic detail")).addOption(new Option("--cwd <path>", "run as if started in <path>")).exitOverride((err) => {
     throw err;
   }).configureOutput({
-    // S9 stream discipline: data → stdout, diagnostics → stderr. Help and
-    // errors are diagnostics, so both go to stderr (keeps stdout pristine for
-    // --json payloads). commander's default error formatting is preserved.
-    writeOut: (str) => process.stderr.write(str),
+    // Stream discipline: --help/--version → stdout (conventional; users pipe
+    // them), errors → stderr. --json data is emitted by command actions via
+    // process.stdout directly, NOT by commander's writeOut, so routing help/
+    // version to stdout does not conflict with --json payloads.
+    writeOut: (str) => process.stdout.write(str),
     writeErr: (str) => process.stderr.write(str)
   });
   program2.hook("preAction", (_thisCmd, actionCmd) => {
@@ -1211,13 +1241,66 @@ function createProgram() {
       }
     }
   });
-  program2.command("init").description("scaffold Noir in the current project (.noir/, .mcp.json, CLAUDE.md, skills)").option("--transport <transport>", "stdio | streamable-http (default: stdio)", "stdio").option("--url <url>", "streamable-http daemon URL (localhost only)").action(async (opts) => {
-    const transport = opts.transport === "streamable-http" ? "streamable-http" : "stdio";
-    await init(process.cwd(), { transport, url: opts.url });
-  });
-  program2.command("sync").description("re-emit the Noir builtin skills into the host skills dir").action(async () => {
-    const { sync } = await import("./sync-7YLRJYMR.js");
-    await sync(process.cwd());
+  program2.command("init").description("scaffold Noir in the current project (.noir/, .mcp.json, CLAUDE.md, skills)").option("--transport <transport>", "stdio | streamable-http (default: stdio)", "stdio").option("--url <url>", "streamable-http daemon URL (localhost only)").option(
+    "--upgrade",
+    "run scaffold migrations before re-emitting (re-run on an existing project)"
+  ).addOption(
+    // S10: target host. Defaults to `'claude'` (the regression anchor). The
+    // chosen host is forwarded to scaffold() + skills emission via
+    // resolveAdapter. The choice list mirrors `SUPPORTED_HOSTS` so a new host
+    // lands here automatically; commander rejects anything else as usage=2.
+    new Option(
+      "--host <id>",
+      "target agentic CLI (default: claude) \u2014 drives host-side emission"
+    ).choices(SUPPORTED_HOSTS)
+  ).action(
+    async (opts) => {
+      const transport = opts.transport === "streamable-http" ? "streamable-http" : "stdio";
+      const upgrade = opts.upgrade === true;
+      const host = parseHost(opts.host);
+      await init(process.cwd(), {
+        transport,
+        url: opts.url,
+        ...upgrade ? { upgrade } : {},
+        ...host !== void 0 ? { host } : {}
+      });
+    }
+  );
+  program2.command("create [dir]").description("bootstrap the Noir AI layer in a new or empty directory").option("--transport <transport>", "stdio | streamable-http (default: stdio)", "stdio").option("--url <url>", "streamable-http daemon URL (localhost only)").addOption(
+    new Option(
+      "--host <id>",
+      "target agentic CLI (default: claude) \u2014 drives host-side emission"
+    ).choices(SUPPORTED_HOSTS)
+  ).action(
+    async (dir, opts) => {
+      const transport = opts.transport === "streamable-http" ? "streamable-http" : "stdio";
+      const host = parseHost(opts.host);
+      const { create } = await import("./create-ZK2EBXG3.js");
+      await create(dir, {
+        transport,
+        url: opts.url,
+        ...host !== void 0 ? { host } : {}
+      });
+    }
+  );
+  program2.command("sync").description(
+    "re-emit Noir managed files (.mcp.json, CLAUDE.md blocks, NOIR.md brief, ignores) + skills"
+  ).addOption(
+    // S10: optional `--host` override. When omitted, sync reads host from
+    // `.noir/config.yml` (whatever `noir init --host <id>` persisted). The
+    // override is rarely needed — documented as advanced.
+    new Option(
+      "--host <id>",
+      "override the configured host (advanced; default reads .noir/config.yml)"
+    ).choices(SUPPORTED_HOSTS)
+  ).action(async (opts) => {
+    const { sync } = await import("./sync-IEH2BVXU.js");
+    const host = parseHost(opts.host);
+    if (host === void 0) {
+      await sync(process.cwd());
+    } else {
+      await sync(process.cwd(), { host });
+    }
   });
   const mcpCmd = program2.command("mcp").description("MCP server control");
   mcpCmd.command("serve").description("run the Noir MCP server (stdio, or via the shared daemon)").option("--stdio", "force the stdio transport").action(async (opts) => {
@@ -1230,7 +1313,7 @@ function createProgram() {
   daemonGrp.command("start").description("start the Noir daemon (foreground; backgrounding deferred)").option("--detach", "run in the background (not yet implemented; exits 2)").action(async (...args) => {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
-    const detach = g["detach"] === true;
+    const detach = g.detach === true;
     await daemonStart({ ...toCliOptions(g), ...detach ? { detach } : {} });
   });
   daemonGrp.command("stop").description("stop the Noir daemon").action(async (...args) => {
@@ -1256,7 +1339,7 @@ function createProgram() {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
     const query = typeof args[0] === "string" ? args[0] : "";
-    const limit = typeof g["limit"] === "string" ? g["limit"] : void 0;
+    const limit = typeof g.limit === "string" ? g.limit : void 0;
     await contextSearch({
       ...toCliOptions(g),
       query,
@@ -1271,8 +1354,8 @@ function createProgram() {
   ).option("--force", "ignore content-hash caching (recognized; not yet honored)").action(async (...args) => {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
-    const rawPaths = Array.isArray(g["path"]) ? g["path"].filter((p) => typeof p === "string") : [];
-    const force = g["force"] === true;
+    const rawPaths = Array.isArray(g.path) ? g.path.filter((p) => typeof p === "string") : [];
+    const force = g.force === true;
     await contextIndex({
       ...toCliOptions(g),
       ...rawPaths.length === 0 ? {} : { paths: rawPaths },
@@ -1290,7 +1373,7 @@ function createProgram() {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
     const query = typeof args[0] === "string" ? args[0] : "";
-    const limit = typeof g["limit"] === "string" ? g["limit"] : void 0;
+    const limit = typeof g.limit === "string" ? g.limit : void 0;
     await memoryRecall({
       ...toCliOptions(g),
       query,
@@ -1303,9 +1386,9 @@ function createProgram() {
   ).option("--files <files>", "comma-separated related file paths").action(async (...args) => {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
-    const content = typeof g["content"] === "string" ? g["content"] : void 0;
-    const type = typeof g["type"] === "string" ? g["type"] : void 0;
-    const files = typeof g["files"] === "string" ? g["files"] : void 0;
+    const content = typeof g.content === "string" ? g.content : void 0;
+    const type = typeof g.type === "string" ? g.type : void 0;
+    const files = typeof g.files === "string" ? g.files : void 0;
     await memorySave({
       ...toCliOptions(g),
       ...content === void 0 ? {} : { content },
@@ -1326,8 +1409,8 @@ function createProgram() {
   memoryGrp.command("consolidate").description("consolidate memories into a derived lesson (provider-explicit)").option("--types <types>", "comma-separated observation types to consolidate").option("--limit <n>", "cap on candidate observations").action(async (...args) => {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
-    const types = typeof g["types"] === "string" ? g["types"] : void 0;
-    const limit = typeof g["limit"] === "string" ? g["limit"] : void 0;
+    const types = typeof g.types === "string" ? g.types : void 0;
+    const limit = typeof g.limit === "string" ? g.limit : void 0;
     await memoryConsolidate({
       ...toCliOptions(g),
       ...types === void 0 ? {} : { types },
@@ -1354,8 +1437,8 @@ function createProgram() {
   taskGrp.command("new").description("start a new workflow task").requiredOption("--slug <slug>", "task slug").option("--mode <mode>", "full | quick").action(async (...args) => {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
-    const slug = typeof g["slug"] === "string" ? g["slug"] : "";
-    const mode = typeof g["mode"] === "string" ? g["mode"] : void 0;
+    const slug = typeof g.slug === "string" ? g.slug : "";
+    const mode = typeof g.mode === "string" ? g.mode : void 0;
     await taskNew({
       ...toCliOptions(g),
       slug,
@@ -1375,8 +1458,8 @@ function createProgram() {
   taskGrp.command("advance").description("advance the active task to the next phase").option("--to <phase>", "target phase").option("--force <reason>", "force the gate with a reason").action(async (...args) => {
     const cmd = trailingCmd(args);
     const g = cmd.optsWithGlobals();
-    const to = typeof g["to"] === "string" ? g["to"] : void 0;
-    const force = typeof g["force"] === "string" ? g["force"] : void 0;
+    const to = typeof g.to === "string" ? g.to : void 0;
+    const force = typeof g.force === "string" ? g.force : void 0;
     await taskAdvance({
       ...toCliOptions(g),
       ...to === void 0 ? {} : { to },
@@ -1425,7 +1508,8 @@ async function run(argv = []) {
 var isMainModule = (() => {
   try {
     const entry = process.argv[1];
-    return typeof entry === "string" && entry.length > 0 ? pathToFileURL(entry).href === import.meta.url : false;
+    if (typeof entry !== "string" || entry.length === 0) return false;
+    return pathToFileURL(realpathSync(entry)).href === import.meta.url;
   } catch {
     return false;
   }