@archme/cli 0.8.0 → 0.8.2

package/dist/cli.js

@@ -10005,9 +10005,23 @@ async function tailLog(opts = {}) {
   await new Promise((resolve6, reject) => {
     let fileWatcher = null;
     let dirWatcher = null;
+    let poller = null;
+    let settled = false;
     const dir = dirname7(path7);
     const name = basename(path7);
-    const onChange = async () => {
+    const stop = () => {
+      settled = true;
+      fileWatcher?.close();
+      dirWatcher?.close();
+      if (poller) clearInterval(poller);
+      process.removeListener("SIGINT", handleSigint);
+    };
+    const fail = (err2) => {
+      if (settled) return;
+      stop();
+      reject(err2);
+    };
+    const readNew = async () => {
       try {
         const st = await stat(path7);
         if (st.size < offset) offset = 0;
@@ -10020,61 +10034,50 @@ async function tailLog(opts = {}) {
           });
           offset = st.size;
         }
+        if (!fileWatcher && !settled) attachFileWatcher();
       } catch (err2) {
         if (err2.code === "ENOENT") return;
-        reject(err2);
+        fail(err2);
       }
     };
-    const attachFileWatcher = () => {
-      try {
-        fileWatcher = watch(path7, (event) => {
-          if (event === "change") void onChange();
-        });
-      } catch (err2) {
-        if (err2.code !== "ENOENT") {
-          reject(err2);
-          return;
-        }
-        attachDirWatcher();
-      }
+    let chain = Promise.resolve();
+    const drain = () => {
+      if (settled) return;
+      chain = chain.then(readNew);
     };
-    const attachDirWatcher = () => {
+    const attachFileWatcher = () => {
       try {
-        dirWatcher = watch(dir, (_event, filename) => {
-          if (filename === name) {
-            void onChange().then(() => {
-              dirWatcher?.close();
-              dirWatcher = null;
-              attachFileWatcher();
-            });
-          }
-        });
-      } catch (err2) {
-        reject(err2);
+        fileWatcher = watch(path7, () => drain());
+        dirWatcher?.close();
+        dirWatcher = null;
+      } catch {
+        fileWatcher = null;
       }
     };
-    stat(path7).then(
-      () => attachFileWatcher(),
-      (err2) => {
-        if (err2.code === "ENOENT") {
-          attachDirWatcher();
-        } else {
-          reject(err2);
-        }
-      }
-    );
+    try {
+      dirWatcher = watch(dir, (_event, filename) => {
+        if (filename === name) drain();
+      });
+    } catch (err2) {
+      fail(err2);
+      return;
+    }
     const handleSigint = () => {
-      fileWatcher?.close();
-      dirWatcher?.close();
+      if (settled) return;
+      stop();
       resolve6();
     };
     process.once("SIGINT", handleSigint);
+    poller = setInterval(drain, FOLLOW_POLL_MS);
+    drain();
   });
 }
+var FOLLOW_POLL_MS;
 var init_logs = __esm({
   "src/daemon/service/logs.ts"() {
     "use strict";
     init_paths();
+    FOLLOW_POLL_MS = 500;
   }
 });
 
@@ -10344,10 +10347,31 @@ var init_preflight = __esm({
 });
 
 // ../shared/daemonModel.ts
-var DEFAULT_CLAUDE_MODEL;
+function parseClaudeCodeVersion(output) {
+  return /(\d+)\.(\d+)\.(\d+)/.exec(output ?? "")?.[0] ?? null;
+}
+function versionBelow(version, minimum) {
+  const a2 = version.split(".").map(Number);
+  const b = minimum.split(".").map(Number);
+  for (let i2 = 0; i2 < Math.max(a2.length, b.length); i2++) {
+    const d = (a2[i2] ?? 0) - (b[i2] ?? 0);
+    if (d !== 0) return d < 0;
+  }
+  return false;
+}
+function runnableModel(requested, installedVersion) {
+  const needs = MIN_CLAUDE_CODE_VERSION[requested];
+  if (!needs || !installedVersion || !versionBelow(installedVersion, needs)) return { model: requested };
+  return { model: FALLBACK_CLAUDE_MODEL, fellBack: { from: requested, needs } };
+}
+var DEFAULT_CLAUDE_MODEL, FALLBACK_CLAUDE_MODEL, MIN_CLAUDE_CODE_VERSION;
 var init_daemonModel = __esm({
   "../shared/daemonModel.ts"() {
     DEFAULT_CLAUDE_MODEL = "claude-opus-5-5";
+    FALLBACK_CLAUDE_MODEL = "claude-opus-4-8";
+    MIN_CLAUDE_CODE_VERSION = {
+      "claude-opus-5-5": "2.1.280"
+    };
   }
 });
 
@@ -10509,6 +10533,39 @@ var init_spawn_claude = __esm({
   }
 });
 
