mergestorm 0.3.15 → 0.3.17

package/dist/commands/stack.js

@@ -1,4 +1,4 @@
-import { adoptStack, ensureUpperPark, landNextStack, listStacks, restackStack, } from "../api.js";
+import { adoptStack, ensureUpperPark, landNextStack, listStacks, restackStack, setStackPolicy, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { CommandError } from "../errors.js";
 import { createPr, findOpenPrNumber, requireGh } from "../gh.js";
@@ -6,7 +6,7 @@ import { parseGithubOriginRepo } from "../git.js";
 import { branchExists, commitsAheadOf, createBranchFromHead, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, fetchRemoteBranch, pushBranch, tipCommitMessage, tipCommitSubject, worktreeDirty, } from "../git-stack.js";
 import { buildPrBodyFromCommit } from "../pr-body.js";
 import { gitTopLevel } from "../repo-identity.js";
-import { activeLayers, appendLayer, emptyStackMeta, loadStackMeta, removeActiveStack, resetStackMeta, saveStackMeta, selectStackForCreate, } from "../stack-meta.js";
+import { activeLayers, appendLayer, emptyStackMeta, loadStackMeta, removeActiveStack, resetStackMeta, saveStackMeta, selectStackForCreate, setActivePolicy, } from "../stack-meta.js";
 import { isMgParkBranch, planSubmitLayerBases } from "../submit-pr-base.js";
 import { ansi } from "../ui/ansi.js";
 import { runLineTabsBrowser } from "../ui/line-tabs.js";
@@ -14,14 +14,18 @@ import { present } from "../ui/present.js";
 import { canBrowse } from "./browse.js";
 import { openHelpBrowser } from "./help.js";
 const STACK_USAGE = `usage:
-  mergestorm stack create [name] [--onto <branch>] [--trunk <branch>] [--extend] [--json]
-  mergestorm stack submit [--extend] [--json]
+  mergestorm stack create [name] [--onto <branch>] [--trunk <branch>] [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--json]
+  mergestorm stack submit [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--json]
   mergestorm stack reset --force
   mergestorm stack list [--json]
-  mergestorm stack adopt <owner/repo>#<pr>
+  mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--json]
+  mergestorm stack adopt <owner/repo>#<pr> [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--json]
   mergestorm stack restack <stack-id> [--json]
   mergestorm stack land <stack-id> [--json]
 
+  --auto-review / --auto-patch pin Vortex auto-review / Cyclone auto-patch for
+  one stack in either direction. Absent, or \`default\` on stack set, follows
+  the account setting.
   stack submit opens PRs with a body generated from each layer tip commit.
   Layers 1–2 use the git parent as GitHub base. Layer 3+ opens onto the
   review-unit park freeze (mg-park-*) so adopt does not retarget after open.
@@ -126,9 +130,25 @@ export function buildStackListLines(stacks) {
     lines.push(ansi.dim("  create · submit · land <id> · q to close"));
     return lines;
 }
+/** Short per-stack policy suffixes: Auto land when on, overrides when pinned. */
+export function stackPolicyLabels(s) {
+    const labels = [];
+    if (s.autoEnqueueWhenReady)
+        labels.push("auto-land on");
+    if (typeof s.autoReviewOverride === "boolean") {
+        labels.push(`auto-review ${s.autoReviewOverride ? "on" : "off"}`);
+    }
+    if (typeof s.autoPatchOverride === "boolean") {
+        labels.push(`auto-patch ${s.autoPatchOverride ? "on" : "off"}`);
+    }
+    return labels;
+}
 function formatStackHuman(s) {
     const lines = [];
-    lines.push(`  ${ansi.bold(`${s.owner}/${s.repo}`)}  trunk=${s.trunkBranch}`);
+    lines.push(`  ${ansi.bold(`${s.owner}/${s.repo}`)}  trunk=${s.trunkBranch}` +
+        stackPolicyLabels(s)
+            .map((label) => `  ${label}`)
+            .join(""));
     lines.push(`  ${ansi.dim(s.id)}`);
     if (s.layers.length === 0) {
         lines.push(ansi.dim("    (no layers)"));
@@ -141,12 +161,45 @@ function formatStackHuman(s) {
     }
     return lines;
 }
+const OPEN_POLICY_FLAGS = [
+    { flag: "--auto-land", key: "autoLand" },
+    { flag: "--auto-review", key: "autoReview" },
+    { flag: "--auto-patch", key: "autoPatch" },
+];
+/**
+ * Consume one `--auto-* on|off` flag at `args[i]` (space or `=` form). Returns
+ * the next index to scan, or null when `args[i]` is not a policy flag.
+ */
+function takeOpenPolicyFlag(args, i, into, verb) {
+    const a = args[i];
+    for (const { flag, key } of OPEN_POLICY_FLAGS) {
+        if (a === flag) {
+            into[key] = parseOnOff(args[i + 1], flag, verb);
+            return i + 2;
+        }
+        if (a.startsWith(`${flag}=`)) {
+            into[key] = parseOnOff(a.slice(flag.length + 1), flag, verb);
+            return i + 1;
+        }
+    }
+    return null;
+}
+/** Wire policy for adopt from the parsed `on|off` flags; absent keys stay off the body. */
+export function openPolicyPatch(flags) {
+    const patch = {
+        ...(typeof flags.autoLand === "boolean" ? { autoEnqueueWhenReady: flags.autoLand } : {}),
+        ...(typeof flags.autoReview === "boolean" ? { autoReviewOverride: flags.autoReview } : {}),
+        ...(typeof flags.autoPatch === "boolean" ? { autoPatchOverride: flags.autoPatch } : {}),
+    };
+    return Object.keys(patch).length > 0 ? patch : undefined;
+}
 /** Parse `stack create` argv into options. Exported for tests. */
 export function parseStackCreateArgs(args) {
     let name;
     let onto;
     let trunk;
     let extend = false;
+    const policy = {};
     let asJson = false;
     for (let i = 0; i < args.length; i++) {
         const a = args[i];
@@ -158,6 +211,11 @@ export function parseStackCreateArgs(args) {
             extend = true;
             continue;
         }
+        const next = takeOpenPolicyFlag(args, i, policy, "stack create");
+        if (next !== null) {
+            i = next - 1;
+            continue;
+        }
         if (a === "--onto") {
             const v = args[++i];
             if (!v) {
@@ -190,13 +248,24 @@ export function parseStackCreateArgs(args) {
         }
         name = a;
     }
-    return { name, onto, trunk, extend, asJson };
+    return {
+        name,
+        onto,
+        trunk,
+        extend,
+        autoLand: policy.autoLand,
+        autoReview: policy.autoReview,
+        autoPatch: policy.autoPatch,
+        asJson,
+    };
 }
 /** Parse `stack submit` argv. Exported for tests. */
 export function parseStackSubmitArgs(args) {
     let extend = false;
+    const policy = {};
     let asJson = false;
-    for (const a of args) {
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
         if (a === "--json") {
             asJson = true;
             continue;
@@ -205,43 +274,159 @@ export function parseStackSubmitArgs(args) {
             extend = true;
             continue;
         }
-        throw new CommandError("usage: mergestorm stack submit [--extend] [--json]");
+        const next = takeOpenPolicyFlag(args, i, policy, "stack submit");
+        if (next !== null) {
+            i = next - 1;
+            continue;
+        }
+        throw new CommandError("usage: mergestorm stack submit [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--json]");
     }
-    return { extend, asJson };
+    return {
+        extend,
+        autoLand: policy.autoLand,
+        autoReview: policy.autoReview,
+        autoPatch: policy.autoPatch,
+        asJson,
+    };
+}
+function parseOnOff(raw, flag, verb) {
+    if (raw === "on")
+        return true;
+    if (raw === "off")
+        return false;
+    throw new CommandError(`usage: mergestorm ${verb} [${flag} on|off]`);
+}
+/** `stack set` overrides are tri-state: `default` writes null (follow the account flag). */
+function parseOnOffDefault(raw, flag, verb) {
+    if (raw === "on")
+        return true;
+    if (raw === "off")
+        return false;
+    if (raw === "default")
+        return null;
+    throw new CommandError(`usage: mergestorm ${verb} [${flag} on|off|default]`);
+}
+export function parseStackAdoptArgs(args) {
+    const targetArgs = [];
+    const policy = {};
+    let asJson = false;
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a === "--json") {
+            asJson = true;
+            continue;
+        }
+        const next = takeOpenPolicyFlag(args, i, policy, "stack adopt <owner/repo>#<pr>");
+        if (next !== null) {
+            i = next - 1;
+            continue;
+        }
+        if (a.startsWith("-")) {
+            throw new CommandError(`${STACK_USAGE}\nunknown flag: ${a}`);
+        }
+        targetArgs.push(a);
+    }
+    const target = parseAdoptTarget(targetArgs);
+    return {
+        ...target,
+        autoLand: policy.autoLand,
+        autoReview: policy.autoReview,
+        autoPatch: policy.autoPatch,
+        asJson,
+    };
+}
+export function parseStackSetArgs(args) {
+    const usage = "usage: mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--json]";
+    const verb = "stack set <stack-id>";
+    let stackId;
+    let autoLand;
+    let autoReview;
+    let autoPatch;
+    let asJson = false;
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === "--json") {
+            asJson = true;
+        }
+        else if (arg === "--auto-land") {
+            autoLand = parseOnOff(args[++i], "--auto-land", verb);
+        }
+        else if (arg.startsWith("--auto-land=")) {
+            autoLand = parseOnOff(arg.slice("--auto-land=".length), "--auto-land", verb);
+        }
+        else if (arg === "--auto-review") {
+            autoReview = parseOnOffDefault(args[++i], "--auto-review", verb);
+        }
+        else if (arg.startsWith("--auto-review=")) {
+            autoReview = parseOnOffDefault(arg.slice("--auto-review=".length), "--auto-review", verb);
+        }
+        else if (arg === "--auto-patch") {
+            autoPatch = parseOnOffDefault(args[++i], "--auto-patch", verb);
+        }
+        else if (arg.startsWith("--auto-patch=")) {
+            autoPatch = parseOnOffDefault(arg.slice("--auto-patch=".length), "--auto-patch", verb);
+        }
+        else if (arg.startsWith("-") || stackId !== undefined) {
+            throw new CommandError(usage);
+        }
+        else {
+            stackId = arg;
+        }
+    }
+    if (autoLand === undefined && autoReview === undefined && autoPatch === undefined) {
+        throw new CommandError(usage);
+    }
+    return {
+        stackId: requireStackId(stackId, usage),
+        ...(autoLand !== undefined ? { autoLand } : {}),
+        ...(autoReview !== undefined ? { autoReview } : {}),
+        ...(autoPatch !== undefined ? { autoPatch } : {}),
+        asJson,
+    };
 }
 export function parseStackResetArgs(args) {
     if (args.length !== 1 || args[0] !== "--force") {
         throw new CommandError("usage: mergestorm stack reset --force\nClears only CLI-managed pre-submit state; branches, PRs, and registered stacks are unchanged.");
     }
 }
-async function cmdStackCreate(args, deps = {}) {
-    const { name, onto, trunk: trunkFlag, extend, asJson } = parseStackCreateArgs(args);
+export async function cmdStackCreate(args, deps = {}) {
+    const { name, onto, trunk: trunkFlag, extend, autoLand, autoReview, autoPatch, asJson, } = parseStackCreateArgs(args);
     const cwd = deps.cwd ?? process.cwd();
+    const gitTopLevelFn = deps.gitTopLevel ?? gitTopLevel;
+    const worktreeDirtyFn = deps.worktreeDirty ?? worktreeDirty;
+    const currentBranchFn = deps.currentBranch ?? currentBranch;
+    const branchExistsFn = deps.branchExists ?? branchExists;
+    const createBranchFromHeadFn = deps.createBranchFromHead ?? createBranchFromHead;
+    const deleteBranchFn = deps.deleteBranch ?? deleteBranch;
+    const discoverTrunkFn = deps.discoverTrunk ?? discoverTrunk;
+    const defaultLayerBranchNameFn = deps.defaultLayerBranchName ?? defaultLayerBranchName;
+    const loadStackMetaFn = deps.loadStackMeta ?? loadStackMeta;
+    const saveStackMetaFn = deps.saveStackMeta ?? saveStackMeta;
     const listStacksFn = deps.listStacks ?? listStacks;
     const loadConfigFn = deps.loadConfig ?? loadConfig;
     const parseOriginFn = deps.parseGithubOriginRepo ?? parseGithubOriginRepo;
     try {
-        gitTopLevel(cwd);
+        gitTopLevelFn(cwd);
     }
     catch {
         throw new CommandError("Not in a git repository. Run `mg stack create` from inside the repository whose stack you want to author.");
     }
-    if (worktreeDirty(cwd)) {
+    if (worktreeDirtyFn(cwd)) {
         throw new CommandError("Working tree is dirty. Commit or stash changes before `stack create`.");
     }
-    const parentBranch = onto?.trim() || currentBranch(cwd);
+    const parentBranch = onto?.trim() || currentBranchFn(cwd);
     if (!parentBranch) {
         throw new CommandError("Detached HEAD. Check out a branch (or pass --onto <branch>) before `stack create`.");
     }
-    if (!branchExists(parentBranch, cwd)) {
+    if (!branchExistsFn(parentBranch, cwd)) {
         throw new CommandError(`Parent branch not found: ${parentBranch}`);
     }
-    const branch = defaultLayerBranchName(name);
-    if (branchExists(branch, cwd)) {
+    const branch = defaultLayerBranchNameFn(name);
+    if (branchExistsFn(branch, cwd)) {
         throw new CommandError(`Branch already exists: ${branch}`);
     }
-    let meta = await loadStackMeta(cwd);
-    const trunk = trunkFlag?.trim() || meta?.trunk || discoverTrunk(cwd);
+    let meta = await loadStackMetaFn(cwd);
+    const trunk = trunkFlag?.trim() || meta?.trunk || discoverTrunkFn(cwd);
     if (!meta) {
         meta = emptyStackMeta(trunk);
     }
@@ -281,23 +466,28 @@ async function cmdStackCreate(args, deps = {}) {
     }
     try {
         meta = selectStackForCreate(meta, parentBranch);
+        meta = setActivePolicy(meta, {
+            autoEnqueueWhenReady: autoLand,
+            autoReviewOverride: autoReview,
+            autoPatchOverride: autoPatch,
+        });
     }
     catch (err) {
         throw new CommandError(err instanceof Error ? err.message : String(err));
     }
     try {
-        createBranchFromHead(branch, cwd);
+        createBranchFromHeadFn(branch, cwd);
     }
     catch (err) {
         throw new CommandError(err instanceof Error ? err.message : String(err));
     }
     try {
         meta = appendLayer(meta, { branch, parentBranch });
-        await saveStackMeta(meta, cwd);
+        await saveStackMetaFn(meta, cwd);
     }
     catch (err) {
         try {
-            deleteBranch(branch, cwd);
+            deleteBranchFn(branch, cwd);
         }
         catch { /* rollback best-effort */ }
         throw new CommandError(err instanceof Error ? err.message : String(err));
@@ -328,7 +518,13 @@ async function cmdStackCreate(args, deps = {}) {
     await present("Stack", created);
 }
 export async function cmdStackSubmit(args, deps = {}) {
-    const { extend, asJson } = parseStackSubmitArgs(args);
+    const { extend, autoLand, autoReview, autoPatch, asJson } = parseStackSubmitArgs(args);
+    const progress = (message) => {
+        if (asJson)
+            console.error(message);
+        else
+            console.log(message);
+    };
     const cwd = deps.cwd ?? process.cwd();
     const gitTopLevelFn = deps.gitTopLevel ?? gitTopLevel;
     const loadStackMetaFn = deps.loadStackMeta ?? loadStackMeta;
@@ -399,11 +595,26 @@ export async function cmdStackSubmit(args, deps = {}) {
         owner,
         repo,
     });
+    // Explicit submit flags win; otherwise a fresh (unregistered) stack carries
+    // the choices remembered at `stack create`. Joining a registered stack
+    // never replays stored create-time flags onto it.
+    const stored = meta.stacks[meta.active];
+    const freshStack = plans.every((plan) => plan.stackId === null);
+    const pick = (flag, remembered) => typeof flag === "boolean"
+        ? flag
+        : freshStack && typeof remembered === "boolean"
+            ? remembered
+            : undefined;
+    const policy = openPolicyPatch({
+        autoLand: pick(autoLand, stored?.autoEnqueueWhenReady),
+        autoReview: pick(autoReview, stored?.autoReviewOverride),
+        autoPatch: pick(autoPatch, stored?.autoPatchOverride),
+    });
     for (const layer of layers) {
         if (!branchExistsFn(layer.branch, cwd)) {
             throw new CommandError(`Stack layer branch missing locally: ${layer.branch}`);
         }
-        console.log(ansi.dim(`  Pushing ${layer.branch} …`));
+        progress(ansi.dim(`  Pushing ${layer.branch} …`));
         try {
             pushBranchFn(layer.branch, cwd);
         }
@@ -420,7 +631,7 @@ export async function cmdStackSubmit(args, deps = {}) {
     const openLayerPr = (branch, base) => {
         const existing = findOpenPrNumberFn(owner, repo, branch, cwd);
         if (existing != null) {
-            console.log(ansi.dim(`  PR #${existing} already open for ${branch}`));
+            progress(ansi.dim(`  PR #${existing} already open for ${branch}`));
             return { prNumber: existing, created: false };
         }
         const aheadRef = isMgParkBranch(base) ? `origin/${base}` : base;
