@getmikie/cli 1.1.135 → 1.1.137

package/bin/mikie.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { spawnSync } from "node:child_process";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import { access, mkdir, writeFile } from "node:fs/promises";
@@ -37,6 +38,7 @@ import {
   setAsideUpdateTransaction,
 } from "../lib/update.mjs";
 import {
+  clientReconciliationLine,
   completeSkippedInstall,
   installedClientRuntimeDigests,
   reconcileInstalledClients,
@@ -335,6 +337,18 @@ Account:
     } else if (result.status === "reconciled") {
       console.log(`Mikie is up to date (${result.version})`);
     }
+    if (result.status === "updated" || result.status === "reconciled") {
+      // Bring the clients already set up to the installed runtime now,
+      // through the installed package's own reconciliation (the files on
+      // disk are the new version's, unlike the modules this process loaded).
+      // Without it Codex and Claude Code stayed on the old runtime until
+      // some later command happened to finish the install.
+      spawnSync(
+        process.execPath,
+        [fileURLToPath(new URL("../scripts/reconcile-install.mjs", import.meta.url))],
+        { stdio: "inherit", windowsHide: true },
+      );
+    }
   } catch (error) {
     const message = error instanceof Error ? error.message : "Mikie update failed";
     for (const line of updateFailureLines(message, error?.recovery)) console.error(line);
@@ -358,6 +372,8 @@ Account:
         const clients = await completeSkippedInstall({ version: packageMetadata.version });
         if (clients.status === "deferred") {
           await reportDeferredOnce(packageMetadata.version);
+        } else if (clients.status === "reconciled_by_setup") {
+          console.error(clientReconciliationLine(clients));
         }
       } catch (error) {
         const reason = error instanceof Error ? error.message : "unavailable";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getmikie/cli",
-  "version": "1.1.135",
+  "version": "1.1.137",
   "description": "Native Mikie relay launcher for MCP clients",
   "license": "Apache-2.0",
   "repository": {
@@ -21,13 +21,13 @@
     "node": ">=22"
   },
   "optionalDependencies": {
-    "@getmikie/darwin-arm64": "1.1.135",
-    "@getmikie/linux-x64-gnu": "1.1.135",
-    "@getmikie/win32-x64": "1.1.135"
+    "@getmikie/darwin-arm64": "1.1.137",
+    "@getmikie/linux-x64-gnu": "1.1.137",
+    "@getmikie/win32-x64": "1.1.137"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "mikieReleaseNote": "Mikie finds your real source in large repos, mikie usage is much faster, and updates no longer stall after an interrupted Claude Code setup."
+  "mikieReleaseNote": "Codex sessions now always use the project they were opened in, so Mikie returns the right code instead of an empty answer."
 }

package/scripts/reconcile-install.mjs

@@ -1,7 +1,9 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { createHash, randomUUID } from "node:crypto";
+import { spawn } from "node:child_process";
 import { createReadStream } from "node:fs";
+import { homedir } from "node:os";
 import { lstat, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 
 import {
@@ -449,6 +451,84 @@ export async function installedClientRuntimeDigests({
   return retainedRuntimeDigests(defaultClientMarkerRoot(environment, platform), platform);
 }
 
+const SETUP_TIMEOUT_MS = 180_000;
+
+/**
+ * The clients this person already set up Mikie in: Codex when its config
+ * has a `[mcp_servers.mikie]` table, Claude Code when `~/.claude.json` has a
+ * `mikie` MCP server. Clients never set up are never touched.
+ */
+export async function configuredClients({ environment = process.env } = {}) {
+  const home = environment.USERPROFILE || environment.HOME || homedir();
+  const clients = [];
+  try {
+    const codexHome = environment.CODEX_HOME || path.join(home, ".codex");
+    const codex = await readFile(path.join(codexHome, "config.toml"), "utf8");
+    if (/^\[mcp_servers\.mikie\]\s*$/m.test(codex)) clients.push("codex");
+  } catch {
+    // No Codex config: Codex was never set up.
+  }
+  try {
+    const claude = JSON.parse(await readFile(path.join(home, ".claude.json"), "utf8"));
+    if (claude?.mcpServers?.mikie) clients.push("claude");
+  } catch {
+    // No Claude config: Claude Code was never set up.
+  }
+  return clients;
+}
+
+/**
+ * Run `<launcher> setup <client>`, answering its confirmation with yes, the
+ * way the `mikie` command starts the runtime (as an npm install).
+ */
+export function runAnsweredSetup(
+  launcher,
+  client,
+  { spawnProcess = spawn, environment = process.env } = {},
+) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (ok) => {
+      if (!settled) {
+        settled = true;
+        clearTimeout(deadline);
+        resolve(ok);
+      }
+    };
+    const child = spawnProcess(launcher, ["setup", client], {
+      shell: false,
+      stdio: ["pipe", "ignore", "ignore"],
+      windowsHide: true,
+      env: { ...environment, MIKIE_DISTRIBUTION_MODE: "npm" },
+    });
+    const deadline = setTimeout(() => {
+      child.kill?.();
+      finish(false);
+    }, SETUP_TIMEOUT_MS);
+    child.on("error", () => finish(false));
+    child.on("close", (code) => finish(code === 0));
+    child.stdin?.end("y\n");
+  });
+}
+
+/**
+ * Bring every already-configured client to `launcher` through the same
+ * setup a person runs. The update's in-place repair is strict and refuses
+ * on states it cannot prove; left alone that kept clients on an old
+ * runtime release after release while the update reported success.
+ */
+export async function setupConfiguredClients({
+  launcher,
+  environment = process.env,
+  runSetup = runAnsweredSetup,
+} = {}) {
+  const results = [];
+  for (const client of await configuredClients({ environment })) {
+    results.push({ client, ok: await runSetup(launcher, client, { environment }) });
+  }
+  return results;
+}
+
 /** Reconcile exact-owned client launchers once for this installed package. */
 export async function reconcileInstalledClients({
   environment = process.env,
@@ -464,6 +544,7 @@ export async function reconcileInstalledClients({
     }),
   commands = createCommandAdapter({ environment, platform }),
   allowDeferred = false,
+  setupClients = setupConfiguredClients,
 } = {}) {
   if (isTransactionStagedInstall(environment, platform)) {
     return { status: "staged_candidate" };
@@ -572,6 +653,15 @@ export async function reconcileInstalledClients({
   parseClientSettlement(committed, settlementPhase);
   if (preparedReceipt.action === "refused") {
     if (allowDeferred) {
+      const setup = await setupClients({ launcher: finalLauncher, environment });
+      if (setup.length > 0 && setup.every((result) => result.ok)) {
+        await writeClientMarker(scopedMarker, authority);
+        return {
+          status: "reconciled_by_setup",
+          clients: setup.map((result) => result.client),
+          finalLauncher,
+        };
+      }
       return { status: "deferred", providerState: preparedReceipt.before };
     }
     throw new Error(
@@ -605,12 +695,24 @@ export async function completeSkippedInstall({
   reconcileTrajectory = reconcileInstalledTrajectory,
 } = {}) {
   const clients = await reconcileClients({ version, allowDeferred: true });
-  if (clients.status === "reconciled") {
+  if (clients.status === "reconciled" || clients.status === "reconciled_by_setup") {
     await reconcileTrajectory();
   }
   return clients;
 }
 
+/** One line for the person: what an install did to their clients' setup. */
+export function clientReconciliationLine(clients) {
+  if (clients?.status === "reconciled_by_setup") {
+    const names = clients.clients.map((client) => (client === "claude" ? "Claude Code" : "Codex"));
+    return `Mikie updated its setup in ${names.join(" and ")}. Restart ${names.length > 1 ? "them" : "it"} to use the new version.`;
+  }
+  if (clients?.status === "deferred") {
+    return "Mikie could not update its Codex and Claude Code setup. Run `mikie setup codex` or `mikie setup claude`.";
+  }
+  return null;
+}
+
 const scriptIdentity = pathIdentity(fileURLToPath(import.meta.url), process.platform);
 const invokedIdentity = pathIdentity(process.argv[1], process.platform);
 if (scriptIdentity !== null && scriptIdentity === invokedIdentity) {
@@ -623,9 +725,8 @@ if (scriptIdentity !== null && scriptIdentity === invokedIdentity) {
       version: packageMetadata.version,
       allowDeferred: true,
     });
-    if (clients.status === "deferred") {
-      console.warn("Mikie will finish updating its Codex and Claude Code setup next time. If Mikie stops working there, run `mikie setup codex` or `mikie setup claude`.");
-    }
+    const line = clientReconciliationLine(clients);
+    if (line) console.warn(line);
   } catch (error) {
     console.error(`Mikie install reconciliation failed: ${error.message}`);
     process.exitCode = 1;