@aiviatic/kindling 0.1.1 → 0.1.3

package/bootstrap/setup.ps1

@@ -10,7 +10,7 @@
 $ErrorActionPreference = 'Stop'
 
 $KindlingNodeVersion = '24.16.0'  # == pins.node
-$KindlingVersion     = '0.1.1'    # == pins.kindling
+$KindlingVersion     = '0.1.3'    # == pins.kindling
 $NodeFloorMajor      = 20
 
 # --- Inline helpers (were bootstrap/lib/common.ps1; inlined for the file-less delivery) ----------
@@ -39,19 +39,24 @@ Say " - This window already runs with -ExecutionPolicy Bypass for THIS process o
 # $NodeExe stays $null when a system Node is reused (launch via PATH); the portable-install path
 # sets it to the absolute node.exe so the launch never depends on PATH (clean-runtime rule, AR6).
 $NodeExe = $null
+$arch     = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64' } else { 'x64' }
+$distName = "node-v$KindlingNodeVersion-win-$arch"
+$nodeRoot = Join-Path $env:LOCALAPPDATA 'kindling\node'
+$portableNode = Join-Path $nodeRoot "$distName\node.exe"
 if (Test-NodeOk $NodeFloorMajor) {
   Say "Node is already installed - reusing it."
+} elseif (Test-Path $portableNode) {
+  # Portable Node from a previous run is already extracted here - reuse it, don't re-download the
+  # 30 MB. (The portable dir is never persisted to PATH, so Test-NodeOk alone can't see it.)
+  Say "Node is already installed - reusing it."
+  $NodeExe = $portableNode
 } else {
   Say "Setting up Node - the engine your project runs on. This downloads about 30 MB, one time."
   # Portable Node: download the pinned Windows zip from nodejs.org, VERIFY its SHA-256 against Node's
   # published SHASUMS256.txt before touching it, extract, and point the launch at the absolute
   # node.exe (clean-runtime rule AR6 — never rely on a mutated PATH). Mirrors node-windows.ts.
-  # NOTE: newly implemented; validate on real Windows (proxy/TLS-interception, extract, non-admin exec).
   $ProgressPreference = 'SilentlyContinue'  # a visible progress bar makes Invoke-WebRequest ~10x slower
   [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-  $arch     = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64' } else { 'x64' }
-  $distName = "node-v$KindlingNodeVersion-win-$arch"
-  $nodeRoot = Join-Path $env:LOCALAPPDATA 'kindling\node'
   $zipPath  = Join-Path $nodeRoot "$distName.zip"
   $baseUrl  = "https://nodejs.org/dist/v$KindlingNodeVersion"
   New-Item -ItemType Directory -Force -Path $nodeRoot | Out-Null
@@ -73,13 +78,61 @@ if (Test-NodeOk $NodeFloorMajor) {
   Say "Node is ready."
 }
 
-# --- Git (portable) -----------------------------------------------------------
+# --- Git (pinned, portable MinGit) -------------------------------------------
+# $GitCmdDir stays $null when a system Git is reused (already on PATH); the portable path sets it to
+# MinGit's cmd\ dir, prepended to PATH at launch so the engine can `git init` the new project.
+$GitCmdDir = $null
+$gitRoot = Join-Path $env:LOCALAPPDATA 'kindling\git'
+$portableGitCmd = Join-Path $gitRoot 'cmd'
 if (Test-Cmd 'git') {
   Say "Git is already installed - reusing it."
+} elseif (Test-Path (Join-Path $portableGitCmd 'git.exe')) {
+  # Portable MinGit from a previous run is already extracted here - reuse it, don't re-download.
+  Say "Git is already installed - reusing it."
+  $GitCmdDir = $portableGitCmd
 } else {
-  Say "Setting up Git - it keeps the history of your project."
-  # PortableGit download/extract — deferred (needs pinned version + release URL); resolved at rehearsal.
+  Say "Setting up Git - it keeps the history of your project. This downloads about 35 MB, one time."
+  # Portable MinGit (the ZIP build made for bundling): download the pinned release, VERIFY its SHA-256
+  # before touching it, extract, and expose cmd\ on PATH. Mirrors the Node block. Pinned version +
+  # hash below MUST be bumped together (git-for-windows publishes the digest on each release asset).
+  $ProgressPreference = 'SilentlyContinue'
+  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+  $gitVersion = '2.55.0.2'
+  $gitZip  = Join-Path $env:LOCALAPPDATA 'kindling\mingit.zip'
+  $gitUrl  = "https://github.com/git-for-windows/git/releases/download/v2.55.0.windows.2/MinGit-$gitVersion-64-bit.zip"
+  $gitSha  = 'e3ea2944cea4b3fabcd69c7c1669ef69b1b66c05ac7806d81224d0abad2dec31'
+  New-Item -ItemType Directory -Force -Path $gitRoot | Out-Null
+  try {
+    Invoke-WebRequest -Uri $gitUrl -OutFile $gitZip -UseBasicParsing
+    $actual = (Get-FileHash -Path $gitZip -Algorithm SHA256).Hash.ToLower()
+    if ($actual -ne $gitSha) {
+      throw "downloaded Git failed its integrity check (expected '$gitSha', got '$actual')"
+    }
+    Expand-Archive -Path $gitZip -DestinationPath $gitRoot -Force
+  } catch {
+    throw "Couldn't set up Git ($($_.Exception.Message)). Check your internet connection, then run this again - it's safe to re-run."
+  }
+  $GitCmdDir = $portableGitCmd
+  if (-not (Test-Path (Join-Path $GitCmdDir 'git.exe'))) { throw "Git was downloaded but git.exe wasn't found at $GitCmdDir." }
+  Say "Git is ready."
+}
+
+# --- Persist the portable runtime on the USER PATH ---------------------------
+# So the tools actually WORK in a normal terminal afterward (not just during this run): node/npm/npx
+# live in the Node dir, git in MinGit's cmd\, and any globally-installed agent CLI (claude/codex)
+# gets its shim written INTO the Node dir (npm's global prefix) - so putting the Node dir on PATH
+# covers those too. Only the PORTABLE paths need this; a reused system Node/Git is already on PATH.
+# User-scope (no admin), idempotent, prepended so the pinned runtime wins. Future terminals pick it up.
+function Add-UserPath([string]$dir) {
+  if (-not $dir -or -not (Test-Path $dir)) { return }
+  $cur = [Environment]::GetEnvironmentVariable('Path', 'User')
+  $parts = @(($cur -split ';') | Where-Object { $_ -ne '' })
+  if ($parts -notcontains $dir) {
+    [Environment]::SetEnvironmentVariable('Path', ((@($dir) + $parts) -join ';'), 'User')
+  }
 }
+if ($NodeExe) { Add-UserPath (Split-Path $NodeExe) }
+if ($GitCmdDir) { Add-UserPath $GitCmdDir }
 
 # --- Launch Kindling (clean-runtime: absolute node when portable, else npx on PATH) -----------
 Say "Starting Kindling..."
@@ -91,6 +144,9 @@ Say "Starting Kindling..."
 $launchDir = Join-Path $env:LOCALAPPDATA 'kindling'
 New-Item -ItemType Directory -Force -Path $launchDir | Out-Null
 Set-Location -LiteralPath $launchDir
+# Portable Git on PATH (the engine spawns `git` by name to scaffold the project's history). Applies
+# to both launch branches; the provisioned Node dir is added inside the portable-Node branch below.
+if ($GitCmdDir) { $env:Path = "$GitCmdDir;$env:Path" }
 if ($null -eq $NodeExe) {
   & npx -y "@aiviatic/kindling@$KindlingVersion"
 } else {

package/bootstrap/setup.sh

@@ -7,7 +7,7 @@
 set -euo pipefail
 
 KINDLING_NODE_VERSION="24.16.0"  # == pins.node
-KINDLING_VERSION="0.1.1"         # == pins.kindling
+KINDLING_VERSION="0.1.3"         # == pins.kindling
 NVM_VERSION="v0.40.3"            # == NVM_VERSION (engine/provision/node-unix.ts)
 NODE_FLOOR_MAJOR=20
 

package/dist/{chunk-6VTQGOJR.js → chunk-G2SKKJWZ.js}

@@ -40,75 +40,75 @@ var pins = Object.freeze({
   node: "24.16.0",
   bmad: "6.9.0",
   // frozen for the Cohort #1 cycle (matches this repo's BMad install; tools + install flags verified vs the real 6.9.0 CLI 2026-07-02); bump between cohorts
-  kindling: "0.1.1"
+  kindling: "0.1.3"
 });
 
 // engine/messages.ts
 var stepMessages = {
-  [StepId.ProvisionNode]: "Setting up Node \u2014 the engine your project runs on.",
-  [StepId.ProvisionGit]: "Setting up Git \u2014 it keeps the history of your project safe.",
-  [StepId.ProvisionXcodeClt]: "macOS is installing some developer tools. A system dialog popped up \u2014 click Install. This is completely normal and usually takes about 5 minutes. You can grab a coffee.",
+  [StepId.ProvisionNode]: "Setting up Node - the engine your project runs on.",
+  [StepId.ProvisionGit]: "Setting up Git - it keeps the history of your project safe.",
+  [StepId.ProvisionXcodeClt]: "macOS is installing some developer tools. A system dialog popped up: click Install. This is completely normal and usually takes about 5 minutes. You can grab a coffee.",
   [StepId.ScaffoldGitInit]: "Creating your project folder and starting its history.",
-  [StepId.InstallBmad]: "Installing BMad \u2014 the toolkit that powers your project. This is a sizeable download, so it can take a couple of minutes. Nothing is stuck; hang tight.",
+  [StepId.InstallBmad]: "Installing BMad - the toolkit that powers your project. This is a sizeable download, so it can take a couple of minutes. Nothing is stuck; hang tight.",
   [StepId.InstallAgentCli]: "Installing your AI coding assistant so it\u2019s ready to run right after setup.",
   [StepId.FinalizeSelfCheck]: "Double-checking everything is in place."
 };
 var agentCliMessages = {
   working: (name) => `Installing ${name} so you can start right away.`,
   done: (name) => `${name} is installed and ready to run.`,
-  skipped: (name) => `${name} is already installed \u2014 reusing it.`,
-  failed: (name) => `${name} didn\u2019t finish installing \u2014 your project is still set up and ready. You can press Retry, or install it yourself later.`,
+  skipped: (name) => `${name} is already installed, reusing it.`,
+  failed: (name) => `${name} didn\u2019t finish installing - your project is still set up and ready. You can press Retry, or install it yourself later.`,
   manualInstall: (pkg) => `To install it yourself later, run: npm install -g ${pkg}`
 };
 var scaffoldMessages = {
   done: "Your project folder is ready.",
-  skipped: "Project already set up \u2014 nothing to do.",
-  blocked: "This folder already has files in it. Kindling won\u2019t change anything without your OK \u2014 pick an empty folder, or confirm before continuing.",
+  skipped: "Project already set up, nothing to do.",
+  blocked: "This folder already has files in it. Kindling won\u2019t change anything without your OK, pick an empty folder, or confirm before continuing.",
   failed: "Setting up your project folder ran into a problem. Check the details, then press Retry."
 };
 var provisionMessages = {
-  nodePresent: "Node is already installed \u2014 reusing it.",
-  nodeQueued: "Node needs setting up \u2014 the engine your project runs on.",
-  gitPresent: "Git is already installed \u2014 reusing it.",
-  gitQueued: "Git needs setting up \u2014 it keeps the history of your project.",
+  nodePresent: "Node is already installed, reusing it.",
+  nodeQueued: "Node needs setting up - the engine your project runs on.",
+  gitPresent: "Git is already installed, reusing it.",
+  gitQueued: "Git needs setting up - it keeps the history of your project.",
   gitInstalled: "Git is set up.",
-  xcodeWaiting: "Still installing developer tools\u2026 the macOS dialog is doing its thing. This can take a few minutes \u2014 hang tight, nothing is stuck.",
-  xcodeDone: "Developer tools are ready \u2014 Git is set up.",
+  xcodeWaiting: "Still installing developer tools\u2026 the macOS dialog is doing its thing. This can take a few minutes, hang tight, nothing is stuck.",
+  xcodeDone: "Developer tools are ready - Git is set up.",
   xcodeTimeout: "The developer-tools install is taking longer than expected. If the macOS dialog is still open, let it finish, then press Retry.",
   xcodeInstallFailed: "We couldn\u2019t start the developer-tools install. Make sure you\u2019re connected, then press Retry.",
-  gitInstallFailed: "Setting up Git ran into a problem \u2014 it may need permission to install. Check the details, then press Retry."
+  gitInstallFailed: "Setting up Git ran into a problem, it may need permission to install. Check the details, then press Retry."
 };
 var selfCheckMessages = {
-  done: "Everything checks out \u2014 you\u2019re ready.",
-  failed: "Some checks didn\u2019t pass \u2014 see the readiness details."
+  done: "Everything checks out, you\u2019re ready.",
+  failed: "Some checks didn\u2019t pass, see the readiness details."
 };
 var installMessages = {
-  notPinned: "BMad isn\u2019t pinned to a version yet \u2014 set the cohort version before installing.",
+  notPinned: "BMad isn\u2019t pinned to a version yet, set the cohort version before installing.",
   done: (version) => `BMad ${version} installed.`
 };
 var errorMessages = {
-  [ErrorCode.ExecFailed]: "Something needs a quick fix \u2014 a step did not finish. Check the next step below, then press Retry.",
+  [ErrorCode.ExecFailed]: "Something needs a quick fix: a step did not finish. Check the next step below, then press Retry.",
   [ErrorCode.NetworkLost]: "We lost the connection. Reconnect to the internet, then press Retry.",
-  [ErrorCode.BmadInstallFailed]: "BMad didn\u2019t finish installing. The details are below \u2014 press Retry.",
-  [ErrorCode.AgentCliInstallFailed]: "Your AI coding assistant didn\u2019t finish installing \u2014 your project is still ready. Press Retry, or install it yourself later.",
-  [ErrorCode.ExecPolicyBlocked]: "Windows blocked the script because it\u2019s unsigned \u2014 that\u2019s expected, safe, and reversible.",
-  [ErrorCode.SmartScreenBlocked]: "Windows SmartScreen (or your antivirus) paused the script \u2014 that\u2019s expected, safe, and reversible.",
+  [ErrorCode.BmadInstallFailed]: "BMad didn\u2019t finish installing. The details are below, press Retry.",
+  [ErrorCode.AgentCliInstallFailed]: "Your AI coding assistant didn\u2019t finish installing - your project is still ready. Press Retry, or install it yourself later.",
+  [ErrorCode.ExecPolicyBlocked]: "Windows blocked the script because it\u2019s unsigned, that\u2019s expected, safe, and reversible.",
+  [ErrorCode.SmartScreenBlocked]: "Windows SmartScreen (or your antivirus) paused the script, that\u2019s expected, safe, and reversible.",
   [ErrorCode.ProjectConflict]: "That folder already has files in it that Kindling didn\u2019t create."
 };
 var recoveryGuidance = {
   [ErrorCode.ExecFailed]: {
     title: "Something needs a quick fix.",
-    detail: "A step didn\u2019t finish. This usually clears up on a second try \u2014 press Retry.",
+    detail: "A step didn\u2019t finish. This usually clears up on a second try, press Retry.",
     recovery: "retry"
   },
   [ErrorCode.NetworkLost]: {
     title: "We lost the connection.",
-    detail: "A download was interrupted. Reconnect to the internet, then press Retry \u2014 Kindling resumes where it left off.",
+    detail: "A download was interrupted. Reconnect to the internet, then press Retry, Kindling resumes where it left off.",
     recovery: "retry"
   },
   [ErrorCode.BmadInstallFailed]: {
     title: "BMad didn\u2019t install.",
-    detail: "The install step didn\u2019t finish. This is usually temporary \u2014 press Retry. The step details below show what happened.",
+    detail: "The install step didn\u2019t finish. This is usually temporary, press Retry. The step details below show what happened.",
     recovery: "retry"
   },
   [ErrorCode.AgentCliInstallFailed]: {
@@ -116,18 +116,18 @@ var recoveryGuidance = {
     // concrete, copy-pasteable `npm install -g <package>` line ships in the failed step's own
     // message (agentCliMessages.manualInstall) rather than in this static, error-code-keyed entry.
     title: "Your AI assistant didn\u2019t install.",
-    detail: "Your project is set up and ready either way \u2014 this step is optional. Press Retry to try again, or install it yourself later using the command shown in the step details below.",
+    detail: "Your project is set up and ready either way, this step is optional. Press Retry to try again, or install it yourself later using the command shown in the step details below.",
     recovery: "retry"
   },
   [ErrorCode.ExecPolicyBlocked]: {
     title: "Something needs a quick fix.",
-    detail: "Windows blocked the script because it\u2019s unsigned \u2014 that\u2019s expected, and it\u2019s safe and reversible. Run this one line in PowerShell, then come back and press Retry:",
+    detail: "Windows blocked the script because it\u2019s unsigned, that\u2019s expected, and it\u2019s safe and reversible. Run this one line in PowerShell, then come back and press Retry:",
     fixCommand: "Set-ExecutionPolicy -Scope Process Bypass",
     recovery: "retry"
   },
   [ErrorCode.SmartScreenBlocked]: {
     title: "Windows asked you to confirm.",
-    detail: "SmartScreen or your antivirus paused the script \u2014 this is expected and safe. Choose \u201CMore info\u201D, then \u201CRun anyway\u201D, and press Retry. Nothing was changed on your computer.",
+    detail: "SmartScreen or your antivirus paused the script, this is expected and safe. Choose \u201CMore info\u201D, then \u201CRun anyway\u201D, and press Retry. Nothing was changed on your computer.",
     recovery: "retry"
   },
   [ErrorCode.ProjectConflict]: {
@@ -304,14 +304,30 @@ async function runBmadInstall(opts) {
       const alreadyInstalled = opts.bmadAlreadyInstalled ?? defaultBmadInstalled;
       action = await alreadyInstalled(opts.config.projectDir) ? "update" : "install";
     }
-    const args = [`bmad-method@${versionTag}`, ...composeInstallArgs(opts.config, action)];
+    const args = [
+      ...opts.npxPrefixArgs ?? [],
+      `bmad-method@${versionTag}`,
+      ...composeInstallArgs(opts.config, action)
+    ];
     result = await exec2(npx, args);
   } catch (err) {
-    emit(Status.Failed, errorMessages[ErrorCode.BmadInstallFailed], "error", ErrorCode.BmadInstallFailed);
+    const detail = err instanceof Error ? err.message : String(err);
+    emit(
+      Status.Failed,
+      `${errorMessages[ErrorCode.BmadInstallFailed]} (${detail})`,
+      "error",
+      ErrorCode.BmadInstallFailed
+    );
     throw err;
   }
   if (result.code !== 0) {
-    emit(Status.Failed, errorMessages[ErrorCode.BmadInstallFailed], "error", ErrorCode.BmadInstallFailed);
+    const raw = (result.stderr.trim() ? result.stderr : result.stdout).trim();
+    const detail = raw.slice(-600).trim();
+    const humanMessage = detail ? `${errorMessages[ErrorCode.BmadInstallFailed]}
+
+Details:
+${detail}` : errorMessages[ErrorCode.BmadInstallFailed];
+    emit(Status.Failed, humanMessage, "error", ErrorCode.BmadInstallFailed);
     return { ok: false, bmadVersion: versionTag };
   }
   emit(Status.Done, installMessages.done(versionTag));
@@ -331,6 +347,15 @@ async function probeVersion(exec2, cmd) {
     return null;
   }
 }
+async function probeCliVersion(exec2, bin, isWindows) {
+  try {
+    const r = isWindows ? await exec2("cmd", ["/c", bin, "--version"]) : await exec2(bin, ["--version"]);
+    const out = r.stdout.trim() || r.stderr.trim();
+    return r.code === 0 && out ? out : null;
+  } catch {
+    return null;
+  }
+}
 
 // engine/orchestrate/agent-cli.ts
 var AGENT_CLI_TABLE = {
@@ -346,7 +371,7 @@ function eligibleAgentClis(installCli) {
 async function installAgentCli(opts) {
   const exec2 = opts.exec ?? exec;
   const npm = opts.npmCommand ?? "npm";
-  const resolveBin = opts.resolveBin ?? ((bin) => bin);
+  const isWindows = opts.isWindows ?? false;
   const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
   const emit = (status, humanMessage, level = "info", errorCode) => {
     opts.emitter.emit({
@@ -365,7 +390,7 @@ async function installAgentCli(opts) {
   const failed = [];
   const eligible = eligibleAgentClis(opts.config.installCli);
   for (const { id, pkg, bin, name } of eligible) {
-    if (await probeVersion(exec2, resolveBin(bin)) !== null) {
+    if (await probeCliVersion(exec2, bin, isWindows) !== null) {
       emit(Status.Skipped, agentCliMessages.skipped(name));
       skipped.push(id);
       continue;
@@ -373,29 +398,61 @@ async function installAgentCli(opts) {
     emit(Status.Working, agentCliMessages.working(name));
     const failMessage = `${agentCliMessages.failed(name)} ${agentCliMessages.manualInstall(pkg)}`;
     try {
-      const result = await exec2(npm, ["install", "-g", pkg]);
+      const result = await exec2(npm, [...opts.npmPrefixArgs ?? [], "install", "-g", pkg]);
       if (result.code === 0) {
         emit(Status.Done, agentCliMessages.done(name));
         installed.push(id);
       } else {
-        emit(Status.Failed, failMessage, "error", ErrorCode.AgentCliInstallFailed);
+        const raw = (result.stderr.trim() ? result.stderr : result.stdout).trim();
+        const detail = raw.slice(-600).trim();
+        emit(
+          Status.Failed,
+          detail ? `${failMessage}
+
+Details:
+${detail}` : failMessage,
+          "error",
+          ErrorCode.AgentCliInstallFailed
+        );
         failed.push(id);
       }
-    } catch {
-      emit(Status.Failed, failMessage, "error", ErrorCode.AgentCliInstallFailed);
+    } catch (err) {
+      const detail = err instanceof Error ? err.message : String(err);
+      emit(
+        Status.Failed,
+        `${failMessage} (${detail})`,
+        "error",
+        ErrorCode.AgentCliInstallFailed
+      );
       failed.push(id);
     }
   }
   return { ok: true, installed, skipped, failed };
 }
 
+// engine/orchestrate/launch.ts
+import { dirname, join as join3 } from "path";
+function npxCliPath(nodeExe) {
+  return join3(dirname(nodeExe), "node_modules", "npm", "bin", "npx-cli.js");
+}
+function npmCliPath(nodeExe) {
+  return join3(dirname(nodeExe), "node_modules", "npm", "bin", "npm-cli.js");
+}
+function composeLaunchCommand({ nodeExe, kindlingVersion }) {
+  const spec = `@aiviatic/kindling@${kindlingVersion}`;
+  if (nodeExe === null) {
+    return { cmd: "npx", args: ["-y", spec] };
+  }
+  return { cmd: nodeExe, args: [npxCliPath(nodeExe), "-y", spec] };
+}
+
 // engine/bmad-manifest.ts
 import { readFile } from "fs/promises";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { load } from "js-yaml";
 async function readInstalledBmadVersion(projectDir) {
   try {
-    const raw = await readFile(join3(projectDir, "_bmad", "_config", "manifest.yaml"), "utf8");
+    const raw = await readFile(join4(projectDir, "_bmad", "_config", "manifest.yaml"), "utf8");
     const doc = load(raw);
     if (typeof doc !== "object" || doc === null) return null;
     const installation = doc.installation;
@@ -455,7 +512,6 @@ import { randomUUID as randomUUID4 } from "crypto";
 async function runSelfCheck(opts) {
   const exec2 = opts.exec ?? exec;
   const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
-  const resolveBin = opts.resolveBin ?? ((bin) => bin);
   const readInstalledBmadVersion2 = opts.readInstalledBmadVersion ?? readInstalledBmadVersion;
   const platform = opts.platform ?? {
     os: process.platform,
@@ -480,9 +536,10 @@ async function runSelfCheck(opts) {
   const nodeVersion = await probeVersion(exec2, opts.node ?? "node");
   const gitVersion = await probeVersion(exec2, opts.git ?? "git");
   const nodeMajor = parseMajor(nodeVersion);
+  const isWindows = platform.os === "win32";
   const cli = [];
   for (const c of opts.agentClis ?? []) {
-    const present = await probeVersion(exec2, resolveBin(c.bin)) !== null;
+    const present = await probeCliVersion(exec2, c.bin, isWindows) !== null;
     cli.push({ id: c.id, name: c.name, bin: c.bin, pkg: c.pkg, present });
   }
   const installedVersion = await readInstalledBmadVersion2(opts.projectDir);
@@ -625,14 +682,14 @@ async function provisionGitUnix(opts) {
 
 // engine/log.ts
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { homedir } from "os";
 import { randomUUID as randomUUID7 } from "crypto";
 function defaultLogDir() {
   if (process.platform === "win32" && process.env.LOCALAPPDATA) {
-    return join4(process.env.LOCALAPPDATA, "kindling", "logs");
+    return join5(process.env.LOCALAPPDATA, "kindling", "logs");
   }
-  return join4(homedir(), ".kindling", "logs");
+  return join5(homedir(), ".kindling", "logs");
 }
 function render(entry, timestamp) {
   const lines = [
@@ -644,7 +701,7 @@ function render(entry, timestamp) {
     entry.error,
     ``,
     `Event log:`,
-    ...entry.events.map((e) => `  [${e.status}] ${e.step} \u2014 ${e.humanMessage}`),
+    ...entry.events.map((e) => `  [${e.status}] ${e.step} - ${e.humanMessage}`),
     ``
   ];
   return lines.join("\n");
@@ -655,7 +712,7 @@ async function writeFailureLog(entry, opts = {}) {
   const safeStamp = timestamp.replace(/[:.]/g, "-");
   const suffix = randomUUID7().slice(0, 8);
   await mkdir2(dir, { recursive: true });
-  const path = join4(dir, `kindling-report-${safeStamp}-${suffix}.log`);
+  const path = join5(dir, `kindling-report-${safeStamp}-${suffix}.log`);
   await writeFile2(path, render(entry, timestamp));
   return path;
 }
@@ -733,7 +790,11 @@ var Engine = class {
       {
         id: StepId.InstallBmad,
         run: async () => {
-          const result = await this.deps.runBmadInstall({ config: this.config, emitter: this.emitter });
+          const result = await this.deps.runBmadInstall({
+            config: this.config,
+            emitter: this.emitter,
+            ...this.deps.platform === "win32" ? { npxCommand: process.execPath, npxPrefixArgs: [npxCliPath(process.execPath)] } : {}
+          });
           this.bmadInstalled = result.ok;
           return result.ok;
         }
@@ -748,7 +809,14 @@ var Engine = class {
         // CLI-presence guidance (retry() skips the already-completed self-check). See deferred-work.md.
         id: StepId.InstallAgentCli,
         run: async () => {
-          await this.deps.installAgentCli({ config: this.config, emitter: this.emitter });
+          await this.deps.installAgentCli({
+            config: this.config,
+            emitter: this.emitter,
+            // Windows: the idempotent-skip probe must go through `cmd /c <bin> --version` so the
+            // installed `claude.cmd` shim is detected (Node won't spawn `.cmd` with shell:false).
+            isWindows: this.deps.platform === "win32",
+            ...this.deps.platform === "win32" ? { npmCommand: process.execPath, npmPrefixArgs: [npmCliPath(process.execPath)] } : {}
+          });
           return true;
         }
       },
@@ -872,6 +940,8 @@ export {
   AGENT_CLI_TABLE,
   eligibleAgentClis,
   installAgentCli,
+  npxCliPath,
+  composeLaunchCommand,
   readInstalledBmadVersion,
   SCHEMA_VERSION,
   NODE_FLOOR_MAJOR,
@@ -887,4 +957,4 @@ export {
   writeFailureLog,
   Engine
 };
-//# sourceMappingURL=chunk-6VTQGOJR.js.map
+//# sourceMappingURL=chunk-G2SKKJWZ.js.map