@getmikie/cli 1.1.104 → 1.1.105

package/package.json

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

package/scripts/reconcile-install.mjs

@@ -81,12 +81,34 @@ function hasExactKeys(value, keys) {
   );
 }
 
-function parseClientRepair(stdout, code) {
+const MAX_NATIVE_DIAGNOSTIC_BYTES = 512;
+
+function nativeDiagnostic({ code, stdout, stderr }) {
+  const redact = (value) =>
+    String(value ?? "")
+      .replace(
+        /(authorization|api[_-]?key|password|secret|token)\s*[:=]\s*[^\s,;]+/gi,
+        "$1=[redacted]",
+      )
+      .replace(/\s+/g, " ")
+      .trim()
+      .slice(0, MAX_NATIVE_DIAGNOSTIC_BYTES);
+  const details = [`exit=${Number.isInteger(code) ? code : 1}`];
+  const safeStderr = redact(stderr);
+  const safeStdout = redact(stdout);
+  if (safeStderr) details.push(`stderr=${safeStderr}`);
+  if (safeStdout) details.push(`stdout=${safeStdout}`);
+  return details.join("; ");
+}
+
+function parseClientRepair({ stdout, stderr, code }) {
   let receipt;
   try {
     receipt = JSON.parse(stdout.trim());
   } catch {
-    throw new Error("native client reconciliation returned invalid JSON");
+    throw new Error(
+      `native client reconciliation returned invalid JSON (${nativeDiagnostic({ code, stdout, stderr })})`,
+    );
   }
   const exact = hasExactKeys(receipt, [
     "schema_version",
@@ -124,17 +146,32 @@ function parseClientRepair(stdout, code) {
     receipt.action === "refused" &&
     receipt.restart_required === false;
   if ((code === 0 && !current && !migrated && !absent) || (code !== 0 && !refused)) {
-    throw new Error("native client reconciliation returned an invalid receipt");
+    throw new Error(
+      `native client reconciliation returned an invalid receipt (${nativeDiagnostic({ code, stdout, stderr })})`,
+    );
   }
   return receipt;
 }
 
-function parseClientSettlement(stdout, code, phase) {
+function parseClientSettlement({ stdout, stderr, code }, phase) {
   let receipt;
   try {
     receipt = JSON.parse(stdout.trim());
   } catch {
-    throw new Error("native client reconciliation settlement returned invalid JSON");
+    throw new Error(
+      `native client reconciliation settlement returned invalid JSON (${nativeDiagnostic({ code, stdout, stderr })})`,
+    );
+  }
+  const failed =
+    code !== 0 &&
+    hasExactKeys(receipt, ["schema_version", "phase", "status"]) &&
+    receipt.schema_version === CLIENT_SETTLEMENT_SCHEMA &&
+    receipt.phase === phase &&
+    receipt.status === "failed";
+  if (failed) {
+    throw new Error(
+      `native client reconciliation settlement failed (${nativeDiagnostic({ code, stdout, stderr })})`,
+    );
   }
   if (
     code !== 0 ||
@@ -143,7 +180,9 @@ function parseClientSettlement(stdout, code, phase) {
     receipt.phase !== phase ||
     receipt.status !== "settled"
   ) {
-    throw new Error("native client reconciliation settlement failed");
+    throw new Error(
+      `native client reconciliation settlement failed (${nativeDiagnostic({ code, stdout, stderr })})`,
+    );
   }
 }
 
@@ -492,14 +531,14 @@ export async function reconcileInstalledClients({
     capture: true,
     environment: { ...baseEnvironment, MIKIE_NPM_UPDATE_REPAIR_PHASE: "prepare" },
   });
-  const preparedReceipt = parseClientRepair(prepared.stdout, prepared.code);
+  const preparedReceipt = parseClientRepair(prepared);
   const settlementPhase = preparedReceipt.action === "refused" ? "rollback" : "commit";
   const committed = await commands.run(binary, CLIENT_REPAIR_ARGUMENTS, {
     shell: false,
     capture: true,
     environment: { ...baseEnvironment, MIKIE_NPM_UPDATE_REPAIR_PHASE: settlementPhase },
   });
-  parseClientSettlement(committed.stdout, committed.code, settlementPhase);
+  parseClientSettlement(committed, settlementPhase);
   if (preparedReceipt.action === "refused") {
     throw new Error(
       "Mikie could not authenticate every configured client; close active clients and run `mikie update` before reinstalling",