+// src/scan/claudeVersion.ts
+async function runClaudeVersion() {
+  const r = await execa("claude", ["--version"], { reject: false, timeout: 15e3 });
+  return r.exitCode === 0 ? String(r.stdout) : null;
+}
+function createClaudeVersionProbe(opts = {}) {
+  const exec = opts.exec ?? runClaudeVersion;
+  const now = opts.now ?? Date.now;
+  const ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS;
+  let cached;
+  return async () => {
+    if (cached && now() - cached.at < ttlMs) return cached.version;
+    let version = null;
+    try {
+      version = parseClaudeCodeVersion(await exec());
+    } catch {
+      version = null;
+    }
+    cached = { version, at: now() };
+    return version;
+  };
+}
+var DEFAULT_TTL_MS, claudeCodeVersion;
+var init_claudeVersion = __esm({
+  "src/scan/claudeVersion.ts"() {
+    "use strict";
+    init_execa();
+    init_daemonModel();
+    DEFAULT_TTL_MS = 10 * 6e4;
+    claudeCodeVersion = createClaudeVersionProbe();
+  }
+});
+
 // src/scan/model-pin.ts
 async function resolveModelPin(supabase) {
   try {
@@ -10522,10 +10579,30 @@ async function resolveModelPin(supabase) {
     return DEFAULT_CLAUDE_MODEL;
   }
 }
+async function resolveRunnableModel(supabase, deps = {}) {
+  const requested = await resolveModelPin(supabase);
+  const installed = await (deps.version ?? claudeCodeVersion)();
+  const { model, fellBack } = runnableModel(requested, installed);
+  if (fellBack) {
+    const warned = deps.warned ?? warnedFallbacks;
+    const key = `${fellBack.from}@${installed}`;
+    if (!warned.has(key)) {
+      warned.add(key);
+      (deps.warn ?? console.warn)(
+        `Claude Code ${installed} can't run ${fellBack.from} (needs ${fellBack.needs}+); running ${model} instead. Run \`claude update\` to use ${fellBack.from}.`
+      );
+    }
+  }
+  return model;
+}
+var warnedFallbacks;
 var init_model_pin = __esm({
   "src/scan/model-pin.ts"() {
     "use strict";
     init_spawn_claude();
+    init_daemonModel();
+    init_claudeVersion();
+    warnedFallbacks = /* @__PURE__ */ new Set();
   }
 });
 
@@ -10646,7 +10723,7 @@ async function runDigestJob(ctx, job, deviceId, inFlight2, mcp) {
       mcpConfigPath = join8(dir, "mcp.json");
       await writeFile5(mcpConfigPath, JSON.stringify({ mcpServers: {} }));
     }
-    const model = await resolveModelPin(ctx.supabase);
+    const model = await resolveRunnableModel(ctx.supabase);
     const proc = spawnClaude({
       prompt: buildDigestPrompt(payload),
       mcpConfigPath,
@@ -13220,6 +13297,13 @@ var init_sequenceChapters = __esm({
   }
 });
 
+// ../shared/architectureDiff.ts
+var init_architectureDiff = __esm({
+  "../shared/architectureDiff.ts"() {
+    init_storyChanges();
+  }
+});
+
 // ../shared/walkthrough.ts
 var MAX_WALKTHROUGH_STEPS, MAX_STEP_TITLE_CHARS;
 var init_walkthrough = __esm({
@@ -13227,6 +13311,7 @@ var init_walkthrough = __esm({
     init_storyChanges();
     init_sequenceChapters();
     init_validationCodes();
+    init_architectureDiff();
     MAX_WALKTHROUGH_STEPS = 20;
     MAX_STEP_TITLE_CHARS = 60;
   }
@@ -13243,13 +13328,15 @@ var init_walkthroughGuidance = __esm({
 - **Steps are in reading order, not build order.** This is not an implementation plan and not a restatement of your sequencing section \u2014 start where a reviewer should start, and put each step where it makes the next one make sense.
 - **Group by idea.** One step is one coherent change, usually 3\u20138 elements. A one-element step is fine and often valuable: an independent fix that would otherwise be lost among the rest. Aim for a handful of steps; the cap is ${MAX_WALKTHROUGH_STEPS}.
 - **Titles are terse** \u2014 a handle, not a summary. Under ${MAX_STEP_TITLE_CHARS} characters. \`Markers move per-repo\`, not \`This step explains how the source marker moves onto a per-repo table\`.
-- **Description is optional and usually absent.** Never restate the components, stories or connections the step already references \u2014 the reader is looking at them. Write one only for something the diagrams cannot show: a constraint, a consequence, a trade-off that is not visible in the graph.
-- **Write it for someone meeting this change for the first time.** They know the system; they have NOT read your proposal body and were not in the design discussion. Say plainly what the step does and why it is there. Two sentences is plenty.
+- **Every step gets a short description** \u2014 the narration a reader follows while the diagrams move beside it, one step at a time. Two or three plain sentences: what this part of the change is, why it exists, and how it fits the rest, at a high level. Example: \`This is the daemon picking up GitHub's answer after it posts a comment, review or approval on your behalf, and recording whether it worked.\`
+  - Not prescriptive: describe the change, do not tell the reviewer what to check or what to think of it.
+  - Not dense: no condensed paragraph of identifiers, flags and edge cases crammed into one sentence. Never restate the components, stories or connections the step already references \u2014 the reader is looking at them.
+- **Write it for someone meeting this change for the first time.** They know the system; they have NOT read your proposal body and were not in the design discussion. Say plainly what the step does and why it is there.
   - Don't argue with objections the reader hasn't raised \u2014 no \`not just a nicety\`, no \`as discussed\`, no \`this is why it is its own step\`. They don't know how the walkthrough was assembled and haven't disagreed with you. A trade-off worth stating is information (\`X was considered; it breaks Y\`), not a rebuttal.
   - Don't use the change's OWN new vocabulary undefined. If the step introduces a term, say what it means in the same breath or use plain words.
   - Bad: \`A correctness item, not a phase-3 nicety: anchors are repo-relative paths, so two repos with the same conventional layout collide silently and seed stories from the wrong one.\`
   - Good: \`With two repos in one project a path like src/index.ts exists in both, so looking up which component owns a changed file can return the wrong repo's. Each repo now records the container its code lives under, and lookups search only that subtree.\`
-- **Cover every story the change touches.** A changed story no step references is a change the reader will step straight past.
+- **Cover every change** \u2014 every story, component and connection the change touches \u2014 or \`set_walkthrough\` rejects the walkthrough and lists what is missing. Guided mode walks the steps and nothing after them, so anything no step reaches is a change the reviewer never sees. A connection is covered when a step names it, names both of its components, or names a story page that draws it as an arrow. Name a connection inside a component as \`<component path>::<id>\` (\`daemon::session_auth->key_account\`); a root connection by its plain id.
 - **Skip it for a small change.** A handful of elements needs no walkthrough; omit it rather than writing a step per element.
 - **Prefer CHAPTERS to narrow a diagram.** If a story's sequence carries \`%% chapter: <id> | <Label>\` markers, name the ones your step covers as \`chapters: [{ story, chapter }]\`, using the **id**, never the label \u2014 ids are stable across a rename, labels are not. A chapter is a page break the story's author already wrote, so it is sharper than naming components, where one hub the step mentions decides the whole view.`;
   }
@@ -16055,7 +16142,9 @@ function observeGithubPull(p) {
     createdAt: p.created_at ?? null,
     updatedAt: p.updated_at ?? null,
     mergedAt: p.merged_at ?? null,
-    closedAt: p.closed_at ?? null
+    closedAt: p.closed_at ?? null,
+    // Before the merge it is GitHub's throwaway test merge.
+    mergeCommitSha: p.merged_at ? p.merge_commit_sha ?? null : null
   };
 }
 function metaKey(o2) {
@@ -16090,6 +16179,7 @@ function toItem(o2, action, sent) {
     created_at: o2.createdAt,
     merged_at: o2.mergedAt,
     closed_at: o2.closedAt,
+    merge_commit_sha: o2.mergeCommitSha,
     body: o2.body,
     ...action === "synchronize" && sent.seq !== void 0 ? { seq: sent.seq } : {}
   };
@@ -16499,6 +16589,22 @@ var init_defaultBranch = __esm({
   }
 });
 
+// ../shared/prRefs.ts
+function pushCommitSubject(message) {
+  if (message == null) return null;
+  const [subject = "", ...body] = message.split("\n");
+  const pr = MERGE_PR_SUBJECT.exec(subject.trim());
+  const title = body.find((line) => line.trim())?.trim();
+  return pr && title && !TRAILER_LINE.test(title) ? `${title} (#${pr[1]})` : subject;
+}
+var MERGE_PR_SUBJECT, TRAILER_LINE;
+var init_prRefs = __esm({
+  "../shared/prRefs.ts"() {
+    MERGE_PR_SUBJECT = /^Merge pull request #(\d+) from \S+$/;
+    TRAILER_LINE = /^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)+:\s/;
+  }
+});
+
 // src/daemon/localGit.ts
 var localGit_exports = {};
 __export(localGit_exports, {
@@ -16567,13 +16673,14 @@ async function firstParentRange(dir, marker, tip) {
 async function readCommitMeta(dir, sha) {
   const { exitCode, stdout } = await git(
     dir,
-    ["show", "-s", "--format=%s%n%an%n%cI", sha],
+    // %b last: it spans lines, and `pushCommitSubject` reads a merge commit's title from it.
+    ["show", "-s", "--format=%an%n%cI%n%s%n%b", sha],
     { allowFail: true }
   );
   if (exitCode !== 0) return { message: "", authorName: null, committedAt: null };
-  const [message = "", authorName = "", committedAt = ""] = stdout.split("\n");
+  const [authorName = "", committedAt = "", ...message] = stdout.split("\n");
   return {
-    message: message.trim(),
+    message: (pushCommitSubject(message.join("\n")) ?? "").trim(),
     authorName: authorName.trim() || null,
     committedAt: committedAt.trim() || null
   };
@@ -16602,6 +16709,7 @@ var init_localGit = __esm({
     init_execa();
     init_preflight();
     init_defaultBranch();
+    init_prRefs();
     GIT_TIMEOUT_MS = 10 * 60 * 1e3;
   }
 });
@@ -17051,6 +17159,7 @@ __export(run_exports, {
   buildClaudeExitMessage: () => buildClaudeExitMessage,
   buildDevices: () => buildDevices,
   buildDiffPrompt: () => buildDiffPrompt,
+  claudeFailureDetail: () => claudeFailureDetail,
   computeDiff: () => computeDiff,
   parseClaudeResult: () => parseClaudeResult,
   probeMcpAuth: () => probeMcpAuth,
@@ -17074,6 +17183,12 @@ function attributeKillCause(result, recorded) {
 function buildClaudeExitMessage(exitCode, causeSuffix, stderr) {
   return `claude exited ${exitCode}${causeSuffix}: ${stderr.slice(0, 4e3)}`;
 }
+function claudeFailureDetail(stderr, stdout) {
+  if (stderr.trim() || !stdout.trim()) return null;
+  const parsed = parseClaudeResult(stdout);
+  const text = (parsed.parsed ? parsed.summary : stdout).trim();
+  return text ? text.slice(-FAILURE_DETAIL_MAX) : null;
+}
 async function routeShutdownInterrupt(id, cancelled2, fail, exitCode) {
   if (cancelled2.has(id)) return;
   if (exitCode === 0) {
@@ -18016,7 +18131,7 @@ async function runJob(ctx, job, claimDeviceId) {
         `MCP auth preflight failed after ${probe.attempts} attempt(s) (last status ${probe.lastStatus ?? "n/a"}): ${probe.detail}. Not spawning claude \u2014 the architecture would not be writable and the run would silently no-op. Failing the job so it retries with a freshly minted token.`
       );
     }
-    const model = await resolveModelPin(ctx.supabase);
+    const model = await resolveRunnableModel(ctx.supabase, { warn: log });
     metrics.model = model;
     log(`spawning claude (mcp config at ${configPath}, model ${model})`);
     const proc = spawnClaude({
@@ -18054,6 +18169,8 @@ async function runJob(ctx, job, claimDeviceId) {
     if (result.exitCode !== 0) {
       const causeSuffix = cause ? ` (${result.signal ?? "exit"}, cause: ${cause})` : "";
       const stderr = result.stderr ? String(result.stderr) : "";
+      const detail = claudeFailureDetail(stderr, result.stdout ? String(result.stdout) : "");
+      if (detail) log(`claude output: ${detail.replace(/\n/g, " ")}`);
       throw new Error(buildClaudeExitMessage(result.exitCode, causeSuffix, stderr));
     }
     const runResult = parseClaudeResult(result.stdout ? String(result.stdout) : "");
@@ -18557,7 +18674,7 @@ ${signal} received, shutting down`);
   process.on("SIGINT", () => shutdown("SIGINT"));
   process.on("SIGTERM", () => shutdown("SIGTERM"));
 }
-var HEARTBEAT_INTERVAL_MS, CLAUDE_TIMEOUT_MS, CLAUDE_LARGE_DIFF_TIMEOUT_MS, SAFETY_SWEEP_MS, LOG_STDOUT_CAP_BYTES, LOG_STDERR_CAP_BYTES, PRE_SPAWN_TOKEN_MIN_LIFETIME_MS, SUPABASE_URL, SUPABASE_ANON_KEY, ARCHME_DAEMON_CLIENT_ID, ARCHME_MCP_BASE_URL, CLONE_BASE_DIR, DAEMON_ID, LEASE_SECONDS, inFlight, cancelled, killReasons, activeCleanups, cloneMutex, shuttingDown, daemonVersion, pauseUntilMs, resumeTimer, currentSched, MAX_CONCURRENT_JOBS, ctxByJob, deviceByJob, DEFAULT_CLONE_BASE_DIR, INLINE_PATCH_BYTE_CAP, GIT_SHA_RE, CURATOR_PREAMBLE, CORE_PRINCIPLES, STORY_COVERAGE_GATE, NEW_STORY_GUIDANCE, STORY_DESCRIPTION_EDIT_RULE, PHASE_GUIDANCE, BASE_RULES, DIFF_RULES, finite, channelSeq, MultipleAccountsError, __testDispatch;
+var HEARTBEAT_INTERVAL_MS, CLAUDE_TIMEOUT_MS, CLAUDE_LARGE_DIFF_TIMEOUT_MS, SAFETY_SWEEP_MS, LOG_STDOUT_CAP_BYTES, LOG_STDERR_CAP_BYTES, FAILURE_DETAIL_MAX, PRE_SPAWN_TOKEN_MIN_LIFETIME_MS, SUPABASE_URL, SUPABASE_ANON_KEY, ARCHME_DAEMON_CLIENT_ID, ARCHME_MCP_BASE_URL, CLONE_BASE_DIR, DAEMON_ID, LEASE_SECONDS, inFlight, cancelled, killReasons, activeCleanups, cloneMutex, shuttingDown, daemonVersion, pauseUntilMs, resumeTimer, currentSched, MAX_CONCURRENT_JOBS, ctxByJob, deviceByJob, DEFAULT_CLONE_BASE_DIR, INLINE_PATCH_BYTE_CAP, GIT_SHA_RE, CURATOR_PREAMBLE, CORE_PRINCIPLES, STORY_COVERAGE_GATE, NEW_STORY_GUIDANCE, STORY_DESCRIPTION_EDIT_RULE, PHASE_GUIDANCE, BASE_RULES, DIFF_RULES, finite, channelSeq, MultipleAccountsError, __testDispatch;
 var init_run = __esm({
   "src/daemon/run.ts"() {
     "use strict";
@@ -18603,6 +18720,7 @@ var init_run = __esm({
     SAFETY_SWEEP_MS = 3e4;
     LOG_STDOUT_CAP_BYTES = 30 * 1024;
     LOG_STDERR_CAP_BYTES = 30 * 1024;
+    FAILURE_DETAIL_MAX = 400;
     PRE_SPAWN_TOKEN_MIN_LIFETIME_MS = CLAUDE_LARGE_DIFF_TIMEOUT_MS + 5 * 60 * 1e3;
     inFlight = /* @__PURE__ */ new Map();
     cancelled = /* @__PURE__ */ new Set();
@@ -19983,7 +20101,7 @@ async function runScan(opts, deps = {}) {
     ...sourceRepo ? { source: await buildScanSource(opts.repoPath, sourceRepo, headSha) } : {}
   });
   try {
-    const model = await resolveModelPin(supabase);
+    const model = await resolveRunnableModel(supabase, { warn: log });
     const interactive = opts.interactive !== false;
     log(
       interactive ? `starting claude (mcp config at ${configPath}, model ${model}) \u2014 this session is interactive; answer its questions as they come` : `spawning claude (mcp config at ${configPath}, model ${model}, timeout ${Math.round(SCAN_CLAUDE_TIMEOUT_MS / 6e4)} min)`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "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",