@mnemonik/cli 7.104.2 → 7.104.5

package/dist/router.js

@@ -562,6 +562,7 @@ var init_hookRuntime = __esm({
 });
 
 // packages/cli/src/router.ts
+import { humanReason, humanReport, humanIdentityState } from "./humanReason.js";
 import { enableScanner, updateScannerRoots } from "./scanner/enable.js";
 import { controlScanner, scannerReceipt } from "./scanner/control.js";
 import { updateScanner } from "./scanner/update.js";
@@ -4949,7 +4950,6 @@ import {
   runHosts,
   hostSource,
   codexTrustConditions,
-  connectHost,
   logoutHost,
   selectOwned
 } from "./install/hosts.js";
@@ -4978,7 +4978,7 @@ import { createCliAuth } from "./auth/index.js";
 import { currentInstallSession, ensureInstallSession } from "./auth/installSession.js";
 import { runIdentityMigration } from "./identity/migrate.js";
 import { renderScannerStatus } from "./scanner/picker.js";
-import { interrupted } from "./install/journal.js";
+import { abandonInterrupted, interrupted } from "./install/journal.js";
 import {
   installFailureReason,
   runInstall
@@ -4987,9 +4987,13 @@ import { chooseHostProfile, simulatedInstall, terminalInstallUI } from "./instal
 import {
   CODEX_TRUST_MESSAGE,
   collectStatusDocument,
+  localEditorStatus,
+  localInstallationConditions,
+  mcpTurnOnAction,
   renderStatusSummaries,
   statusExitCode
 } from "./status.js";
+import { editorAuthorizationRows } from "./screens/journey.js";
 import {
   DiagnosticsError,
   previewDiagnostics,
@@ -5118,7 +5122,10 @@ function actionRequired2(output, json, message, flag) {
       ...flag ? { flag } : {},
       action: message
     });
-  else output.error(flag ? `Missing required consent flag: ${flag}` : message);
+  else
+    output.error(
+      flag ? `Missing required consent flag: ${flag}` : /^[a-z][a-z0-9_]*$/u.test(message) ? humanReason(message) : message
+    );
   return 3;
 }
 function requireConsent(parsed, output, required) {
@@ -5206,6 +5213,7 @@ async function runHostCommand(command, parsed, deps, output, scannerSelected = f
   const fullUninstall = command === "uninstall" && !host && !scope && !component;
   if (scope && !["user", "project"].includes(String(scope)) || host && !hostOrder.includes(host) || component && !["hooks", "mcp"].includes(String(component)))
     return output.error("Invalid host, scope or component"), 2;
+  if (command === "uninstall") await abandonInterrupted(state);
   let selections;
   if (command === "install") {
     const names = String(parsed.flags.get("hosts") ?? hostOrder.join(",")).split(",");
@@ -5323,6 +5331,8 @@ async function runHostCommand(command, parsed, deps, output, scannerSelected = f
     }
     let failed = scanner?.status === "FAILED" || cli?.status === "FAILED";
     const hostExit = maintenanceExitCode(result.results);
+    const remaining = command === "repair" ? await collectCurrentInstallation(deps, output) : void 0;
+    const remainingExit = remaining?.installation.state === "FAILED" ? 1 : remaining?.installation.state === "READY" || !remaining ? 0 : 3;
     const hostsFailed = hostUpdateFailed(result);
     const codexTrustPending = result.results.some(
       (target) => target.reason === "codex_trust_pending"
@@ -5355,12 +5365,13 @@ async function runHostCommand(command, parsed, deps, output, scannerSelected = f
     }
     if (json)
       output.json({
-        status: failed ? "FAILED" : scanner?.status === "uninstalled" ? "uninstalled" : result.journal.state,
+        status: failed || remainingExit === 1 ? "FAILED" : remainingExit === 3 ? "ACTION_REQUIRED" : scanner?.status === "uninstalled" ? "uninstalled" : result.journal.state,
         targets: result.results,
         reports: result.reports,
         ...scanner ? { scanner } : {},
         ...launcher ? { launcher } : {},
-        ...cli ? { cli } : {}
+        ...cli ? { cli } : {},
+        ...remaining ? { remaining } : {}
       });
     else if (command === "update") {
       if (failed || hostsFailed) output.error(updateFailureMessage);
@@ -5373,20 +5384,27 @@ async function runHostCommand(command, parsed, deps, output, scannerSelected = f
       else output.line("Mnemonik is up to date.");
     } else {
       for (const target of result.results)
-        output.line(
-          `${target.target}: ${target.status} (${target.reason}${target.detail ? `: ${target.detail}` : ""})`
-        );
-      for (const report of result.reports) output.line(report);
-      if (!selections.length && !fullUninstall) output.line("No recorded host targets.");
+        output.line(target.status === "READY" ? "Done." : humanReason(target.reason));
+      for (const report of result.reports) output.line(humanReport(report));
+      if (remaining) renderStatusSummaries(remaining, output);
+      if (!selections.length && !fullUninstall && !remaining)
+        output.line("No recorded host targets.");
       if (fullUninstall && !failed && hostExit === 0)
         output.line(
           "Stopped collection; removed local software. Credentials, cloud data and consent retained."
         );
       else if (scanner)
-        output.line(`Scanner ${scanner.status}: ${scanner.version ?? scanner.reason}.`);
+        output.line(
+          scanner.reason ? humanReason(scanner.reason) : scanner.status === "not_installed" ? "The scanner is not installed." : "The scanner was uninstalled."
+        );
+    }
+    if (scanner?.status === "failed") {
+      const reason = scanner.reason ?? "scanner_uninstall_failed";
+      if (json) output.error(reason, false);
+      else output.error(humanReason(reason));
     }
-    if (scanner?.status === "failed") output.error(scanner.reason ?? "scanner_uninstall_failed");
-    return failed ? 1 : hostExit;
+    if (failed || remainingExit === 1) return 1;
+    return hostExit || remainingExit;
   } catch (error) {
     if (command === "update" && !json) {
       output.error(updateFailureMessage);
@@ -5395,14 +5413,14 @@ async function runHostCommand(command, parsed, deps, output, scannerSelected = f
     if (error instanceof LauncherError) {
       if (json)
         output.json({ status: error.status, reason: error.message, launcher: error.launcher });
-      else output.error(error.message);
+      else output.error(humanReason(error.message));
       return 3;
     }
     const reason = installFailureReason(error);
     if (reason === "lock_held") {
       if (json) output.json({ status: "FAILED", reason });
       else output.error("Another mnemonik command holds the state lock; retry in a moment.");
-    } else output.error(reason);
+    } else output.error(humanReason(reason));
     return 1;
   }
 }
@@ -5452,7 +5470,7 @@ async function enableCommand(parsed, deps, output) {
       action: "mnemonik scanner enable"
     };
     if (json) output.json(result);
-    else output.error(`${result.reason}: ${result.action}`);
+    else output.error(humanReason(result.reason));
     return 3;
   }
 }
@@ -5492,7 +5510,7 @@ async function installCommand(parsed, deps, output) {
     try {
       await ensureCliAuth(deps, output, parsed.flags.has("no-browser"));
     } catch (error) {
-      output.error(`Sign-in refused: ${installFailureReason(error)}`);
+      output.error(humanReason(installFailureReason(error)));
       return 1;
     }
   }
@@ -5507,10 +5525,10 @@ async function installCommand(parsed, deps, output) {
     const pending = await interrupted(install.stateDir);
     const result = await runInstall(install, pending[0]);
     output.line(`${result.state}: install ${result.runId}`);
-    for (const report of result.reports) output.line(report);
+    for (const report of result.reports) output.line(humanReport(report));
     return result.phase === "rolled_back" ? 130 : result.state === "FAILED" ? 1 : result.state === "READY" ? 0 : 3;
   } catch (error) {
-    output.error(`Install failed: ${installFailureReason(error)}`);
+    output.error(humanReason(installFailureReason(error)));
     return 1;
   } finally {
     terminal?.close();
@@ -5551,14 +5569,23 @@ async function doctorCommand(parsed, deps, output) {
   return document.installation.state === "READY" ? 0 : document.installation.state === "FAILED" ? 1 : 3;
 }
 async function collectCurrentInstallation(deps, output) {
-  const result = await runPreflight({ cwd: deps.cwd, home: deps.home, ...deps.preflight });
+  const result = await runPreflight({
+    cwd: deps.cwd,
+    home: deps.home,
+    ...deps.preflight,
+    fetch: async () => new Response(null, { status: 204 })
+  });
   output.setContext({ home: deps.home ?? homedir2(), projectRoot: result.project.root });
   const hostStateDir = deps.hostManagement?.stateDir ?? deps.installStateDir ?? stateDirectory(process.platform, process.env, deps.home);
-  const trustConditions = await (deps.codexTrustConditions ?? (() => codexTrustConditions({
-    stateDir: hostStateDir,
-    env: deps.hostManagement?.env,
-    imports: deps.hostManagement?.imports
-  })))();
+  const localConditions = deps.projectHookConditions ? [] : [
+    ...await localInstallationConditions(deps.home ?? homedir2(), hostStateDir, deps.launcher),
+    // Installed Codex hooks that Codex has not trusted cannot run.
+    ...await (deps.codexTrustConditions ?? (() => codexTrustConditions({
+      stateDir: hostStateDir,
+      env: deps.hostManagement?.env,
+      imports: deps.hostManagement?.imports
+    })))()
+  ];
   const document = await collectStatusDocument({
     preflight: result,
     cwd: deps.cwd ?? process.cwd(),
@@ -5567,11 +5594,13 @@ async function collectCurrentInstallation(deps, output) {
     executor: deps.projectExecutor,
     resolver: deps.projectResolver ?? (deps.preflight?.resolveIdentity ? { resolveProjectIdentity: deps.preflight.resolveIdentity } : void 0),
     stateDir: deps.projectStateDir ?? deps.installStateDir,
+    // The project section reports project access, as doctor and the console
+    // route do. Local evidence still decides the installation verdict.
     getCliBearer: deps.getCliBearer,
     transport: deps.projectTransport,
     scannerStatus: deps.scannerStatus,
-    installationConditions: [...deps.installationConditions ?? [], ...trustConditions],
-    projectHookConditions: deps.projectHookConditions,
+    installationConditions: [...deps.installationConditions ?? [], ...localConditions],
+    projectHookConditions: deps.projectHookConditions ?? [],
     configuredHosts: deps.configuredHosts ?? deps.install?.input.hosts,
     details: deps.statusDetails,
     generatedAt: deps.statusGeneratedAt,
@@ -5585,15 +5614,13 @@ async function collectCurrentInstallation(deps, output) {
 async function reportCurrentInstallation(deps, output, document) {
   const bearer = await auth(deps, output, false).getCliBearer().catch(() => void 0);
   if (typeof bearer !== "string") return;
-  try {
-    await postCurrentReadiness(
-      bearer,
-      serializeReadiness(document ?? await collectCurrentInstallation(deps, output)),
-      deps.grantFetch
-    );
-  } catch {
-    output.error("The final installation status could not be uploaded.");
-  }
+  const send = deps.grantFetch ?? globalThis.fetch;
+  await postCurrentReadiness(
+    bearer,
+    serializeReadiness(document ?? await collectCurrentInstallation(deps, output)),
+    (url, options) => send(url, { ...options, signal: AbortSignal.timeout(2500) })
+  ).catch(() => {
+  });
 }
 async function runCli(args2, deps = {}) {
   const parsed = parse(args2);
@@ -5607,7 +5634,7 @@ async function runCli(args2, deps = {}) {
   });
   if (process.env.MNEMONIK_DEV_RELEASE_DIR && !silent)
     stderr.write(
-      "WARNING: MNEMONIK_DEV_RELEASE_DIR uses development artifacts; readiness remains LIMITED (dev_release_source).\n"
+      "WARNING: MNEMONIK_DEV_RELEASE_DIR uses development artifacts; readiness remains LIMITED.\n"
     );
   if (parsed.error) return output.error(parsed.error), 2;
   if (parsed.flags.has("version")) {
@@ -5686,9 +5713,7 @@ async function runCli(args2, deps = {}) {
         return 3;
       }
       if (project.status !== "done") {
-        output.error(
-          `Project action required: ${"state" in project ? project.state : project.status}`
-        );
+        output.error(humanReason("project_setup_required"));
         return 3;
       }
     }
@@ -5734,7 +5759,7 @@ async function runCli(args2, deps = {}) {
         );
       return 0;
     } catch (error) {
-      output.error(error.message);
+      output.error(humanReason(error.message));
       return 3;
     }
   }
@@ -5753,7 +5778,7 @@ async function runCli(args2, deps = {}) {
         );
       return 0;
     } catch (error) {
-      output.error(error.message);
+      output.error(humanReason(error.message));
       return 3;
     }
   }
@@ -5797,7 +5822,9 @@ async function runCli(args2, deps = {}) {
       }
       return 0;
     } catch (error) {
-      output.error(command === "update" ? updateFailureMessage : error.message);
+      output.error(
+        command === "update" ? updateFailureMessage : humanReason(error.message)
+      );
       return 3;
     }
   }
@@ -5880,9 +5907,19 @@ Preview: ${preview.path}
       }
       return 0;
     } catch (error) {
-      const code = error instanceof DiagnosticsError ? error.code : "diagnostics_failed";
+      const nativeCode = error.code;
+      const code = error instanceof DiagnosticsError ? error.code : typeof nativeCode === "string" ? nativeCode : "diagnostics_failed";
       if (parsed.flags.has("json")) output.json({ status: "error", error: code });
-      else output.error(code);
+      else if (/^(?:bundle_id_invalid|bundle_hash_mismatch|diagnostics_preview_invalid|ENOENT)$/u.test(
+        code
+      ))
+        output.error(
+          "Saved diagnostics could not be used.\nRun mnemonik diagnostics preview, then try again."
+        );
+      else
+        output.error(
+          subcommand === "preview" ? "Diagnostics could not be created.\nRun mnemonik install to try again." : "Diagnostics could not be sent.\nCheck your internet connection, then try again."
+        );
       return 1;
     }
   }
