@archme/cli 0.4.3 → 0.4.5

package/dist/cli.js

@@ -8666,12 +8666,6 @@ var init_enroll = __esm({
     init_execa();
     init_credentials();
     init_defaults();
-    if (import.meta.url === `file://${process.argv[1]}`) {
-      runLogin().catch((err2) => {
-        console.error(err2 instanceof Error ? err2.message : err2);
-        process.exit(1);
-      });
-    }
   }
 });
 
@@ -8726,13 +8720,43 @@ var init_paths = __esm({
   }
 });
 
+// src/daemon/supervision.ts
+function isSupervised(env) {
+  return env[SUPERVISED_ENV_VAR] === "1";
+}
+function resolveExitCode(code, env) {
+  return isSupervised(env) && PERMANENT_EXIT_CODES.has(code) ? 0 : code;
+}
+function supervisedStopNotice(code, env) {
+  if (!isSupervised(env) || !PERMANENT_EXIT_CODES.has(code)) return null;
+  return "this cannot be fixed by restarting, so the service is stopping rather than retrying; re-run `archme daemon start` once resolved";
+}
+var PERMANENT_EXIT_CODES, SUPERVISED_ENV_VAR;
+var init_supervision = __esm({
+  "src/daemon/supervision.ts"() {
+    "use strict";
+    PERMANENT_EXIT_CODES = /* @__PURE__ */ new Set([
+      1,
+      // missing/unreadable config
+      2,
+      // no stored credentials — needs `archme login`
+      78
+      // several accounts on one machine — needs a human to choose
+    ]);
+    SUPERVISED_ENV_VAR = "ARCHME_SUPERVISED";
+  }
+});
+
 // src/daemon/service/unitFiles.ts
