memgineering 0.25.1 → 0.25.3

package/dist/index.js

@@ -1065,22 +1065,6 @@ function mapNoteToMemory(input) {
     issues
   };
 }
-function isUntouchedBase(path, content) {
-  if (!/^01_BASE\//.test(path)) return false;
-  const body = content.replace(/^---\r?\n[\s\S]*?\r?\n---[ \t]*(\r?\n|$)/, "");
-  const lines2 = body.split(/\r?\n/).map((l) => l.trimEnd());
-  let seenHeading = false;
-  for (const line of lines2) {
-    if (line.trim() === "") continue;
-    if (!seenHeading && line.startsWith("# ")) {
-      seenHeading = true;
-      continue;
-    }
-    if (/^-\s*$/.test(line)) continue;
-    if (/^[-*+]\s+\S/.test(line) || /^#{1,6}\s/.test(line)) return false;
-  }
-  return seenHeading;
-}
 var NAMESPACE, isRecord, asString, asStringArray, AUTHORABLE;
 var init_markdown_mapping = __esm({
   "../../packages/memory-engine/src/markdown-mapping.ts"() {
@@ -2441,11 +2425,18 @@ var init_planner = __esm({
   }
 });
 
-// ../../packages/memory-engine/src/recall/semantic.ts
-var init_semantic = __esm({
-  "../../packages/memory-engine/src/recall/semantic.ts"() {
+// ../../packages/memory-engine/src/note-body.ts
+function bodyOf(content) {
+  const stripped = content.startsWith(BOM) ? content.slice(BOM.length) : content;
+  const fence2 = FENCE.exec(stripped);
+  return fence2 ? stripped.slice(fence2[0].length) : stripped;
+}
+var BOM, FENCE;
+var init_note_body = __esm({
+  "../../packages/memory-engine/src/note-body.ts"() {
     "use strict";
-    init_markdown_mapping();
+    BOM = String.fromCharCode(65279);
+    FENCE = /^---[ \t]*\r?\n[\s\S]*?\r?\n---[ \t]*(\r?\n|$)/;
   }
 });
 
@@ -2469,10 +2460,31 @@ function base(id, title, summary, body) {
 function ownEntry(record, key2) {
   return Object.hasOwn(record, key2) ? record[key2] : void 0;
 }
-var BASE_TEMPLATES, RETIRED_BASE_TEMPLATES;
+function wordingsFor(path) {
+  const current = ownEntry(BASE_TEMPLATES, path);
+  const retired = ownEntry(RETIRED_BASE_TEMPLATES, path) ?? [];
+  return current === void 0 ? retired : [current, ...retired];
+}
+function isExactUntouchedBase(path, content) {
+  const saved = asSaved(content);
+  return wordingsFor(path).some((t) => asSaved(t) === saved);
+}
+function isTemplateBody(path, content) {
+  const lines2 = bodyLines(content).join("\n");
+  return wordingsFor(path).some((t) => bodyLines(t).join("\n") === lines2);
+}
+function isUnwrittenBody(path, content) {
+  if (isTemplateBody(path, content)) return true;
+  const [first, ...rest] = bodyLines(content);
+  if (first === void 0) return false;
+  const headings = wordingsFor(path).map((t) => bodyLines(t)[0]);
+  return headings.includes(first) && rest.every((line) => /^-\s*$/.test(line));
+}
+var BASE_TEMPLATES, RETIRED_BASE_TEMPLATES, BOM2, asSaved, bodyLines;
 var init_base_templates = __esm({
   "../../packages/memory-engine/src/base-templates.ts"() {
     "use strict";
+    init_note_body();
     BASE_TEMPLATES = {
       "01_BASE/CRITICAL_FACTS.md": base(
         "critical-facts",
@@ -2553,6 +2565,17 @@ var init_base_templates = __esm({
         ].join("\n")
       ]
     };
+    BOM2 = String.fromCharCode(65279);
+    asSaved = (text) => (text.startsWith(BOM2) ? text.slice(BOM2.length) : text).replace(/\r\n/g, "\n").trimEnd();
+    bodyLines = (content) => bodyOf(content).split("\n").map((line) => line.trimEnd()).filter((line) => line.trim() !== "");
+  }
+});
+
+// ../../packages/memory-engine/src/recall/semantic.ts
+var init_semantic = __esm({
+  "../../packages/memory-engine/src/recall/semantic.ts"() {
+    "use strict";
+    init_base_templates();
   }
 });
 
@@ -2577,6 +2600,13 @@ var init_unfilled = __esm({
   }
 });
 
+// ../../packages/memory-engine/src/setup-progress.ts
+var init_setup_progress = __esm({
+  "../../packages/memory-engine/src/setup-progress.ts"() {
+    "use strict";
+  }
+});
+
 // ../../packages/memory-engine/src/recall/query-prefix.ts
 var init_query_prefix = __esm({
   "../../packages/memory-engine/src/recall/query-prefix.ts"() {
@@ -4043,11 +4073,6 @@ function bodyStillAsserts(content, oldClaim, newClaim, normalize) {
   if (line === normalize(newClaim?.split("\n")[0] ?? "").trim()) return null;
   return bodyOf(content).includes(line) ? line : null;
 }
-function bodyOf(content) {
-  const stripped = content.replace(/^/, "");
-  const fence2 = /^---[ \t]*\r?\n[\s\S]*?\r?\n---[ \t]*(\r?\n|$)/.exec(stripped);
-  return fence2 ? stripped.slice(fence2[0].length) : stripped;
-}
 function previousClaim(entry) {
   const current = entry.claims.find((claim) => claim.id === entry.memory.current_claim) ?? entry.claims[0];
   return current?.text ?? null;
@@ -4065,6 +4090,7 @@ var init_curate = __esm({
     init_planner();
     init_schema();
     init_rule_budget();
+    init_note_body();
     NO_REASON_GIVEN = "revised directly";
     noLifecycleReason = (action) => `${action}d directly`;
   }
@@ -4905,6 +4931,7 @@ var init_src = __esm({
     init_planner();
     init_semantic();
     init_unfilled();
+    init_setup_progress();
     init_query_prefix();
     init_base_templates();
     init_scope_spread();
@@ -5507,6 +5534,13 @@ var init_config = __esm({
          * answer as "older than this CLI" and wants the same one command.
          */
         guidanceVersion: z8.string().optional(),
+        /**
+         * The person's answer to "arm the hooks?", as they gave it — not whether
+         * this machine's tools could take one. A flag-less `setup` reads it back,
+         * so a refresh keeps what they chose instead of setup's default (0.25.2).
+         * Absent on a machine set up before it was recorded.
+         */
+        hook: z8.enum(["on", "off"]).optional().catch(void 0),
         /**
          * Notes `setup --web` was asked to upload, not yet sent.
          *
@@ -7864,13 +7898,208 @@ var init_setup_signin = __esm({
   }
 });
 
+// src/lib/next-step.ts
+import { mkdir as mkdir15, readFile as readFile24, writeFile as writeFile13 } from "fs/promises";
+import { join as join23 } from "path";
+function isSetUp(cfg) {
+  return Object.keys(cfg.system.installed).length > 0;
+}
+function connectedMarker(at) {
+  return join23(brandHome(), `setup-connected-shown-${at.replace(/[^0-9A-Za-z]/g, "")}`);
+}
+async function connectedNoticeShown(at) {
+  return readFile24(connectedMarker(at), "utf8").then(
+    () => true,
+    () => false
+  );
+}
+async function markConnectedNoticeShown(at) {
+  try {
+    await mkdir15(brandHome(), { recursive: true });
+    await writeFile13(connectedMarker(at), `${(/* @__PURE__ */ new Date()).toISOString()}
+`);
+  } catch {
+  }
+}
+async function claimFullSetupNotice() {
+  const marker = join23(brandHome(), "setup-notice-shown");
+  try {
+    await readFile24(marker, "utf8");
+    return false;
+  } catch {
+  }
+  try {
+    await mkdir15(brandHome(), { recursive: true });
+    await writeFile13(marker, `${(/* @__PURE__ */ new Date()).toISOString()}
+`);
+  } catch {
+  }
+  return true;
+}
+function shellQuote(value) {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function confirmUploadNotice(p) {
+  const who = p.account_email ?? "the account `setup --web` connected";
+  const brain = p.brain_id && UUID.test(p.brain_id) ? ` --brain ${p.brain_id}` : "";
+  return `## Notes are waiting to be uploaded \u2014 after a check.
+
+\`memgineering setup --web\` chose to upload \`${p.path}\` to a brain on **${who}**.
+This machine has not sent them: an upload decided on the setup screen waits
+until somebody here has seen which account would receive the notes.
+
+If that is your user's account, this uploads them:
+
+\`\`\`bash
+memgineering push --vault ${shellQuote(p.path)}${brain}
+\`\`\`
+
+If it is not, \`memgineering logout\` disconnects this machine from that account
+and nothing is uploaded. If you are not sure which it is, ask them.`;
+}
+function setupConnectedNotice(c2) {
+  const who = c2.email ?? "an account with no email on record";
+  return `## This machine is signed in as **${who}**.
+
+\`memgineering setup --web\` connected it to that account. If that is not your user's account,
+\`memgineering logout\` disconnects it, and nothing they write reaches that brain.`;
+}
+function nextStepFor(cfg, signedIn = false, seen = {}) {
+  if (cfg.system.pendingUpload) {
+    return { id: "confirm_upload", markdown: confirmUploadNotice(cfg.system.pendingUpload) };
+  }
+  if (cfg.system.setupConnected && !seen.connected) {
+    return { id: "setup_connected", markdown: setupConnectedNotice(cfg.system.setupConnected) };
+  }
+  if (signedIn && cfg.brain.cloud === void 0) {
+    return { id: "point_at_a_brain", markdown: POINT_AT_A_BRAIN };
+  }
+  if (isSetUp(cfg) && cfg.system.guidanceVersion !== VERSION) {
+    return { id: "refresh_guidance", markdown: REFRESH_GUIDANCE };
+  }
+  if (cfg.brain.cloud !== void 0 && cfg.brain.cloud.api_url === apiUrl()) return null;
+  if (!isSetUp(cfg)) return { id: "finish_setup", markdown: FINISH_SETUP };
+  if (cfg.brain.brains.length === 0 && cfg.brain.cloud === void 0) {
+    return { id: "connect_a_brain", markdown: CONNECT_A_BRAIN };
+  }
+  return null;
+}
+async function currentNextStep() {
+  try {
+    const stored = await readCredentials().catch(() => null);
+    const cfg = await loadConfig();
+    const connected = cfg.system.setupConnected ? await connectedNoticeShown(cfg.system.setupConnected.at) : false;
+    return nextStepFor(cfg, stored !== null && stored.api_url === apiUrl(), { connected });
+  } catch {
+    return null;
+  }
+}
+var FINISH_SETUP, SETUP_NUDGE, REFRESH_GUIDANCE, CONNECT_A_BRAIN, POINT_AT_A_BRAIN, UUID;
+var init_next_step = __esm({
+  "src/lib/next-step.ts"() {
+    "use strict";
+    init_brand();
+    init_api_client();
+    init_credentials();
+    init_config();
+    init_version();
+    FINISH_SETUP = `## memgineering is installed, but not set up yet.
+
+Nothing is connected: there is no brain to read, and the agent tools on this
+machine have no memgineering guidance yet. Setup is one command:
+
+\`\`\`bash
+memgineering setup --web
+\`\`\`
+
+It does NOT wait for them. It returns in a few seconds \u2014 measured \u2014 and leaves
+a setup screen open in their browser at memgineering.com, where they choose
+everything: signing in, where the memory lives, which notes. Nothing is
+installed until they finish there, and this machine picks it up on its own.
+
+If they have not already asked you to set it up, ask them first \u2014 it opens a
+browser window on their computer. Once you run it, tell them in their language
+that the setup screen is open. It prints a short code first: show it to them,
+because the screen asks them to compare it.
+
+No browser on this machine (a server, a container, a sandbox)? Run
+\`memgineering setup --web --print-url\` and give them the link to open on the
+computer they are actually sitting at.
+
+\`setup --agent\` answers every one of those questions on their behalf, and
+\`--no-login\` answers the biggest one \u2014 no account, so the memory cannot follow
+them to another machine. Use it only when they have said they would rather you
+decided, or when this machine cannot reach a browser and \`--print-url\` is no
+use to them either.
+
+Setup's output then says how to connect their brain \u2014 create one, pick one, or
+move existing notes up.
+
+The \`memgineering-setup\` skill covers what comes after.`;
+    SETUP_NUDGE = "memgineering is installed, but not set up yet. `memgineering setup --web` opens a setup screen in their browser and does NOT wait for them \u2014 ask them first unless they asked you to set it up.\nThe full notes: run `memgineering` on its own.";
+    REFRESH_GUIDANCE = `## The guidance in your agent tools is older than this memgineering.
+
+The hub and skills this CLI installs into your tool's home were written by an
+earlier release. One command rewrites them:
+
+\`\`\`bash
+memgineering setup
+\`\`\`
+
+It does not change which brain this machine reads, or any note. Two things it
+does change, both worth knowing before it runs:
+
+- A setup-owned file your user edited is overwritten; setup names it afterwards.
+- Run with no flags where there is no terminal (an agent's shell), it keeps the
+  auto-update and hook choices recorded on this machine, and installs into
+  every agent tool it finds \u2014 \`--tools\` naming every tool they use keeps it to
+  those (a tool left out keeps its old guidance, and this notice stops
+  appearing anyway). On a machine not signed in, it starts a sign-in and prints
+  a code; \`--no-login\` declines that for a machine they keep local.
+
+If you are not sure what they chose, ask them. If you run it,
+mention it to your user in one line: it is upkeep for a tool they already set
+up, and they should not have to discover it later.
+
+Guidance files are read at the start of a session, so what changes today
+arrives in the next one.`;
+    CONNECT_A_BRAIN = `## memgineering is set up, and no brain is connected.
+
+A brain is a folder of markdown notes. Until one is connected there is nothing
+to recall and nowhere to remember. Which folder is your user's choice; the
+command is one you can run for them:
+
+\`\`\`bash
+memgineering link <their-notes-folder>   # they already keep notes
+memgineering init <path>                 # they do not \u2014 creates one, laid out
+\`\`\`
+
+\`link\` reports what would be stored before anything is indexed. An existing
+folder needs no index and no frontmatter of its own \u2014 plain markdown is a brain.
+
+Then run \`memgineering onboard\`: it prints what to ask so the brain knows whose
+it is. A brain whose \`01_BASE/\` is still template text answers almost nothing.
+
+Read \`memgineering-setup\` for accounts and which of their tools this reaches.
+
+Synced instead? \`memgineering login\`, then \`memgineering create <name>\`.`;
+    POINT_AT_A_BRAIN = `## Signed in, and this machine reads no brain yet.
+
+\`memgineering brains\` lists what is on the account.
+\`memgineering use --brain <name>\` points this machine at one.
+\`memgineering create <name>\` makes one and points here, when the account has none yet.
+`;
+    UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  }
+});
+
 // src/lib/provenance.ts
-import { execFile } from "child_process";
+import { execFile, spawn as spawn2 } from "child_process";
 import { realpath as realpath3 } from "fs/promises";
-import { dirname as dirname8, join as join23, resolve as resolve14 } from "path";
+import { dirname as dirname8, join as join24, resolve as resolve14 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { promisify } from "util";
-async function detectProvenance(selfPath) {
+async function detectProvenance(selfPath, opts = {}) {
   const entry = selfPath ?? fileURLToPath2(import.meta.url);
   const selfDir = await realpath3(dirname8(entry)).catch(() => dirname8(entry));
   if (/[\\/]_npx[\\/]|[\\/]\.npm[\\/]_cacache[\\/]/.test(selfDir)) {
@@ -7882,9 +8111,11 @@ async function detectProvenance(selfPath) {
       reason: "this is a one-off npx run, not an installed copy"
     };
   }
-  for (const manager of MANAGERS) {
-    const prefix = await prefixOf(manager.bin, manager.prefixArgs);
-    if (prefix === null) continue;
+  const deadline = opts.deadlineMs;
+  const answers = deadline === void 0 ? null : await probeAllWithin(MANAGERS.map((m) => [m.bin, m.prefixArgs]), deadline);
+  for (const [i, manager] of MANAGERS.entries()) {
+    const prefix = answers === null ? await prefixOf(manager.bin, manager.prefixArgs) : answers.prefixes[i];
+    if (prefix === null || prefix === void 0) continue;
     if (isInside2(selfDir, manager.moduleRoot(prefix))) {
       return {
         kind: manager.kind,
@@ -7895,6 +8126,15 @@ async function detectProvenance(selfPath) {
       };
     }
   }
+  if (answers?.timedOut === true) {
+    return {
+      kind: "undetermined",
+      selfDir,
+      prefix: null,
+      command: "npm i -g memgineering@latest",
+      reason: "the package managers did not answer in time to tell which one installed this copy"
+    };
+  }
   const local = selfDir.includes(`${"node_modules"}`);
   return {
     kind: local ? "local" : "unknown",
@@ -7907,6 +8147,62 @@ async function detectProvenance(selfPath) {
 function canSelfUpdate(p) {
   return p.kind === "npm" || p.kind === "pnpm" || p.kind === "bun";
 }
+async function probeAllWithin(probes, deadlineMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), deadlineMs);
+  timer.unref();
+  try {
+    const prefixes = await Promise.all(
+      probes.map(([bin, args]) => probeOnce(bin, args, controller.signal))
+    );
+    return { prefixes, timedOut: controller.signal.aborted };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function probeOnce(bin, args, signal) {
+  return new Promise((settle) => {
+    let child;
+    try {
+      child = spawn2(bin, args, { detached: true, stdio: ["ignore", "pipe", "ignore"] });
+    } catch {
+      settle(null);
+      return;
+    }
+    let out = "";
+    let done = false;
+    const finish = (value) => {
+      if (done) return;
+      done = true;
+      signal.removeEventListener("abort", stop);
+      settle(value);
+    };
+    function stop() {
+      try {
+        if (process.platform === "win32" || child.pid === void 0) child.kill("SIGKILL");
+        else process.kill(-child.pid, "SIGKILL");
+      } catch {
+      }
+      child.stdout?.destroy();
+      child.unref();
+      finish(null);
+    }
+    child.stdout?.on("data", (chunk) => {
+      out += chunk.toString("utf8");
+    });
+    child.on("error", () => finish(null));
+    child.on("close", (code) => {
+      const value = out.trim();
+      if (code !== 0 || value === "") {
+        finish(null);
+        return;
+      }
+      void realpath3(value).catch(() => value).then(finish);
+    });
+    if (signal.aborted) stop();
+    else signal.addEventListener("abort", stop, { once: true });
+  });
+}
 async function prefixOf(bin, args) {
   try {
     const { stdout } = await run(bin, args, { timeout: 5e3 });
@@ -7928,7 +8224,7 @@ async function unreachableByName(selfPath) {
   const p = await detectProvenance(entry);
   return p.kind === "local" || p.kind === "npx" ? p.reason : null;
 }
-var run, MANAGERS;
+var run, MANAGERS, BACKGROUND_PROBE_DEADLINE_MS;
 var init_provenance = __esm({
   "src/lib/provenance.ts"() {
     "use strict";
@@ -7938,7 +8234,7 @@ var init_provenance = __esm({
         kind: "npm",
         bin: "npm",
         prefixArgs: ["prefix", "-g"],
-        moduleRoot: (prefix) => process.platform === "win32" ? join23(prefix, "node_modules") : join23(prefix, "lib", "node_modules"),
+        moduleRoot: (prefix) => process.platform === "win32" ? join24(prefix, "node_modules") : join24(prefix, "lib", "node_modules"),
         install: "npm i -g memgineering@latest"
       },
       {
@@ -7957,6 +8253,7 @@ var init_provenance = __esm({
         install: "bun add -g memgineering"
       }
     ];
+    BACKGROUND_PROBE_DEADLINE_MS = 1500;
   }
 });
 
@@ -7972,24 +8269,29 @@ __export(setup_cloud_exports, {
   runSetupCloudChild: () => runSetupCloudChild,
   waitAndApply: () => waitAndApply
 });
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { realpathSync as realpathSync2 } from "fs";
 import { readdir as readdir7, stat as stat6 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { basename as basename3, dirname as dirname9, join as join24, resolve as resolve15, sep as sep4 } from "path";
-async function report2(setupToken, state, detail) {
+import { basename as basename3, dirname as dirname9, join as join25, resolve as resolve15, sep as sep4 } from "path";
+async function report2(setupToken, state, detail, code) {
   try {
     await apiRequest({
       method: "POST",
       path: "/v1/setup/session/report",
-      body: { setup_token: setupToken, state, ...detail === void 0 ? {} : { detail } }
+      body: {
+        setup_token: setupToken,
+        state,
+        ...detail === void 0 ? {} : { detail },
+        ...code === void 0 ? {} : { code }
+      }
     });
   } catch {
   }
 }
 async function folderCandidates() {
   const home = homedir5();
-  const roots = ["Documents", "notes", "Notes", "Obsidian", "vault"].map((d) => join24(home, d));
+  const roots = ["Documents", "notes", "Notes", "Obsidian", "vault"].map((d) => join25(home, d));
   const found = [];
   const countNotes = async (dir) => {
     let count = 0;
@@ -7998,7 +8300,7 @@ async function folderCandidates() {
       if (entry.name.startsWith(".")) continue;
       if (entry.isFile() && /\.(md|markdown)$/i.test(entry.name)) count += 1;
       else if (entry.isDirectory()) {
-        const inner = await readdir7(join24(dir, entry.name)).catch(() => []);
+        const inner = await readdir7(join25(dir, entry.name)).catch(() => []);
         count += inner.filter((n) => /\.(md|markdown)$/i.test(n)).length;
       }
       if (count > 999) break;
@@ -8058,17 +8360,24 @@ async function applyAnswers(setupToken, claim, detected, guards = { candidates:
         ...cfg,
         system: {
           ...cfg.system,
-          setupConnected: { account_id: account.id, email: account.email, at: (/* @__PURE__ */ new Date()).toISOString() }
+          setupConnected: {
+            account_id: account.id,
+            email: account.email,
+            at: (/* @__PURE__ */ new Date()).toISOString()
+          }
         }
       });
     }
   }
-  await report2(setupToken, "applying", "\uC124\uC815\uC744 \uC4F0\uB294 \uC911\uC774\uC5D0\uC694.");
+  await report2(setupToken, "applying", "\uC124\uC815\uC744 \uC4F0\uB294 \uC911\uC774\uC5D0\uC694.", "writing_config");
   const choice = {
     tools: toolsFromAnswers(answers, detected),
     autoUpdate: answers.auto_update ? "on" : "off",
     errorTelemetry: answers.error_telemetry === null ? "undecided" : answers.error_telemetry ? "on" : "off",
-    hook: answers.hook
+    hook: answers.hook,
+    // The screen always shows the hook switch, so this is the person's answer,
+    // and a later flag-less refresh keeps it only if it is recorded as one.
+    hookAnswer: answers.hook ? "on" : "off"
   };
   await applySetup(choice, false);
   const parts = [];
@@ -8096,7 +8405,7 @@ async function applyAnswers(setupToken, claim, detected, guards = { candidates:
       const email = account?.email ?? null;
       const yes = guards.confirmUpload ? await guards.confirmUpload({ path, email }) : null;
       if (yes === true) {
-        await report2(setupToken, "applying", "\uB178\uD2B8\uB97C \uC62C\uB9AC\uB294 \uC911\uC774\uC5D0\uC694.");
+        await report2(setupToken, "applying", "\uB178\uD2B8\uB97C \uC62C\uB9AC\uB294 \uC911\uC774\uC5D0\uC694.", "uploading");
         const { pushCommand: pushCommand2 } = await Promise.resolve().then(() => (init_push(), push_exports));
         await pushCommand2().parseAsync(
           ["--vault", path, ...claim.brain?.id ? ["--brain", claim.brain.id] : []],
@@ -8119,7 +8428,12 @@ async function applyAnswers(setupToken, claim, detected, guards = { candidates:
             }
           }
         });
-        await report2(setupToken, "applying", "\uB178\uD2B8 \uC62C\uB9AC\uAE30\uB294 \uC774 \uCEF4\uD4E8\uD130\uC5D0\uC11C \uD655\uC778\uD55C \uB4A4\uC5D0 \uC2DC\uC791\uB3FC\uC694.");
+        await report2(
+          setupToken,
+          "applying",
+          "\uB178\uD2B8 \uC62C\uB9AC\uAE30\uB294 \uC774 \uCEF4\uD4E8\uD130\uC5D0\uC11C \uD655\uC778\uD55C \uB4A4\uC5D0 \uC2DC\uC791\uB3FC\uC694.",
+          "upload_waits_for_check"
+        );
         parts.push(`upload of ${path} waits for a check on this machine`);
       } else {
         parts.push(`not uploaded: ${path}`);
@@ -8189,11 +8503,12 @@ async function waitAndApply(setupToken, opts) {
           candidates: offered,
           confirmUpload: opts.confirmUpload ?? null
         });
-        await report2(setupToken, "done", "\uC124\uCE58\uB97C \uB9C8\uCCE4\uC5B4\uC694.");
+        await report2(setupToken, "done", "\uC124\uCE58\uB97C \uB9C8\uCCE4\uC5B4\uC694.", "done");
         return done;
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        await report2(setupToken, "failed", message.slice(0, 400));
+        const code = err.code === "conflict" ? "different_account" : "failed";
+        await report2(setupToken, "failed", message.slice(0, 400), code);
         throw err;
       }
     }
@@ -8205,7 +8520,7 @@ async function waitAndApply(setupToken, opts) {
       }).catch(() => null);
       if (state?.body?.folders_requested === true) {
         sentFolders = true;
-        opts.onProgress?.("\uD3F4\uB354\uB97C \uCC3E\uC544\uBCF4\uB294 \uC911\u2026");
+        opts.onProgress?.("Looking for note folders on this machine\u2026");
         const candidates = await folderCandidates();
         offered = candidates.map((c2) => c2.path);
         await apiRequest({
@@ -8236,7 +8551,7 @@ async function startSession(detected) {
   return body;
 }
 function detachChild(setupToken) {
-  const child = spawn2(process.execPath, [process.argv[1] ?? "", "setup", "--web"], {
+  const child = spawn3(process.execPath, [process.argv[1] ?? "", "setup", "--web"], {
     detached: true,
     stdio: ["pipe", "ignore", "ignore"],
     env: { ...process.env, [SETUP_CHILD_ENV]: "1" }
@@ -8255,7 +8570,7 @@ async function runSetupCloud(opts) {
   const session = await startSession(opts.detected);
   const intervalMs = Math.max(1, session.interval ?? 5) * 1e3;
   printHuman(`
-  \uC124\uCE58 \uCF54\uB4DC: ${c.bold(session.user_code)}
+  Setup code: ${c.bold(session.user_code)}
 `);
   const opened = opts.printUrl ? false : await openBrowser(session.setup_url);
   const foreground = opts.wait || process.stdout.isTTY === true && process.stderr.isTTY === true;
@@ -8271,14 +8586,14 @@ async function runSetupCloud(opts) {
       waiting: foreground
     },
     human: () => {
-      if (opened) printHuman("\uBE0C\uB77C\uC6B0\uC800\uC5D0 \uC124\uCE58 \uD654\uBA74\uC744 \uC5F4\uC5C8\uC5B4\uC694.");
+      if (opened) printHuman("Opened the setup screen in the browser.");
       else {
-        printHuman("\uBE0C\uB77C\uC6B0\uC800\uC5D0\uC11C \uC774 \uC8FC\uC18C\uB97C \uC5F4\uC5B4 \uC124\uCE58\uB97C \uB9C8\uCCD0 \uC8FC\uC138\uC694:\n");
+        printHuman("Open this link in a browser to finish the setup:\n");
         printHuman(`  ${session.setup_url}`);
       }
       printHuman(
         c.gray(
-          foreground ? "\n  \uD654\uBA74\uC5D0\uC11C \uB9C8\uCE58\uBA74 \uC5EC\uAE30\uC11C \uC774\uC5B4\uC11C \uC124\uCE58\uD560\uAC8C\uC694. \uAE30\uB2E4\uB9AC\uB294 \uAC78 \uBA48\uCD94\uB824\uBA74 Ctrl-C." : "\n  \uD654\uBA74\uC5D0\uC11C \uB9C8\uCE58\uBA74 \uC774 \uCEF4\uD4E8\uD130\uC5D0 \uC790\uB3D9\uC73C\uB85C \uC124\uCE58\uB3FC\uC694. \uCC3D\uC744 \uB2EB\uC544\uB3C4 \uAD1C\uCC2E\uC544\uC694."
+          foreground ? "\n  When the screen is done, the install continues here. Ctrl-C stops waiting." : "\n  When the screen is done, this machine installs on its own. This window can be closed."
         )
       );
     }
@@ -8296,7 +8611,7 @@ async function runSetupCloud(opts) {
     confirmUpload: interactive ? askBeforeUpload : null
   });
   if (outcome === "expired") {
-    const line = "\uC124\uCE58 \uD654\uBA74\uC774 \uB9CC\uB8CC\uB410\uC5B4\uC694. \uC544\uBB34\uAC83\uB3C4 \uBC14\uB00C\uC9C0 \uC54A\uC558\uC5B4\uC694 \u2014 `memgineering setup --web`\uC744 \uB2E4\uC2DC \uC2E4\uD589\uD558\uBA74 \uC0C8 \uD654\uBA74\uC774 \uC5F4\uB824\uC694.";
+    const line = "The setup screen expired and nothing was changed. `memgineering setup --web` opens a new one.";
     if (isJsonMode()) notice(JSON.stringify({ setup_web: "expired" }));
     else printHuman(c.gray(`
 ${line}`));
@@ -8304,10 +8619,10 @@ ${line}`));
   }
   if (isJsonMode()) notice(JSON.stringify({ setup_web: "applied" }));
   else {
-    printHuman(c.green("\n\uC124\uCE58\uB97C \uB9C8\uCCE4\uC5B4\uC694."));
+    printHuman(c.green("\nSetup finished."));
     printHuman(
       c.gray(
-        "  \uC9C0\uAE08 \uBC14\uB85C \uC4F8 \uC218 \uC788\uC5B4\uC694 \u2014 recall\uB3C4 remember\uB3C4 \uB429\uB2C8\uB2E4.\n  \uC0C8\uB85C \uC124\uCE58\uB41C \uC548\uB0B4\uBB38\uC740 \uB2E4\uC74C \uB300\uD654\uBD80\uD130 \uD568\uAED8 \uC2E4\uB824\uC694."
+        "  recall and remember work now.\n  The newly installed guidance is read from the next conversation on."
       )
     );
   }
@@ -8342,7 +8657,7 @@ async function askBeforeUpload(q) {
   const { yes } = await prompts6({
     type: "confirm",
     name: "yes",
-    message: `${q.path} \uC758 \uB178\uD2B8\uB97C ${q.email ?? "\uC774 \uACC4\uC815"} \uBE0C\uB808\uC778\uC73C\uB85C \uC62C\uB9B4\uAE4C\uC694?`,
+    message: `Upload the notes in ${q.path} to the brain on ${q.email ?? "this account"}?`,
     initial: false
   });
   return yes === true;
@@ -8377,8 +8692,8 @@ var init_setup_cloud = __esm({
 
 // src/commands/setup.ts
 import { createHash as createHash9 } from "crypto";
-import { access as access2, mkdir as mkdir15, readFile as readFile24 } from "fs/promises";
-import { dirname as dirname10, join as join25 } from "path";
+import { access as access2, mkdir as mkdir16, readFile as readFile25 } from "fs/promises";
+import { dirname as dirname10, join as join26 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { Command as Command40 } from "commander";
 import prompts5 from "prompts";
@@ -8403,10 +8718,11 @@ function setupCommand() {
     "after",
     [
       "",
-      "Chat apps with no shell \u2014 ChatGPT, Claude.ai, Claude Desktop, Cowork \u2014 need no",
-      `setup: add ${HOSTED_CONNECTOR_URL} as a custom connector in the app and`,
-      "sign in. It reads and writes the brain on your account (not a folder on this",
-      "machine)."
+      "Chat apps with no shell need no setup. They read and write the brain on your",
+      `account (not a folder on this machine) at ${HOSTED_CONNECTOR_URL}:`,
+      "  ChatGPT: Settings \u2192 Developer mode \u2192 add an MCP server with that URL, sign in.",
+      "  Claude.ai, Claude Desktop, Cowork: Customize \u2192 Connectors \u2192 Add custom",
+      "  connector with that URL, sign in."
     ].join("\n")
   ).action(async (opts) => {
     const detected = await detectTools();
@@ -8441,16 +8757,18 @@ function setupCommand() {
       dryRun: opts.dryRun === true
     });
     const mode = await resolveMode(opts);
-    const choice = mode.kind === "human" ? await askHuman(detected, opts) : fromFlags(detected, opts);
+    const recorded = mode.kind === "human" ? {} : await recordedChoices(detected);
+    const choice = mode.kind === "human" ? await askHuman(detected, opts) : fromFlags(detected, opts, recorded);
     const defaultsTaken = !mode.chosen ? [
-      ...opts.autoUpdate === void 0 ? ["auto-update: on"] : [],
+      // Only what nobody chose, here or on an earlier run.
+      ...opts.autoUpdate === void 0 && recorded.autoUpdate === void 0 ? ["auto-update: on"] : [],
       // Every callback this flag arms, named — on Claude Code and Codex
       // that is two (note summaries at session start, the user's own
       // rules before an edit), and saying only the first would be
       // reporting half of what was decided on their behalf. On Grok it
       // is one, at the end of a turn, and naming the other two there
       // reported callbacks that were never installed.
-      ...opts.hook === void 0 && choice?.hook ? hooksFor(choice.tools).map((h) => `${h.what}: on`) : []
+      ...opts.hook === void 0 && recorded.hook === void 0 && choice?.hook ? hooksFor(choice.tools).map((h) => `${h.what}: on`) : []
     ] : [];
     if (choice === null) {
       printHuman(c.yellow("Cancelled \u2014 nothing was changed."));
@@ -8716,6 +9034,7 @@ async function applySetup(choice, dryRun) {
       system: {
         ...cfg.system,
         autoUpdate: choice.autoUpdate,
+        ...choice.hookAnswer === void 0 ? {} : { hook: choice.hookAnswer },
         installed,
         // Stamped whether or not anything was rewritten. A run that finds every
         // file already current is exactly the run that must clear the notice —
@@ -8741,7 +9060,7 @@ async function applySetup(choice, dryRun) {
   }
   async function write2() {
     for (const tool of choice.tools) {
-      const hubPath = join25(agentHome(), tool.hubFile);
+      const hubPath = join26(agentHome(), tool.hubFile);
       const written = await injectBlock(
         hubPath,
         hub + tailFor(tool, choice.hook),
@@ -8756,8 +9075,8 @@ async function applySetup(choice, dryRun) {
       });
       if (!dryRun && written.after !== null) mark(hubPath, written.after);
       for (const skill of BRAND.subSkills) {
-        const content = await loadAsset(join25(skill, "SKILL.md"));
-        const path = join25(agentHome(), tool.skillsDir, skill, "SKILL.md");
+        const content = await loadAsset(join26(skill, "SKILL.md"));
+        const path = join26(agentHome(), tool.skillsDir, skill, "SKILL.md");
         const out = await writeIfDifferent(path, content, dryRun);
         results.push({
           tool: tool.label,
@@ -8830,6 +9149,23 @@ function globalInstallHint(reason, hooks) {
   return `${hooks ? "The hooks and the guide call" : "The guide tells your agent to run"} \`memgineering\` by name, and ${reason} \u2014
 so nothing reaches it until a global install exists: \`npm i -g memgineering\`. Nothing needs re-running after that.`;
 }
+async function recordedChoices(detected) {
+  const cfg = await loadConfig();
+  if (!isSetUp(cfg)) return {};
+  const hook = cfg.system.hook ?? await hooksArmed(detected);
+  return { autoUpdate: cfg.system.autoUpdate, ...hook === void 0 ? {} : { hook } };
+}
+async function hooksArmed(tools) {
+  const capable = tools.filter((t) => t.hooks && t.hooksFile);
+  if (capable.length === 0) return void 0;
+  for (const tool of capable) {
+    const raw = await readFile25(join26(agentHome(), ...(tool.hooksFile ?? "").split("/")), "utf8").catch(
+      () => ""
+    );
+    if (hooksFor([tool]).some((spec) => raw.includes(spec.signature))) return "on";
+  }
+  return "off";
+}
 async function resolveMode(opts) {
   if (opts.agent) return { kind: "agent", chosen: true };
   if (opts.human) {
@@ -8863,11 +9199,11 @@ async function detectTools() {
   const home = agentHome();
   const found = [];
   for (const tool of TOOLS) {
-    if (await exists2(join25(home, tool.dir))) found.push(tool);
+    if (await exists2(join26(home, tool.dir))) found.push(tool);
   }
   return found;
 }
-function fromFlags(detected, opts) {
+function fromFlags(detected, opts, recorded = {}) {
   const tools = opts.tools ? opts.tools.split(",").map((t) => t.trim().toLowerCase()).map((id) => {
     const tool = detected.find((t) => t.id === id);
     if (tool) return tool;
@@ -8886,14 +9222,16 @@ function fromFlags(detected, opts) {
       `${known.label} creates ~/${known.dir} the first time it runs. If it is installed, open it once, then run setup again. ${detectedList}`
     );
   }) : detected;
+  const hookAnswer = parseChoice(opts.hook, recorded.hook ?? "on", "--hook");
   return {
     tools,
-    autoUpdate: parseChoice(opts.autoUpdate, "on", "--auto-update"),
+    autoUpdate: parseChoice(opts.autoUpdate, recorded.autoUpdate ?? "on", "--auto-update"),
     errorTelemetry: opts.errorTelemetry === void 0 ? "undecided" : parseChoice(opts.errorTelemetry, "off", "--error-telemetry"),
     // Only Claude Code can run something at session start. For the others the
     // skill tells the agent to call resurface itself, which is why asking for
     // a hook there is not an error — it simply has nowhere to go.
-    hook: parseChoice(opts.hook, "on", "--hook") === "on" && tools.some((t) => t.hooks)
+    hook: hookAnswer === "on" && tools.some((t) => t.hooks),
+    hookAnswer
   };
 }
 function parseChoice(value, fallback, flag2) {
@@ -8952,17 +9290,19 @@ async function askHuman(detected, opts) {
     autoUpdate: answers.autoUpdate === false ? "off" : parseChoice(opts.autoUpdate, "on", "--auto-update"),
     // An aborted prompt is not an answer — undecided, never a silent yes.
     errorTelemetry: answers.errorTelemetry === void 0 ? "undecided" : answers.errorTelemetry ? "on" : "off",
-    hook: answers.hook !== false
+    hook: answers.hook !== false,
+    // Only a question that was put is an answer to record.
+    ...answers.hook === void 0 ? {} : { hookAnswer: answers.hook ? "on" : "off" }
   };
 }
 async function injectBlock(filePath, content, dryRun, weWroteThis) {
   const block = `${BRAND.hubMarkerStart}
 ${content.trimEnd()}
 ${BRAND.hubMarkerEnd}`;
-  const existing = await readFile24(filePath, "utf8").catch(() => null);
+  const existing = await readFile25(filePath, "utf8").catch(() => null);
   if (existing === null) {
     if (!dryRun) {
-      await mkdir15(dirname10(filePath), { recursive: true });
+      await mkdir16(dirname10(filePath), { recursive: true });
       await writeThenRename(filePath, `${block}
 `);
     }
@@ -9002,11 +9342,11 @@ function looksLikeOurGuide(text) {
   return text.includes("memgineering recall") && text.includes("memgineering remember");
 }
 async function writeIfDifferent(filePath, content, dryRun) {
-  const existing = await readFile24(filePath, "utf8").catch(() => null);
+  const existing = await readFile25(filePath, "utf8").catch(() => null);
   const after = fingerprint(content);
   if (existing === content) return { outcome: "unchanged", before: existing, after };
   if (!dryRun) {
-    await mkdir15(dirname10(filePath), { recursive: true });
+    await mkdir16(dirname10(filePath), { recursive: true });
     await writeThenRename(filePath, content);
   }
   return { outcome: existing === null ? "injected" : "updated", before: existing, after };
@@ -9017,8 +9357,8 @@ function hooksFor(tools) {
   );
 }
 async function installHook(spec, tool, dryRun) {
-  const settingsPath = join25(agentHome(), ...(tool.hooksFile ?? "").split("/"));
-  const raw = await readFile24(settingsPath, "utf8").catch(() => null);
+  const settingsPath = join26(agentHome(), ...(tool.hooksFile ?? "").split("/"));
+  const raw = await readFile25(settingsPath, "utf8").catch(() => null);
   let settings = {};
   if (raw !== null) {
     try {
@@ -9060,15 +9400,15 @@ async function installHook(spec, tool, dryRun) {
   }
   const next = { ...settings, hooks: { ...hooks, [spec.event]: existingGroups } };
   if (!dryRun) {
-    await mkdir15(dirname10(settingsPath), { recursive: true });
+    await mkdir16(dirname10(settingsPath), { recursive: true });
     await writeThenRename(settingsPath, `${JSON.stringify(next, null, 2)}
 `);
   }
   return raw === null ? "injected" : "updated";
 }
 async function removeHook(spec, tool, dryRun) {
-  const settingsPath = join25(agentHome(), ...(tool.hooksFile ?? "").split("/"));
-  const raw = await readFile24(settingsPath, "utf8").catch(() => null);
+  const settingsPath = join26(agentHome(), ...(tool.hooksFile ?? "").split("/"));
+  const raw = await readFile25(settingsPath, "utf8").catch(() => null);
   if (raw === null) return "unchanged";
   let parsed;
   try {
@@ -9092,7 +9432,7 @@ async function removeHook(spec, tool, dryRun) {
   return "removed";
 }
 async function loadAsset(relPath) {
-  const raw = await readFile24(join25(await assetRoot(), relPath), "utf8");
+  const raw = await readFile25(join26(await assetRoot(), relPath), "utf8");
   if (relPath === BRAND.hubFileName && raw.startsWith("---")) {
     const end = raw.indexOf("\n---", 4);
     if (end !== -1) return raw.slice(end + 4).trimStart();
@@ -9101,12 +9441,12 @@ async function loadAsset(relPath) {
 }
 async function assetRoot() {
   const here = dirname10(fileURLToPath3(import.meta.url));
-  const bundled = join25(here, "..", "assets");
-  if (await exists2(join25(bundled, BRAND.hubFileName))) return bundled;
+  const bundled = join26(here, "..", "assets");
+  if (await exists2(join26(bundled, BRAND.hubFileName))) return bundled;
   let dir = here;
   for (; ; ) {
-    const candidate = join25(dir, "packages", "skills");
-    if (await exists2(join25(candidate, BRAND.hubFileName))) return candidate;
+    const candidate = join26(dir, "packages", "skills");
+    if (await exists2(join26(candidate, BRAND.hubFileName))) return candidate;
     const parent = dirname10(dir);
     if (parent === dir) break;
     dir = parent;
@@ -9136,6 +9476,7 @@ var init_setup = __esm({
     init_setup_brain();
     init_setup_signin();
     init_config();
+    init_next_step();
     init_provenance();
     init_ui();
     init_version();
@@ -13040,34 +13381,21 @@ var BASE_FILES = [
 ];
 var HUB_PATH = "00_HUB/HUB.md";
 var TEMPLATE_SLOTS = 2;
-function capTemplates(cards, isTemplate) {
+function capTemplates(cards, isTemplate, inConflict = () => false) {
   const kept = [];
   const withheld = [];
   let templates = 0;
   for (const card of cards) {
-    if (isTemplate(card) && ++templates > TEMPLATE_SLOTS) withheld.push(card);
+    if (isTemplate(card) && !inConflict(card) && ++templates > TEMPLATE_SLOTS) withheld.push(card);
     else kept.push(card);
   }
   return { kept, withheld };
 }
-function bodyOf2(content) {
-  const stripped = content.replace(/^/, "");
-  const fence2 = /^---[ \t]*\r?\n[\s\S]*?\r?\n---[ \t]*(\r?\n|$)/.exec(stripped);
-  return (fence2 ? stripped.slice(fence2[0].length) : stripped).trim();
-}
-function templatesFor(path, current) {
-  const retired = ownEntry(RETIRED_BASE_TEMPLATES, path) ?? [];
-  return current === void 0 ? retired : [current, ...retired];
-}
 function isBaseFilePath(path) {
   return path.startsWith("01_BASE/");
 }
 function bodyStillTemplate(path, content) {
-  const template = ownEntry(files("brain"), path);
-  if (template === void 0) return false;
-  const body = bodyOf2(content);
-  if (body === "") return false;
-  return templatesFor(path, template).some((t) => body === bodyOf2(t));
+  return isTemplateBody(path, content);
 }
 async function scaffoldingAmong(adapter, notes) {
   const basePaths = new Set(BASE_FILES.map((f) => f.path));
@@ -13082,19 +13410,18 @@ async function scaffoldingAmong(adapter, notes) {
 async function untouchedHub(adapter, title) {
   const actual = await adapter.read(HUB_PATH).then((r) => r.content).catch(() => null);
   if (actual === null) return false;
-  return actual.trimEnd() === (files(title)[HUB_PATH] ?? "").trimEnd();
+  return asSaved2(actual) === asSaved2(files(title)[HUB_PATH] ?? "");
+}
+function asSaved2(text) {
+  const BOM3 = String.fromCharCode(65279);
+  return (text.startsWith(BOM3) ? text.slice(BOM3.length) : text).replace(/\r\n/g, "\n").trimEnd();
 }
 async function untouchedBase(adapter, paths) {
-  const templates = files("brain");
   const out = /* @__PURE__ */ new Set();
   await Promise.all(
     paths.map(async (path) => {
-      const template = ownEntry(templates, path);
-      if (template === void 0) return;
       const actual = await adapter.read(path).then((r) => r.content).catch(() => null);
-      if (actual === null) return;
-      const trimmed = actual.trimEnd();
-      if (templatesFor(path, template).some((t) => trimmed === t.trimEnd())) out.add(path);
+      if (actual !== null && isExactUntouchedBase(path, actual)) out.add(path);
     })
   );
   return out;
@@ -18239,7 +18566,7 @@ function onboardCommand() {
         ...survey.missing.length === 0 ? {} : { missing: survey.missing, missing_hint: MISSING_HINT },
         // Spelled out in the machine-readable form too, because an agent
         // parsing this is the one that has to do the asking.
-        how_to_write: 'Write the body with your own file tools, then `memgineering revise <path> --action reinforce --claim "<one line>" --summary "<what recall should show>"`. This is the one place editing a brain file directly is right, and only while it is still the template.'
+        how_to_write: 'Write the body with your own file tools, then `memgineering revise <path> --action reinforce --claim "<one line>" --summary "<what recall should show>"`. This is the one place editing a brain file directly is right, and only while its body has not been written yet.'
       },
       human: () => {
         if (survey.unfilled.length === 0 && survey.missing.length === 0) {
@@ -18253,7 +18580,7 @@ function onboardCommand() {
           );
           return;
         }
-        printHuman(`${survey.heading}  (${survey.unfilled.length} of 5 still untouched)
+        printHuman(`${survey.heading}  (${survey.unfilled.length} of 5 still to write)
 `);
         if (survey.unfilled.length > 0) {
           printHuman(
@@ -18294,21 +18621,23 @@ function onboardCommand() {
 var MISSING_HINT = "A note that does not exist cannot be revised into \u2014 `revise` answers `ref_not_found`. `memgineering create <name>` writes the base notes into a brain that holds nothing but its own scaffolding. A brain that already holds other notes takes them from a folder: `memgineering init <folder>` then `memgineering push --brain <name>`, which skips every path already up there.";
 async function localSurvey(where) {
   const adapter = await openBrainOrExplain(where.brain.root);
-  const untouched = await untouchedBase(
-    adapter,
-    BASE_FILES.map((f) => f.path)
+  const unwritten = /* @__PURE__ */ new Set();
+  await Promise.all(
+    BASE_FILES.map(async (f) => {
+      const content = await adapter.read(f.path).then((r) => r.content).catch(() => null);
+      if (content !== null && isUnwrittenBody(f.path, content)) unwritten.add(f.path);
+    })
   );
   return {
     identity: { brain: where.brain.root },
     heading: "## onboard",
-    unfilled: BASE_FILES.filter((f) => untouched.has(f.path)),
-    // A file that is not there reads as written here, and that is the shipped
-    // behaviour rather than a decision taken now: `untouchedBase` cannot tell
-    // "somebody wrote in it" from "it is gone", because both fail the
-    // byte-equality test (`lib/base-files.ts`). `init` writes all five, so the
-    // state does not arise on a folder brain. The hosted half CAN arrive
-    // without them, which is why it answers the question separately.
-    filled: BASE_FILES.filter((f) => !untouched.has(f.path)).map((f) => f.path),
+    unfilled: BASE_FILES.filter((f) => unwritten.has(f.path)),
+    // A file that is not there reads as written here. That is a choice kept
+    // from before, not something this side cannot tell: `init` writes all
+    // five, so the state does not arise on a folder brain, and asking about a
+    // file that is gone would send an agent to revise a ref that does not
+    // exist. The hosted half CAN arrive without them, and says so (`missing`).
+    filled: BASE_FILES.filter((f) => !unwritten.has(f.path)).map((f) => f.path),
     missing: []
   };
 }
@@ -18317,7 +18646,7 @@ async function hostedSurvey(where) {
   const state = (file) => {
     const content = contents.get(file.path);
     if (content === void 0) return "missing";
-    return isUntouchedBase(file.path, content) ? "unfilled" : "filled";
+    return isUnwrittenBody(file.path, content) ? "unfilled" : "filled";
   };
   return {
     identity: { brain: where.name, brain_id: where.brainId },
@@ -22198,7 +22527,8 @@ function recallCommand() {
           })
         );
         isScaffolding = (card) => scaffolding.has(byId.get(card.id)?.path ?? "");
-        const capped2 = capTemplates(local.memory_cards, isScaffolding);
+        const sides = new Set(local.conflicts.flatMap((conflict) => conflict.between));
+        const capped2 = capTemplates(local.memory_cards, isScaffolding, (card) => sides.has(card.id));
         templatesWithheld = capped2.withheld.length;
         result = { ...local, memory_cards: capped2.kept };
         entries = built.entries;
@@ -22393,7 +22723,7 @@ ${unsearchedLocal.map(
           if (templatesWithheld > 0) {
             printHuman(
               c.gray(
-                `  ${templatesWithheld} more untouched template${templatesWithheld === 1 ? "" : "s"} matched and ${templatesWithheld === 1 ? "is" : "are"} not shown \u2014 at most ${TEMPLATE_SLOTS} per answer.
+                `  ${templatesWithheld} more untouched template${templatesWithheld === 1 ? "" : "s"} matched and ${templatesWithheld === 1 ? "is" : "are"} not shown \u2014 at most ${TEMPLATE_SLOTS} per answer, plus any that is one side of a conflict.
 `
               )
             );
@@ -23024,205 +23354,14 @@ init_setup();
 init_brand();
 init_version();
 init_config();
-import { spawn as spawn3 } from "child_process";
+init_next_step();
+init_provenance();
+import { spawn as spawn4 } from "child_process";
 import { randomBytes as randomBytes2 } from "crypto";
-import { mkdir as mkdir18, open, readFile as readFile27, stat as stat7, unlink as unlink4 } from "fs/promises";
+import { mkdir as mkdir18, open, readFile as readFile27, rename as rename4, rm as rm8, stat as stat7, unlink as unlink4, writeFile as writeFile15 } from "fs/promises";
 import { join as join28 } from "path";
 import { Command as Command41 } from "commander";
 
-// src/lib/next-step.ts
-init_brand();
-init_api_client();
-init_credentials();
-init_config();
-init_version();
-import { mkdir as mkdir16, readFile as readFile25, writeFile as writeFile13 } from "fs/promises";
-import { join as join26 } from "path";
-function isSetUp(cfg) {
-  return Object.keys(cfg.system.installed).length > 0;
-}
-var FINISH_SETUP = `## memgineering is installed, but not set up yet.
-
-Nothing is connected: there is no brain to read, and the agent tools on this
-machine have no memgineering guidance yet. Setup is one command:
-
-\`\`\`bash
-memgineering setup --web
-\`\`\`
-
-It does NOT wait for them. It returns in a few seconds \u2014 measured \u2014 and leaves
-a setup screen open in their browser at memgineering.com, where they choose
-everything: signing in, where the memory lives, which notes. Nothing is
-installed until they finish there, and this machine picks it up on its own.
-
-If they have not already asked you to set it up, ask them first \u2014 it opens a
-browser window on their computer. Once you run it, tell them in their language
-that the setup screen is open. It prints a short code first: show it to them,
-because the screen asks them to compare it.
-
-No browser on this machine (a server, a container, a sandbox)? Run
-\`memgineering setup --web --print-url\` and give them the link to open on the
-computer they are actually sitting at.
-
-\`setup --agent\` answers every one of those questions on their behalf, and
-\`--no-login\` answers the biggest one \u2014 no account, so the memory cannot follow
-them to another machine. Use it only when they have said they would rather you
-decided, or when this machine cannot reach a browser and \`--print-url\` is no
-use to them either.
-
-Setup's output then says how to connect their brain \u2014 create one, pick one, or
-move existing notes up.
-
-The \`memgineering-setup\` skill covers what comes after.`;
-var SETUP_NUDGE = "memgineering is installed, but not set up yet. `memgineering setup --web` opens a setup screen in their browser and does NOT wait for them \u2014 ask them first unless they asked you to set it up.\nThe full notes: run `memgineering` on its own.";
-function connectedMarker(at) {
-  return join26(brandHome(), `setup-connected-shown-${at.replace(/[^0-9A-Za-z]/g, "")}`);
-}
-async function connectedNoticeShown(at) {
-  return readFile25(connectedMarker(at), "utf8").then(
-    () => true,
-    () => false
-  );
-}
-async function markConnectedNoticeShown(at) {
-  try {
-    await mkdir16(brandHome(), { recursive: true });
-    await writeFile13(connectedMarker(at), `${(/* @__PURE__ */ new Date()).toISOString()}
-`);
-  } catch {
-  }
-}
-async function claimFullSetupNotice() {
-  const marker = join26(brandHome(), "setup-notice-shown");
-  try {
-    await readFile25(marker, "utf8");
-    return false;
-  } catch {
-  }
-  try {
-    await mkdir16(brandHome(), { recursive: true });
-    await writeFile13(marker, `${(/* @__PURE__ */ new Date()).toISOString()}
-`);
-  } catch {
-  }
-  return true;
-}
-var REFRESH_GUIDANCE = `## The guidance in your agent tools is older than this memgineering.
-
-The hub and skills this CLI installs into your tool's home were written by an
-earlier release. One command rewrites them:
-
-\`\`\`bash
-memgineering setup
-\`\`\`
-
-It does not change which brain this machine reads, or any note. Two things it
-does change, both worth knowing before it runs:
-
-- A setup-owned file your user edited is overwritten; setup names it afterwards.
-- Run with no flags where there is no terminal (an agent's shell), it applies
-  setup's defaults over whatever they chose before: auto-update on, its hooks
-  on, every agent tool it finds \u2014 and on a machine not signed in, it starts a
-  sign-in and prints a code. To keep what they chose, pass it:
-  \`--auto-update off\`, \`--hook off\`, \`--no-login\` for a machine they keep
-  local, and \`--tools\` naming every tool they use (a tool left out keeps its
-  old guidance, and this notice stops appearing anyway).
-
-If you are not sure what they chose, ask them. If you run it,
-mention it to your user in one line: it is upkeep for a tool they already set
-up, and they should not have to discover it later.
-
-Guidance files are read at the start of a session, so what changes today
-arrives in the next one.`;
-var CONNECT_A_BRAIN = `## memgineering is set up, and no brain is connected.
-
-A brain is a folder of markdown notes. Until one is connected there is nothing
-to recall and nowhere to remember. Which folder is your user's choice; the
-command is one you can run for them:
-
-\`\`\`bash
-memgineering link <their-notes-folder>   # they already keep notes
-memgineering init <path>                 # they do not \u2014 creates one, laid out
-\`\`\`
-
-\`link\` reports what would be stored before anything is indexed. An existing
-folder needs no index and no frontmatter of its own \u2014 plain markdown is a brain.
-
-Then run \`memgineering onboard\`: it prints what to ask so the brain knows whose
-it is. A brain whose \`01_BASE/\` is still template text answers almost nothing.
-
-Read \`memgineering-setup\` for accounts and which of their tools this reaches.
-
-Synced instead? \`memgineering login\`, then \`memgineering create <name>\`.`;
-var POINT_AT_A_BRAIN = `## Signed in, and this machine reads no brain yet.
-
-\`memgineering brains\` lists what is on the account.
-\`memgineering use --brain <name>\` points this machine at one.
-\`memgineering create <name>\` makes one and points here, when the account has none yet.
-`;
-var UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function shellQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-function confirmUploadNotice(p) {
-  const who = p.account_email ?? "the account `setup --web` connected";
-  const brain = p.brain_id && UUID.test(p.brain_id) ? ` --brain ${p.brain_id}` : "";
-  return `## Notes are waiting to be uploaded \u2014 after a check.
-
-\`memgineering setup --web\` chose to upload \`${p.path}\` to a brain on **${who}**.
-This machine has not sent them: an upload decided on the setup screen waits
-until somebody here has seen which account would receive the notes.
-
-If that is your user's account, this uploads them:
-
-\`\`\`bash
-memgineering push --vault ${shellQuote(p.path)}${brain}
-\`\`\`
-
-If it is not, \`memgineering logout\` disconnects this machine from that account
-and nothing is uploaded. If you are not sure which it is, ask them.`;
-}
-function setupConnectedNotice(c2) {
-  const who = c2.email ?? "an account with no email on record";
-  return `## This machine is signed in as **${who}**.
-
-\`memgineering setup --web\` connected it to that account. If that is not your user's account,
-\`memgineering logout\` disconnects it, and nothing they write reaches that brain.`;
-}
-function nextStepFor(cfg, signedIn = false, seen = {}) {
-  if (cfg.system.pendingUpload) {
-    return { id: "confirm_upload", markdown: confirmUploadNotice(cfg.system.pendingUpload) };
-  }
-  if (cfg.system.setupConnected && !seen.connected) {
-    return { id: "setup_connected", markdown: setupConnectedNotice(cfg.system.setupConnected) };
-  }
-  if (signedIn && cfg.brain.cloud === void 0) {
-    return { id: "point_at_a_brain", markdown: POINT_AT_A_BRAIN };
-  }
-  if (isSetUp(cfg) && cfg.system.guidanceVersion !== VERSION) {
-    return { id: "refresh_guidance", markdown: REFRESH_GUIDANCE };
-  }
-  if (cfg.brain.cloud !== void 0 && cfg.brain.cloud.api_url === apiUrl()) return null;
-  if (!isSetUp(cfg)) return { id: "finish_setup", markdown: FINISH_SETUP };
-  if (cfg.brain.brains.length === 0 && cfg.brain.cloud === void 0) {
-    return { id: "connect_a_brain", markdown: CONNECT_A_BRAIN };
-  }
-  return null;
-}
-async function currentNextStep() {
-  try {
-    const stored = await readCredentials().catch(() => null);
-    const cfg = await loadConfig();
-    const connected = cfg.system.setupConnected ? await connectedNoticeShown(cfg.system.setupConnected.at) : false;
-    return nextStepFor(cfg, stored !== null && stored.api_url === apiUrl(), { connected });
-  } catch {
-    return null;
-  }
-}
-
-// src/commands/update.ts
-init_provenance();
-
 // src/lib/update-check.ts
 init_atomic();
 init_brand();
@@ -23432,6 +23571,18 @@ async function runUpdate(opts, inherited) {
     return;
   }
   const held = await holdUpdateSlot(inherited);
+  if (held === null && await blockedBy() === "stuck") {
+    const lock = join28(brandHome(), RECLAIM_LOCK);
+    const hint = `A previous update did not finish, and clearing what it left is blocked by ${lock}. If no memgineering update is running, delete that folder and run \`memgineering update\` again.`;
+    printDual({
+      json: { ...status, provenance: provenance.kind, updated: false, reason: "update_claim_stuck", hint },
+      human: () => {
+        printHuman(`memgineering ${status.latest} is available, but a previous update's leftover claim could not be cleared.`);
+        printHuman(c.gray(hint));
+      }
+    });
+    return;
+  }
   if (held === null) {
     const started = (await claimOwner())?.split(" ")[0];
     const hint = "Another memgineering update is installing right now. Run `memgineering update` again in a few minutes \u2014 it reports whether that install worked.";
@@ -23487,10 +23638,10 @@ async function backgroundUpdateNotice(deps = {}) {
     const status = await (deps.check ?? checkForUpdate)(VERSION);
     await reportPreviousAttempt();
     if (status.updateAvailable && cfg.system.autoUpdate === "on" && isSetUp(cfg) && !process.env["CI"]) {
-      const provenance = await (deps.provenance ?? detectProvenance)();
+      const provenance = await (deps.provenance ?? (() => detectProvenance(void 0, { deadlineMs: BACKGROUND_PROBE_DEADLINE_MS })))();
       const token = newClaimToken();
       if (canSelfUpdate(provenance) && await claimUpdateSlot(token)) {
-        (deps.startUpdate ?? ((t) => startDetachedUpdate(spawn3, t)))(token);
+        (deps.startUpdate ?? ((t) => startDetachedUpdate(spawn4, t)))(token);
         notice(
           c.gray(
             `memgineering ${status.latest} is available \u2014 installing it in the background (auto-update is on). The next run uses it.`
@@ -23513,7 +23664,7 @@ async function backgroundUpdateNotice(deps = {}) {
   } catch {
   }
 }
-function startDetachedUpdate(spawnImpl = spawn3, token) {
+function startDetachedUpdate(spawnImpl = spawn4, token) {
   const child = spawnImpl(process.execPath, [process.argv[1] ?? "", "update"], {
     detached: true,
     stdio: "ignore",
@@ -23554,7 +23705,7 @@ async function holdUpdateSlot(inherited) {
 }
 var HOOK_VERBS = /* @__PURE__ */ new Set(["guard", "resurface"]);
 var UPDATE_CLAIM_MS = 15 * 6e4;
-async function claimUpdateSlot(token = newClaimToken()) {
+async function claimUpdateSlot(token = newClaimToken(), hooks = {}) {
   const path = join28(brandHome(), "update-running");
   try {
     await mkdir18(brandHome(), { recursive: true });
@@ -23567,17 +23718,86 @@ async function claimUpdateSlot(token = newClaimToken()) {
     if (err?.code !== "EEXIST") return false;
   }
   try {
-    if (Date.now() - (await stat7(path)).mtimeMs >= UPDATE_CLAIM_MS) await unlink4(path);
+    if (Date.now() - (await stat7(path)).mtimeMs >= UPDATE_CLAIM_MS) {
+      await hooks.afterObserve?.();
+      await withReclaimLock(async () => {
+        if (Date.now() - (await stat7(path)).mtimeMs < UPDATE_CLAIM_MS) return;
+        await hooks.afterRecheck?.();
+        await unlink4(path);
+      });
+    }
   } catch {
   }
   return false;
 }
+var RECLAIM_LOCK = "update-running.reclaim";
+var RECLAIM_LOCK_MAX_MS = 10 * 6e4;
+async function withReclaimLock(fn) {
+  const home = brandHome();
+  const lock = join28(home, RECLAIM_LOCK);
+  const staging = join28(home, `${RECLAIM_LOCK}.${process.pid}.${randomBytes2(4).toString("hex")}`);
+  await mkdir18(staging, { recursive: true });
+  await writeFile15(join28(staging, "owner"), `${process.pid} ${Date.now()}
+`);
+  try {
+    await rename4(staging, lock);
+  } catch {
+    await rm8(staging, { recursive: true, force: true }).catch(() => void 0);
+    await breakAbandonedLock(lock);
+    return null;
+  }
+  try {
+    return await fn();
+  } finally {
+    const aside = `${lock}.done.${randomBytes2(4).toString("hex")}`;
+    await rename4(lock, aside).then(() => rm8(aside, { recursive: true, force: true })).catch(() => void 0);
+  }
+}
+async function breakAbandonedLock(lock) {
+  try {
+    const seen = (await readFile27(join28(lock, "owner"), "utf8")).trim();
+    if (!lockAbandoned(seen)) return;
+    const aside = `${lock}.dead.${randomBytes2(4).toString("hex")}`;
+    await rename4(lock, aside);
+    const moved = (await readFile27(join28(aside, "owner"), "utf8").catch(() => "")).trim();
+    if (moved !== seen) {
+      await rename4(aside, lock).catch(() => void 0);
+      return;
+    }
+    await rm8(aside, { recursive: true, force: true });
+  } catch {
+  }
+}
+function lockAbandoned(owner, now = Date.now()) {
+  const [pidText, atText] = owner.split(" ");
+  const pid = Number(pidText);
+  const at = Number(atText);
+  if (!Number.isFinite(at) || now - at > RECLAIM_LOCK_MAX_MS) return true;
+  if (!Number.isInteger(pid) || pid <= 0) return true;
+  try {
+    process.kill(pid, 0);
+    return false;
+  } catch (err) {
+    return err?.code !== "EPERM";
+  }
+}
+async function blockedBy() {
+  try {
+    const old = Date.now() - (await stat7(join28(brandHome(), "update-running"))).mtimeMs >= UPDATE_CLAIM_MS;
+    if (old) {
+      await stat7(join28(brandHome(), RECLAIM_LOCK));
+      return "stuck";
+    }
+  } catch {
+  }
+  return "in_progress";
+}
 async function reportPreviousAttempt() {
   const previous = await readUpdateState();
   if (!previous || previous.ok) return;
   notice(
     c.yellow(`\u26A0 The last update attempt did not complete: ${previous.message}`) + c.gray(
-      "\n  `memgineering update` shows why. `memgineering setup --agent --auto-update off --hook <on|off>` stops\n  these attempts \u2014 name the hook setting you want kept, because `--agent` sets that too."
+      "\n  `memgineering update` shows why. `memgineering setup --agent --auto-update off` stops\n  these attempts; the hooks stay as this machine recorded them."
     )
   );
 }
@@ -23597,7 +23817,7 @@ function reportBelowMinimum(below) {
 
 // src/commands/undo.ts
 init_src();
-import { readFile as readFile28, rm as rm8 } from "fs/promises";
+import { readFile as readFile28, rm as rm9 } from "fs/promises";
 import { join as join29 } from "path";
 import { Command as Command42 } from "commander";
 init_atomic();
@@ -23767,7 +23987,7 @@ async function reverse(brain, op, current) {
         "Nothing to take back. `memgineering log` shows what this brain recorded."
       );
     }
-    await rm8(absolute, { force: true });
+    await rm9(absolute, { force: true });
     return null;
   }
   if (op.verb === "exclude" || op.verb === "unexclude") {
@@ -24301,6 +24521,7 @@ function whoamiCommand() {
 
 // src/program.ts
 init_config();
+init_next_step();
 init_ui();
 init_brand();
 
@@ -24491,8 +24712,14 @@ async function run3(argv) {
       process.stderr.isTTY === true ? "person" : cleaned[2] === void 0 ? "full" : "brief"
     );
   }
+  let ran;
+  program.hook("preAction", (_root, action) => {
+    let command = action;
+    while (command.parent && command.parent !== program) command = command.parent;
+    ran = command === program ? void 0 : command.name();
+  });
   await program.parseAsync(cleaned);
-  if (argv[2] !== "update") await backgroundUpdateNotice(argv[2] === void 0 ? {} : { verb: argv[2] });
+  if (ran !== "update") await backgroundUpdateNotice(ran === void 0 ? {} : { verb: ran });
 }
 async function handleError(err) {
   const failure = adaptRegistryError(err) ?? err;