@nuucognition/flint-cli 0.5.6-dev.1 → 0.5.6-dev.3

package/dist/index.js

@@ -403,9 +403,9 @@ var require_brace_expansion = __commonJS({
 
 // src/index.ts
 import { Command as Command38 } from "commander";
-import { readFileSync as readFileSync11, existsSync as existsSync15, cpSync, mkdirSync as mkdirSync5, readdirSync as readdirSync8 } from "fs";
+import { readFileSync as readFileSync12, existsSync as existsSync16, cpSync, mkdirSync as mkdirSync5, readdirSync as readdirSync8 } from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
-import { dirname as dirname4, join as join20 } from "path";
+import { dirname as dirname5, join as join20 } from "path";
 import { homedir as homedir11 } from "os";
 import pc43 from "picocolors";
 
@@ -5851,10 +5851,10 @@ function sendNotification(title, message) {
   }
 }
 
-const child = spawn('claude', claudeArgs, {
+const agentCmd = resolveCommand('claude');
+const child = spawn(agentCmd.cmd, [...agentCmd.prependArgs, ...claudeArgs], {
   cwd: flintPath,
   stdio: ['ignore', 'ignore', 'pipe'],
-  shell: process.platform === 'win32',
 });
 
 let stderr = '';
@@ -8299,24 +8299,26 @@ import { randomUUID as randomUUID2 } from "crypto";
 import { existsSync as existsSync22, readFileSync as readFileSync22 } from "fs";
 import { closeSync, existsSync as existsSync32, openSync, readSync, statSync, unwatchFile, watch, watchFile } from "fs";
 import { existsSync as existsSync42, readFileSync as readFileSync3, unwatchFile as unwatchFile2, watch as watch2, watchFile as watchFile2 } from "fs";
-import { existsSync as existsSync52 } from "fs";
-import { join as join22 } from "path";
-import { homedir as homedir5 } from "os";
-import { spawnSync as spawnSync3 } from "child_process";
-import { readdirSync as readdirSync2, readFileSync as readFileSync4 } from "fs";
 import { existsSync as existsSync6 } from "fs";
 import { join as join32 } from "path";
+import { homedir as homedir5 } from "os";
+import { spawnSync as spawnSync3 } from "child_process";
+import { appendFileSync, existsSync as existsSync52, mkdirSync as mkdirSync22, readFileSync as readFileSync4 } from "fs";
+import { dirname as dirname3, join as join22 } from "path";
+import { readdirSync as readdirSync2, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync7 } from "fs";
+import { join as join42 } from "path";
 import { homedir as homedir22 } from "os";
-import { existsSync as existsSync7, readdirSync as readdirSync3, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
-import { basename as basename4, join as join42 } from "path";
+import { existsSync as existsSync8, readdirSync as readdirSync3, readFileSync as readFileSync6, statSync as statSync2 } from "fs";
+import { basename as basename4, join as join52 } from "path";
 import { homedir as homedir32 } from "os";
-import { existsSync as existsSync8, readdirSync as readdirSync4, readFileSync as readFileSync6, statSync as statSync3 } from "fs";
+import { existsSync as existsSync9, readdirSync as readdirSync4, readFileSync as readFileSync7, statSync as statSync3 } from "fs";
 import { spawnSync as spawnSync22 } from "child_process";
 import { homedir as homedir42 } from "os";
-import { basename as basename22, join as join52 } from "path";
+import { basename as basename22, join as join62 } from "path";
 import { spawn as spawn4, spawnSync as spawnSync32 } from "child_process";
-import { existsSync as existsSync9, readdirSync as readdirSync5, readFileSync as readFileSync7 } from "fs";
-import { join as join62 } from "path";
+import { existsSync as existsSync10, readdirSync as readdirSync5, readFileSync as readFileSync8 } from "fs";
+import { join as join72 } from "path";
 import { homedir as homedir52 } from "os";
 var RUN_TRANSITIONS = {
   running: ["completed", "failed", "cancelled", "suspended"],
@@ -10213,14 +10215,68 @@ var JsonSessionWatcher = class {
 function createJsonSessionWatcher(transcriptPath, mapper, options) {
   return new JsonSessionWatcher(transcriptPath, mapper, options);
 }
+function debugLog(message) {
+  if (process.platform !== "win32") return;
+  try {
+    const root = process.env.FLINT_ROOT || process.cwd();
+    const logDir = join22(root, ".flint");
+    mkdirSync22(logDir, { recursive: true });
+    const ts = (/* @__PURE__ */ new Date()).toISOString();
+    appendFileSync(join22(logDir, "orbh-debug.log"), `[${ts}] ${message}
+`);
+  } catch {
+  }
+}
 function isCommandOnPath(name) {
   const cmd = process.platform === "win32" ? "where" : "which";
-  return spawnSync3(cmd, [name], { stdio: "ignore" }).status === 0;
+  const result = spawnSync3(cmd, [name], { stdio: "ignore" });
+  debugLog(`isCommandOnPath(${name}): ${cmd} \u2192 exit ${result.status}`);
+  return result.status === 0;
+}
+function resolveCommand(name) {
+  if (process.platform !== "win32") return { cmd: name, prependArgs: [] };
+  debugLog(`resolveCommand(${name}): starting`);
+  const where = spawnSync3("where", [name], { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] });
+  debugLog(`resolveCommand(${name}): where exit=${where.status}, stdout=${JSON.stringify(where.stdout ?? "")}`);
+  const firstLine = (where.stdout ?? "").trim().split(/\r?\n/)[0]?.trim();
+  if (where.status !== 0 || !firstLine) {
+    debugLog(`resolveCommand(${name}): where failed \u2014 returning bare name`);
+    return { cmd: name, prependArgs: [] };
+  }
+  const resolved = firstLine;
+  debugLog(`resolveCommand(${name}): resolved path = ${resolved}`);
+  if (!resolved.toLowerCase().endsWith(".cmd")) {
+    debugLog(`resolveCommand(${name}): not .cmd \u2014 using resolved path directly`);
+    return { cmd: resolved, prependArgs: [] };
+  }
+  try {
+    const content = readFileSync4(resolved, "utf-8");
+    debugLog(`resolveCommand(${name}): .cmd content (${content.length} chars):
+${content}`);
+    const matches = [...content.matchAll(/%(?:~dp0|dp0%)\\([^"%\r\n]+\.m?[jc]?[jt]s)/gi)];
+    debugLog(`resolveCommand(${name}): regex matches = ${JSON.stringify(matches.map((m) => m[0]))}`);
+    const last = matches.length > 0 ? matches[matches.length - 1] : void 0;
+    if (last && last[1]) {
+      const scriptPath = join22(dirname3(resolved), last[1]);
+      const scriptExists = existsSync52(scriptPath);
+      debugLog(`resolveCommand(${name}): script path = ${scriptPath}, exists = ${scriptExists}`);
+      if (scriptExists) {
+        const result = { cmd: process.execPath, prependArgs: [scriptPath] };
+        debugLog(`resolveCommand(${name}): SUCCESS \u2192 ${result.cmd} ${result.prependArgs.join(" ")}`);
+        return result;
+      }
+    } else {
+      debugLog(`resolveCommand(${name}): no regex match found in .cmd content`);
+    }
+  } catch (err) {
+    debugLog(`resolveCommand(${name}): error parsing .cmd: ${err}`);
+  }
+  debugLog(`resolveCommand(${name}): FALLBACK \u2192 using resolved path ${resolved}`);
+  return { cmd: resolved, prependArgs: [] };
 }
-var SPAWN_SHELL = process.platform === "win32";
 function buildTranscriptPath(cwd, nativeSessionId) {
   const sanitized = cwd.replace(/[^a-zA-Z0-9\-_]/g, "-");
-  return join22(homedir5(), ".claude", "projects", sanitized, `${nativeSessionId}.jsonl`);
+  return join32(homedir5(), ".claude", "projects", sanitized, `${nativeSessionId}.jsonl`);
 }
 function createClaudeHarness() {
   return {
@@ -10268,7 +10324,7 @@ function createClaudeHarness() {
     },
     resolveTranscriptPath(nativeSessionId, cwd) {
       const candidate = buildTranscriptPath(cwd, nativeSessionId);
-      if (existsSync52(candidate)) {
+      if (existsSync6(candidate)) {
         return candidate;
       }
       return null;
@@ -10288,7 +10344,7 @@ function createClaudeHarness() {
   };
 }
 function listDateDirectories(root) {
-  if (!existsSync6(root)) {
+  if (!existsSync7(root)) {
     return [];
   }
   const directories = [];
@@ -10296,15 +10352,15 @@ function listDateDirectories(root) {
     if (!year.isDirectory()) {
       continue;
     }
-    const yearPath = join32(root, year.name);
+    const yearPath = join42(root, year.name);
     for (const month of readdirSync2(yearPath, { withFileTypes: true })) {
       if (!month.isDirectory()) {
         continue;
       }
-      const monthPath = join32(yearPath, month.name);
+      const monthPath = join42(yearPath, month.name);
       for (const day of readdirSync2(monthPath, { withFileTypes: true })) {
         if (day.isDirectory()) {
-          directories.push(join32(monthPath, day.name));
+          directories.push(join42(monthPath, day.name));
         }
       }
     }
@@ -10312,11 +10368,11 @@ function listDateDirectories(root) {
   return directories.sort((left, right) => right.localeCompare(left));
 }
 function resolveCodexSessionIndex(root, nativeSessionId) {
-  const indexPath = join32(root, "session_index.jsonl");
-  if (!existsSync6(indexPath)) {
+  const indexPath = join42(root, "session_index.jsonl");
+  if (!existsSync7(indexPath)) {
     return null;
   }
-  const lines = readFileSync4(indexPath, "utf-8").split("\n");
+  const lines = readFileSync5(indexPath, "utf-8").split("\n");
   for (const line of lines) {
     const trimmed = line.trim();
     if (trimmed.length === 0) {
@@ -10368,7 +10424,7 @@ function createCodexHarness() {
       return args;
     },
     resolveTranscriptPath(nativeSessionId) {
-      const sessionsRoot = join32(homedir22(), ".codex", "sessions");
+      const sessionsRoot = join42(homedir22(), ".codex", "sessions");
       const indexedPath = resolveCodexSessionIndex(sessionsRoot, nativeSessionId);
       if (indexedPath) {
         return indexedPath;
@@ -10376,7 +10432,7 @@ function createCodexHarness() {
       for (const directory of listDateDirectories(sessionsRoot)) {
         for (const entry of readdirSync2(directory)) {
           if (entry.includes(nativeSessionId) && entry.endsWith(".jsonl")) {
-            return join32(directory, entry);
+            return join42(directory, entry);
           }
         }
       }
@@ -10402,13 +10458,13 @@ function sanitizeFactoryCwd(cwd) {
   return cwd.replace(/[\\/]/g, "-");
 }
 function buildScopedTranscriptPath(cwd, nativeSessionId) {
-  return join42(homedir32(), ".factory", "sessions", sanitizeFactoryCwd(cwd), `${nativeSessionId}.jsonl`);
+  return join52(homedir32(), ".factory", "sessions", sanitizeFactoryCwd(cwd), `${nativeSessionId}.jsonl`);
 }
 function buildLegacyTranscriptPath(nativeSessionId) {
-  return join42(homedir32(), ".factory", "sessions", `${nativeSessionId}.jsonl`);
+  return join52(homedir32(), ".factory", "sessions", `${nativeSessionId}.jsonl`);
 }
 function getDroidSessionsRoot() {
-  return join42(homedir32(), ".factory", "sessions");
+  return join52(homedir32(), ".factory", "sessions");
 }
 function parseStartedAtMs(startedAt) {
   if (typeof startedAt === "number" && Number.isFinite(startedAt)) {
@@ -10433,7 +10489,7 @@ function isTranscriptRecentEnough(transcriptPath, startedAt) {
 }
 function readDroidSessionId(transcriptPath) {
   try {
-    const firstLine = readFileSync5(transcriptPath, "utf-8").split(/\r?\n/, 1)[0]?.trim();
+    const firstLine = readFileSync6(transcriptPath, "utf-8").split(/\r?\n/, 1)[0]?.trim();
     if (!firstLine) {
       return basename4(transcriptPath, ".jsonl");
     }
@@ -10446,10 +10502,10 @@ function readDroidSessionId(transcriptPath) {
   return basename4(transcriptPath, ".jsonl");
 }
 function listDroidTranscriptPaths(cwd) {
-  const candidateDirs = [join42(getDroidSessionsRoot(), sanitizeFactoryCwd(cwd)), getDroidSessionsRoot()];
+  const candidateDirs = [join52(getDroidSessionsRoot(), sanitizeFactoryCwd(cwd)), getDroidSessionsRoot()];
   const transcriptPaths = /* @__PURE__ */ new Map();
   for (const directory of candidateDirs) {
-    if (!existsSync7(directory)) {
+    if (!existsSync8(directory)) {
       continue;
     }
     try {
@@ -10457,7 +10513,7 @@ function listDroidTranscriptPaths(cwd) {
         if (!entry.isFile() || !entry.name.endsWith(".jsonl")) {
           continue;
         }
-        const transcriptPath = join42(directory, entry.name);
+        const transcriptPath = join52(directory, entry.name);
         transcriptPaths.set(transcriptPath, statSync2(transcriptPath).mtimeMs);
       }
     } catch {
@@ -10473,7 +10529,7 @@ function discoverDroidNativeSessionByOrbhSessionId(cwd, orbhSessionId, options)
       continue;
     }
     try {
-      const content = readFileSync5(transcriptPath, "utf-8");
+      const content = readFileSync6(transcriptPath, "utf-8");
       if (!content.includes(orbhSessionId)) {
         continue;
       }
@@ -10536,11 +10592,11 @@ function createDroidHarness() {
     },
     resolveTranscriptPath(nativeSessionId, cwd) {
       const scopedPath = buildScopedTranscriptPath(cwd, nativeSessionId);
-      if (existsSync7(scopedPath)) {
+      if (existsSync8(scopedPath)) {
         return scopedPath;
       }
       const legacyPath = buildLegacyTranscriptPath(nativeSessionId);
-      if (existsSync7(legacyPath)) {
+      if (existsSync8(legacyPath)) {
         return legacyPath;
       }
       return scopedPath;
@@ -10566,24 +10622,24 @@ function slugifyProjectName(name) {
   return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function getGeminiTmpRoot() {
-  return join52(homedir42(), ".gemini", "tmp");
+  return join62(homedir42(), ".gemini", "tmp");
 }
 function getProjectSlug(cwd) {
   return slugifyProjectName(basename22(cwd));
 }
 function getGeminiChatsDir(cwd) {
-  return join52(getGeminiTmpRoot(), getProjectSlug(cwd), "chats");
+  return join62(getGeminiTmpRoot(), getProjectSlug(cwd), "chats");
 }
 function listGeminiTranscriptPaths(cwd) {
   const chatsDir = getGeminiChatsDir(cwd);
-  if (!existsSync8(chatsDir)) {
+  if (!existsSync9(chatsDir)) {
     return [];
   }
-  return readdirSync4(chatsDir).filter((entry) => entry.startsWith("session-") && entry.endsWith(".json")).map((entry) => join52(chatsDir, entry)).sort((left, right) => right.localeCompare(left));
+  return readdirSync4(chatsDir).filter((entry) => entry.startsWith("session-") && entry.endsWith(".json")).map((entry) => join62(chatsDir, entry)).sort((left, right) => right.localeCompare(left));
 }
 function readGeminiSessionId(transcriptPath) {
   try {
-    const parsed = JSON.parse(readFileSync6(transcriptPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync7(transcriptPath, "utf-8"));
     return typeof parsed.sessionId === "string" ? parsed.sessionId : null;
   } catch {
     return null;
@@ -10661,7 +10717,7 @@ function discoverGeminiNativeSessionByOrbhSessionId(cwd, orbhSessionId, options)
       continue;
     }
     try {
-      const content = readFileSync6(transcriptPath, "utf-8");
+      const content = readFileSync7(transcriptPath, "utf-8");
       if (!content.includes(orbhSessionId)) {
         continue;
       }
@@ -10778,7 +10834,7 @@ function buildHarnessSpawnEnv(cwd, sessionId, baseEnv = process.env) {
   delete env.CODEX_THREAD_ID;
   delete env.CODEX_CI;
   delete env.CODEX_SESSION_ID;
-  const localBin = join62(homedir52(), ".local", "bin");
+  const localBin = join72(homedir52(), ".local", "bin");
   if (env.PATH && !env.PATH.startsWith(localBin)) {
     env.PATH = `${localBin}:${env.PATH}`;
   }
@@ -10810,8 +10866,8 @@ function sendNotification2(session, exitCode) {
   }
 }
 function listRecentCodexRollouts() {
-  const sessionsRoot = join62(homedir52(), ".codex", "sessions");
-  if (!existsSync9(sessionsRoot)) {
+  const sessionsRoot = join72(homedir52(), ".codex", "sessions");
+  if (!existsSync10(sessionsRoot)) {
     return [];
   }
   const paths = [];
@@ -10819,20 +10875,20 @@ function listRecentCodexRollouts() {
     if (!year.isDirectory()) {
       continue;
     }
-    const yearPath = join62(sessionsRoot, year.name);
+    const yearPath = join72(sessionsRoot, year.name);
     for (const month of readdirSync5(yearPath, { withFileTypes: true })) {
       if (!month.isDirectory()) {
         continue;
       }
-      const monthPath = join62(yearPath, month.name);
+      const monthPath = join72(yearPath, month.name);
       for (const day of readdirSync5(monthPath, { withFileTypes: true })) {
         if (!day.isDirectory()) {
           continue;
         }
-        const dayPath = join62(monthPath, day.name);
+        const dayPath = join72(monthPath, day.name);
         for (const fileName of readdirSync5(dayPath)) {
           if (fileName.startsWith("rollout-") && fileName.endsWith(".jsonl")) {
-            paths.push(join62(dayPath, fileName));
+            paths.push(join72(dayPath, fileName));
           }
         }
       }
@@ -10844,7 +10900,7 @@ function listCodexNativeSessionCandidates(cwd) {
   const candidates = [];
   for (const rolloutPath of listRecentCodexRollouts()) {
     try {
-      const [firstLine] = readFileSync7(rolloutPath, "utf-8").split("\n");
+      const [firstLine] = readFileSync8(rolloutPath, "utf-8").split("\n");
       if (!firstLine) {
         continue;
       }
@@ -10897,13 +10953,13 @@ async function spawnHarnessProcess(options) {
   const run = addRun2(session, { nativeSessionId });
   session.status = "queued";
   writeSession(options.sessionsDir, session);
-  const command = options.command ?? harness.name;
-  const child = spawn4(command, harness.buildSpawnArgs(options.config), {
+  const commandName = options.command ?? harness.name;
+  const resolved = resolveCommand(commandName);
+  const child = spawn4(resolved.cmd, [...resolved.prependArgs, ...harness.buildSpawnArgs(options.config)], {
     cwd: options.cwd,
     detached: true,
     stdio: ["ignore", "ignore", "pipe"],
-    env: buildHarnessSpawnEnv(options.cwd, options.sessionId),
-    shell: process.platform === "win32"
+    env: buildHarnessSpawnEnv(options.cwd, options.sessionId)
   });
   let stderr = "";
   child.stderr?.on("data", (chunk) => {
@@ -12544,7 +12600,7 @@ minimatch.unescape = unescape;
 
 // ../../packages/flint-server/dist/index.js
 import { parse as parseYaml } from "yaml";
-import { existsSync as existsSync10, watch as watch3 } from "fs";
+import { existsSync as existsSync11, watch as watch3 } from "fs";
 import { stat as stat22 } from "fs/promises";
 import path22 from "path";
 import { mkdir as mkdir5, readFile as readFile22, writeFile as writeFile3 } from "fs/promises";
@@ -13145,7 +13201,7 @@ function createResilientWatcher({
     if (closed) {
       return;
     }
-    if (!existsSync10(targetPath)) {
+    if (!existsSync11(targetPath)) {
       scheduleRestart();
       return;
     }
@@ -14084,12 +14140,12 @@ function registerOrbhRoutes(app, ctx, options) {
       prompt: prompt6,
       extraArgs: session.runtime === "claude" ? ["--chrome"] : []
     });
-    const child = spawn22(harness.name, args, {
+    const resolved = resolveCommand(harness.name);
+    const child = spawn22(resolved.cmd, [...resolved.prependArgs, ...args], {
       cwd: ctx.flintPath,
       detached: true,
       stdio: ["ignore", "ignore", "pipe"],
-      env: buildHarnessSpawnEnv(ctx.flintPath, session.id),
-      shell: process.platform === "win32"
+      env: buildHarnessSpawnEnv(ctx.flintPath, session.id)
     });
     let stderr = "";
     child.stderr?.on("data", (chunk) => {
@@ -16050,7 +16106,7 @@ import { Command as Command24 } from "commander";
 import pc29 from "picocolors";
 import { spawn as spawn7, execSync as execSync3 } from "child_process";
 import { createInterface as createInterface5 } from "readline";
-import { existsSync as existsSync11, mkdirSync as mkdirSync3, readFileSync as readFileSync8, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync3, readFileSync as readFileSync9, writeFileSync as writeFileSync2 } from "fs";
 import { randomUUID as randomUUID4 } from "crypto";
 import { join as join14 } from "path";
 
@@ -16255,7 +16311,7 @@ function exportOrbhSessionTranscript(session, flintPath) {
   }
   let content;
   try {
-    content = readFileSync8(transcriptPath, "utf-8");
+    content = readFileSync9(transcriptPath, "utf-8");
   } catch {
     console.log(pc29.dim("Could not read transcript file."));
     return;
@@ -16284,10 +16340,10 @@ var CLIENT_INFO = {
 };
 async function bootstrapCodexSession(cwd, initPrompt) {
   return new Promise((resolve12, reject) => {
-    const proc = spawn7("codex", ["app-server"], {
+    const codexCmd = resolveCommand("codex");
+    const proc = spawn7(codexCmd.cmd, [...codexCmd.prependArgs, "app-server"], {
       stdio: ["pipe", "pipe", "pipe"],
-      cwd,
-      shell: process.platform === "win32"
+      cwd
     });
     const rl = createInterface5({ input: proc.stdout });
     const send = (msg) => proc.stdin.write(`${JSON.stringify(msg)}
@@ -16305,7 +16361,7 @@ async function bootstrapCodexSession(cwd, initPrompt) {
     let pollInterval = null;
     const startPolling = () => {
       pollInterval = setInterval(() => {
-        if (sessionPath && existsSync11(sessionPath)) {
+        if (sessionPath && existsSync12(sessionPath)) {
           if (pollInterval) clearInterval(pollInterval);
           send({ method: "turn/interrupt", id: 4, params: { threadId } });
           setTimeout(() => {
@@ -16370,10 +16426,10 @@ codeCommand.command("claude").description("Open Claude Code TUI").option("-p, --
       sessionId = randomUUID4();
       args.push("--session-id", sessionId, await buildClaudeInitPrompt(sessionId));
     }
-    const child = spawn7("claude", args, {
+    const claudeCmd = resolveCommand("claude");
+    const child = spawn7(claudeCmd.cmd, [...claudeCmd.prependArgs, ...args], {
       cwd: flintPath,
-      stdio: "inherit",
-      shell: process.platform === "win32"
+      stdio: "inherit"
     });
     child.on("error", (err) => {
       if (err.code === "ENOENT") {
@@ -16440,15 +16496,16 @@ codeCommand.command("codex").description("Open Codex TUI with session tracking")
     console.log(pc29.green(`Session ID: ${threadId}`));
     console.log("");
     const resumePrompt = options.continue ? `continuing session ${threadId}` : `your session id is ${threadId}`;
-    const child = spawn7("codex", [
+    const codexResumeCmd = resolveCommand("codex");
+    const child = spawn7(codexResumeCmd.cmd, [
+      ...codexResumeCmd.prependArgs,
       "resume",
       threadId,
       "--dangerously-bypass-approvals-and-sandbox",
       resumePrompt
     ], {
       cwd: flintPath,
-      stdio: "inherit",
-      shell: process.platform === "win32"
+      stdio: "inherit"
     });
     child.on("error", (err) => {
       console.error(pc29.red(`Error: ${err.message}`));
@@ -16539,11 +16596,11 @@ codeCommand.command("gemini").description("Open Gemini CLI with Orbh session tra
         writeSession(sessionsDir, fresh);
       });
     }
-    const child = spawn7("gemini", args, {
+    const geminiCmd = resolveCommand("gemini");
+    const child = spawn7(geminiCmd.cmd, [...geminiCmd.prependArgs, ...args], {
       cwd: flintPath,
       stdio: "inherit",
-      env: { ...process.env, ORBH_SESSION_ID: session.id },
-      shell: process.platform === "win32"
+      env: { ...process.env, ORBH_SESSION_ID: session.id }
     });
     if (child.pid) {
       updateCurrentRun2(session, { pid: child.pid });
@@ -16604,7 +16661,7 @@ codeCommand.command("gemini").description("Open Gemini CLI with Orbh session tra
 // src/commands/helper.ts
 import { Command as Command25 } from "commander";
 import pc30 from "picocolors";
-import { readdirSync as readdirSync6, existsSync as existsSync12, statSync as statSync4 } from "fs";
+import { readdirSync as readdirSync6, existsSync as existsSync13, statSync as statSync4 } from "fs";
 import { join as join15, basename as basename5 } from "path";
 function extractNumberFromFile(filename, typeName) {
   const regex = new RegExp(`^\\(${typeName}\\)\\s+(\\d+)`, "i");
@@ -16613,7 +16670,7 @@ function extractNumberFromFile(filename, typeName) {
 }
 function collectFilesRecursively(dirPath) {
   const files = [];
-  if (!existsSync12(dirPath)) {
+  if (!existsSync13(dirPath)) {
     return files;
   }
   const entries = readdirSync6(dirPath);
@@ -16634,7 +16691,7 @@ function collectFilesRecursively(dirPath) {
 }
 function getNextNumber(flintPath, typeName) {
   const meshDir = join15(flintPath, "Mesh");
-  if (!existsSync12(meshDir)) {
+  if (!existsSync13(meshDir)) {
     return 1;
   }
   const allFiles = collectFilesRecursively(meshDir);
@@ -16752,7 +16809,7 @@ var featuresCommand = createFeaturesCommand({
 import { Command as Command27 } from "commander";
 import pc32 from "picocolors";
 var VALID_TYPES = ["codebase", "flint"];
-var resolveCommand = new Command27("resolve").description("Resolve a reference to its local path").argument("<type>", "Reference type: codebase, flint, or source").argument("<name>", 'Name of the reference to resolve (or "FlintName/ExportName" for sources)').option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("--json", "Output as JSON").action(async (type, name, options) => {
+var resolveCommand2 = new Command27("resolve").description("Resolve a reference to its local path").argument("<type>", "Reference type: codebase, flint, or source").argument("<name>", 'Name of the reference to resolve (or "FlintName/ExportName" for sources)').option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("--json", "Output as JSON").action(async (type, name, options) => {
   try {
     const flintPath = options.path || await findFlintRoot(process.cwd());
     if (!flintPath) {
@@ -16917,17 +16974,17 @@ function prompt5(message) {
 // src/commands/update.ts
 import { Command as Command29 } from "commander";
 import pc34 from "picocolors";
-import { readFileSync as readFileSync9, existsSync as existsSync13 } from "fs";
-import { dirname as dirname3, join as join16 } from "path";
+import { readFileSync as readFileSync10, existsSync as existsSync14 } from "fs";
+import { dirname as dirname4, join as join16 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { execSync as execSync4 } from "child_process";
 import https from "https";
-var __dirname2 = dirname3(fileURLToPath3(import.meta.url));
+var __dirname2 = dirname4(fileURLToPath3(import.meta.url));
 function readPkgVersion() {
   for (const rel of ["../..", ".."]) {
     const p = join16(__dirname2, rel, "package.json");
-    if (existsSync13(p)) {
-      return JSON.parse(readFileSync9(p, "utf-8")).version;
+    if (existsSync14(p)) {
+      return JSON.parse(readFileSync10(p, "utf-8")).version;
     }
   }
   throw new Error("Could not determine current version");
@@ -17803,7 +17860,7 @@ var tinderboxCommand = new Command35("tinderbox").description("Orchestrate opera
 import { Command as Command36 } from "commander";
 import pc41 from "picocolors";
 import { spawn as spawn8, spawnSync as spawnSync4, execSync as execSync5 } from "child_process";
-import { existsSync as existsSync14, mkdirSync as mkdirSync4, readFileSync as readFileSync10, readdirSync as readdirSync7, statSync as statSync5, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync4, readFileSync as readFileSync11, readdirSync as readdirSync7, statSync as statSync5, writeFileSync as writeFileSync3 } from "fs";
 import { join as join18 } from "path";
 import { homedir as homedir10 } from "os";
 import { createInterface as createInterface7 } from "readline";
@@ -17847,7 +17904,7 @@ function readTranscriptEntries(session, flintPath) {
   const transcriptPath = harness.resolveTranscriptPath(nativeId, flintPath);
   if (!transcriptPath) return null;
   try {
-    const content = readFileSync10(transcriptPath, "utf-8");
+    const content = readFileSync11(transcriptPath, "utf-8");
     return harness.parseTranscript(content, { transcriptPath });
   } catch {
     return null;
@@ -17869,7 +17926,7 @@ function formatTokenSummary(usage) {
 }
 var DETACHED_ORB_MONITOR = String.raw`
 const { spawn, spawnSync } = require('node:child_process');
-const { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, renameSync } = require('node:fs');
+const { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, renameSync } = require('node:fs');
 const { basename, dirname, join } = require('node:path');
 const { homedir } = require('node:os');
 
@@ -17878,6 +17935,17 @@ if (!configJson) process.exit(1);
 
 const { sessionPath, cwd, command, args } = JSON.parse(configJson);
 
+function debugLog(msg) {
+  if (process.platform !== 'win32') return;
+  try {
+    const logDir = join(cwd, '.flint');
+    mkdirSync(logDir, { recursive: true });
+    appendFileSync(join(logDir, 'orbh-debug.log'), '[' + new Date().toISOString() + '] [monitor] ' + msg + '\n');
+  } catch {}
+}
+
+debugLog('Monitor started. command=' + command + ', args=' + JSON.stringify(args).slice(0, 200));
+
 function readSession() {
   try { return JSON.parse(readFileSync(sessionPath, 'utf-8')); }
   catch { return null; }
@@ -17916,12 +17984,53 @@ function notify(title, message) {
   } catch {}
 }
 
-const child = spawn(command, args, { cwd, stdio: ['ignore', 'ignore', 'pipe'], shell: process.platform === 'win32' });
+// On Windows, resolve .cmd shims to the underlying node script
+let spawnCmd = command;
+let spawnArgs = args;
+if (process.platform === 'win32') {
+  debugLog('Resolving command: ' + command);
+  const where = spawnSync('where', [command], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] });
+  debugLog('where exit=' + where.status + ', stdout=' + JSON.stringify((where.stdout || '').trim()));
+  if (where.status === 0 && where.stdout) {
+    const resolved = where.stdout.trim().split(/\r?\n/)[0].trim();
+    debugLog('Resolved path: ' + resolved);
+    if (resolved.toLowerCase().endsWith('.cmd')) {
+      try {
+        const content = readFileSync(resolved, 'utf-8');
+        debugLog('.cmd content (' + content.length + ' chars):\n' + content);
+        const matches = [...content.matchAll(/%(?:~dp0|dp0%)\\([^"%\r\n]+\.m?[jc]?[jt]s)/gi)];
+        debugLog('Regex matches: ' + JSON.stringify(matches.map(m => m[0])));
+        if (matches.length > 0) {
+          const scriptPath = join(dirname(resolved), matches[matches.length - 1][1]);
+          const scriptExists = existsSync(scriptPath);
+          debugLog('Script path: ' + scriptPath + ', exists: ' + scriptExists);
+          if (scriptExists) {
+            spawnCmd = process.execPath;
+            spawnArgs = [scriptPath, ...args];
+          }
+        } else {
+          debugLog('No regex matches in .cmd content');
+        }
+      } catch (e) {
+        debugLog('Error parsing .cmd: ' + e);
+      }
+    } else {
+      spawnCmd = resolved;
+    }
+  } else {
+    debugLog('where failed — using bare command name');
+  }
+}
+debugLog('Final spawn: cmd=' + spawnCmd + ', args[0..2]=' + JSON.stringify(spawnArgs.slice(0, 3)));
+const child = spawn(spawnCmd, spawnArgs, { cwd, stdio: ['ignore', 'ignore', 'pipe'] });
 
 let stderr = '';
 child.stderr?.on('data', (chunk) => { stderr += chunk.toString(); });
 
-child.on('error', () => {
+debugLog('Spawn initiated, pid=' + (child.pid || 'none'));
+
+child.on('error', (err) => {
+  debugLog('Spawn ERROR: ' + err.message + ' (code=' + err.code + ')');
   const s = readSession();
   if (s) {
     s.status = 'failed';
@@ -18048,6 +18157,7 @@ if (command === 'gemini') {
 }
 
 child.on('exit', (code) => {
+  debugLog('Child exited with code=' + code + ', stderr=' + (stderr || '(empty)').slice(0, 500));
   const s = readSession();
   if (!s) { process.exit(typeof code === 'number' ? code : 1); return; }
   const desc = (s.title || s.description || s.prompt || '').slice(0, 60);
@@ -18216,7 +18326,7 @@ function exportSessionTranscript(session, flintPath) {
   }
   let content;
   try {
-    content = readFileSync10(transcriptPath, "utf-8");
+    content = readFileSync11(transcriptPath, "utf-8");
   } catch {
     console.log(pc41.dim("Could not read transcript file."));
     return;
@@ -19118,11 +19228,11 @@ orbCommand.command("watch").description("Stream a live session transcript to the
   console.log(`${pc41.bold("Watching")} ${pc41.cyan(shortId2(session.id))} ${pc41.dim("\xB7")} ${session.runtime}${watchTitle} ${pc41.dim("\xB7")} ${statusIcon2(session.status)} ${session.status}${watchMeta}`);
   console.log(pc41.dim(transcriptPath));
   console.log("");
-  if (!existsSync14(transcriptPath)) {
+  if (!existsSync15(transcriptPath)) {
     process.stdout.write(pc41.dim("Waiting for transcript..."));
     await new Promise((resolve12, reject) => {
       const poll = setInterval(() => {
-        if (existsSync14(transcriptPath)) {
+        if (existsSync15(transcriptPath)) {
           clearInterval(poll);
           process.stdout.write("\r\x1B[2K");
           resolve12();
@@ -19541,15 +19651,15 @@ var steelCommand = new Command37("steel").description("Manage Steel UI state (.s
 );
 
 // src/index.ts
-var __dirname3 = dirname4(fileURLToPath4(import.meta.url));
-var pkg = JSON.parse(readFileSync11(join20(__dirname3, "..", "package.json"), "utf-8"));
+var __dirname3 = dirname5(fileURLToPath4(import.meta.url));
+var pkg = JSON.parse(readFileSync12(join20(__dirname3, "..", "package.json"), "utf-8"));
 var runtime = resolveRuntimeSync({ cliname: "flint" });
 var devAvailable = runtime.mode === "dev";
 var newDir = getConfigDir("flint");
 var oldDir = join20(homedir11(), ".flint");
 var intermediateDir = join20(homedir11(), ".nuucognition", ".flint");
 function migrateDir(sourceDir, label) {
-  if (!existsSync15(sourceDir)) return false;
+  if (!existsSync16(sourceDir)) return false;
   try {
     const entries = readdirSync8(sourceDir);
     const filesToMigrate = entries.filter((e) => !e.startsWith(".DS_Store"));
@@ -19559,7 +19669,7 @@ function migrateDir(sourceDir, label) {
     for (const entry of filesToMigrate) {
       const src = join20(sourceDir, entry);
       const dest = join20(newDir, entry);
-      if (!existsSync15(dest)) {
+      if (!existsSync16(dest)) {
         cpSync(src, dest, { recursive: true });
         migrated++;
       }
@@ -19627,7 +19737,7 @@ var COMMAND_MAP = [
   { featureId: "reference", command: referenceCommand },
   { featureId: "export", command: exportCommand },
   { featureId: "obsidian", command: obsidianCommand },
-  { featureId: "resolve", command: resolveCommand },
+  { featureId: "resolve", command: resolveCommand2 },
   { featureId: "fulfill", command: fulfillCommand },
   { featureId: "update", command: updateCommand },
   { featureId: "send", command: sendCommand },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuucognition/flint-cli",
-  "version": "0.5.6-dev.1",
+  "version": "0.5.6-dev.3",
   "type": "module",
   "description": "Flint cognitive workspace CLI",
   "license": "PROPRIETARY",
@@ -36,12 +36,12 @@
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
     "typescript": "^5.9.2",
-    "@nuucognition/flint-server": "0.0.1",
     "@nuucognition/flint": "0.1.0",
-    "@nuucognition/flint-migrations": "0.1.0",
-    "@nuucognition/typescript-config": "0.0.0",
+    "@nuucognition/flint-server": "0.0.1",
     "@nuucognition/orbh": "0.0.1-dev.0",
-    "@nuucognition/eslint-config": "0.0.0"
+    "@nuucognition/eslint-config": "0.0.0",
+    "@nuucognition/typescript-config": "0.0.0",
+    "@nuucognition/flint-migrations": "0.1.0"
   },
   "scripts": {
     "predev": "turbo build --filter=@nuucognition/flint-cli^...",