+function unitEnv(env) {
+  return { ...env, [SUPERVISED_ENV_VAR]: "1" };
+}
 function xmlEscape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function renderLaunchdPlist(opts) {
   const argLines = [opts.nodeBin, opts.cliEntry, "daemon", "run"].map((a2) => `        <string>${xmlEscape(a2)}</string>`).join("\n");
-  const envLines = Object.entries(opts.env).map(
+  const envLines = Object.entries(unitEnv(opts.env)).map(
     ([k, v]) => `        <key>${xmlEscape(k)}</key>
         <string>${xmlEscape(v)}</string>`
   ).join("\n");
@@ -8750,8 +8774,8 @@ ${argLines}
     <true/>
     <key>KeepAlive</key>
     <dict>
-        <key>Crashed</key>
-        <true/>
+        <key>SuccessfulExit</key>
+        <false/>
     </dict>
     <key>ThrottleInterval</key>
     <integer>10</integer>
@@ -8774,7 +8798,7 @@ function systemdArgQuote(s) {
   return `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
 }
 function renderSystemdUnit(opts) {
-  const envLines = Object.entries(opts.env).map(([k, v]) => `Environment="${k}=${systemdEnvEscape(v)}"`).join("\n");
+  const envLines = Object.entries(unitEnv(opts.env)).map(([k, v]) => `Environment="${k}=${systemdEnvEscape(v)}"`).join("\n");
   const execStart = [
     systemdArgQuote(opts.nodeBin),
     systemdArgQuote(opts.cliEntry),
@@ -8801,6 +8825,7 @@ var init_unitFiles = __esm({
   "src/daemon/service/unitFiles.ts"() {
     "use strict";
     init_paths();
+    init_supervision();
   }
 });
 
@@ -9581,6 +9606,9 @@ var init_daemonModel = __esm({
 });
 
 // src/scan/spawn-claude.ts
+function stripNulBytes(arg) {
+  return arg.includes("\0") ? arg.replaceAll("\0", "\uFFFD") : arg;
+}
 function buildClaudeArgs(opts) {
   const tools = (opts.allowedTools ?? DEFAULT_ALLOWED_TOOLS).join(",");
   const args = [
@@ -9607,7 +9635,7 @@ function buildClaudeArgs(opts) {
   if (opts.model) {
     args.push("--model", opts.model);
   }
-  return args;
+  return args.map(stripNulBytes);
 }
 function spawnClaude(opts) {
   requireBinary("claude");
@@ -14189,15 +14217,17 @@ async function acquireSingleInstanceLock(pidfile) {
     }
   };
 }
-var SingleInstanceLockedError;
+var SINGLE_INSTANCE_EXIT_CODE, LOCK_HELD_MESSAGE, SingleInstanceLockedError;
 var init_singleInstanceLock = __esm({
   "src/daemon/service/singleInstanceLock.ts"() {
     "use strict";
+    SINGLE_INSTANCE_EXIT_CODE = 64;
+    LOCK_HELD_MESSAGE = "already holds";
     SingleInstanceLockedError = class extends Error {
       heldByPid;
       constructor(pidfile, heldByPid) {
         super(
-          heldByPid != null ? `another archme daemon already holds ${pidfile} (pid ${heldByPid})` : `another archme daemon already holds ${pidfile}`
+          heldByPid != null ? `another archme daemon ${LOCK_HELD_MESSAGE} ${pidfile} (pid ${heldByPid})` : `another archme daemon ${LOCK_HELD_MESSAGE} ${pidfile}`
         );
         this.heldByPid = heldByPid;
         this.name = "SingleInstanceLockedError";
@@ -14881,9 +14911,13 @@ function rateLimitDeferPlan(text, nowMs = Date.now(), defaultTimeZone = localTim
   }
   return null;
 }
+function stripPromptEcho(haystack, prompt) {
+  if (!prompt || prompt.length < 40) return haystack;
+  return haystack.split(prompt).join(" ");
+}
 function rateLimitDeferPlanForExit(channels, nowMs = Date.now(), defaultTimeZone = localTimeZone()) {
-  const haystack = `${channels.message}
-${channels.stderr}`;
+  const haystack = stripPromptEcho(`${channels.message}
+${channels.stderr}`, channels.prompt);
   return rateLimitDeferPlan(haystack, nowMs, defaultTimeZone);
 }
 var RATE_LIMIT_RE, MONTHS, RATE_LIMIT_TENTATIVE_PAUSE_MS, DATED_RESET_ROLLOVER_GRACE_MS, RATE_LIMIT_PAUSE_PADDING_MS, RATE_LIMIT_SHAPED_RE;
@@ -15680,7 +15714,6 @@ import { randomUUID } from "node:crypto";
 import { mkdtemp as mkdtemp3, mkdir as mkdir10, writeFile as writeFile10, rm as rm6, stat as stat8, chmod as chmod3 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join18 } from "node:path";
-import { pathToFileURL } from "node:url";
 import { homedir as homedir5 } from "node:os";
 function attributeKillCause(result, recorded) {
   if (recorded) return recorded;
@@ -16428,6 +16461,7 @@ async function runJob(ctx, job, claimDeviceId) {
   };
   let metrics = { durations_ms: timings };
   let logs = { stdout: "", stderr: "" };
+  let sentPrompt;
   const cleanupFns = [];
   const heartbeat = setInterval(() => {
     rpcHeartbeat(ctx, job.id, deviceId);
@@ -16561,6 +16595,7 @@ async function runJob(ctx, job, claimDeviceId) {
     }
     const bugsFolderId = await ensureBugsFolder(ctx.supabase, job.project_id);
     const prompt = buildDiffPrompt(job, projectSlug, diff, worktreeDir, affectedSeed, bugsFolderId);
+    sentPrompt = prompt;
     if (cancelled.has(job.id)) {
       log(`cancelled before claude spawn, aborting`);
       return;
@@ -16677,9 +16712,14 @@ async function runJob(ctx, job, claimDeviceId) {
       return;
     }
     const msg = err2 instanceof Error ? err2.message : String(err2);
-    const haystack = `${msg}
-${logs.stderr}`;
-    const plan = rateLimitDeferPlanForExit({ message: msg, stderr: logs.stderr, stdout: logs.stdout });
+    const haystack = stripPromptEcho(`${msg}
+${logs.stderr}`, sentPrompt);
+    const plan = rateLimitDeferPlanForExit({
+      message: msg,
+      stderr: logs.stderr,
+      stdout: logs.stdout,
+      prompt: sentPrompt
+    });
     if (plan) {
       const { parsed, pauseUntil, info } = plan;
       if (!parsed) {
@@ -16862,6 +16902,11 @@ async function signInAccount(creds, makeAuth) {
   }
   return { active, lastErr, usedFallback };
 }
+function exitDaemon(code) {
+  const notice = supervisedStopNotice(code, process.env);
+  if (notice) console.error(notice);
+  process.exit(resolveExitCode(code, process.env));
+}
 async function runDaemon() {
   let lockHandle = null;
   try {
@@ -16869,7 +16914,7 @@ async function runDaemon() {
   } catch (err2) {
     if (err2 instanceof SingleInstanceLockedError) {
       console.error(String(err2.message));
-      process.exit(64);
+      process.exit(SINGLE_INSTANCE_EXIT_CODE);
     }
     throw err2;
   }
@@ -16885,7 +16930,7 @@ async function runDaemon() {
         } catch {
         }
       }
-      process.exit(1);
+      exitDaemon(1);
     }
     throw err2;
   }
@@ -16916,7 +16961,7 @@ async function runDaemon() {
       } catch {
       }
     }
-    process.exit(2);
+    exitDaemon(2);
   }
   let credentials;
   try {
@@ -16930,7 +16975,7 @@ async function runDaemon() {
         } catch {
         }
       }
-      process.exit(78);
+      exitDaemon(78);
     }
     throw err2;
   }
@@ -16945,7 +16990,7 @@ async function runDaemon() {
       } catch {
       }
     }
-    process.exit(75);
+    exitDaemon(75);
   }
   const auth = active.auth;
   const client = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
@@ -17127,6 +17172,7 @@ var init_run = __esm({
     init_dispatch();
     init_defaults();
     init_singleInstanceLock();
+    init_supervision();
     init_paths();
     init_semaphore();
     init_bearer();
@@ -17327,12 +17373,6 @@ ${ANCHOR_VERIFICATION}`;
         return daemonVersion;
       }
     };
-    if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
-      runDaemon().catch((err2) => {
-        console.error("fatal:", err2);
-        process.exit(1);
-      });
-    }
   }
 });
 
@@ -19267,7 +19307,14 @@ async function registerLocalWatch(args) {
     p_project_id: projectId,
     p_repo_owner: target.repoOwner,
     p_repo_name: target.repoName,
-    p_branch: target.repoBranch
+    p_branch: target.repoBranch,
+    // The ArchMe branch has to be RECORDED, not re-derived by each reader.
+    // The poller resolves it from the row (`commit_update_archme_branch ??
+    // branch`, mirroring the webhook); with the column unset it fell back to
+    // the git branch, so registration checked `main-scan` while polling read
+    // `main`, found no marker, and idled forever with everything looking
+    // healthy. Migration 111.
+    p_archme_branch: target.archmeBranch
   });
   if (watchErr || typeof watchedRepoId !== "string") {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Map your codebase into a living architecture diagram: run `archme init` in a repo to scan it, `archme daemon start` to keep it current on every commit.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",