@noir-ai/cli 1.3.0-beta.6 → 1.4.0-beta.1

package/dist/chunk-A5W2E3X2.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+// src/serve.ts
+import { loadProjectInfo } from "@noir-ai/core";
+import { ensureDaemonRunning, startStdioServer } from "@noir-ai/daemon";
+async function serve(opts) {
+  const project = loadProjectInfo(process.cwd());
+  if (opts.stdio) {
+    await startStdioServer({ project, transport: "stdio", daemon: false });
+    return;
+  }
+  try {
+    const { url } = await ensureDaemonRunning({
+      project,
+      idleTimeoutSec: project.config.daemon.idleTimeoutSec
+    });
+    process.stderr.write(
+      `Noir daemon available at ${url}. (For HTTP clients, use this URL in .mcp.json.)
+`
+    );
+  } catch (err) {
+    process.stderr.write(
+      `Noir daemon unavailable (${err instanceof Error ? err.message : String(err)}); falling back to stdio.
+`
+    );
+    await startStdioServer({ project, transport: "stdio", daemon: false });
+  }
+}
+
+export {
+  serve
+};
+//# sourceMappingURL=chunk-A5W2E3X2.js.map

package/dist/chunk-A5W2E3X2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/serve.ts"],"sourcesContent":["import { loadProjectInfo } from '@noir-ai/core';\nimport { ensureDaemonRunning, startStdioServer } from '@noir-ai/daemon';\n\nexport async function serve(opts: { stdio: boolean }): Promise<void> {\n  const project = loadProjectInfo(process.cwd());\n  if (opts.stdio) {\n    await startStdioServer({ project, transport: 'stdio', daemon: false });\n    return; // stdio server runs until stdin closes\n  }\n  // Prefer the shared daemon; on failure fall back to in-process stdio so Noir\n  // keeps working even when the daemon cannot start (FS-degradation path).\n  try {\n    const { url } = await ensureDaemonRunning({\n      project,\n      idleTimeoutSec: project.config.daemon.idleTimeoutSec,\n    });\n    process.stderr.write(\n      `Noir daemon available at ${url}. (For HTTP clients, use this URL in .mcp.json.)\\n`,\n    );\n  } catch (err) {\n    process.stderr.write(\n      `Noir daemon unavailable (${err instanceof Error ? err.message : String(err)}); falling back to stdio.\\n`,\n    );\n    await startStdioServer({ project, transport: 'stdio', daemon: false });\n  }\n}\n"],"mappings":";;;AAAA,SAAS,uBAAuB;AAChC,SAAS,qBAAqB,wBAAwB;AAEtD,eAAsB,MAAM,MAAyC;AACnE,QAAM,UAAU,gBAAgB,QAAQ,IAAI,CAAC;AAC7C,MAAI,KAAK,OAAO;AACd,UAAM,iBAAiB,EAAE,SAAS,WAAW,SAAS,QAAQ,MAAM,CAAC;AACrE;AAAA,EACF;AAGA,MAAI;AACF,UAAM,EAAE,IAAI,IAAI,MAAM,oBAAoB;AAAA,MACxC;AAAA,MACA,gBAAgB,QAAQ,OAAO,OAAO;AAAA,IACxC,CAAC;AACD,YAAQ,OAAO;AAAA,MACb,4BAA4B,GAAG;AAAA;AAAA,IACjC;AAAA,EACF,SAAS,KAAK;AACZ,YAAQ,OAAO;AAAA,MACb,4BAA4B,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG,CAAC;AAAA;AAAA,IAC9E;AACA,UAAM,iBAAiB,EAAE,SAAS,WAAW,SAAS,QAAQ,MAAM,CAAC;AAAA,EACvE;AACF;","names":[]}

package/dist/{chunk-J2Y3BOVK.js → chunk-SVFQGAOF.js}

@@ -1,27 +1,41 @@
 #!/usr/bin/env node
 import {
-  buildConflictOpts
-} from "./chunk-OF4OO5W6.js";
+  buildConflictOpts,
+  checkWritePathDedup,
+  resolveInteractive
+} from "./chunk-YES5UCU5.js";
 
 // src/init.ts
 import { resolveAdapter } from "@noir-ai/adapters";
+import { loadProjectInfo } from "@noir-ai/core";
 import { scaffold } from "@noir-ai/create";
 import { emitSkillsToDir } from "@noir-ai/skills";
 async function init(root, opts) {
   assertTransportUrl(opts);
   const host = opts.host ?? "claude";
+  const interactive = resolveInteractive();
+  const conflictOpts = buildConflictOpts({ force: opts.force, interactive });
   const res = await scaffold({
     root,
     mode: "init",
     host,
     transport: opts.transport,
+    interactive,
     ...opts.url !== void 0 ? { url: opts.url } : {},
     ...opts.upgrade === true ? { upgrade: true } : {},
     ...opts.force === true ? { force: true } : {},
-    ...buildConflictOpts({ force: opts.force })
+    ...conflictOpts
   });
-  if (res.noop) return;
-  await emitHostSkills(root, host);
+  if (res.noop) return res;
+  await emitHostSkills(root, host, conflictOpts, interactive);
+  let projectInfo;
+  try {
+    projectInfo = loadProjectInfo(root);
+  } catch {
+    projectInfo = void 0;
+  }
+  const dedup = await checkWritePathDedup(root, res, { interactive, project: projectInfo });
+  if (dedup.conflicts.length > 0) res.conflicts.push(...dedup.conflicts);
   process.stderr.write(
     `Noir initialized in ${root} (host: ${host}, transport: ${opts.transport}).
 `
@@ -29,8 +43,9 @@ async function init(root, opts) {
   process.stderr.write(
     "Next: run `noir` to open the home menu (or `noir status` for a snapshot).\n"
   );
+  return res;
 }
-async function emitHostSkills(root, host) {
+async function emitHostSkills(root, host, conflictOpts, interactive) {
   const adapter = resolveAdapter(host);
   const skillsDir = adapter.skillsDir?.({ root });
   if (skillsDir === void 0) {
@@ -39,7 +54,16 @@ async function emitHostSkills(root, host) {
     return;
   }
   const target = host;
-  const summary = await emitSkillsToDir(skillsDir, { includeIntegrations: true, target });
+  const skillOpts = {
+    includeIntegrations: true,
+    target,
+    conflictPolicy: conflictOpts.conflictPolicy,
+    interactive
+  };
+  if (conflictOpts.onConflict !== void 0) {
+    skillOpts.onConflict = conflictOpts.onConflict;
+  }
+  const summary = await emitSkillsToDir(skillsDir, skillOpts);
   const relDir = skillsDir.replace(`${root}/`, "");
   process.stderr.write(
     `Emitted ${summary.emitted.length} Noir skills to ${relDir}/ (target: ${target}).
@@ -73,4 +97,4 @@ export {
   init,
   assertTransportUrl
 };
-//# sourceMappingURL=chunk-J2Y3BOVK.js.map
+//# sourceMappingURL=chunk-SVFQGAOF.js.map

package/dist/chunk-SVFQGAOF.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/init.ts"],"sourcesContent":["// `noir init` — first-run + `--upgrade`.\n//\n// Slice S-T2 refactor: the ad-hoc writers (syncIgnores, writeManagedRegion,\n// writeFileSync for .mcp.json/project.id/config.yml/NOIR.md/RULES.md) are\n// replaced by a single call into `@noir-ai/create`'s `scaffold({mode:'init'})`.\n// The manifest + three-mode writer are the source of truth for what init\n// emits; this module is now a thin caller that owns ONLY:\n//   - the transport/url precondition (the localhost security gate, whose\n//     error strings are locked by url-validation.test.ts), and\n//   - skills emission (out-of-manifest by design — composed after scaffold()).\n//\n// S10 multi-host: the 8 direct `claudeAdapter` imports across init/sync/create\n// collapsed to `resolveAdapter(host)` where `host` comes from `--host <id>`\n// (default `'claude'`). The adapter drives (a) the manifest via\n// `scaffold({host})` and (b) skills emission — claude/cursor have a skill dir;\n// gemini/agents-md/opencode have no skill concept and the call is skipped.\n//\n// Deliberate behavior changes vs the predecessor (spec-aligned latent-bug\n// fixes; see S-T1 contract notes + CHANGELOG):\n//   - `.noir/project.id` → skipIfExists (predecessor overwrote on every init,\n//     orphaning the store DB named after the id). Re-init now preserves it.\n//   - `.noir/config.yml` → skipIfExists (predecessor overwrote).\n//   - `.noir/NOIR.md` → managedBlock with BRIEF_BLOCK markers (predecessor\n//     wrote the whole file with no markers). First-run output GAINS markers;\n//     user notes outside the markers survive re-runs.\n//   - `.noir/scaffold-version` is now stamped on init/create (engine-owned).\n\nimport { type HostId, resolveAdapter } from '@noir-ai/adapters';\nimport { loadProjectInfo, type ProjectInfo } from '@noir-ai/core';\nimport { type ScaffoldResult, scaffold } from '@noir-ai/create';\nimport { type CompileTarget, emitSkillsToDir } from '@noir-ai/skills';\nimport { buildConflictOpts, type ScaffoldConflictOpts } from './conflict.js';\nimport { checkWritePathDedup } from './dedup-write.js';\nimport { resolveInteractive } from './output.js';\n\nexport interface InitOptions {\n  transport: 'stdio' | 'streamable-http';\n  url?: string;\n  /** `noir init --upgrade`: run scaffold migrations from the on-disk\n   *  scaffold-version to current, then re-emit ONLY the runtime subset\n   *  (regenerate + managedBlock). skipIfExists seeds are left alone so user\n   *  edits survive. */\n  upgrade?: boolean;\n  /** S10 target host. Defaults to `'claude'` (the regression anchor). Drives\n   *  both scaffold emission (the manifest's host-specific half) and skills\n   *  emission (skipped for hosts with no `skillsDir`). */\n  host?: HostId;\n  /** SP-A: re-scaffold even if already initialized (bypasses the\n   *  already-initialized no-op guard in scaffold()). */\n  force?: boolean;\n}\n\n/**\n * Initialize Noir in `root`. Returns the {@link ScaffoldResult} (with\n * structured `conflicts[]` + any dedup records appended) so `--json`\n * callers can surface conflict detail. `undefined` when the already-initialized\n * guard short-circuited (a no-op).\n */\nexport async function init(root: string, opts: InitOptions): Promise<ScaffoldResult | undefined> {\n  assertTransportUrl(opts);\n\n  const host: HostId = opts.host ?? 'claude';\n  // The engine reads ScaffoldOptions.interactive (hermetic — never\n  // process.env). The CLI derives it once from the bridge + TTY/CI/NO_COLOR gate.\n  const interactive = resolveInteractive();\n  const conflictOpts = buildConflictOpts({ force: opts.force, interactive });\n\n  const res = await scaffold({\n    root,\n    mode: 'init',\n    host,\n    transport: opts.transport,\n    interactive,\n    ...(opts.url !== undefined ? { url: opts.url } : {}),\n    ...(opts.upgrade === true ? { upgrade: true } : {}),\n    ...(opts.force === true ? { force: true } : {}),\n    ...conflictOpts,\n  });\n  // SP-A: if the already-initialized guard no-op'd scaffold, stop — don't re-emit\n  // skills or print \"initialized\" (scaffold already printed the no-op message).\n  if (res.noop) return res;\n\n  // Thread the SAME conflictOpts into skills emission so the\n  // skills-emit conflict flow is LIVE in interactive mode (the producer\n  // accepts conflict opts; this closes the wiring gap). The safe-default\n  // `assertNotUserOwned` runs unconditionally inside the producer.\n  await emitHostSkills(root, host, conflictOpts, interactive);\n\n  // Write-path semantic dedup. Non-blocking; degrades to a\n  // stderr warn-skip when the embedder is unavailable. Records near-dups on\n  // `res.conflicts` so `--json` consumers see them without a prompt.\n  // Best-effort project read: first-run init has no .noir/config.yml yet →\n  // undefined → resolveEmbedder warn-skips. `init --force` on an existing\n  // project reads the config and runs the dedup against existing host files.\n  let projectInfo: ProjectInfo | undefined;\n  try {\n    projectInfo = loadProjectInfo(root);\n  } catch {\n    projectInfo = undefined;\n  }\n  const dedup = await checkWritePathDedup(root, res, { interactive, project: projectInfo });\n  if (dedup.conflicts.length > 0) res.conflicts.push(...dedup.conflicts);\n\n  process.stderr.write(\n    `Noir initialized in ${root} (host: ${host}, transport: ${opts.transport}).\\n`,\n  );\n  process.stderr.write(\n    'Next: run `noir` to open the home menu (or `noir status` for a snapshot).\\n',\n  );\n  return res;\n}\n\n/**\n * Compose skill emission onto the resolved adapter's `skillsDir` (claude →\n * `.claude/skills/`; cursor → `.cursor/rules/` compiled as `.mdc`; the other\n * three hosts have no skill concept and are skipped with a stderr note).\n *\n * The `CompileTarget` matches the host id (S10 foundation widened the enum to\n * the same union) so cursor skills compile to the `.mdc` rule shape via\n * `compileSkill(_, 'cursor')`; the others keep the verbatim SKILL.md format.\n */\nasync function emitHostSkills(\n  root: string,\n  host: HostId,\n  conflictOpts: ScaffoldConflictOpts,\n  interactive: boolean,\n): Promise<void> {\n  const adapter = resolveAdapter(host);\n  const skillsDir = adapter.skillsDir?.({ root });\n  if (skillsDir === undefined) {\n    // N1: standardized wording — same phrase across init/sync/create so logs\n    // grep uniformly. (Pre-N1 each command phrased this differently.)\n    process.stderr.write(`host '${host}' has no skill emitter; skipping skills\\n`);\n    return;\n  }\n  const target: CompileTarget = host;\n  // Forward conflictPolicy + onConflict + interactive so an\n  // interactive `noir init` with a conflicting skill emit consults the\n  // resolver (clack menu + diff preview + apply-to-all); --json/--no-input\n  // stays prompt-free via the `interactive: false` guard. The resolver shape\n  // is structurally compatible with the skill emit seam (see skills/types.ts);\n  // the cast isolates the literal-narrowing mismatch on the return type.\n  type SkillEmitOpts = NonNullable<Parameters<typeof emitSkillsToDir>[1]>;\n  const skillOpts: SkillEmitOpts = {\n    includeIntegrations: true,\n    target,\n    conflictPolicy: conflictOpts.conflictPolicy,\n    interactive,\n  };\n  if (conflictOpts.onConflict !== undefined) {\n    skillOpts.onConflict = conflictOpts.onConflict as SkillEmitOpts['onConflict'];\n  }\n  const summary = await emitSkillsToDir(skillsDir, skillOpts);\n  const relDir = skillsDir.replace(`${root}/`, '');\n  process.stderr.write(\n    `Emitted ${summary.emitted.length} Noir skills to ${relDir}/ (target: ${target}).\\n`,\n  );\n}\n\n/**\n * Transport + URL precondition. The error strings here are the SECURITY GATE\n * locked by `url-validation.test.ts` — do not rephrase. Thrown errors are\n * plain `Error`s (bin.ts's `main().catch` maps them to stderr + exitCode 1).\n *\n * Exported so `noir create` (commands/create.ts) reuses the SAME gate instead\n * of duplicating the localhost allowlist.\n */\nexport function assertTransportUrl(opts: {\n  transport: 'stdio' | 'streamable-http';\n  url?: string;\n}): void {\n  if (opts.transport === 'streamable-http' && opts.url === undefined) {\n    throw new Error('--transport streamable-http requires --url');\n  }\n  if (opts.url !== undefined) {\n    assertLocalhostUrl(opts.url);\n  }\n}\n\n// Validate a streamable-http --url is http(s) and localhost-only. Gate 2's\n// daemon binds 127.0.0.1, so persisting a non-localhost URL is a footgun.\n// Not exported: the single external surface is assertTransportUrl(); thrown\n// errors propagate to bin.ts's main().catch (stderr + exitCode 1).\nfunction assertLocalhostUrl(raw: string): void {\n  let url: URL;\n  try {\n    url = new URL(raw);\n  } catch {\n    throw new Error(`Invalid URL: ${raw}`);\n  }\n  if (!['http:', 'https:'].includes(url.protocol)) {\n    throw new Error('Only http/https URLs are supported');\n  }\n  if (!['localhost', '127.0.0.1', '::1'].includes(url.hostname)) {\n    throw new Error(`Only localhost URLs are supported (got ${url.hostname})`);\n  }\n}\n"],"mappings":";;;;;;;;AA2BA,SAAsB,sBAAsB;AAC5C,SAAS,uBAAyC;AAClD,SAA8B,gBAAgB;AAC9C,SAA6B,uBAAuB;AA4BpD,eAAsB,KAAK,MAAc,MAAwD;AAC/F,qBAAmB,IAAI;AAEvB,QAAM,OAAe,KAAK,QAAQ;AAGlC,QAAM,cAAc,mBAAmB;AACvC,QAAM,eAAe,kBAAkB,EAAE,OAAO,KAAK,OAAO,YAAY,CAAC;AAEzE,QAAM,MAAM,MAAM,SAAS;AAAA,IACzB;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA,WAAW,KAAK;AAAA,IAChB;AAAA,IACA,GAAI,KAAK,QAAQ,SAAY,EAAE,KAAK,KAAK,IAAI,IAAI,CAAC;AAAA,IAClD,GAAI,KAAK,YAAY,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;AAAA,IACjD,GAAI,KAAK,UAAU,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AAAA,IAC7C,GAAG;AAAA,EACL,CAAC;AAGD,MAAI,IAAI,KAAM,QAAO;AAMrB,QAAM,eAAe,MAAM,MAAM,cAAc,WAAW;AAQ1D,MAAI;AACJ,MAAI;AACF,kBAAc,gBAAgB,IAAI;AAAA,EACpC,QAAQ;AACN,kBAAc;AAAA,EAChB;AACA,QAAM,QAAQ,MAAM,oBAAoB,MAAM,KAAK,EAAE,aAAa,SAAS,YAAY,CAAC;AACxF,MAAI,MAAM,UAAU,SAAS,EAAG,KAAI,UAAU,KAAK,GAAG,MAAM,SAAS;AAErE,UAAQ,OAAO;AAAA,IACb,uBAAuB,IAAI,WAAW,IAAI,gBAAgB,KAAK,SAAS;AAAA;AAAA,EAC1E;AACA,UAAQ,OAAO;AAAA,IACb;AAAA,EACF;AACA,SAAO;AACT;AAWA,eAAe,eACb,MACA,MACA,cACA,aACe;AACf,QAAM,UAAU,eAAe,IAAI;AACnC,QAAM,YAAY,QAAQ,YAAY,EAAE,KAAK,CAAC;AAC9C,MAAI,cAAc,QAAW;AAG3B,YAAQ,OAAO,MAAM,SAAS,IAAI;AAAA,CAA2C;AAC7E;AAAA,EACF;AACA,QAAM,SAAwB;AAQ9B,QAAM,YAA2B;AAAA,IAC/B,qBAAqB;AAAA,IACrB;AAAA,IACA,gBAAgB,aAAa;AAAA,IAC7B;AAAA,EACF;AACA,MAAI,aAAa,eAAe,QAAW;AACzC,cAAU,aAAa,aAAa;AAAA,EACtC;AACA,QAAM,UAAU,MAAM,gBAAgB,WAAW,SAAS;AAC1D,QAAM,SAAS,UAAU,QAAQ,GAAG,IAAI,KAAK,EAAE;AAC/C,UAAQ,OAAO;AAAA,IACb,WAAW,QAAQ,QAAQ,MAAM,mBAAmB,MAAM,cAAc,MAAM;AAAA;AAAA,EAChF;AACF;AAUO,SAAS,mBAAmB,MAG1B;AACP,MAAI,KAAK,cAAc,qBAAqB,KAAK,QAAQ,QAAW;AAClE,UAAM,IAAI,MAAM,4CAA4C;AAAA,EAC9D;AACA,MAAI,KAAK,QAAQ,QAAW;AAC1B,uBAAmB,KAAK,GAAG;AAAA,EAC7B;AACF;AAMA,SAAS,mBAAmB,KAAmB;AAC7C,MAAI;AACJ,MAAI;AACF,UAAM,IAAI,IAAI,GAAG;AAAA,EACnB,QAAQ;AACN,UAAM,IAAI,MAAM,gBAAgB,GAAG,EAAE;AAAA,EACvC;AACA,MAAI,CAAC,CAAC,SAAS,QAAQ,EAAE,SAAS,IAAI,QAAQ,GAAG;AAC/C,UAAM,IAAI,MAAM,oCAAoC;AAAA,EACtD;AACA,MAAI,CAAC,CAAC,aAAa,aAAa,KAAK,EAAE,SAAS,IAAI,QAAQ,GAAG;AAC7D,UAAM,IAAI,MAAM,0CAA0C,IAAI,QAAQ,GAAG;AAAA,EAC3E;AACF;","names":[]}