@staff0rd/assist 0.962.0 → 0.963.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.962.0",
+  version: "0.963.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -6207,7 +6207,7 @@ var adviceConfigHelp = [
   {
     key: "advice.rules",
     setter: "assist rules add '<text>' --title '<title>' --user",
-    note: `listed under "Your rules"; user (db), user (node) and repo entries are concatenated in that order. --node writes ~/.assist.yml instead; 'assist config import-user' moves those into user (db)`
+    note: `listed under "Your rules"; user (db), user (node), repo (db) and repo (git) entries are concatenated in that order. --node writes ~/.assist.yml instead; 'assist config import-user' moves those into user (db)`
   }
 ];
 
@@ -6215,7 +6215,7 @@ var adviceConfigHelp = [
 var askQuestionConfigHelp = [
   {
     key: "sessions.askQuestion",
-    setter: "assist config set sessions.askQuestion true -g",
+    setter: "assist config set sessions.askQuestion true --node",
     note: "opt in: assist ask-question answers AskUserQuestion questions from the session's web preview pane; when on, assist cli-hook denies AskUserQuestion in assist sessions and an advice fragment points Claude at assist ask-question; when off it exits non-zero so Claude uses the built-in tool (default off)"
   }
 ];
@@ -6276,7 +6276,7 @@ var backupConfigHelp = [
 var autoUpdateConfigHelp = [
   {
     key: "autoUpdate.enabled",
-    setter: "assist config set autoUpdate.enabled false -g",
+    setter: "assist config set autoUpdate.enabled false --node",
     note: "when this install is a git clone, the daemon pulls and builds it in the background as origin moves (assist watch wait --pull --build), logging each lap to ~/.assist/watchers/; a branch that cannot fast-forward starts a claude session to reconcile it and the loop resumes once it closes. Set false to stop it (default on)"
   }
 ];
@@ -6317,8 +6317,8 @@ var complexityConfigHelp = [
 var configConfigHelp = [
   {
     key: "repos",
-    setter: "assist config set worktree.enabled true -g --repo",
-    note: "per-repo overrides stored in the shared db, keyed by repo identity and seen by every node that uses it; written by 'config set -g --repo [name]' or the web /config repo scope, and a yml repos: entry applies only until 'config import-repos' moves it"
+    setter: "assist config set worktree.enabled true --repo",
+    note: "repo (db): per-repo overrides stored in the shared db, keyed by repo identity and seen by every node that uses it; written by 'config set --repo [name]' or the web /config repo (db) scope, and a yml repos: entry applies only until 'config import-repos' moves it"
   }
 ];
 
@@ -6418,32 +6418,32 @@ var newsConfigHelp = [
 var nextConfigHelp = [
   {
     key: "next.peers",
-    setter: "assist config set next.peers alice,bob -g --repo",
+    setter: "assist config set next.peers alice,bob --repo",
     note: "GitHub logins whose open, non-draft PRs the web /next view lists for review alongside PRs requesting your review; PRs you approved with no newer commits are hidden"
   },
   {
     key: "next.repos",
-    setter: "assist config set next.repos my-org,other/web -g --repo",
+    setter: "assist config set next.repos my-org,other/web --repo",
     note: "GitHub repos the web /next view reads peer PRs and issues assigned to you from: owner/name for one repo, or a bare owner (org or user) for all its unarchived repos (default: the selected repo)"
   },
   {
     key: "next.projects",
-    setter: "assist config set next.projects my-org/3,my-org/5 -g --repo",
+    setter: "assist config set next.projects my-org/3,my-org/5 --repo",
     note: "GitHub Projects (owner/number, from each URL) the web /next view suggests unassigned issues to pick up from; needs the gh project scope"
   },
   {
     key: "next.pickStatuses",
-    setter: "assist config set next.pickStatuses Ready,Todo -g --repo",
+    setter: "assist config set next.pickStatuses Ready,Todo --repo",
     note: "Project Status values whose unassigned items the web /next view offers to pick up (default: Ready, Todo)"
   },
   {
     key: "next.excludeLabels",
-    setter: "assist config set next.excludeLabels blocked,spike -g --repo",
+    setter: "assist config set next.excludeLabels blocked,spike --repo",
     note: "Labels whose project items the web /next view never offers to pick up (case-insensitive)"
   },
   {
     key: "next.excludeTypes",
-    setter: "assist config set next.excludeTypes Epic -g --repo",
+    setter: "assist config set next.excludeTypes Epic --repo",
     note: "GitHub issue types whose project items the web /next view never offers to pick up (case-insensitive)"
   }
 ];
@@ -6577,7 +6577,7 @@ var reviewConfigHelp = [
 
 // src/commands/sync/printAutoConfirmHint.ts
 import chalk8 from "chalk";
-var autoConfirmHintCommand = "assist config set sync.autoConfirm true --global";
+var autoConfirmHintCommand = "assist config set sync.autoConfirm true --node";
 function printAutoConfirmHint() {
   console.log(
     chalk8.dim(
@@ -6666,7 +6666,7 @@ var nodesConfigHelp = [
   },
   {
     key: "sessions.linkVersionCheck",
-    setter: "assist config set sessions.linkVersionCheck block -g",
+    setter: "assist config set sessions.linkVersionCheck block --node",
     note: "reaction when a linked node's protocol range doesn't overlap this node's (app versions may differ; never restarts a peer): block (default) holds the link version-blocked until the older node is updated, warn proceeds, off skips the check"
   }
 ];
@@ -6716,7 +6716,7 @@ var EXAMPLES = {
 };
 var hotkeysConfigHelp = Object.keys(ACTIONS).map((name) => ({
   key: `sessions.hotkeys.${name}`,
-  setter: `assist config set sessions.hotkeys.${name} ${EXAMPLES[name] ?? defaultHotkeys[name][0]} -g`,
+  setter: `assist config set sessions.hotkeys.${name} ${EXAMPLES[name] ?? defaultHotkeys[name][0]} --node`,
   note: `${ACTIONS[name]}; default ${defaultHotkeys[name].join(" / ")}`
 }));
 
@@ -6724,52 +6724,52 @@ var hotkeysConfigHelp = Object.keys(ACTIONS).map((name) => ({
 var sessionsConfigHelp = [
   {
     key: "sessions.nodeName",
-    setter: "assist config set sessions.nodeName <name> -g",
+    setter: "assist config set sessions.nodeName <name> --node",
     note: "this install's node label, shown in the web UI hamburger menu and reported by /api/health (default: OS hostname, with -wsl under WSL)"
   },
   {
     key: "sessions.includeCommittedChanges",
-    setter: "assist config set sessions.includeCommittedChanges false -g",
+    setter: "assist config set sessions.includeCommittedChanges false --node",
     note: "default on: session card counts, /diff and the diff scope picker span the commits recorded against the session's backlog item as well as uncommitted work, so they survive the agent committing. Set false to show only uncommitted changes"
   },
   {
     key: "sessions.maxLive",
-    setter: "assist config set sessions.maxLive 24 -g",
+    setter: "assist config set sessions.maxLive 24 --node",
     note: "ceiling on concurrent live sessions one daemon holds; spawning past it is refused, and restore respawns at most this many persisted sessions (default: 24)"
   },
   {
     key: "sessions.newSessionMode",
-    setter: "assist config set sessions.newSessionMode bug -g",
+    setter: "assist config set sessions.newSessionMode bug --node",
     note: "default mode pre-selected in the Ctrl+N new session dialog: draft | bug | prompt | design (default: draft)"
   },
   {
     key: "worktree.enabled",
-    setter: "assist config set worktree.enabled true -g --repo",
+    setter: "assist config set worktree.enabled true --repo",
     note: "opt in per repo: every session spills into a fresh adjacent <clone>-N worktree and the clone itself is never allocated; only inPlace launches (e.g. PR Review) and agents joining a stream stay in their tree (default off)"
   },
   {
     key: "worktree.trunk",
-    setter: "assist config set worktree.trunk true -g --repo",
+    setter: "assist config set worktree.trunk true --repo",
     note: "trunk-based: a worktree's branch tracks origin/<the clone's branch> so commits land on the mainline (default off: a worktree starts off the remote default with no mainline tracking, so the session raises its own branch and PR)"
   },
   {
     key: "worktree.root",
-    setter: "assist config set worktree.root ~/git -g --repo",
+    setter: "assist config set worktree.root ~/git --repo",
     note: "optional; parent dir for <clone>-N worktrees (default: the clone's parent)"
   },
   {
     key: "worktree.install",
-    setter: "assist config set worktree.install true -g --repo",
+    setter: "assist config set worktree.install true --repo",
     note: `per-worktree dep install: true auto-detects the package manager (npm ci when a package-lock.json exists), or give an explicit command; false to skip; or a JSON list of paths (e.g. '[".","packages/ui"]') to auto-detect and install in each, in order, stopping at the first failure`
   },
   {
     key: "worktree.commitBeforePhaseEnd",
-    setter: "assist config set worktree.commitBeforePhaseEnd true -g --repo",
+    setter: "assist config set worktree.commitBeforePhaseEnd true --repo",
     note: "phase prompts run /commit once verify passes \u2014 before asking the user to perform manual checks, or before phase-done when the phase has none \u2014 so work is not left uncommitted in a reapable worktree (default off)"
   },
   {
     key: "worktree.copy",
-    setter: "assist config set worktree.copy .env,.claude/settings.local.json -g --repo",
+    setter: "assist config set worktree.copy .env,.claude/settings.local.json --repo",
     note: "gitignored files copied into a new worktree so it can build/run"
   }
 ];
@@ -6778,12 +6778,12 @@ var sessionsConfigHelp = [
 var webConfigHelp = [
   {
     key: "sessions.tailscaleServe",
-    setter: "assist config set sessions.tailscaleServe false -g",
+    setter: "assist config set sessions.tailscaleServe false --node",
     note: "default on: the web server exposes its port on the tailnet with tailscale serve when it starts, so other nodes can link it by Tailscale name; set false to keep it off the tailnet"
   },
   {
     key: "extension.redirects",
-    setter: "assist config set extension.redirects.<owner>/<repo> <owner>/<repo> -g",
+    setter: "assist config set extension.redirects.<owner>/<repo> <owner>/<repo> --node",
     note: "maps a GitHub owner/repo to the owner/repo whose clone under clone.baseDir hosts the browser extension's issue sessions; the prompt keeps the original link, and PR review sends are not redirected"
   }
 ];
@@ -6907,6 +6907,20 @@ function isGlobalOnlyConfigKey(key) {
   return GLOBAL_ONLY_KEYS.some((k) => key.startsWith(k));
 }
 
+// src/commands/config/isNodeOnlyConfigKey.ts
+var DB_EXCLUDED_ROOTS = ["repos", "database"];
+function isNodeOnlyConfigKey(key) {
+  const root2 = key.split(".")[0];
+  return isGlobalOnlyConfigKey(key) || DB_EXCLUDED_ROOTS.includes(root2);
+}
+
+// src/commands/config/configWritableScopes.ts
+function configWritableScopes(key) {
+  if (isGlobalOnlyConfigKey(key)) return ["global"];
+  if (isNodeOnlyConfigKey(key)) return ["project", "repo", "global"];
+  return void 0;
+}
+
 // src/commands/config/resolveConfigSources.ts
 function resolveConfigSources(key, layers) {
   const sources = [];
@@ -6924,6 +6938,7 @@ function configEntryFor(leaf, { config, layers, globalConfigFile, schema: schema
   const sources = resolveConfigSources(leaf.key, layers);
   const node = configEntryNode(schema2, leaf.key);
   const help = configHelpForKey(leaf.key);
+  const writableScopes = configWritableScopes(leaf.key);
   return {
     ...leaf,
     ...help ? { note: help.note, setter: help.setter } : {},
@@ -6935,7 +6950,7 @@ function configEntryFor(leaf, { config, layers, globalConfigFile, schema: schema
     ...layers.repoKey ? { repoKey: layers.repoKey } : {},
     ...layers.repoSource ? { repoSource: layers.repoSource } : {},
     globalConfigFile,
-    globalOnly: isGlobalOnlyConfigKey(leaf.key),
+    ...writableScopes ? { writableScopes } : {},
     node
   };
 }
@@ -6977,7 +6992,7 @@ function isDbBackedConfigKey(key) {
   return Object.hasOwn(dbBackedConfigKeys, key);
 }
 function dbBackedRepoError(key) {
-  return `"${key}" is stored in the database and shared by every repo; drop --repo`;
+  return `"${key}" is stored in user (db) and shared by every repo; drop --repo`;
 }
 
 // src/commands/config/setNestedValue.ts
@@ -7048,17 +7063,15 @@ async function withDbBackedConfigValues(config, keys) {
 }
 
 // src/commands/config/withDbBackedConfigEntries.ts
-var DB_BACKED_CONFIG_FILE = "the shared db (all nodes)";
 function dbBackedEntry(entry, value) {
   const set = value !== void 0;
   return {
     ...entry,
     value: set ? value : entry.defaultValue,
-    source: set ? "global" : "default",
-    sources: set ? ["global"] : [],
-    layers: set ? { global: value } : {},
-    globalConfigFile: DB_BACKED_CONFIG_FILE,
-    globalOnly: true
+    source: set ? "user" : "default",
+    sources: set ? ["user"] : [],
+    layers: set ? { user: value } : {},
+    writableScopes: ["user"]
   };
 }
 async function withDbBackedConfigEntries(entries) {
@@ -10969,25 +10982,31 @@ async function nodeDoctor(req, res) {
   respondJson(res, 200, { hop: await firstBrokenHop(link3) ?? null });
 }
 
+// src/commands/config/configScopeNames.ts
+var configScopeNames = {
+  project: "repo (git)",
+  repo: "repo (db)",
+  global: "user (node)",
+  user: "user (db)"
+};
+
 // src/commands/config/applyDbBackedConfigWrite.ts
 async function applyDbBackedConfigWrite(key, scope, write) {
-  if (scope !== "global")
+  const target = configScopeNames.user;
+  if (scope !== "user")
     return {
       ok: false,
-      errors: [`"${key}" is stored in the shared db; save it globally`]
+      errors: [`"${key}" is stored in ${target}; save it there`]
     };
   const handler = dbBackedConfigKeys[key];
   const db = await getDb();
   if ("unset" in write)
     return {
       ok: true,
-      payload: {
-        target: DB_BACKED_CONFIG_FILE,
-        removed: await handler.unset(db)
-      }
+      payload: { target, removed: await handler.unset(db) }
     };
   await handler.write(db, write.value);
-  return { ok: true, payload: { target: DB_BACKED_CONFIG_FILE } };
+  return { ok: true, payload: { target } };
 }
 
 // src/commands/config/coerceConfigScalar.ts
@@ -11213,7 +11232,7 @@ function applyConfigSet(key, coerced, global, cwd = process.cwd(), globalConfigP
     return {
       ok: false,
       errors: [
-        `"${key}" is a global-only key. Use --global to set it in ~/.assist.yml`
+        `"${key}" is a user (node)-only key. Use --node to set it in ~/.assist.yml`
       ]
     };
   }
@@ -11235,7 +11254,7 @@ function globalOnlyRepoKeyError(key, verb) {
   return {
     ok: false,
     errors: [
-      `"${key}" is a global-only key. ${verb} it in ~/.assist.yml rather than under repos:`
+      `"${key}" is a user (node)-only key. ${verb} it in ~/.assist.yml with --node rather than in repo (db)`
     ]
   };
 }
@@ -11342,10 +11361,10 @@ async function applySharedRepoConfigSet(key, coerced, repoName, cwd = process.cw
 
 // src/shared/db/updateUserConfig.ts
 import { eq as eq24 } from "drizzle-orm";
-async function updateUserConfig(orm, update3) {
+async function updateUserConfig(orm, update4) {
   return orm.transaction(async (tx) => {
     const [row3] = await tx.select().from(userConfig).where(eq24(userConfig.id, 1)).for("update");
-    const outcome = update3(row3?.config ?? {});
+    const outcome = update4(row3?.config ?? {});
     if (!outcome.ok) return outcome;
     if (Object.keys(outcome.config).length === 0) {
       await tx.delete(userConfig).where(eq24(userConfig.id, 1));
@@ -11360,17 +11379,12 @@ async function updateUserConfig(orm, update3) {
 }
 
 // src/commands/config/userDbKeyError.ts
-var DB_EXCLUDED_ROOTS = ["repos", "database"];
-function isNodeOnlyKey(key) {
-  const root2 = key.split(".")[0];
-  return isGlobalOnlyConfigKey(key) || DB_EXCLUDED_ROOTS.includes(root2);
-}
 function userDbKeyError(key, verb) {
-  if (!isNodeOnlyKey(key)) return void 0;
+  if (!isNodeOnlyConfigKey(key)) return void 0;
   return {
     ok: false,
     errors: [
-      `"${key}" can't be stored in user (db); it stays in user (node). ${verb} it in ~/.assist.yml with -g`
+      `"${key}" can't be stored in user (db); it stays in user (node). ${verb} it in ~/.assist.yml with --node`
     ]
   };
 }
@@ -11430,7 +11444,10 @@ async function parseConfigWriteRequest(req) {
   if (typeof cwd !== "string" || cwd === "")
     return { ok: false, error: "Missing cwd" };
   if (!isConfigWriteScope(scope))
-    return { ok: false, error: 'scope must be "project", "global" or "repo"' };
+    return {
+      ok: false,
+      error: 'scope must be "project", "repo", "global" or "user"'
+    };
   return { ok: true, key, value: body.value, cwd, scope };
 }
 
@@ -11564,7 +11581,7 @@ function applyConfigUnset(key, global, cwd = process.cwd(), globalConfigPath) {
     return {
       ok: false,
       errors: [
-        `"${key}" is a global-only key. Use --global to unset it in ~/.assist.yml`
+        `"${key}" is a user (node)-only key. Use --node to unset it in ~/.assist.yml`
       ]
     };
   }
@@ -21477,7 +21494,7 @@ function loadDenyConfig(global) {
 
 // src/commands/deny/denyAdd.ts
 function denyAdd(pattern2, message3, options2) {
-  const { deny, saveDeny } = loadDenyConfig(options2.global);
+  const { deny, saveDeny } = loadDenyConfig(options2.node);
   if (deny.some((r) => r.pattern === pattern2)) {
     console.log(chalk112.yellow(`Deny rule already exists for: ${pattern2}`));
     return;
@@ -21515,7 +21532,7 @@ function denyList() {
 // src/commands/deny/denyRemove.ts
 import chalk114 from "chalk";
 function denyRemove(pattern2, options2) {
-  const { deny, saveDeny } = loadDenyConfig(options2.global);
+  const { deny, saveDeny } = loadDenyConfig(options2.node);
   const index2 = deny.findIndex((r) => r.pattern === pattern2);
   if (index2 === -1) {
     console.log(chalk114.yellow(`No deny rule found for: ${pattern2}`));
@@ -21530,8 +21547,8 @@ function denyRemove(pattern2, options2) {
 function registerDeny(parent) {
   const denyCommand = parent.command("deny").description("Manage command deny rules").action(denyList);
   configHelp(denyCommand, denyConfigHelp);
-  denyCommand.command("add").description("Add a deny rule for a command pattern").argument("<pattern>", "Command prefix to deny").argument("<message>", "Correction message shown to the agent").option("-g, --global", "Write to global ~/.assist.yml").action(denyAdd);
-  denyCommand.command("remove").description("Remove a deny rule by pattern").argument("<pattern>", "Command prefix to remove").option("-g, --global", "Remove from global ~/.assist.yml").action(denyRemove);
+  denyCommand.command("add").description("Add a deny rule for a command pattern").argument("<pattern>", "Command prefix to deny").argument("<message>", "Correction message shown to the agent").option("--node", "Write to user (node): this node's ~/.assist.yml").action(denyAdd);
+  denyCommand.command("remove").description("Remove a deny rule by pattern").argument("<pattern>", "Command prefix to remove").option("--node", "Remove from user (node): this node's ~/.assist.yml").action(denyRemove);
   denyCommand.command("list").description("List all deny rules").action(denyList);
 }
 
@@ -23427,25 +23444,25 @@ import chalk136 from "chalk";
 async function setDbBackedConfigKey(key, value, useRepo) {
   if (useRepo) exitWithConfigErrors([dbBackedRepoError(key)]);
   await dbBackedConfigKeys[key].write(await getDb(), value);
-  console.log(chalk136.green(`Set ${key} = ${JSON.stringify(value)} (database)`));
+  console.log(chalk136.green(`Set ${key} = ${JSON.stringify(value)} (user (db))`));
 }
 
 // src/commands/config/setFileConfigKey.ts
 import chalk137 from "chalk";
-async function setFileConfigKey({ key, useRepo, repoName, global, user }, coerced) {
-  const target = useRepo ? `repo: ${await applyRepoOrExit(key, coerced, repoName)}` : user ? await applyUserOrExit(key, coerced) : applyOrExit(key, coerced, global);
+async function setFileConfigKey({ key, useRepo, repoName, node, user }, coerced) {
+  const target = useRepo ? `${configScopeNames.repo}: ${await applyRepoOrExit(key, coerced, repoName)}` : user ? await applyUserOrExit(key, coerced) : applyOrExit(key, coerced, node);
   const shown = JSON.stringify(maskConfigKeySecrets(key, coerced));
   console.log(chalk137.green(`Set ${key} = ${shown} (${target})`));
 }
-function applyOrExit(key, coerced, global) {
-  const result = applyConfigSet(key, coerced, global);
+function applyOrExit(key, coerced, node) {
+  const result = applyConfigSet(key, coerced, node);
   if (!result.ok) exitWithConfigErrors(result.errors);
-  return result.target;
+  return configScopeNames[result.target];
 }
 async function applyUserOrExit(key, coerced) {
   const result = await applyUserConfigSet(key, coerced);
   if (!result.ok) exitWithConfigErrors(result.errors);
-  return "user (db)";
+  return configScopeNames.user;
 }
 async function applyRepoOrExit(key, coerced, repoName) {
   const result = await applySharedRepoConfigSet(key, coerced, repoName);
@@ -23454,17 +23471,20 @@ async function applyRepoOrExit(key, coerced, repoName) {
 }
 
 // src/commands/config/scopeOptionsError.ts
-function scopeOptionsError(options2, repoAction) {
-  if (options2.user && (options2.global || options2.repo !== void 0))
-    return "--user writes user (db); drop -g and --repo";
-  if (options2.repo !== void 0 && !options2.global)
-    return `--repo ${repoAction} the global config; add -g (e.g. -g --repo)`;
+function scopeOptionsError(options2) {
+  const chosen = [
+    options2.repo !== void 0 && "--repo",
+    options2.node && "--node",
+    options2.user && "--user"
+  ].filter(Boolean);
+  if (chosen.length > 1)
+    return `${chosen.join(" and ")} pick different scopes; pass one: --repo for repo (db), --node for user (node), --user for user (db)`;
   return void 0;
 }
 
 // src/commands/config/configSet.ts
 async function configSet(key, value, options2 = {}) {
-  const scopeError = scopeOptionsError(options2, "writes to");
+  const scopeError = scopeOptionsError(options2);
   if (scopeError) exitWithConfigErrors([scopeError]);
   const resolved = resolveRepoTarget(key, value, options2.repo);
   if (resolved.value === void 0) {
@@ -23478,7 +23498,7 @@ async function configSet(key, value, options2 = {}) {
   await setFileConfigKey(
     {
       ...resolved,
-      global: options2.global ?? false,
+      node: options2.node ?? false,
       user: options2.user ?? false
     },
     coercion.value
@@ -23504,7 +23524,7 @@ async function unsetDbBackedConfigKey(key, useRepo) {
   if (useRepo) exitWithConfigErrors([dbBackedRepoError(key)]);
   const removed = await dbBackedConfigKeys[key].unset(await getDb());
   console.log(
-    removed ? chalk139.green(`Unset ${key} (database)`) : chalk139.yellow(`${key} is not set in the database`)
+    removed ? chalk139.green(`Unset ${key} (user (db))`) : chalk139.yellow(`${key} is not set in user (db)`)
   );
 }
 
@@ -23514,31 +23534,26 @@ async function unsetFileConfigKey({
   key,
   useRepo,
   repoName,
-  global,
+  node,
   user
 }) {
-  const result = useRepo ? await applySharedRepoConfigUnset(key, repoName) : user ? await applyUserConfigUnset(key) : applyConfigUnset(key, global);
+  const result = useRepo ? await applySharedRepoConfigUnset(key, repoName) : user ? await applyUserConfigUnset(key) : applyConfigUnset(key, node);
   if (!result.ok) exitWithConfigErrors(result.errors);
   if (!result.removed) {
-    console.log(chalk140.yellow(`${key} is not set in ${whereLabel(result)}`));
+    console.log(chalk140.yellow(`${key} is not set in ${targetLabel(result)}`));
     return;
   }
   console.log(chalk140.green(`Unset ${key} (${targetLabel(result)})`));
 }
-function whereLabel(result) {
-  if (result.target === "repo") return `repos.${result.label}`;
-  if (result.target === "user") return "user (db)";
-  return `the ${result.target} config`;
-}
 function targetLabel(result) {
-  if (result.target === "repo") return `repo: ${result.label}`;
-  if (result.target === "user") return "user (db)";
-  return result.target;
+  if (result.target === "repo")
+    return `${configScopeNames.repo}: ${result.label}`;
+  return configScopeNames[result.target];
 }
 
 // src/commands/config/configUnset.ts
 async function configUnset(key, options2 = {}) {
-  const scopeError = scopeOptionsError(options2, "removes from");
+  const scopeError = scopeOptionsError(options2);
   if (scopeError) exitWithConfigErrors([scopeError]);
   const resolved = resolveRepoUnsetTarget(key, options2.repo);
   if (resolved.key === void 0) {
@@ -23552,24 +23567,28 @@ async function configUnset(key, options2 = {}) {
     key: resolved.key,
     useRepo: resolved.useRepo,
     repoName: resolved.repoName,
-    global: options2.global ?? false,
+    node: options2.node ?? false,
     user: options2.user ?? false
   });
 }
 
 // src/commands/config/registerConfigWrites.ts
 function registerConfigWrites(configCommand) {
-  configCommand.command("set <key> [value]").description("Set a config value (e.g. commit.push true)").option("-g, --global", "Write to global ~/.assist.yml").option(
-    "-r, --repo [name]",
-    "Requires -g: write a repo's override to the shared db, seen by every node (defaults to the current repo)"
+  configCommand.command("set <key> [value]").description(
+    "Set a config value (e.g. commit.push true); with no scope flag it writes repo (git), this repo's assist.yml"
   ).option(
+    "-r, --repo [name]",
+    "Write to repo (db): a repo's override in the shared db, seen by every node (defaults to the current repo)"
+  ).option("--node", "Write to user (node): this node's ~/.assist.yml").option(
     "-u, --user",
     "Write to user (db): the shared db, applied to every repo on every node"
   ).action((key, value, options2) => configSet(key, value, options2));
-  configCommand.command("unset [key]").description("Remove a config value (e.g. commit.push)").option("-g, --global", "Remove from global ~/.assist.yml").option(
+  configCommand.command("unset [key]").description(
+    "Remove a config value (e.g. commit.push); with no scope flag it removes it from repo (git), this repo's assist.yml"
+  ).option(
     "-r, --repo [name]",
-    "Requires -g: remove the key from a repo's shared db override (defaults to the current repo)"
-  ).option("-u, --user", "Remove from user (db) in the shared db").action((key, options2) => configUnset(key, options2));
+    "Remove from repo (db): a repo's override in the shared db (defaults to the current repo)"
+  ).option("--node", "Remove from user (node): this node's ~/.assist.yml").option("-u, --user", "Remove from user (db) in the shared db").action((key, options2) => configUnset(key, options2));
 }
 
 // src/commands/registerConfig.ts
@@ -29917,9 +29936,9 @@ async function saveMiroExtract(name, extract2, options2, paths = {}) {
     cwd: paths.cwd ?? process.cwd(),
     globalConfigPath: paths.globalConfigPath ?? getGlobalConfigPath()
   };
-  if (options2.repo !== void 0 && !options2.global)
+  if (options2.repo !== void 0 && options2.node)
     throw new MiroExtractError(
-      "--repo writes to the global config; add -g (e.g. -g --repo)"
+      "--repo writes repo (db) and --node writes user (node); pass one"
     );
   const key = `miro.extracts.${name}`;
   if (options2.repo !== void 0)
@@ -29927,7 +29946,7 @@ async function saveMiroExtract(name, extract2, options2, paths = {}) {
   const result = applyConfigSet(
     key,
     extract2,
-    options2.global ?? false,
+    options2.node ?? false,
     resolved.cwd,
     resolved.globalConfigPath
   );
@@ -30194,9 +30213,12 @@ function registerMiro(program) {
   ).option(
     "--save <name>",
     "Save the selection as this named extract without asking"
-  ).option("-g, --global", "Save the extract to global ~/.assist.yml").option(
+  ).option(
+    "--node",
+    "Save the extract to user (node), this node's ~/.assist.yml"
+  ).option(
     "-r, --repo [name]",
-    "Requires -g: save the extract to a repo's shared db override instead (defaults to the current repo)"
+    "Save the extract to repo (db), a repo's shared db override (defaults to the current repo)"
   ).action(
     (name, options2) => runExtract(name, options2)
   );
@@ -30651,8 +30673,8 @@ function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
 }
 
 // src/commands/netcap/collectVoyagerAttributes.ts
-function attributeDetails(update3) {
-  const attrs = asObject(asObject(update3.commentary)?.text)?.attributesV2;
+function attributeDetails(update4) {
+  const attrs = asObject(asObject(update4.commentary)?.text)?.attributesV2;
   if (!Array.isArray(attrs)) return [];
   return attrs.map((a) => asObject(asObject(a)?.detailData)).filter((d) => d !== void 0);
 }
@@ -30679,23 +30701,23 @@ function hashtagsFrom(details) {
 function textLinksFrom(details) {
   return details.map((detail) => asObject(detail.textLink)?.url).filter((url) => typeof url === "string");
 }
-function articleCardLinksFrom(update3) {
-  const article = asObject(asObject(update3.content)?.articleComponent);
+function articleCardLinksFrom(update4) {
+  const article = asObject(asObject(update4.content)?.articleComponent);
   const url = asObject(article?.navigationContext)?.actionTarget;
   return typeof url === "string" ? [url] : [];
 }
-function linksFrom(update3, details) {
+function linksFrom(update4, details) {
   return dedupeLinks([
     ...textLinksFrom(details),
-    ...articleCardLinksFrom(update3)
+    ...articleCardLinksFrom(update4)
   ]);
 }
-function collectVoyagerAttributes(update3, profiles, authorSlug) {
-  const details = attributeDetails(update3);
+function collectVoyagerAttributes(update4, profiles, authorSlug) {
+  const details = attributeDetails(update4);
   return {
     mentions: mentionsFrom(details, profiles, authorSlug),
     hashtags: hashtagsFrom(details),
-    links: linksFrom(update3, details)
+    links: linksFrom(update4, details)
   };
 }
 
@@ -30706,8 +30728,8 @@ function profileSlug(actor) {
   if (typeof target !== "string") return void 0;
   return target.match(/\/in\/([^/?]+)/)?.[1];
 }
-function resolveVoyagerAuthor(update3) {
-  const actor = asObject(update3.actor);
+function resolveVoyagerAuthor(update4) {
+  const actor = asObject(update4.actor);
   const slug2 = profileSlug(actor);
   if (!slug2) return void 0;
   const name = asObject(actor?.name)?.text;
@@ -30717,24 +30739,24 @@ function resolveVoyagerAuthor(update3) {
 }
 
 // src/commands/netcap/buildVoyagerPost.ts
-function commentaryText(update3) {
-  const body = asObject(asObject(update3.commentary)?.text)?.text;
+function commentaryText(update4) {
+  const body = asObject(asObject(update4.commentary)?.text)?.text;
   return typeof body === "string" && body.trim() ? body.trim() : void 0;
 }
-function activityUrnOf(update3) {
-  const urn = asObject(update3.metadata)?.backendUrn;
+function activityUrnOf(update4) {
+  const urn = asObject(update4.metadata)?.backendUrn;
   return typeof urn === "string" ? urn : void 0;
 }
-function buildVoyagerPost(update3, profiles) {
-  const text18 = commentaryText(update3);
+function buildVoyagerPost(update4, profiles) {
+  const text18 = commentaryText(update4);
   if (!text18) return void 0;
-  const author = resolveVoyagerAuthor(update3);
+  const author = resolveVoyagerAuthor(update4);
   const { mentions, hashtags, links: links2 } = collectVoyagerAttributes(
-    update3,
+    update4,
     profiles,
     author?.slug
   );
-  const activityUrn = activityUrnOf(update3);
+  const activityUrn = activityUrnOf(update4);
   return {
     text: text18,
     markdown: linkifyMentions(text18, mentions),
@@ -30802,9 +30824,9 @@ function extractVoyagerPosts(body) {
   const profiles = voyagerProfileMentions(included);
   const posts = [];
   for (const ref of elementUrns(rootObj)) {
-    const update3 = byUrn.get(ref);
-    if (!update3) continue;
-    const post2 = buildVoyagerPost(update3, profiles);
+    const update4 = byUrn.get(ref);
+    if (!update4) continue;
+    const post2 = buildVoyagerPost(update4, profiles);
     if (post2) posts.push(post2);
   }
   return posts;
@@ -33971,7 +33993,7 @@ async function writeConfigKeys(writes, scope, cwd = process.cwd()) {
     return {
       ok: false,
       errors: globalOnly.map(
-        (write) => `"${write.key}" is a global-only key. Set it with 'assist config set ${write.key} <value> -g'`
+        (write) => `"${write.key}" is a user (node)-only key. Set it with 'assist config set ${write.key} <value> --node'`
       )
     };
   }
@@ -33979,7 +34001,7 @@ async function writeConfigKeys(writes, scope, cwd = process.cwd()) {
   const applied = applyConfigWrites(loadProjectConfig(cwd), writes);
   if (!applied.ok) return applied;
   saveConfig(applied.updated, cwd);
-  return { ok: true, target: "project assist.yml" };
+  return { ok: true, target: "repo (git), this repo's assist.yml" };
 }
 async function writeRepoBlock(writes, cwd) {
   const orm = await getDb();
@@ -33987,7 +34009,10 @@ async function writeRepoBlock(writes, cwd) {
   const applied = applyConfigWrites(block, writes, repoConfigSchema);
   if (!applied.ok) return applied;
   await saveSharedRepoBlock(orm, label, applied.updated);
-  return { ok: true, target: `${SHARED_REPO_CONFIG_SOURCE}, repo: ${label}` };
+  return {
+    ok: true,
+    target: `repo (db), ${SHARED_REPO_CONFIG_SOURCE}, repo: ${label}`
+  };
 }
 
 // src/commands/releases/declaredStreamsInScope.ts
@@ -37115,11 +37140,11 @@ async function promptConfigScope() {
       choices: [
         {
           name: "repo",
-          message: "this repo's override in the shared db \u2014 personal, seen by every node, as 'config set -g --repo' writes it"
+          message: "repo (db): this repo's override in the shared db \u2014 personal, seen by every node, as 'config set --repo' writes it"
         },
         {
           name: "project",
-          message: "assist.yml in this repo \u2014 checked in, shared with the team"
+          message: "repo (git): assist.yml in this repo \u2014 checked in, shared with the team"
         }
       ]
     }).run()
@@ -37840,15 +37865,15 @@ function checkDescriptionSections(body) {
 }
 
 // src/commands/review/highLevel/checkDescriptionWordCap.ts
-function checkDescriptionWordCap(body, cap2) {
+function checkDescriptionWordCap(body, cap3) {
   const { prose, code } = countReadingWords(body);
   const words = prose + code;
-  if (words > cap2)
+  if (words > cap3)
     return {
       status: "fail",
-      reason: `${words} words, ${words - cap2} over the ${cap2}-word cap`
+      reason: `${words} words, ${words - cap3} over the ${cap3}-word cap`
     };
-  return { status: "pass", reason: `${words} of ${cap2} words` };
+  return { status: "pass", reason: `${words} of ${cap3} words` };
 }
 
 // src/commands/review/highLevel/checkNoMergeConflicts.ts
@@ -45972,6 +45997,25 @@ function toSessionRunInfo({
   };
 }
 
+// src/commands/sessions/daemon/toSessionViewInfo.ts
+function toSessionViewInfo({
+  lastUserMessage,
+  lastAssistantMessage,
+  cols,
+  rows,
+  activeViewer,
+  activeViewerNode
+}) {
+  return {
+    lastUserMessage,
+    lastAssistantMessage,
+    cols,
+    rows,
+    activeViewer,
+    activeViewerNode
+  };
+}
+
 // src/commands/sessions/daemon/worktree/joinRefusal.ts
 import { existsSync as existsSync85 } from "fs";
 function joinRefusal(session) {
@@ -46006,13 +46050,11 @@ function toSessionInfo(session) {
     seeding,
     pendingPrPreview,
     pendingShow,
-    undurable,
-    lastUserMessage,
-    activeViewer,
-    activeViewerNode
+    undurable
   } = session;
   return {
     ...toSessionRunInfo(session),
+    ...toSessionViewInfo(session),
     id,
     name,
     title,
@@ -46035,9 +46077,6 @@ function toSessionInfo(session) {
     pendingPrPreview,
     pendingShow,
     undurable,
-    lastUserMessage,
-    activeViewer,
-    activeViewerNode,
     promptIssue: promptIssueRef(session.initialPrompt),
     promptPr: promptPrNumber(session.initialPrompt),
     joinable: joinRefusal(session) === void 0
@@ -46550,10 +46589,13 @@ var SessionIo = class {
   }
   writeAsDaemon = (id, data) => this.write(id, data, {});
   resize(id, cols, rows, viewer) {
+    const s = this.sessions.get(id);
+    const before = `${s?.cols}x${s?.rows}`;
     resizeSession(this.sessions, id, cols, rows, {
       ...viewer,
       onClaim: this.notify
     });
+    if (s && `${s.cols}x${s.rows}` !== before) this.notify();
   }
 };
 
@@ -48917,73 +48959,6 @@ function deriveTranscriptStatus(entries, opts = {}) {
   return "running";
 }
 
-// src/commands/sessions/shared/renderPrompt.ts
-function renderPrompt(raw) {
-  const command = marker(raw, "command-name");
-  if (command) {
-    const args = marker(raw, "command-args");
-    const name = `/${command.replace(/^\/+/, "")}`;
-    return args ? `${name} ${args}` : name;
-  }
-  const bashInput = marker(raw, "bash-input");
-  if (bashInput) return `! ${bashInput}`;
-  return stripBlocks(raw);
-}
-function marker(raw, tag) {
-  const match = raw.match(new RegExp(`<${tag}>([\\s\\S]*?)</${tag}>`));
-  return match ? match[1].trim() : "";
-}
-function stripBlocks(raw) {
-  return raw.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "").replace(/<task-notification>[\s\S]*?<\/task-notification>/g, "").replace(/<command-[^>]*>[\s\S]*?<\/command-[^>]*>/g, "").replace(/<local-command-[^>]*>[\s\S]*?<\/local-command-[^>]*>/g, "").replace(/<bash-(stdout|stderr)>[\s\S]*?<\/bash-\1>/g, "").trim();
-}
-
-// src/commands/sessions/shared/renderUserPrompt.ts
-var MAX_LENGTH = 2048;
-var INTERRUPT_PREFIX2 = "[Request interrupted";
-function renderUserPrompt(entry, maxLength = MAX_LENGTH) {
-  if (entry.isSidechain || entry.isMeta) return void 0;
-  if (entry.type !== "user" || isTaskNotification(entry)) return void 0;
-  const raw = promptTextOrNull(entry);
-  if (raw === null) return void 0;
-  const message3 = renderPrompt(raw);
-  return message3 ? cap(message3, maxLength) : void 0;
-}
-function isTaskNotification(entry) {
-  return asRecord4(entry.origin)?.kind === "task-notification";
-}
-function promptTextOrNull(entry) {
-  const content = asRecord4(entry.message)?.content;
-  if (typeof content === "string") return isInterrupt(content) ? null : content;
-  if (!Array.isArray(content)) return null;
-  const parts = [];
-  for (const block of content) {
-    const b = asRecord4(block);
-    if (b?.type !== "text") continue;
-    const text18 = typeof b.text === "string" ? b.text : "";
-    if (isInterrupt(text18)) return null;
-    parts.push(text18);
-  }
-  return parts.length === 0 ? null : parts.join("\n");
-}
-function cap(message3, maxLength) {
-  return message3.length <= maxLength ? message3 : `${message3.slice(0, maxLength).trimEnd()}\u2026`;
-}
-function isInterrupt(value) {
-  return value.trimStart().startsWith(INTERRUPT_PREFIX2);
-}
-function asRecord4(value) {
-  return value && typeof value === "object" ? value : null;
-}
-
-// src/commands/sessions/shared/extractLastUserMessage.ts
-function extractLastUserMessage(entries, maxLength) {
-  for (let i = entries.length - 1; i >= 0; i--) {
-    const message3 = renderUserPrompt(entries[i], maxLength);
-    if (message3) return message3;
-  }
-  return void 0;
-}
-
 // src/commands/sessions/shared/readTranscriptTail.ts
 import * as fs52 from "fs";
 var DEFAULT_MAX_BYTES = 256 * 1024;
@@ -49058,16 +49033,128 @@ function transcriptTailFingerprint(entries) {
   return null;
 }
 
-// src/commands/sessions/daemon/reconcileTranscriptStatus.ts
-function updateLastUserMessage(session, entries, notify2) {
-  const message3 = extractLastUserMessage(entries);
-  if (message3 === session.lastUserMessage) return;
-  session.lastUserMessage = message3;
+// src/commands/sessions/shared/extractLastAssistantMessage.ts
+var MAX_LENGTH = 500;
+function extractLastAssistantMessage(entries) {
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    if (entry.isSidechain || entry.type !== "assistant") continue;
+    const text18 = assistantText(entry);
+    if (text18) return cap(text18);
+  }
+  return void 0;
+}
+function assistantText(entry) {
+  const content = asRecord4(entry.message)?.content;
+  if (!Array.isArray(content)) return "";
+  const parts = [];
+  for (const block of content) {
+    const b = asRecord4(block);
+    if (b?.type === "text" && typeof b.text === "string" && b.text.trim())
+      parts.push(b.text.trim());
+  }
+  return parts.join("\n");
+}
+function cap(text18) {
+  return text18.length <= MAX_LENGTH ? text18 : `${text18.slice(0, MAX_LENGTH).trimEnd()}\u2026`;
+}
+function asRecord4(value) {
+  return value && typeof value === "object" ? value : null;
+}
+
+// src/commands/sessions/shared/renderPrompt.ts
+function renderPrompt(raw) {
+  const command = marker(raw, "command-name");
+  if (command) {
+    const args = marker(raw, "command-args");
+    const name = `/${command.replace(/^\/+/, "")}`;
+    return args ? `${name} ${args}` : name;
+  }
+  const bashInput = marker(raw, "bash-input");
+  if (bashInput) return `! ${bashInput}`;
+  return stripBlocks(raw);
+}
+function marker(raw, tag) {
+  const match = raw.match(new RegExp(`<${tag}>([\\s\\S]*?)</${tag}>`));
+  return match ? match[1].trim() : "";
+}
+function stripBlocks(raw) {
+  return raw.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "").replace(/<task-notification>[\s\S]*?<\/task-notification>/g, "").replace(/<command-[^>]*>[\s\S]*?<\/command-[^>]*>/g, "").replace(/<local-command-[^>]*>[\s\S]*?<\/local-command-[^>]*>/g, "").replace(/<bash-(stdout|stderr)>[\s\S]*?<\/bash-\1>/g, "").trim();
+}
+
+// src/commands/sessions/shared/renderUserPrompt.ts
+var MAX_LENGTH2 = 2048;
+var INTERRUPT_PREFIX2 = "[Request interrupted";
+function renderUserPrompt(entry, maxLength = MAX_LENGTH2) {
+  if (entry.isSidechain || entry.isMeta) return void 0;
+  if (entry.type !== "user" || isTaskNotification(entry)) return void 0;
+  const raw = promptTextOrNull(entry);
+  if (raw === null) return void 0;
+  const message3 = renderPrompt(raw);
+  return message3 ? cap2(message3, maxLength) : void 0;
+}
+function isTaskNotification(entry) {
+  return asRecord5(entry.origin)?.kind === "task-notification";
+}
+function promptTextOrNull(entry) {
+  const content = asRecord5(entry.message)?.content;
+  if (typeof content === "string") return isInterrupt(content) ? null : content;
+  if (!Array.isArray(content)) return null;
+  const parts = [];
+  for (const block of content) {
+    const b = asRecord5(block);
+    if (b?.type !== "text") continue;
+    const text18 = typeof b.text === "string" ? b.text : "";
+    if (isInterrupt(text18)) return null;
+    parts.push(text18);
+  }
+  return parts.length === 0 ? null : parts.join("\n");
+}
+function cap2(message3, maxLength) {
+  return message3.length <= maxLength ? message3 : `${message3.slice(0, maxLength).trimEnd()}\u2026`;
+}
+function isInterrupt(value) {
+  return value.trimStart().startsWith(INTERRUPT_PREFIX2);
+}
+function asRecord5(value) {
+  return value && typeof value === "object" ? value : null;
+}
+
+// src/commands/sessions/shared/extractLastUserMessage.ts
+function extractLastUserMessage(entries, maxLength) {
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const message3 = renderUserPrompt(entries[i], maxLength);
+    if (message3) return message3;
+  }
+  return void 0;
+}
+
+// src/commands/sessions/daemon/updateLastMessages.ts
+function update3(session, field, message3, label) {
+  if (message3 === session[field]) return false;
+  session[field] = message3;
   daemonLog(
-    `session ${session.id} last user message: ${JSON.stringify(message3?.slice(0, 120) ?? null)}`
+    `session ${session.id} last ${label} message: ${JSON.stringify(message3?.slice(0, 120) ?? null)}`
   );
-  notify2?.();
+  return true;
 }
+function updateLastMessages(session, entries, notify2) {
+  const user = update3(
+    session,
+    "lastUserMessage",
+    extractLastUserMessage(entries),
+    "user"
+  );
+  const assistant = update3(
+    session,
+    "lastAssistantMessage",
+    extractLastAssistantMessage(entries),
+    "assistant"
+  );
+  if (user || assistant) notify2?.();
+}
+
+// src/commands/sessions/daemon/reconcileTranscriptStatus.ts
 function isFinished(session) {
   return session.status === "done" || session.status === "error" || session.status === "stopped";
 }
@@ -49079,7 +49166,7 @@ async function reconcileTranscriptStatus(session, onStatusChange, notify2) {
   if (fingerprint !== null && fingerprint === session.transcriptFingerprint)
     return;
   session.transcriptFingerprint = fingerprint ?? void 0;
-  updateLastUserMessage(session, entries, notify2);
+  updateLastMessages(session, entries, notify2);
   if (isFinished(session)) return;
   const derived = deriveTranscriptStatus(entries, {
     permissionActive: session.permissionActive
@@ -49312,7 +49399,7 @@ var sessionLimits = {
         `refusing to spawn: at ceiling of ${ceiling} live sessions (sessions.maxLive)`
       );
       throw new Error(
-        `session ceiling of ${ceiling} reached \u2014 raise it with: assist config set sessions.maxLive <n> -g`
+        `session ceiling of ${ceiling} reached \u2014 raise it with: assist config set sessions.maxLive <n> --node`
       );
     }
     return String(counter.next++);
@@ -50063,7 +50150,7 @@ function restoreBase(id, persisted) {
 }
 
 // src/commands/sessions/daemon/deferredSession.ts
-function deferredSession(id, persisted, cap2) {
+function deferredSession(id, persisted, cap3) {
   return {
     ...restoreBase(id, persisted),
     status: "stopped",
@@ -50077,13 +50164,13 @@ function deferredSession(id, persisted, cap2) {
     runArgs: persisted.runArgs,
     activity: persisted.activity,
     restored: false,
-    scrollback: deferralNotice(persisted, cap2)
+    scrollback: deferralNotice(persisted, cap3)
   };
 }
-function deferralNotice(persisted, cap2) {
+function deferralNotice(persisted, cap3) {
   return [
     `\r
-\x1B[33mNot resumed: restore was already at its cap of ${cap2} session(s) (raise it with: assist config set sessions.maxLive <n> -g)\x1B[0m\r
+\x1B[33mNot resumed: restore was already at its cap of ${cap3} session(s) (raise it with: assist config set sessions.maxLive <n> --node)\x1B[0m\r
 `,
     `This card is the handle for it. Its command, working directory (${persisted.cwd})\r
 `,
@@ -50639,23 +50726,23 @@ function logRestoreError(persisted, error) {
 // src/commands/sessions/daemon/restoreAll.ts
 function restoreAll(spawner, sessions) {
   const persisted = dropUnrestorableSessions(loadPersistedSessions());
-  const cap2 = sessionLimits.maxRestore();
+  const cap3 = sessionLimits.maxRestore();
   const restoredIds = /* @__PURE__ */ new Map();
-  const names = persisted.slice(0, cap2).map((entry) => {
+  const names = persisted.slice(0, cap3).map((entry) => {
     const id = restoreOne(entry, spawner, sessions);
     if (entry.id != null && id != null) restoredIds.set(entry.id, id);
     return entry.name;
   });
-  for (const over of persisted.slice(cap2))
-    deferOne(over, spawner.recoveryCard, cap2);
+  for (const over of persisted.slice(cap3))
+    deferOne(over, spawner.recoveryCard, cap3);
   remapLaunchedFrom(sessions, restoredIds);
   return names;
 }
-function deferOne(persisted, spawnRecoveryCard, cap2) {
+function deferOne(persisted, spawnRecoveryCard, cap3) {
   try {
-    const id = spawnRecoveryCard((sid) => deferredSession(sid, persisted, cap2));
+    const id = spawnRecoveryCard((sid) => deferredSession(sid, persisted, cap3));
     daemonLog(
-      `restore capped at ${cap2} (sessions.maxLive): ${describePersistedSession(persisted)} deferred to stopped card ${id}`
+      `restore capped at ${cap3} (sessions.maxLive): ${describePersistedSession(persisted)} deferred to stopped card ${id}`
     );
   } catch (error) {
     logDroppedSession(persisted, error);