@@ -448,7 +659,7 @@ export async function cmdStackSubmit(args, deps = {}) {
         }
         const title = tipCommitSubjectFn(branch, cwd);
         const body = buildPrBodyFn(tipCommitMessageFn(branch, cwd));
-        console.log(ansi.dim(`  Opening PR ${branch} → ${base} …`));
+        progress(ansi.dim(`  Opening PR ${branch} → ${base} …`));
         return {
             prNumber: createPrFn({
                 owner,
@@ -474,8 +685,8 @@ export async function cmdStackSubmit(args, deps = {}) {
     let adoptData = null;
     let stackId = plans.find((plan) => plan.stackId)?.stackId ?? null;
     const registerPr = async (prNumber) => {
-        console.log(ansi.dim(`  Registering stack via import (${owner}/${repo}#${prNumber}) …`));
-        const body = await adoptStackFn(owner, repo, prNumber, cfg);
+        progress(ansi.dim(`  Registering stack via import (${owner}/${repo}#${prNumber}) …`));
+        const body = await adoptStackFn(owner, repo, prNumber, cfg, policy);
         if (typeof body !== "object" || body === null) {
             throw new CommandError("Unexpected response shape from adopt API");
         }
@@ -498,7 +709,7 @@ export async function cmdStackSubmit(args, deps = {}) {
         if (!stackId) {
             throw new CommandError("Cannot mint a park freeze before the stack is registered. Open layers 1–2 first, then retry.");
         }
-        console.log(ansi.dim(`  Ensuring upper-park freeze for stack ${stackId} …`));
+        progress(ansi.dim(`  Ensuring upper-park freeze for stack ${stackId} …`));
         const park = await ensureUpperParkFn(stackId, cfg);
         for (const plan of pendingPark) {
             const { prNumber, created } = openLayerPr(plan.branch, park.freezeBranch);
@@ -576,15 +787,39 @@ async function cmdStackList(args) {
     listed.push(ansi.dim("  Dashboard: https://mergestorm.ai/dashboard"));
     await present("Stacks", listed);
 }
-async function cmdStackAdopt(args) {
-    const asJson = args.includes("--json");
-    const targetArgs = args.filter((a) => a !== "--json");
-    if (targetArgs.length === 0) {
-        throw new CommandError(`usage: mergestorm stack adopt <owner/repo>#<pr>`);
+/** Human summary lines for a `stack set` write, one per flag. */
+export function stackSetSummary(parsed) {
+    const tri = (value) => value === null ? "default (account setting)" : value ? "on" : "off";
+    const lines = [];
+    if (parsed.autoLand !== undefined) {
+        lines.push(`Auto land ${parsed.autoLand ? "on" : "off"}`);
     }
-    const { owner, repo, prNumber } = parseAdoptTarget(targetArgs);
+    if (parsed.autoReview !== undefined) {
+        lines.push(`Auto-review ${tri(parsed.autoReview)}`);
+    }
+    if (parsed.autoPatch !== undefined) {
+        lines.push(`Auto-patch ${tri(parsed.autoPatch)}`);
+    }
+    return lines;
+}
+export async function cmdStackSet(args, deps = {}) {
+    const parsed = parseStackSetArgs(args);
+    const cfg = await (deps.loadConfig ?? loadConfig)();
+    const body = await (deps.setStackPolicy ?? setStackPolicy)(parsed.stackId, {
+        ...(parsed.autoLand !== undefined ? { autoEnqueueWhenReady: parsed.autoLand } : {}),
+        ...(parsed.autoReview !== undefined ? { autoReviewOverride: parsed.autoReview } : {}),
+        ...(parsed.autoPatch !== undefined ? { autoPatchOverride: parsed.autoPatch } : {}),
+    }, cfg);
+    if (parsed.asJson) {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    await present("Stack", stackSetSummary(parsed).map((line) => ansi.brightGreen(`  ${line} for ${parsed.stackId}`)));
+}
+async function cmdStackAdopt(args) {
+    const { owner, repo, prNumber, autoLand, autoReview, autoPatch, asJson } = parseStackAdoptArgs(args);
     const cfg = await loadConfig();
-    const body = await adoptStack(owner, repo, prNumber, cfg);
+    const body = await adoptStack(owner, repo, prNumber, cfg, openPolicyPatch({ autoLand, autoReview, autoPatch }));
     if (asJson) {
         console.log(JSON.stringify(body, null, 2));
         return;
@@ -670,6 +905,8 @@ export async function cmdStack(args) {
         return cmdStackReset(rest);
     if (sub === "list" || sub === "ls")
         return cmdStackList(rest);
+    if (sub === "set")
+        return cmdStackSet(rest);
     if (sub === "adopt")
         return cmdStackAdopt(rest);
     if (sub === "restack")

package/dist/commands/status.js

@@ -5,6 +5,7 @@ import { canBrowse, formatJobDetailLines } from "./browse.js";
 import { CommandError, DetachedError, REVIEW_EXIT, isCommandErrorCode, } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
 import { renderFindings } from "../ui/findings.js";
+import { humanSummary } from "../ui/human-summary.js";
 import { toReviewJobEnvelope, } from "../ui/job-envelope.js";
 import { REVIEW_POLL_DEFAULT_TIMEOUT_MS, ReviewPollTimeoutError, pollReview, } from "./review-client.js";
 const STATUS_USAGE = "usage: mergestorm status <job_id> [--json] [--wait] [--timeout seconds]";
@@ -71,8 +72,9 @@ function printPretty(row) {
     if (envelope.credits) {
         console.log(`Credits:   ${envelope.credits.standard} standard`);
     }
-    if (envelope.summary)
-        console.log(envelope.summary);
+    const summary = envelope.summary ? humanSummary(envelope.summary) : null;
+    if (summary)
+        console.log(summary);
     if (envelope.error)
         console.log(ansi.red(`Error: ${envelope.error}`));
     renderFindings(envelope.findings, {

package/dist/commands/whoami.js

@@ -1,5 +1,5 @@
 import { getMe } from "../api.js";
-import { apiBase, configPath, loadConfig, resolveApiKey, keyDisplay } from "../config.js";
+import { apiBase, configPath, loadConfig, resolveApiKey } from "../config.js";
 import { CommandError } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
 import { present } from "../ui/present.js";
@@ -16,14 +16,17 @@ export async function cmdWhoami(args, opts = {}) {
         return;
     }
     const me = await getMe(cfg);
+    if (!me) {
+        throw new CommandError("Live account details unavailable. Could not verify account with /me.");
+    }
     const payload = {
-        key_prefix: me?.key.prefix ?? keyDisplay(key),
-        key_name: me?.key.name ?? null,
-        plan_key: me?.plan_key ?? null,
-        plan_label_key: me?.plan_label_key ?? null,
+        key_prefix: me.key.prefix,
+        key_name: me.key.name ?? null,
+        plan_key: me.plan_key ?? null,
+        plan_label_key: me.plan_label_key ?? null,
         api_base: apiBase(cfg),
         config_path: configPath(),
-        usage: me?.usage ?? null,
+        usage: me.usage ?? null,
     };
     if (asJson) {
         const text = JSON.stringify(payload, null, 2);
@@ -42,8 +45,5 @@ export async function cmdWhoami(args, opts = {}) {
     }
     lines.push(`  API      ${payload.api_base}`);
     lines.push(`  Config   ${payload.config_path}`);
-    if (!me) {
-        lines.push(ansi.dim("  (live account details unavailable — older API or offline)"));
-    }
     await present("Account", lines);
 }

package/dist/git.js

@@ -48,7 +48,7 @@ export async function changedNamesInSandbox(base, head, cwd = process.cwd(), san
     // even though their contents cannot be read from the working tree for upload.
     // -z disables core.quotePath quoting and NUL-terminates names, so paths with
     // spaces or non-ASCII characters survive the split verbatim.
-    const names = git(["diff", "--name-only", "-z", "--diff-filter=ACMRDT", `${base}...${head}`], cwd)
+    const names = git(["diff", "--no-ext-diff", "--no-textconv", "--name-only", "-z", "--diff-filter=ACMRDT", `${base}...${head}`], cwd)
         .split("\0")
         .filter(Boolean);
     const kept = [];

package/dist/repo-identity.d.ts

@@ -2,7 +2,7 @@ export declare const LEGACY_STACK_META_REL: string;
 export declare function gitTopLevel(cwd?: string): string;
 export declare function gitCommonDir(cwd?: string): string;
 /**
- * A physical clone and all its linked worktrees share one authoring state.
+ * Each worktree has its own authoring state.
  * Independent clones remain isolated even when they point at the same remote.
  */
 export declare function stableRepoId(cwd?: string): string;

package/dist/repo-identity.js

@@ -41,11 +41,22 @@ export function gitCommonDir(cwd = process.cwd()) {
     }
 }
 /**
- * A physical clone and all its linked worktrees share one authoring state.
+ * Each worktree has its own authoring state.
  * Independent clones remain isolated even when they point at the same remote.
  */
 export function stableRepoId(cwd = process.cwd()) {
-    return createHash("sha256").update(gitCommonDir(cwd)).digest("hex").slice(0, 20);
+    let raw;
+    try {
+        raw = git(["rev-parse", "--git-dir"], cwd).trim();
+    }
+    catch (err) {
+        rethrowIfNotARepo(err);
+    }
+    const absolute = path.isAbsolute(raw) ? raw : path.resolve(cwd, raw);
+    return createHash("sha256")
+        .update(realpathSync(absolute))
+        .digest("hex")
+        .slice(0, 20);
 }
 export function cliStacksRoot() {
     return path.join(mergestormHome(), "stacks");