@@ -5910,42 +5947,20 @@ Preview: ${preview.path}
     if (invalid) return output.error(invalid), 2;
     if (!subcommand || rest.length || !hostOrder.includes(subcommand))
       return output.error(`Usage: mnemonik connect <${hostOrder.join("|")}>`), 2;
-    const state = deps.hostManagement?.stateDir ?? deps.installStateDir ?? stateDirectory(process.platform, process.env, deps.home);
-    const owned = await selectOwned(
-      state,
-      subcommand,
-      parsed.flags.get("scope"),
-      "mcp"
+    const host = subcommand;
+    const editor = (await localEditorStatus(deps.home ?? homedir2())).find(
+      (candidate) => candidate.host === host
     );
-    if (!owned.selected.length && !parsed.flags.has("json")) {
-      output.line(
-        `${launchHostLabels[subcommand]} will ask you to sign in to Mnemonik the first time you use it.`
-      );
-      return 3;
+    const reason = editor?.mcp === "disabled" ? `${editor.name} connection is turned off.` : editor?.mcp === "ready" ? "Finish signing in to Mnemonik in the editor." : `${launchHostLabels[host]} connection is missing.`;
+    const actions = editor?.mcp === "ready" ? editorAuthorizationRows([host]) : [
+      editor?.mcp === "disabled" ? mcpTurnOnAction[host] : "Run mnemonik install to set it up again."
+    ];
+    if (parsed.flags.has("json")) output.json({ status: "ACTION_REQUIRED", reason, actions });
+    else {
+      output.line(reason);
+      for (const action of actions) output.line(action);
     }
-    if (owned.selected.length !== 1)
-      return actionRequired2(
-        output,
-        parsed.flags.has("json"),
-        owned.selected.length ? "ambiguous_profile" : "no_recorded_targets"
-      );
-    const managed = deps.hostManagement ?? { stateDir: state, account: "" };
-    const selected = owned.selected[0];
-    if (!selected) throw new Error("no_recorded_targets");
-    let instructionShown = false;
-    const result = await connectHost(selected, {
-      ...managed,
-      instruction: (text) => {
-        if (!parsed.flags.has("json")) {
-          output.line(text);
-          instructionShown = true;
-        }
-      }
-    });
-    if (parsed.flags.has("json")) output.json(result);
-    else if (!instructionShown)
-      output.line(`${result.status}: ${result.reason}${result.action ? `. ${result.action}` : ""}`);
-    return result.status === "READY" ? 0 : 3;
+    return 3;
   }
   if (command === "project") {
     if (!subcommand || !["init", "setup", "status", "link", "ensure"].includes(subcommand))
@@ -6026,25 +6041,19 @@ Preview: ${preview.path}
         stateDir: deps.identityStateDir
       });
     } catch (error) {
-      output.error(`Identity migration failed: ${error.message}`);
+      output.error(humanReason(error.message));
       return 1;
     }
     if (parsed.flags.has("json")) output.json(result);
     else if ("report" in result) {
       for (const entry of result.report.entries)
-        output.line(
-          `${entry.state.padEnd(16)} ${entry.path}${entry.actionRequired ? " - ACTION REQUIRED" : ""}${entry.detail ? ` - ${entry.detail}` : ""}`
-        );
-      output.line(
-        `Summary: ${Object.entries(result.report.summary).map(([state, count]) => `${state}=${count}`).join(" ")}`
-      );
+        output.line(`${entry.path}: ${humanIdentityState(entry.state)}`);
+      output.line(`Checked ${result.report.entries.length} project identity files.`);
       if (result.status === "backed_up")
         output.line(`Backup run: ${result.runId} (${result.count} file(s))`);
     } else {
-      output.line(
-        `${result.status}: run ${result.runId}; passed=${result.passed}; failed=${result.failed}`
-      );
-      for (const failure of result.failures) output.error(failure);
+      output.line(`Identity migration: ${result.passed} passed; ${result.failed} failed.`);
+      for (const failure of result.failures) output.error(humanReason(failure));
     }
     return "failed" in result && result.failed > 0 ? 1 : 0;
   }
@@ -6171,8 +6180,6 @@ Preview: ${preview.path}
         output.line(
           subcommand === "status" && supervisor ? supervisor.installed ? `Scanner status: ${result.status} (service: ${supervisor.kind}, ${supervisor.running ? "running" : "stopped"})` : `Scanner status: ${result.status} (service not registered; run mnemonik scanner start)` : `Scanner ${subcommand}: ${result.status}`
         );
-        if ("receipt" in result && result.receipt)
-          output.line(JSON.stringify(result.receipt.snapshot));
       }
       return 0;
     } catch (error) {
@@ -6184,10 +6191,7 @@ Preview: ${preview.path}
         choices: ["retry", "skip"]
       };
       if (json) output.json(result);
-      else
-        output.line(
-          `LIMITED: ${result.reason}: ${result.detail}. Retry: ${result.action}, or skip.`
-        );
+      else output.line(humanReason(result.reason));
       return 3;
     }
   }