@getmikie/cli 1.1.126 → 1.1.127

package/bin/mikie.mjs

@@ -59,34 +59,37 @@ function updateGuidance(message) {
 }
 const packageMetadata = require("../package.json");
 const arguments_ = process.argv.slice(2);
+// Updating Codex/Claude Code registrations can wait for a busy client; the
+// command itself still runs and the update is retried on the next command.
+const CLIENT_REPAIR_DEFERRED =
+  "mikie: 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 singleFlag = arguments_.length === 1 ? arguments_[0].toLowerCase() : null;
 
 if (["--version", "-v"].includes(singleFlag)) {
   console.log(packageMetadata.version);
-} else if (["--help", "-h"].includes(singleFlag)) {
+} else if (["--help", "-h", "help"].includes(singleFlag)) {
   console.log(`Mikie ${packageMetadata.version}
 
-Usage:
-  mikie activity --mode solo|ai_assisted|unknown --language <category>
-  mikie savings history [options]
-  mikie savings export-meter-history
-  mikie mcp [--adapter codex|claude_code]
-  mikie login
-  mikie logout
-  mikie connect .|<absolute-directory>
-  mikie privacy review
-  mikie setup codex
-  mikie setup claude
-  mikie mode codex [active|shadow] [--json]
-  mikie control run --request <absolute-json> --json
-  mikie doctor [--client codex]
-  mikie update
-  mikie device revoke
-  mikie uninstall
-  mikie --help
-  mikie --version
+Get started:
+  mikie login                Sign in
+  mikie setup codex          Add Mikie to Codex
+  mikie setup claude         Add Mikie to Claude Code
+  mikie connect .            Connect the project in this folder
 
-All commands execute the compiled Mikie native engine.`);
+Everyday:
+  mikie doctor               Check that Mikie is working (--json for details)
+  mikie savings history      See what Mikie has saved you
+  mikie mode codex           Show or switch Mikie's Codex mode (active or shadow)
+  mikie privacy review       See what Mikie can read in your project
+  mikie update               Update Mikie
+
+Account:
+  mikie logout               Sign out
+  mikie device revoke        Remove this computer from your account
+  mikie uninstall            Remove Mikie
+
+  mikie --help               Show this help
+  mikie --version            Show the installed version`);
 } else if (arguments_.length === 1 && arguments_[0].toLowerCase() === "update") {
   try {
     const commands = createCommandAdapter();
@@ -322,7 +325,7 @@ All commands execute the compiled Mikie native engine.`);
         allowDeferred: nativeArguments[0] === "serve",
       });
       if (clients.status === "deferred") {
-        console.error("mikie: client repair deferred; relay startup continues. Run `mikie doctor` to inspect client registration.");
+        console.error(CLIENT_REPAIR_DEFERRED);
       }
     } else if (shouldCompleteSkippedInstall(nativeArguments)) {
       // An invalid install fails here, once, before any client repair.
@@ -330,7 +333,7 @@ All commands execute the compiled Mikie native engine.`);
       try {
         const clients = await completeSkippedInstall({ version: packageMetadata.version });
         if (clients.status === "deferred") {
-          console.error("mikie: client repair deferred; run `mikie doctor` to inspect client registration.");
+          console.error(CLIENT_REPAIR_DEFERRED);
         }
       } catch (error) {
         const reason = error instanceof Error ? error.message : "unavailable";

package/lib/update.mjs

@@ -11,6 +11,7 @@ import {
   readdir,
   rename,
   rm,
+  rmdir,
   stat,
 } from "node:fs/promises";
 import path from "node:path";
@@ -449,6 +450,10 @@ export async function setAsideUpdateTransaction(
   } catch (error) {
     if (error?.message === "another Mikie update transaction is active") throw error;
   }
+  return renameTransactionAside(transactionRoot, now);
+}
+
+async function renameTransactionAside(transactionRoot, now = new Date()) {
   const stamp = now.toISOString().replace(/[-:]/g, "").replace(/\.\d+Z$/, "Z");
   for (let attempt = 0; attempt < 100; attempt += 1) {
     const target = `${transactionRoot}.set-aside-${stamp}${attempt ? `-${attempt}` : ""}`;
@@ -2634,6 +2639,21 @@ export function createFilesystemAdapter({
       if (error?.code === "ENOENT") return;
       throw error;
     }
+    try {
+      await lstat(journalPath);
+    } catch (error) {
+      if (error?.code !== "ENOENT") throw error;
+      // The journal is written when the snapshot completes, before any live
+      // change, and a failed snapshot removes its own root. A root without a
+      // journal therefore never recorded a mutation: nothing to roll back.
+      // An empty one is removed; anything else is kept aside byte for byte.
+      if ((await readdir(transactionRoot)).length === 0) {
+        await rmdir(transactionRoot);
+      } else {
+        await renameTransactionAside(transactionRoot);
+      }
+      return;
+    }
     const snapshot = await hydrateJournal(lease, expectedJournalToken);
     if (snapshot.phase === "commit_decided_retain_runtime") {
       const activationMatches = await committedActivationMatches(snapshot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getmikie/cli",
-  "version": "1.1.126",
+  "version": "1.1.127",
   "description": "Native Mikie relay launcher for MCP clients",
   "license": "Apache-2.0",
   "repository": {
@@ -24,9 +24,9 @@
     "node": ">=22"
   },
   "optionalDependencies": {
-    "@getmikie/darwin-arm64": "1.1.126",
-    "@getmikie/linux-x64-gnu": "1.1.126",
-    "@getmikie/win32-x64": "1.1.126"
+    "@getmikie/darwin-arm64": "1.1.127",
+    "@getmikie/linux-x64-gnu": "1.1.127",
+    "@getmikie/win32-x64": "1.1.127"
   },
   "publishConfig": {
     "access": "public",

package/scripts/reconcile-install.mjs

@@ -624,7 +624,7 @@ if (scriptIdentity !== null && scriptIdentity === invokedIdentity) {
       allowDeferred: true,
     });
     if (clients.status === "deferred") {
-      console.warn("Mikie install client repair deferred; run `mikie setup` or `mikie doctor`.");
+      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`.");
     }
   } catch (error) {
     console.error(`Mikie install reconciliation failed: ${error.message}`);