imprnt 0.1.3-edge.60 → 0.1.3-edge.61

package/dist/cli.js

@@ -766,14 +766,9 @@ function registerVault(path, opts = {}) {
   const name = opts.name ?? "personal";
   reg.vaults[name] = path;
   reg.default = name;
-  const p = configPath();
-  try {
-    mkdirSync2(dirname2(p), { recursive: true });
-    writeFileSync5(p, JSON.stringify(reg, null, 2) + `
-`);
-  } catch (e) {
-    return { status: "error", current: path, error: e instanceof Error ? e.message : String(e) };
-  }
+  const w = writeRegistry(reg);
+  if (!w.ok)
+    return { status: "error", current: path, error: w.error };
   return { status: "registered", current: path };
 }
 function readDefaultAgent() {
@@ -842,8 +837,9 @@ var init_registry = () => {};
 // scripts/lib/launch.ts
 import { existsSync as existsSync7, mkdtempSync as mkdtempSync2, readFileSync as readFileSync7, realpathSync, rmSync as rmSync3, statSync as statSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { homedir as homedir2, tmpdir as tmpdir2 } from "node:os";
-import { isAbsolute, join as join8, resolve as resolve4, sep as sep2 } from "node:path";
+import { basename as basename2, isAbsolute, join as join8, resolve as resolve4, sep as sep2 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
+import { createInterface } from "node:readline/promises";
 function importPath(root, target) {
   if (target.startsWith("~/"))
     return join8(homedir2(), target.slice(2));
@@ -1013,7 +1009,12 @@ function claudeRenderArgs(spec) {
   const systemPrompt = spec.insideProject ? spec.globals : joinFragments([spec.cast, spec.pointer, spec.globals]);
   const harness = spec.pluginsRoot ? harnessFlags(spec.pluginsRoot) : [];
   const extra = spec.addDirs.flatMap((d) => ["--add-dir", d]);
-  const pass = spec.skipPermissions && !spec.passthrough.includes("--dangerously-skip-permissions") ? ["--dangerously-skip-permissions", ...spec.passthrough] : spec.passthrough;
+  const lead = [];
+  if (spec.skipPermissions && !spec.passthrough.includes("--dangerously-skip-permissions"))
+    lead.push("--dangerously-skip-permissions");
+  if (spec.model && !spec.passthrough.some((a) => a === "--model" || a.startsWith("--model=")))
+    lead.push("--model", spec.model);
+  const pass = lead.length ? [...lead, ...spec.passthrough] : spec.passthrough;
   const body = systemPrompt ? mergeFragment(pass, systemPrompt, extra) : [...pass, ...extra];
   return [...harness, ...body];
 }
@@ -1023,6 +1024,19 @@ function expandGeminiModel(m) {
 function escapeGeminiImports(text) {
   return text.replaceAll("@", "\\@");
 }
+function trackGeminiTempDir(dir) {
+  geminiTempDirs.add(dir);
+  if (geminiCleanupArmed)
+    return;
+  geminiCleanupArmed = true;
+  process.on("exit", () => {
+    for (const d of geminiTempDirs) {
+      try {
+        rmSync3(d, { recursive: true, force: true });
+      } catch {}
+    }
+  });
+}
 function geminiRenderArgs(spec) {
   const includes = [];
   const systemPrompt = joinFragments([spec.cast, spec.pointer, spec.globals]);
@@ -1030,11 +1044,7 @@ function geminiRenderArgs(spec) {
     const dir = mkdtempSync2(join8(tmpdir2(), "imprnt-gemini-"));
     writeFileSync6(join8(dir, "GEMINI.md"), escapeGeminiImports(systemPrompt) + `
 `);
-    process.on("exit", () => {
-      try {
-        rmSync3(dir, { recursive: true, force: true });
-      } catch {}
-    });
+    trackGeminiTempDir(dir);
     includes.push(dir);
   }
   includes.push(...spec.addDirs);
@@ -1049,16 +1059,23 @@ function geminiRenderArgs(spec) {
       lead.push("--skip-trust");
   }
   const pass = [...spec.passthrough];
-  const mIdx = pass.findIndex((a) => a === "-m" || a === "--model");
-  if (mIdx >= 0 && pass[mIdx + 1] !== undefined) {
-    pass[mIdx + 1] = expandGeminiModel(pass[mIdx + 1]);
-  } else if (mIdx < 0 && spec.model) {
+  const mTerm = pass.indexOf("--");
+  const mEnd = mTerm < 0 ? pass.length : mTerm;
+  const isModelFlag = (a) => a === "-m" || a === "--model" || a.startsWith("-m=") || a.startsWith("--model=");
+  const mIdx = pass.slice(0, mEnd).findIndex(isModelFlag);
+  if (mIdx >= 0) {
+    const tok = pass[mIdx];
+    const eq = tok.indexOf("=");
+    if (eq >= 0)
+      pass[mIdx] = tok.slice(0, eq + 1) + expandGeminiModel(tok.slice(eq + 1));
+    else if (mIdx + 1 < mEnd && pass[mIdx + 1] !== undefined)
+      pass[mIdx + 1] = expandGeminiModel(pass[mIdx + 1]);
+  } else if (spec.model) {
     pass.unshift("-m", expandGeminiModel(spec.model));
   }
-  const rIdx = pass.findIndex((a) => a === "-r" || a === "--resume");
-  if (rIdx >= 0 && (pass[rIdx + 1] === undefined || pass[rIdx + 1].startsWith("-"))) {
+  const rIdx = valuelessResumeIndex(pass);
+  if (rIdx >= 0)
     pass.splice(rIdx + 1, 0, "latest");
-  }
   const flags = includes.length ? ["--include-directories", includes.join(",")] : [];
   return [...lead, ...flags, ...pass];
 }
@@ -1071,11 +1088,88 @@ function parseGeminiSessions(stdout) {
   }
   return out;
 }
+function valuelessResumeIndex(args) {
+  const term = args.indexOf("--");
+  const end = term < 0 ? args.length : term;
+  let i = -1;
+  for (let k = 0;k < end; k++) {
+    if (args[k] === "-r" || args[k] === "--resume") {
+      i = k;
+      break;
+    }
+  }
+  if (i < 0)
+    return -1;
+  const next = i + 1 < end ? args[i + 1] : undefined;
+  return next === undefined || next.startsWith("-") ? i : -1;
+}
+function listGeminiSessions(cwd) {
+  const r = spawnSync2("gemini", ["--list-sessions", "--skip-trust"], { cwd, encoding: "utf8" });
+  if (r.error || r.status !== 0)
+    return { sessions: [], ran: false };
+  const stdout = r.stdout || "";
+  const sessions = parseGeminiSessions(stdout);
+  if (!sessions.length && stdout.trim() && !/\(\s*0\s*\)|no sessions/i.test(stdout)) {
+    console.error("imp: couldn't parse gemini's session list (its format may have changed) - starting fresh");
+  }
+  return { sessions, ran: true };
+}
+async function pickGeminiSession(sessions, label) {
+  const cols = process.stdout.columns || 80;
+  const nameW = Math.max(20, Math.min(64, cols - 16));
+  const trunc = (s) => s.length > nameW ? s.slice(0, nameW - 1) + "…" : s;
+  process.stderr.write(`
+  resume a chat - gemini · ${label}
+
+`);
+  sessions.forEach((s, i) => {
+    process.stderr.write(`  ${String(i + 1).padStart(2)}  ${trunc(s.name).padEnd(nameW)}  ${s.age.replace(/\s*ago$/, "")}
+`);
+  });
+  process.stderr.write(`
+`);
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  const answer = (await rl.question("  number to resume · enter for newest · q to cancel › ")).trim();
+  rl.close();
+  if (answer === "")
+    return "latest";
+  if (answer.toLowerCase() === "q")
+    return null;
+  const n = Number(answer);
+  if (Number.isInteger(n) && n >= 1 && n <= sessions.length)
+    return sessions[n - 1].id;
+  process.stderr.write(`  not a valid choice - starting a fresh session
+`);
+  return null;
+}
+async function geminiResolveResume(passthrough, cwd) {
+  const rIdx = valuelessResumeIndex(passthrough);
+  if (rIdx < 0)
+    return passthrough;
+  if (!(process.stdin.isTTY && process.stdout.isTTY))
+    return passthrough;
+  const { sessions, ran } = listGeminiSessions(cwd);
+  if (!ran)
+    return passthrough;
+  if (!sessions.length) {
+    console.error("imp: no saved gemini chats for this project yet - starting fresh");
+    return passthrough.filter((_, i) => i !== rIdx);
+  }
+  const chosen = await pickGeminiSession(sessions, basename2(cwd));
+  if (chosen === null)
+    return passthrough.filter((_, i) => i !== rIdx);
+  const out = [...passthrough];
+  out.splice(rIdx + 1, 0, chosen);
+  return out;
+}
 function resolveLaunch(passthrough, config = {}) {
+  const term = passthrough.indexOf("--");
+  const head = term < 0 ? passthrough : passthrough.slice(0, term);
+  const tail = term < 0 ? [] : passthrough.slice(term);
   let agentFlag;
   let yoloFlag;
   const rest = [];
-  for (const a of passthrough) {
+  for (const a of head) {
     if (a === "--gemini")
       agentFlag = agentFlag ?? "gemini";
     else if (a === "--claude")
@@ -1093,9 +1187,10 @@ function resolveLaunch(passthrough, config = {}) {
     console.error(`imp: unknown agent "${name}" - falling back to claude (valid: ${Object.keys(backends).join(", ")})`);
     backend = claudeBackend;
   }
-  const envYolo = "IMPRNT_YOLO" in process.env ? !["0", "false", ""].includes(process.env.IMPRNT_YOLO ?? "") : undefined;
+  const yoloEnv = process.env.IMPRNT_YOLO;
+  const envYolo = yoloEnv === undefined ? undefined : !["0", "false", "", "off", "no"].includes(yoloEnv.toLowerCase());
   const skipPermissions = yoloFlag ?? envYolo ?? config.yolo ?? false;
-  return { backend, skipPermissions, passthrough: rest };
+  return { backend, skipPermissions, passthrough: [...rest, ...tail] };
 }
 function launchBackend(backend, cwd, args, env = process.env) {
   if (!isDir(cwd)) {
@@ -1110,7 +1205,7 @@ function launchBackend(backend, cwd, args, env = process.env) {
   }
   return r.status ?? 1;
 }
-var claudeBackend, GEMINI_MODEL_ALIASES, geminiBackend, backends;
+var claudeBackend, GEMINI_MODEL_ALIASES, geminiTempDirs, geminiCleanupArmed = false, geminiBackend, backends;
 var init_launch = __esm(() => {
   init_plugins();
   init_global();
@@ -1127,10 +1222,12 @@ var init_launch = __esm(() => {
     gemma31: "gemma-4-31b-it",
     gemma26: "gemma-4-26b-a4b-it"
   };
+  geminiTempDirs = new Set;
   geminiBackend = {
     name: "gemini",
     missingHint: "Install the Gemini CLI first: npm i -g @google/gemini-cli",
-    renderArgs: geminiRenderArgs
+    renderArgs: geminiRenderArgs,
+    resolveResume: geminiResolveResume
   };
   backends = {
     claude: claudeBackend,
@@ -1173,7 +1270,7 @@ var init_manifest = () => {};
 var exports_ingest = {};
 import { readFileSync as readFileSync9, writeFileSync as writeFileSync8, mkdirSync as mkdirSync3, existsSync as existsSync9, copyFileSync, readdirSync as readdirSync5, rmSync as rmSync4, statSync as statSync6 } from "node:fs";
 import { createHash } from "node:crypto";
-import { basename as basename2, extname, join as join10, relative as relative3 } from "node:path";
+import { basename as basename3, extname, join as join10, relative as relative3 } from "node:path";
 function slugify(s) {
   return s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
 }
@@ -1254,7 +1351,7 @@ function applyStaged(staged, vault) {
     return "error";
   }
   const title = text.match(/^#\s+(.+)$/m)?.[1]?.trim() ?? "";
-  const slug = deriveSlug([fmScalar2(fm, "slug"), title, basename2(staged, ".md")]);
+  const slug = deriveSlug([fmScalar2(fm, "slug"), title, basename3(staged, ".md")]);
   if (!slug) {
     console.error(`  ✗ ${staged}: can't derive a slug - slug:, the H1 title, and the filename all slugify to nothing`);
     return "error";
@@ -1481,7 +1578,7 @@ ${filed} filed, ${noop} no-op, ${conflict} conflict, ${error} error.`);
     console.log(`unchanged (hash ${hash}) — skipping ${src}. note: ${prior.note}`);
     process.exit(0);
   }
-  fname = basename2(src);
+  fname = basename3(src);
   dateMatch = fname.match(/(\d{4}-\d{2}-\d{2})/) || text.match(/^\s*date:\s*(\d{4}-\d{2}-\d{2})/im);
   date = dateMatch ? dateMatch[1] : new Date().toISOString().slice(0, 10);
   lines = text.split(/\r?\n/);
@@ -1515,7 +1612,7 @@ ${filed} filed, ${noop} no-op, ${conflict} conflict, ${error} error.`);
   }
   recurringSpeaker = [...turnsBySpeaker.values()].some((n) => n >= 2);
   isTranscript = isFile && looksLikeTranscript(speakers, turnCount, contentLines, recurringSpeaker);
-  slugBasis = slugHint || subject || [...speakers].join("-") || (isFile ? basename2(src, extname(src)) : text.slice(0, 60));
+  slugBasis = slugHint || subject || [...speakers].join("-") || (isFile ? basename3(src, extname(src)) : text.slice(0, 60));
   subjectSlug = slugify(slugBasis) || "source";
   noteSlug = `${date}-${subjectSlug}`;
   rawDir = join10(vault, "..", "raw", isTranscript ? "transcripts" : "adhoc");
@@ -1756,7 +1853,7 @@ var init_tags = __esm(() => {
 // scripts/recall.ts
 var exports_recall = {};
 import { lstatSync as lstatSync2, readdirSync as readdirSync6, readFileSync as readFileSync11 } from "node:fs";
-import { basename as basename3, join as join12, relative as relative4 } from "node:path";
+import { basename as basename4, join as join12, relative as relative4 } from "node:path";
 function walk2(dir2) {
   const out = [];
   for (const entry of readdirSync6(dir2)) {
@@ -1973,7 +2070,7 @@ var init_recall = __esm(() => {
       for (const t of tokens)
         tf.set(t, (tf.get(t) ?? 0) + weight);
     };
-    add([...tokenize(titleText), ...tokenize(basename3(path, ".md"))], TITLE_BOOST);
+    add([...tokenize(titleText), ...tokenize(basename4(path, ".md"))], TITLE_BOOST);
     add(tokenize(aliases), TITLE_BOOST);
     add(tags.flatMap(tokenize), TAG_BOOST);
     add(tokenize(summary), SUMMARY_BOOST);
@@ -2038,7 +2135,7 @@ var init_recall = __esm(() => {
 var exports_snapshot = {};
 import { readdirSync as readdirSync7, readFileSync as readFileSync12, copyFileSync as copyFileSync2, mkdirSync as mkdirSync4, existsSync as existsSync11, statSync as statSync7, lstatSync as lstatSync3 } from "node:fs";
 import { createHash as createHash2 } from "node:crypto";
-import { join as join13, relative as relative5, basename as basename4, extname as extname2, resolve as resolve5, sep as sep3 } from "node:path";
+import { join as join13, relative as relative5, basename as basename5, extname as extname2, resolve as resolve5, sep as sep3 } from "node:path";
 function destWithinRaw(rawRoot, dest) {
   const rootResolved = resolve5(rawRoot);
   const destResolved = resolve5(rootResolved, dest);
@@ -2050,7 +2147,7 @@ function collect(p, base) {
   let skippedLinks = 0;
   const st = statSync7(p);
   if (st.isFile())
-    return { files: [{ abs: p, rel: basename4(p) }], skippedLinks };
+    return { files: [{ abs: p, rel: basename5(p) }], skippedLinks };
   const out = [];
   const walk3 = (dir2) => {
     for (const entry of readdirSync7(dir2)) {
@@ -2528,10 +2625,10 @@ all plugin checks passed.`);
 var exports_cli = {};
 import { cpSync as cpSync3, mkdirSync as mkdirSync5, chmodSync, existsSync as existsSync13, readFileSync as readFileSync14, lstatSync as lstatSync4, statSync as statSync9, realpathSync as realpathSync2 } from "node:fs";
 import { spawnSync as spawnSync4 } from "node:child_process";
-import { join as join15, dirname as dirname4, resolve as resolve6, basename as basename5 } from "node:path";
+import { join as join15, dirname as dirname4, resolve as resolve6, basename as basename6 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 import { fileURLToPath } from "node:url";
-import { createInterface } from "node:readline/promises";
+import { createInterface as createInterface2 } from "node:readline/promises";
 function pluginRoot() {
   const local = projectRoot();
   if (process.env.IMPRNT_ROOT || process.env.IMPRINT_ROOT)
@@ -2578,7 +2675,7 @@ function physicalTarget(target) {
     const parent = dirname4(existing);
     if (parent === existing)
       return target;
-    tail.unshift(basename5(existing));
+    tail.unshift(basename6(existing));
     existing = parent;
   }
   try {
@@ -2607,61 +2704,6 @@ function controlSlot(dst) {
     return "keep";
   return "blocked-non-regular-file";
 }
-function listGeminiSessions(cwd) {
-  const r = spawnSync4("gemini", ["--list-sessions", "--skip-trust"], { cwd, encoding: "utf8" });
-  return parseGeminiSessions(r.stdout || "");
-}
-async function pickGeminiSession(sessions, label) {
-  const cols = process.stdout.columns || 80;
-  const nameW = Math.max(20, Math.min(64, cols - 16));
-  const trunc = (s) => s.length > nameW ? s.slice(0, nameW - 1) + "…" : s;
-  process.stderr.write(`
-  resume a chat — gemini · ${label}
-
-`);
-  sessions.forEach((s, i) => {
-    process.stderr.write(`  ${String(i + 1).padStart(2)}  ${trunc(s.name).padEnd(nameW)}  ${s.age.replace(/\s*ago$/, "")}
-`);
-  });
-  process.stderr.write(`
-`);
-  const rl = createInterface({ input: process.stdin, output: process.stderr });
-  const answer = (await rl.question("  number to resume · enter for newest · q to cancel › ")).trim();
-  rl.close();
-  if (answer === "")
-    return "latest";
-  if (answer.toLowerCase() === "q")
-    return null;
-  const n = Number(answer);
-  if (Number.isInteger(n) && n >= 1 && n <= sessions.length)
-    return sessions[n - 1].id;
-  process.stderr.write(`  not a valid choice — starting a fresh session
-`);
-  return null;
-}
-async function resolveGeminiResume(backendName, passthrough, cwd) {
-  if (backendName !== "gemini")
-    return passthrough;
-  const rIdx = passthrough.findIndex((a) => a === "-r" || a === "--resume");
-  if (rIdx < 0)
-    return passthrough;
-  const next = passthrough[rIdx + 1];
-  if (next !== undefined && !next.startsWith("-"))
-    return passthrough;
-  if (!(process.stdin.isTTY && process.stdout.isTTY))
-    return passthrough;
-  const sessions = listGeminiSessions(cwd);
-  if (!sessions.length) {
-    console.error("imp: no saved gemini chats for this project yet — starting fresh");
-    return passthrough.filter((_, i) => i !== rIdx);
-  }
-  const chosen = await pickGeminiSession(sessions, basename5(cwd));
-  if (chosen === null)
-    return passthrough.filter((_, i) => i !== rIdx);
-  const out = [...passthrough];
-  out.splice(rIdx + 1, 0, chosen);
-  return out;
-}
 var here, pkgRoot, cmd, rest, asImp;
 var init_cli = __esm(async () => {
   init_resolve();
@@ -2711,7 +2753,7 @@ var init_cli = __esm(async () => {
     case "lair": {
       const home = requireVaultHome();
       const { backend, skipPermissions, passthrough } = resolveLaunch(rest, { agent: readDefaultAgent(), yolo: readSkipPermissions() });
-      const resumed = await resolveGeminiResume(backend.name, passthrough, home);
+      const resumed = backend.resolveResume ? await backend.resolveResume(passthrough, home) : passthrough;
       const spec = assembleSession({ cwd: home, vaultProject: home, pkgRoot, passthrough: resumed, skipPermissions, model: readDefaultModel() });
       process.exit(launchBackend(backend, home, backend.renderArgs(spec), spec.env));
     }
@@ -2735,8 +2777,8 @@ var init_cli = __esm(async () => {
         console.log("set: imprnt agent <claude|gemini>   override one session: imp --gemini | imp --claude");
         break;
       }
-      if (name !== "claude" && name !== "gemini") {
-        console.error(`unknown agent "${name}" — valid: claude, gemini`);
+      if (!(name in backends)) {
+        console.error(`unknown agent "${name}" — valid: ${Object.keys(backends).join(", ")}`);
         process.exit(1);
       }
       const r = setDefaultAgent(name);
@@ -2774,7 +2816,7 @@ var init_cli = __esm(async () => {
         const m = readDefaultModel();
         console.log(`default model: ${m ?? "(agent's own default)"}`);
         console.log("set: imprnt model <alias|id>   clear: imprnt model off");
-        console.log("gemini aliases: pro=gemini-3.1-pro-preview, flash=gemini-3.5-flash, pro25=gemini-2.5-pro, lite=gemini-3.1-flash-lite, gemma31, gemma26");
+        console.log(`gemini aliases: ${Object.entries(GEMINI_MODEL_ALIASES).map(([k, v]) => `${k}=${v}`).join(", ")}`);
         break;
       }
       if (arg === "off" || arg === "default" || arg === "none") {
@@ -2999,7 +3041,7 @@ enable: imprnt plugin add <name>   disable: imprnt plugin rm <name> [--purge]`);
         const inPlace = isVaultProject(process.cwd());
         const display = inPlace ? process.cwd() : "~/imprnt";
         const fallback = inPlace ? process.cwd() : join15(homedir4(), "imprnt");
-        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        const rl = createInterface2({ input: process.stdin, output: process.stdout });
         const answer = (await rl.question(`vault location [${display}]: `)).trim();
         rl.close();
         target = answer ? resolvePath(answer) : fallback;
@@ -3111,7 +3153,7 @@ enable: imprnt plugin add <name>   disable: imprnt plugin rm <name> [--purge]`);
         }
         const raw = bare ? [] : [cmd, ...rest];
         const { backend, skipPermissions, passthrough } = resolveLaunch(raw, { agent: readDefaultAgent(), yolo: readSkipPermissions() });
-        const resumed = await resolveGeminiResume(backend.name, passthrough, process.cwd());
+        const resumed = backend.resolveResume ? await backend.resolveResume(passthrough, process.cwd()) : passthrough;
         const spec = assembleSession({ cwd: process.cwd(), vaultProject: home, pkgRoot, passthrough: resumed, skipPermissions, model: readDefaultModel() });
         process.exit(launchBackend(backend, process.cwd(), backend.renderArgs(spec), spec.env));
       }

package/dist/imp.js

@@ -766,14 +766,9 @@ function registerVault(path, opts = {}) {
   const name = opts.name ?? "personal";
   reg.vaults[name] = path;
   reg.default = name;
-  const p = configPath();
-  try {
-    mkdirSync2(dirname2(p), { recursive: true });
-    writeFileSync5(p, JSON.stringify(reg, null, 2) + `
-`);
-  } catch (e) {
-    return { status: "error", current: path, error: e instanceof Error ? e.message : String(e) };
-  }
+  const w = writeRegistry(reg);
+  if (!w.ok)
+    return { status: "error", current: path, error: w.error };
   return { status: "registered", current: path };
 }
 function readDefaultAgent() {
@@ -842,8 +837,9 @@ var init_registry = () => {};
 // scripts/lib/launch.ts
 import { existsSync as existsSync7, mkdtempSync as mkdtempSync2, readFileSync as readFileSync7, realpathSync, rmSync as rmSync3, statSync as statSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { homedir as homedir2, tmpdir as tmpdir2 } from "node:os";
-import { isAbsolute, join as join8, resolve as resolve4, sep as sep2 } from "node:path";
+import { basename as basename2, isAbsolute, join as join8, resolve as resolve4, sep as sep2 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
+import { createInterface } from "node:readline/promises";
 function importPath(root, target) {
   if (target.startsWith("~/"))
     return join8(homedir2(), target.slice(2));
@@ -1013,7 +1009,12 @@ function claudeRenderArgs(spec) {
   const systemPrompt = spec.insideProject ? spec.globals : joinFragments([spec.cast, spec.pointer, spec.globals]);
   const harness = spec.pluginsRoot ? harnessFlags(spec.pluginsRoot) : [];
   const extra = spec.addDirs.flatMap((d) => ["--add-dir", d]);
-  const pass = spec.skipPermissions && !spec.passthrough.includes("--dangerously-skip-permissions") ? ["--dangerously-skip-permissions", ...spec.passthrough] : spec.passthrough;
+  const lead = [];
+  if (spec.skipPermissions && !spec.passthrough.includes("--dangerously-skip-permissions"))
+    lead.push("--dangerously-skip-permissions");
+  if (spec.model && !spec.passthrough.some((a) => a === "--model" || a.startsWith("--model=")))
+    lead.push("--model", spec.model);
+  const pass = lead.length ? [...lead, ...spec.passthrough] : spec.passthrough;
   const body = systemPrompt ? mergeFragment(pass, systemPrompt, extra) : [...pass, ...extra];
   return [...harness, ...body];
 }
@@ -1023,6 +1024,19 @@ function expandGeminiModel(m) {
 function escapeGeminiImports(text) {
   return text.replaceAll("@", "\\@");
 }
+function trackGeminiTempDir(dir) {
+  geminiTempDirs.add(dir);
+  if (geminiCleanupArmed)
+    return;
+  geminiCleanupArmed = true;
+  process.on("exit", () => {
+    for (const d of geminiTempDirs) {
+      try {
+        rmSync3(d, { recursive: true, force: true });
+      } catch {}
+    }
+  });
+}
 function geminiRenderArgs(spec) {
   const includes = [];
   const systemPrompt = joinFragments([spec.cast, spec.pointer, spec.globals]);
@@ -1030,11 +1044,7 @@ function geminiRenderArgs(spec) {
     const dir = mkdtempSync2(join8(tmpdir2(), "imprnt-gemini-"));
     writeFileSync6(join8(dir, "GEMINI.md"), escapeGeminiImports(systemPrompt) + `
 `);
-    process.on("exit", () => {
-      try {
-        rmSync3(dir, { recursive: true, force: true });
-      } catch {}
-    });
+    trackGeminiTempDir(dir);
     includes.push(dir);
   }
   includes.push(...spec.addDirs);
@@ -1049,16 +1059,23 @@ function geminiRenderArgs(spec) {
       lead.push("--skip-trust");
   }
   const pass = [...spec.passthrough];
-  const mIdx = pass.findIndex((a) => a === "-m" || a === "--model");
-  if (mIdx >= 0 && pass[mIdx + 1] !== undefined) {
-    pass[mIdx + 1] = expandGeminiModel(pass[mIdx + 1]);
-  } else if (mIdx < 0 && spec.model) {
+  const mTerm = pass.indexOf("--");
+  const mEnd = mTerm < 0 ? pass.length : mTerm;
+  const isModelFlag = (a) => a === "-m" || a === "--model" || a.startsWith("-m=") || a.startsWith("--model=");
+  const mIdx = pass.slice(0, mEnd).findIndex(isModelFlag);
+  if (mIdx >= 0) {
+    const tok = pass[mIdx];
+    const eq = tok.indexOf("=");
+    if (eq >= 0)
+      pass[mIdx] = tok.slice(0, eq + 1) + expandGeminiModel(tok.slice(eq + 1));
+    else if (mIdx + 1 < mEnd && pass[mIdx + 1] !== undefined)
+      pass[mIdx + 1] = expandGeminiModel(pass[mIdx + 1]);
+  } else if (spec.model) {
     pass.unshift("-m", expandGeminiModel(spec.model));
   }
-  const rIdx = pass.findIndex((a) => a === "-r" || a === "--resume");
-  if (rIdx >= 0 && (pass[rIdx + 1] === undefined || pass[rIdx + 1].startsWith("-"))) {
+  const rIdx = valuelessResumeIndex(pass);
+  if (rIdx >= 0)
     pass.splice(rIdx + 1, 0, "latest");
-  }
   const flags = includes.length ? ["--include-directories", includes.join(",")] : [];
   return [...lead, ...flags, ...pass];
 }
@@ -1071,11 +1088,88 @@ function parseGeminiSessions(stdout) {
   }
   return out;
 }
+function valuelessResumeIndex(args) {
+  const term = args.indexOf("--");
+  const end = term < 0 ? args.length : term;
+  let i = -1;
+  for (let k = 0;k < end; k++) {
+    if (args[k] === "-r" || args[k] === "--resume") {
+      i = k;
+      break;
+    }
+  }
+  if (i < 0)
+    return -1;
+  const next = i + 1 < end ? args[i + 1] : undefined;
+  return next === undefined || next.startsWith("-") ? i : -1;
+}
+function listGeminiSessions(cwd) {
+  const r = spawnSync2("gemini", ["--list-sessions", "--skip-trust"], { cwd, encoding: "utf8" });
+  if (r.error || r.status !== 0)
+    return { sessions: [], ran: false };
+  const stdout = r.stdout || "";
+  const sessions = parseGeminiSessions(stdout);
+  if (!sessions.length && stdout.trim() && !/\(\s*0\s*\)|no sessions/i.test(stdout)) {
+    console.error("imp: couldn't parse gemini's session list (its format may have changed) - starting fresh");
+  }
+  return { sessions, ran: true };
+}
+async function pickGeminiSession(sessions, label) {
+  const cols = process.stdout.columns || 80;
+  const nameW = Math.max(20, Math.min(64, cols - 16));
+  const trunc = (s) => s.length > nameW ? s.slice(0, nameW - 1) + "…" : s;
+  process.stderr.write(`
+  resume a chat - gemini · ${label}
+
+`);
+  sessions.forEach((s, i) => {
+    process.stderr.write(`  ${String(i + 1).padStart(2)}  ${trunc(s.name).padEnd(nameW)}  ${s.age.replace(/\s*ago$/, "")}
+`);
+  });
+  process.stderr.write(`
+`);
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  const answer = (await rl.question("  number to resume · enter for newest · q to cancel › ")).trim();
+  rl.close();
+  if (answer === "")
+    return "latest";
+  if (answer.toLowerCase() === "q")
+    return null;
+  const n = Number(answer);
+  if (Number.isInteger(n) && n >= 1 && n <= sessions.length)
+    return sessions[n - 1].id;
+  process.stderr.write(`  not a valid choice - starting a fresh session
+`);
+  return null;
+}
+async function geminiResolveResume(passthrough, cwd) {
+  const rIdx = valuelessResumeIndex(passthrough);
+  if (rIdx < 0)
+    return passthrough;
+  if (!(process.stdin.isTTY && process.stdout.isTTY))
+    return passthrough;
+  const { sessions, ran } = listGeminiSessions(cwd);
+  if (!ran)
+    return passthrough;
+  if (!sessions.length) {
+    console.error("imp: no saved gemini chats for this project yet - starting fresh");
+    return passthrough.filter((_, i) => i !== rIdx);
+  }
+  const chosen = await pickGeminiSession(sessions, basename2(cwd));
+  if (chosen === null)
+    return passthrough.filter((_, i) => i !== rIdx);
+  const out = [...passthrough];
+  out.splice(rIdx + 1, 0, chosen);
+  return out;
+}
 function resolveLaunch(passthrough, config = {}) {
+  const term = passthrough.indexOf("--");
+  const head = term < 0 ? passthrough : passthrough.slice(0, term);
+  const tail = term < 0 ? [] : passthrough.slice(term);
   let agentFlag;
   let yoloFlag;
   const rest = [];
-  for (const a of passthrough) {
+  for (const a of head) {
     if (a === "--gemini")
       agentFlag = agentFlag ?? "gemini";
     else if (a === "--claude")
@@ -1093,9 +1187,10 @@ function resolveLaunch(passthrough, config = {}) {
     console.error(`imp: unknown agent "${name}" - falling back to claude (valid: ${Object.keys(backends).join(", ")})`);
     backend = claudeBackend;
   }
-  const envYolo = "IMPRNT_YOLO" in process.env ? !["0", "false", ""].includes(process.env.IMPRNT_YOLO ?? "") : undefined;
+  const yoloEnv = process.env.IMPRNT_YOLO;
+  const envYolo = yoloEnv === undefined ? undefined : !["0", "false", "", "off", "no"].includes(yoloEnv.toLowerCase());
   const skipPermissions = yoloFlag ?? envYolo ?? config.yolo ?? false;
-  return { backend, skipPermissions, passthrough: rest };
+  return { backend, skipPermissions, passthrough: [...rest, ...tail] };
 }
 function launchBackend(backend, cwd, args, env = process.env) {
   if (!isDir(cwd)) {
@@ -1110,7 +1205,7 @@ function launchBackend(backend, cwd, args, env = process.env) {
   }
   return r.status ?? 1;
 }
-var claudeBackend, GEMINI_MODEL_ALIASES, geminiBackend, backends;
+var claudeBackend, GEMINI_MODEL_ALIASES, geminiTempDirs, geminiCleanupArmed = false, geminiBackend, backends;
 var init_launch = __esm(() => {
   init_plugins();
   init_global();
@@ -1127,10 +1222,12 @@ var init_launch = __esm(() => {
     gemma31: "gemma-4-31b-it",
     gemma26: "gemma-4-26b-a4b-it"
   };
+  geminiTempDirs = new Set;
   geminiBackend = {
     name: "gemini",
     missingHint: "Install the Gemini CLI first: npm i -g @google/gemini-cli",
-    renderArgs: geminiRenderArgs
+    renderArgs: geminiRenderArgs,
+    resolveResume: geminiResolveResume
   };
   backends = {
     claude: claudeBackend,
@@ -1173,7 +1270,7 @@ var init_manifest = () => {};
 var exports_ingest = {};
 import { readFileSync as readFileSync9, writeFileSync as writeFileSync8, mkdirSync as mkdirSync3, existsSync as existsSync9, copyFileSync, readdirSync as readdirSync5, rmSync as rmSync4, statSync as statSync6 } from "node:fs";
 import { createHash } from "node:crypto";
-import { basename as basename2, extname, join as join10, relative as relative3 } from "node:path";
+import { basename as basename3, extname, join as join10, relative as relative3 } from "node:path";
 function slugify(s) {
   return s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
 }
@@ -1254,7 +1351,7 @@ function applyStaged(staged, vault) {
     return "error";
   }
   const title = text.match(/^#\s+(.+)$/m)?.[1]?.trim() ?? "";
-  const slug = deriveSlug([fmScalar2(fm, "slug"), title, basename2(staged, ".md")]);
+  const slug = deriveSlug([fmScalar2(fm, "slug"), title, basename3(staged, ".md")]);
   if (!slug) {
     console.error(`  ✗ ${staged}: can't derive a slug - slug:, the H1 title, and the filename all slugify to nothing`);
     return "error";
@@ -1481,7 +1578,7 @@ ${filed} filed, ${noop} no-op, ${conflict} conflict, ${error} error.`);
     console.log(`unchanged (hash ${hash}) — skipping ${src}. note: ${prior.note}`);
     process.exit(0);
   }
-  fname = basename2(src);
+  fname = basename3(src);
   dateMatch = fname.match(/(\d{4}-\d{2}-\d{2})/) || text.match(/^\s*date:\s*(\d{4}-\d{2}-\d{2})/im);
   date = dateMatch ? dateMatch[1] : new Date().toISOString().slice(0, 10);
   lines = text.split(/\r?\n/);
@@ -1515,7 +1612,7 @@ ${filed} filed, ${noop} no-op, ${conflict} conflict, ${error} error.`);
   }
   recurringSpeaker = [...turnsBySpeaker.values()].some((n) => n >= 2);
   isTranscript = isFile && looksLikeTranscript(speakers, turnCount, contentLines, recurringSpeaker);
-  slugBasis = slugHint || subject || [...speakers].join("-") || (isFile ? basename2(src, extname(src)) : text.slice(0, 60));
+  slugBasis = slugHint || subject || [...speakers].join("-") || (isFile ? basename3(src, extname(src)) : text.slice(0, 60));
   subjectSlug = slugify(slugBasis) || "source";
   noteSlug = `${date}-${subjectSlug}`;
   rawDir = join10(vault, "..", "raw", isTranscript ? "transcripts" : "adhoc");
@@ -1756,7 +1853,7 @@ var init_tags = __esm(() => {
 // scripts/recall.ts
 var exports_recall = {};
 import { lstatSync as lstatSync2, readdirSync as readdirSync6, readFileSync as readFileSync11 } from "node:fs";
-import { basename as basename3, join as join12, relative as relative4 } from "node:path";
+import { basename as basename4, join as join12, relative as relative4 } from "node:path";
 function walk2(dir2) {
   const out = [];
   for (const entry of readdirSync6(dir2)) {
@@ -1973,7 +2070,7 @@ var init_recall = __esm(() => {
       for (const t of tokens)
         tf.set(t, (tf.get(t) ?? 0) + weight);
     };
-    add([...tokenize(titleText), ...tokenize(basename3(path, ".md"))], TITLE_BOOST);
+    add([...tokenize(titleText), ...tokenize(basename4(path, ".md"))], TITLE_BOOST);
     add(tokenize(aliases), TITLE_BOOST);
     add(tags.flatMap(tokenize), TAG_BOOST);
     add(tokenize(summary), SUMMARY_BOOST);
@@ -2038,7 +2135,7 @@ var init_recall = __esm(() => {
 var exports_snapshot = {};
 import { readdirSync as readdirSync7, readFileSync as readFileSync12, copyFileSync as copyFileSync2, mkdirSync as mkdirSync4, existsSync as existsSync11, statSync as statSync7, lstatSync as lstatSync3 } from "node:fs";
 import { createHash as createHash2 } from "node:crypto";
-import { join as join13, relative as relative5, basename as basename4, extname as extname2, resolve as resolve5, sep as sep3 } from "node:path";
+import { join as join13, relative as relative5, basename as basename5, extname as extname2, resolve as resolve5, sep as sep3 } from "node:path";
 function destWithinRaw(rawRoot, dest) {
   const rootResolved = resolve5(rawRoot);
   const destResolved = resolve5(rootResolved, dest);
@@ -2050,7 +2147,7 @@ function collect(p, base) {
   let skippedLinks = 0;
   const st = statSync7(p);
   if (st.isFile())
-    return { files: [{ abs: p, rel: basename4(p) }], skippedLinks };
+    return { files: [{ abs: p, rel: basename5(p) }], skippedLinks };
   const out = [];
   const walk3 = (dir2) => {
     for (const entry of readdirSync7(dir2)) {
@@ -2528,10 +2625,10 @@ all plugin checks passed.`);
 var exports_cli = {};
 import { cpSync as cpSync3, mkdirSync as mkdirSync5, chmodSync, existsSync as existsSync13, readFileSync as readFileSync14, lstatSync as lstatSync4, statSync as statSync9, realpathSync as realpathSync2 } from "node:fs";
 import { spawnSync as spawnSync4 } from "node:child_process";
-import { join as join15, dirname as dirname4, resolve as resolve6, basename as basename5 } from "node:path";
+import { join as join15, dirname as dirname4, resolve as resolve6, basename as basename6 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 import { fileURLToPath } from "node:url";
-import { createInterface } from "node:readline/promises";
+import { createInterface as createInterface2 } from "node:readline/promises";
 function pluginRoot() {
   const local = projectRoot();
   if (process.env.IMPRNT_ROOT || process.env.IMPRINT_ROOT)
@@ -2578,7 +2675,7 @@ function physicalTarget(target) {
     const parent = dirname4(existing);
     if (parent === existing)
       return target;
-    tail.unshift(basename5(existing));
+    tail.unshift(basename6(existing));
     existing = parent;
   }
   try {
@@ -2607,61 +2704,6 @@ function controlSlot(dst) {
     return "keep";
   return "blocked-non-regular-file";
 }
-function listGeminiSessions(cwd) {
-  const r = spawnSync4("gemini", ["--list-sessions", "--skip-trust"], { cwd, encoding: "utf8" });
-  return parseGeminiSessions(r.stdout || "");
-}
-async function pickGeminiSession(sessions, label) {
-  const cols = process.stdout.columns || 80;
-  const nameW = Math.max(20, Math.min(64, cols - 16));
-  const trunc = (s) => s.length > nameW ? s.slice(0, nameW - 1) + "…" : s;
-  process.stderr.write(`
-  resume a chat — gemini · ${label}
-
-`);
-  sessions.forEach((s, i) => {
-    process.stderr.write(`  ${String(i + 1).padStart(2)}  ${trunc(s.name).padEnd(nameW)}  ${s.age.replace(/\s*ago$/, "")}
-`);
-  });
-  process.stderr.write(`
-`);
-  const rl = createInterface({ input: process.stdin, output: process.stderr });
-  const answer = (await rl.question("  number to resume · enter for newest · q to cancel › ")).trim();
-  rl.close();
-  if (answer === "")
-    return "latest";
-  if (answer.toLowerCase() === "q")
-    return null;
-  const n = Number(answer);
-  if (Number.isInteger(n) && n >= 1 && n <= sessions.length)
-    return sessions[n - 1].id;
-  process.stderr.write(`  not a valid choice — starting a fresh session
-`);
-  return null;
-}
-async function resolveGeminiResume(backendName, passthrough, cwd) {
-  if (backendName !== "gemini")
-    return passthrough;
-  const rIdx = passthrough.findIndex((a) => a === "-r" || a === "--resume");
-  if (rIdx < 0)
-    return passthrough;
-  const next = passthrough[rIdx + 1];
-  if (next !== undefined && !next.startsWith("-"))
-    return passthrough;
-  if (!(process.stdin.isTTY && process.stdout.isTTY))
-    return passthrough;
-  const sessions = listGeminiSessions(cwd);
-  if (!sessions.length) {
-    console.error("imp: no saved gemini chats for this project yet — starting fresh");
-    return passthrough.filter((_, i) => i !== rIdx);
-  }
-  const chosen = await pickGeminiSession(sessions, basename5(cwd));
-  if (chosen === null)
-    return passthrough.filter((_, i) => i !== rIdx);
-  const out = [...passthrough];
-  out.splice(rIdx + 1, 0, chosen);
-  return out;
-}
 var here, pkgRoot, cmd, rest, asImp;
 var init_cli = __esm(async () => {
   init_resolve();
@@ -2711,7 +2753,7 @@ var init_cli = __esm(async () => {
     case "lair": {
       const home = requireVaultHome();
       const { backend, skipPermissions, passthrough } = resolveLaunch(rest, { agent: readDefaultAgent(), yolo: readSkipPermissions() });
-      const resumed = await resolveGeminiResume(backend.name, passthrough, home);
+      const resumed = backend.resolveResume ? await backend.resolveResume(passthrough, home) : passthrough;
       const spec = assembleSession({ cwd: home, vaultProject: home, pkgRoot, passthrough: resumed, skipPermissions, model: readDefaultModel() });
       process.exit(launchBackend(backend, home, backend.renderArgs(spec), spec.env));
     }
@@ -2735,8 +2777,8 @@ var init_cli = __esm(async () => {
         console.log("set: imprnt agent <claude|gemini>   override one session: imp --gemini | imp --claude");
         break;
       }
-      if (name !== "claude" && name !== "gemini") {
-        console.error(`unknown agent "${name}" — valid: claude, gemini`);
+      if (!(name in backends)) {
+        console.error(`unknown agent "${name}" — valid: ${Object.keys(backends).join(", ")}`);
         process.exit(1);
       }
       const r = setDefaultAgent(name);
@@ -2774,7 +2816,7 @@ var init_cli = __esm(async () => {
         const m = readDefaultModel();
         console.log(`default model: ${m ?? "(agent's own default)"}`);
         console.log("set: imprnt model <alias|id>   clear: imprnt model off");
-        console.log("gemini aliases: pro=gemini-3.1-pro-preview, flash=gemini-3.5-flash, pro25=gemini-2.5-pro, lite=gemini-3.1-flash-lite, gemma31, gemma26");
+        console.log(`gemini aliases: ${Object.entries(GEMINI_MODEL_ALIASES).map(([k, v]) => `${k}=${v}`).join(", ")}`);
         break;
       }
       if (arg === "off" || arg === "default" || arg === "none") {
@@ -2999,7 +3041,7 @@ enable: imprnt plugin add <name>   disable: imprnt plugin rm <name> [--purge]`);
         const inPlace = isVaultProject(process.cwd());
         const display = inPlace ? process.cwd() : "~/imprnt";
         const fallback = inPlace ? process.cwd() : join15(homedir4(), "imprnt");
-        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        const rl = createInterface2({ input: process.stdin, output: process.stdout });
         const answer = (await rl.question(`vault location [${display}]: `)).trim();
         rl.close();
         target = answer ? resolvePath(answer) : fallback;
@@ -3111,7 +3153,7 @@ enable: imprnt plugin add <name>   disable: imprnt plugin rm <name> [--purge]`);
         }
         const raw = bare ? [] : [cmd, ...rest];
         const { backend, skipPermissions, passthrough } = resolveLaunch(raw, { agent: readDefaultAgent(), yolo: readSkipPermissions() });
-        const resumed = await resolveGeminiResume(backend.name, passthrough, process.cwd());
+        const resumed = backend.resolveResume ? await backend.resolveResume(passthrough, process.cwd()) : passthrough;
         const spec = assembleSession({ cwd: process.cwd(), vaultProject: home, pkgRoot, passthrough: resumed, skipPermissions, model: readDefaultModel() });
         process.exit(launchBackend(backend, process.cwd(), backend.renderArgs(spec), spec.env));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imprnt",
-  "version": "0.1.3-edge.60",
+  "version": "0.1.3-edge.61",
   "description": "Deterministic-first, plain-markdown knowledge vault. Code does the bulk transform. The LLM only touches the irreducibly-semantic 20%. Native grep plus BM25 retrieval, zero MCP on the vault.",
   "type": "module",
   "bin": {