bazilion 0.14.0 → 0.14.1

package/README.md

@@ -107,8 +107,12 @@ cd apps/web && pnpm dev    # http://127.0.0.1:4322
 Use your ChatGPT account instead of an API key to access `gpt-5.x` / `gpt-5.x-codex` models:
 
 ```sh
-bazilion auth openai login     # browser flow on localhost:1455
-bazilion auth openai status    # check connection / token expiry
+bazilion auth openai login                # browser flow on localhost:1455
+bazilion auth openai login --device-code  # headless/remote or callback-port fallback
+bazilion auth openai status               # check connection / token expiry
+
+# Source checkout: run from the repository root.
+pnpm tsx apps/cli/src/index.ts auth openai login --device-code
 ```
 
 After connecting, enable `openai-codex` and curate at least one model, for example
@@ -125,11 +129,18 @@ Credentials are stored AES-256-GCM-encrypted in the daemon's `secrets` table.
 ## Uninstall
 
 ```sh
-bazilion uninstall                # interactive: data wipe, then optional full wipe
-bazilion uninstall --yes          # data tier only (DB + profiles/agents/teams)
-bazilion uninstall --yes --all    # also remove auth.json, logs/, skills/
+bazilion uninstall                # interactive: reset, then optional full wipe
+bazilion uninstall --yes          # reset DB + auth.json + profiles/agents/teams
+bazilion uninstall --yes --all    # also remove logs/ and skills/
 ```
 
+Both tiers remove the DB and `auth.json` together so the next `bazilion serve` creates a matching
+bootstrap-token pair. They also remove the legacy `groups/`, `config.json`, and `secrets.enc`
+paths. Team and legacy Group symlink slots are unlinked without touching their external targets. A
+full wipe removes the Bazilion home when only managed paths remain; unmanaged files keep the home
+in place. A symlinked `BAZILION_HOME` root remains as an empty slot so interrupted cleanup can be
+safely resumed through the same canonical identity.
+
 ## Documentation
 
 - Full README: <https://github.com/rullopat/bazilion#readme>

package/dist/cli.js

@@ -6,7 +6,7 @@ import { defineCommand as defineCommand28, runCommand, showUsage } from "citty";
 // package.json
 var package_default = {
   name: "bazilion",
-  version: "0.14.0",
+  version: "0.14.1",
   description: "Multi-agent runtime CLI \u2014 spawn LLM agents, manage profiles/teams/skills, and run the local daemon.",
   license: "MIT",
   repository: {
@@ -699,8 +699,8 @@ var chatResetCmd = defineCommand({
   async run({ args }) {
     if (!args.force) {
       process.stdout.write(`reset all chat history for ${args.id}? [y/N] `);
-      const answer = await new Promise((resolve4) => {
-        process.stdin.once("data", (d) => resolve4(String(d).trim().toLowerCase()));
+      const answer = await new Promise((resolve5) => {
+        process.stdin.once("data", (d) => resolve5(String(d).trim().toLowerCase()));
       });
       if (answer !== "y" && answer !== "yes") {
         console.log("aborted");
@@ -848,8 +848,8 @@ var chatCompactCmd = defineCommand({
       process.stdout.write(
         `compact chat history for ${args.id}? head turns become a summary; tail is preserved. [y/N] `
       );
-      const answer = await new Promise((resolve4) => {
-        process.stdin.once("data", (d) => resolve4(String(d).trim().toLowerCase()));
+      const answer = await new Promise((resolve5) => {
+        process.stdin.once("data", (d) => resolve5(String(d).trim().toLowerCase()));
       });
       if (answer !== "y" && answer !== "yes") {
         console.log("aborted");
@@ -1344,6 +1344,91 @@ var attentionCommand = defineCommand3({
 // src/commands/auth.ts
 import { openaiCodexProvider } from "@earendil-works/pi-ai/providers/openai-codex";
 import { defineCommand as defineCommand4 } from "citty";
+var CLI_OPENAI_LOGIN_TIMEOUT_MS = 10 * 6e4;
+function createCliOpenAILoginLifetime(timeoutMs = CLI_OPENAI_LOGIN_TIMEOUT_MS) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => {
+    controller.abort(
+      new DOMException(
+        "OpenAI login timed out after 10 minutes. Try again with `bazilion auth openai login --device-code`.",
+        "TimeoutError"
+      )
+    );
+  }, timeoutMs);
+  return {
+    signal: controller.signal,
+    dispose() {
+      clearTimeout(timeout);
+    }
+  };
+}
+function promptAbortError(signal) {
+  return signal.reason instanceof Error ? signal.reason : new DOMException("OAuth prompt cancelled", "AbortError");
+}
+function answerCliOpenAIPrompt(prompt, input = process.stdin, output = process.stdout, loginMethod = "browser", loginSignal) {
+  if (prompt.type === "select") {
+    const option = prompt.options.find((candidate) => candidate.id === loginMethod);
+    return option ? Promise.resolve(option.id) : Promise.reject(
+      new Error(
+        `Pi openai-codex provider does not support ${loginMethod === "browser" ? "browser" : "device-code"} login`
+      )
+    );
+  }
+  output.write(`${prompt.message}: `);
+  return new Promise((resolve5, reject) => {
+    let settled = false;
+    const signal = prompt.signal;
+    let readingInput = true;
+    const cleanupInput = () => {
+      if (!readingInput) return;
+      readingInput = false;
+      input.removeListener("data", onData);
+      input.removeListener("end", onInputUnavailable);
+      input.removeListener("error", onInputUnavailable);
+      input.pause();
+    };
+    const cleanup = () => {
+      cleanupInput();
+      signal?.removeEventListener("abort", onAbort);
+      loginSignal?.removeEventListener("abort", onLoginAbort);
+    };
+    const onData = (data) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve5(String(data).trim());
+    };
+    const onAbort = () => {
+      if (settled || !signal) return;
+      settled = true;
+      cleanup();
+      reject(promptAbortError(signal));
+    };
+    const onLoginAbort = () => {
+      if (settled || !loginSignal) return;
+      settled = true;
+      cleanup();
+      reject(promptAbortError(loginSignal));
+    };
+    const onInputUnavailable = () => {
+      if (settled) return;
+      cleanupInput();
+    };
+    if (signal?.aborted) {
+      onAbort();
+      return;
+    }
+    if (loginSignal?.aborted) {
+      onLoginAbort();
+      return;
+    }
+    input.once("data", onData);
+    input.once("end", onInputUnavailable);
+    input.once("error", onInputUnavailable);
+    signal?.addEventListener("abort", onAbort, { once: true });
+    loginSignal?.addEventListener("abort", onLoginAbort, { once: true });
+  });
+}
 function formatExpiry(ms) {
   if (!ms) return "(unknown)";
   const d = new Date(ms);
@@ -1352,36 +1437,53 @@ function formatExpiry(ms) {
 var openaiLoginCmd = defineCommand4({
   meta: {
     name: "login",
-    description: "Connect your ChatGPT account via OAuth (browser sign-in)"
+    description: "Connect your ChatGPT account via OAuth"
   },
-  async run() {
+  args: {
+    "device-code": {
+      type: "boolean",
+      description: "Use headless device-code login instead of the localhost browser callback"
+    }
+  },
+  async run({ args }) {
     const client = createClient2();
-    console.log("opening your browser for OpenAI sign-in...");
-    console.log("(if it doesn't open automatically, paste the URL shown below)");
+    const loginMethod = args["device-code"] ? "device_code" : "browser";
+    if (loginMethod === "device_code") {
+      console.log("starting OpenAI device-code sign-in...");
+    } else {
+      console.log("opening your browser for OpenAI sign-in...");
+      console.log("(if it doesn't open automatically, paste the URL shown below)");
+    }
     const oauth = openaiCodexProvider().auth.oauth;
     if (!oauth) throw new Error("Pi openai-codex provider does not expose OAuth");
-    const loginController = new AbortController();
-    const creds = await oauth.login({
-      signal: loginController.signal,
-      notify: (event) => {
-        if (event.type === "auth_url") {
-          console.log("");
-          console.log(`  \u2192 ${event.url}`);
-          console.log("");
-        } else if (event.type === "progress" || event.type === "info") {
-          console.log(`  ${event.message}`);
-        } else if (event.type === "device_code") {
-          console.log(`  open ${event.verificationUri} and enter ${event.userCode}`);
-        }
-      },
-      prompt: async (prompt) => {
-        if (prompt.type === "select") return prompt.options[0]?.id ?? "";
-        process.stdout.write(`${prompt.message}: `);
-        return new Promise((resolve4) => {
-          process.stdin.once("data", (d) => resolve4(String(d).trim()));
+    const lifetime = createCliOpenAILoginLifetime();
+    const creds = await (async () => {
+      try {
+        return await oauth.login({
+          signal: lifetime.signal,
+          notify: (event) => {
+            if (event.type === "auth_url") {
+              console.log("");
+              console.log(`  \u2192 ${event.url}`);
+              console.log("");
+            } else if (event.type === "progress" || event.type === "info") {
+              console.log(`  ${event.message}`);
+            } else if (event.type === "device_code") {
+              console.log(`  open ${event.verificationUri} and enter ${event.userCode}`);
+            }
+          },
+          prompt: (prompt) => answerCliOpenAIPrompt(
+            prompt,
+            process.stdin,
+            process.stdout,
+            loginMethod,
+            lifetime.signal
+          )
         });
+      } finally {
+        lifetime.dispose();
       }
-    });
+    })();
     const status = await client.put("/api/auth/openai", {
       refresh: creds.refresh,
       access: creds.access,
@@ -1648,13 +1750,16 @@ function parseRecord(raw) {
       "starting",
       "listening",
       "restoring",
+      "uninstalling",
       "swapping",
       "installed",
       "recovery-required"
     ].includes(value.state ?? "") || !Number.isFinite(value.startedAt)) {
       return null;
     }
-    if (value.owner === "daemon" && !["starting", "listening"].includes(value.state ?? "") || value.owner === "restore" && !["restoring", "swapping", "installed", "recovery-required"].includes(value.state ?? "")) {
+    if (value.owner === "daemon" && !["starting", "listening"].includes(value.state ?? "") || value.owner === "restore" && !["restoring", "uninstalling", "swapping", "installed", "recovery-required"].includes(
+      value.state ?? ""
+    )) {
       return null;
     }
     if (value.owner === "restore" && ["swapping", "recovery-required"].includes(value.state ?? "") && (typeof value.recoveryPath !== "string" || !value.recoveryPath || typeof value.hadPrevious !== "boolean")) {
@@ -1757,7 +1862,7 @@ function reclaimRecord(path, existing) {
     throw error;
   }
 }
-async function acquireHomeRestoreLock(home) {
+async function acquireHomeRestoreLock(home, operation = "restoring") {
   const targetHome = resolve(home);
   mkdirSync(dirname(targetHome), { recursive: true });
   const path = daemonLivenessPath(targetHome);
@@ -1777,7 +1882,7 @@ async function acquireHomeRestoreLock(home) {
     const endpoint3 = existing.record ? endpointFor(existing.record) : null;
     if (endpoint3 && existing.record && await endpointHasOwner(endpoint3, existing.record.instanceId)) {
       throw new Error(
-        `bazilion daemon is running at ${endpoint3} for ${targetHome} \u2014 stop it before restoring`
+        `bazilion daemon is running at ${endpoint3} for ${targetHome} \u2014 stop it before ${operation}`
       );
     }
     if (!existing.record) {
@@ -1786,6 +1891,19 @@ async function acquireHomeRestoreLock(home) {
       );
     }
     const livePid = pidIsAlive(existing.record.pid);
+    if (existing.record.owner === "restore" && existing.record.state === "uninstalling") {
+      if (livePid) {
+        throw new Error(
+          `bazilion uninstall process ${existing.record.pid} owns ${targetHome} \u2014 wait for it to finish before ${operation}`
+        );
+      }
+      if (operation !== "uninstalling") {
+        throw new Error(
+          `a previous Bazilion uninstall was interrupted for ${targetHome}. Re-run the same \`bazilion uninstall\` command (including its \`--all\` choice) with the same BAZILION_HOME (or --home) to finish it before ${operation}.`
+        );
+      }
+      console.warn(`resuming interrupted Bazilion uninstall for ${targetHome}`);
+    }
     if (existing.record.owner === "restore" && ["swapping", "recovery-required"].includes(existing.record.state)) {
       if (livePid) {
         throw new Error(
@@ -1802,7 +1920,7 @@ async function acquireHomeRestoreLock(home) {
       const staleDetail = ageMs > STALE_AFTER_MS ? " (its heartbeat is stale)" : "";
       const owner = existing.record.owner === "daemon" ? "daemon" : "restore";
       throw new Error(
-        `bazilion ${owner} process ${existing.record.pid} owns ${targetHome}${staleDetail} \u2014 stop it before restoring`
+        `bazilion ${owner} process ${existing.record.pid} owns ${targetHome}${staleDetail} \u2014 stop it before ${operation}`
       );
     }
     const claim = reclaimRecord(path, existing);
@@ -1813,7 +1931,7 @@ async function acquireHomeRestoreLock(home) {
   }
   if (fd === null) {
     throw new Error(
-      `could not safely acquire exclusive restore ownership for ${targetHome}; try again`
+      `could not safely acquire exclusive ownership for ${operation} ${targetHome}; try again`
     );
   }
   const ownedStat = fstatSync(fd);
@@ -1822,7 +1940,7 @@ async function acquireHomeRestoreLock(home) {
     instanceId,
     pid: process.pid,
     owner: "restore",
-    state: "restoring",
+    state: operation,
     startedAt: Date.now()
   };
   try {
@@ -1843,6 +1961,7 @@ async function acquireHomeRestoreLock(home) {
     throw error;
   }
   let released = false;
+  let uninstallComplete = false;
   const stillOwnsPath = () => {
     try {
       return sameFile(lstatSync(path), ownedStat);
@@ -1853,7 +1972,7 @@ async function acquireHomeRestoreLock(home) {
   const heartbeat = setInterval(() => {
     if (released) return;
     if (!stillOwnsPath()) {
-      console.error("restore ownership was lost; exiting to protect the Bazilion database");
+      console.error(`${operation} ownership was lost; exiting to protect the Bazilion database`);
       process.exit(1);
     }
     try {
@@ -1861,7 +1980,7 @@ async function acquireHomeRestoreLock(home) {
       futimesSync(fd, now, now);
     } catch (error) {
       console.error(
-        "restore ownership heartbeat failed:",
+        `${operation} ownership heartbeat failed:`,
         error instanceof Error ? error.message : error
       );
       process.exit(1);
@@ -1892,12 +2011,19 @@ async function acquireHomeRestoreLock(home) {
       record.hadPrevious = hadPrevious;
       writeRecord(fd, record);
     },
+    markUninstallComplete() {
+      if (released || !stillOwnsPath()) throw new Error("uninstall ownership was lost");
+      if (record.state !== "uninstalling") {
+        throw new Error("cannot complete uninstall from a non-uninstall ownership state");
+      }
+      uninstallComplete = true;
+    },
     release() {
       if (released) return;
       released = true;
       clearInterval(heartbeat);
       const ownsPath = stillOwnsPath();
-      const retainForRecovery = ["swapping", "recovery-required"].includes(record.state);
+      const retainForRecovery = ["swapping", "recovery-required"].includes(record.state) || record.state === "uninstalling" && !uninstallComplete;
       closeSync(fd);
       fd = null;
       if (ownsPath && !retainForRecovery) rmSync(path, { force: true });
@@ -3073,12 +3199,12 @@ function probeHost(host) {
   return host;
 }
 function isTcpPortOpen(host, port) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const socket = connect({ host: probeHost(host), port: Number(port) });
     const done = (open) => {
       socket.removeAllListeners();
       socket.destroy();
-      resolve4(open);
+      resolve5(open);
     };
     socket.setTimeout(600);
     socket.once("connect", () => done(true));
@@ -3219,7 +3345,7 @@ var dashboardCommand = defineCommand8({
         }
         if (!existsSync3(join3(webDist, "server", "server.js"))) {
           throw new Error(
-            `bazilion web UI bundle not found at ${webDist}. Run "pnpm --filter @bazilion/web build" from a source checkout, or reinstall the published package.`
+            `bazilion web UI bundle not found at ${webDist}. Run "pnpm --filter @bazilion/web build" from the repository root of a source checkout, or reinstall the published package.`
           );
         }
         console.log(`starting bazilion web UI at ${webUrl}`);
@@ -3244,13 +3370,13 @@ var dashboardCommand = defineCommand8({
     if (children.length === 0) return;
     process.on("SIGINT", terminateChildren);
     process.on("SIGTERM", terminateChildren);
-    await new Promise((resolve4) => {
+    await new Promise((resolve5) => {
       let remaining = children.length;
       for (const child of children) {
         child.on("close", (code) => {
           remaining--;
           if (!signalled && code && code !== 0) process.exitCode = code;
-          if (remaining === 0) resolve4();
+          if (remaining === 0) resolve5();
         });
       }
     });
@@ -4065,10 +4191,10 @@ var editCmd2 = defineCommand15({
     writeFileSync4(tmpPath, content);
     try {
       const editor = process.env.EDITOR ?? process.env.VISUAL ?? "vi";
-      const code = await new Promise((resolve4, reject) => {
+      const code = await new Promise((resolve5, reject) => {
         const child = spawn2(editor, [tmpPath], { stdio: "inherit" });
         child.on("error", reject);
-        child.on("close", (c) => resolve4(c ?? 0));
+        child.on("close", (c) => resolve5(c ?? 0));
       });
       if (code !== 0) throw new Error(`editor exited with code ${code}`);
       const updated = readFileSync6(tmpPath, "utf8");
@@ -4382,17 +4508,17 @@ var serveCommand = defineCommand18({
       signalled = true;
     });
     process.on("SIGTERM", onSigterm);
-    await new Promise((resolve4, reject) => {
+    await new Promise((resolve5, reject) => {
       proc.on("error", (err) => reject(err));
       proc.on("close", (code) => {
         if (signalled) {
           process.exitCode = 0;
-          resolve4();
+          resolve5();
         } else if (code === 0 || code === null) {
-          resolve4();
+          resolve5();
         } else {
           process.exitCode = code;
-          resolve4();
+          resolve5();
         }
       });
     });
@@ -5993,8 +6119,9 @@ var triggerCommand = defineCommand26({
 });
 
 // src/commands/uninstall.ts
-import { existsSync as existsSync7, readdirSync as readdirSync2, rmSync as rmSync4 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync7, lstatSync as lstatSync3, readdirSync as readdirSync2, realpathSync as realpathSync2, rmSync as rmSync4 } from "fs";
+import { homedir as homedir2 } from "os";
+import { isAbsolute as isAbsolute2, join as join6, parse as parse2, relative as relative2, resolve as resolve4, sep } from "path";
 import { defineCommand as defineCommand27 } from "citty";
 function makeLineReader() {
   let buffer = "";
@@ -6005,8 +6132,8 @@ function makeLineReader() {
       const nlIdx = buffer.indexOf("\n");
       if (nlIdx === -1) {
         if (ended) {
-          const resolve4 = queue.shift();
-          resolve4?.(buffer);
+          const resolve5 = queue.shift();
+          resolve5?.(buffer);
           buffer = "";
         } else {
           return;
@@ -6014,8 +6141,8 @@ function makeLineReader() {
       } else {
         const line = buffer.slice(0, nlIdx);
         buffer = buffer.slice(nlIdx + 1);
-        const resolve4 = queue.shift();
-        resolve4?.(line);
+        const resolve5 = queue.shift();
+        resolve5?.(line);
       }
     }
   };
@@ -6028,8 +6155,8 @@ function makeLineReader() {
     ended = true;
     tryDeliver();
   });
-  return () => new Promise((resolve4) => {
-    queue.push(resolve4);
+  return () => new Promise((resolve5) => {
+    queue.push(resolve5);
     tryDeliver();
   });
 }
@@ -6039,10 +6166,49 @@ async function askYes(readLine, prompt) {
   return answer === "y" || answer === "yes";
 }
 function removePath(p) {
-  if (!existsSync7(p)) return false;
+  try {
+    lstatSync3(p);
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") return false;
+    throw error;
+  }
   rmSync4(p, { recursive: true, force: true });
   return true;
 }
+function canonicalExistingPath(path) {
+  try {
+    return realpathSync2.native(path);
+  } catch (error) {
+    if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) throw error;
+    return resolve4(path);
+  }
+}
+function containsPath(container, candidate) {
+  const nested = relative2(container, candidate);
+  return nested === "" || nested !== ".." && !nested.startsWith(`..${sep}`) && !isAbsolute2(nested);
+}
+function assertSafeUninstallHome(home) {
+  const target = resolve4(home);
+  const canonical = canonicalExistingPath(target);
+  const userHome = canonicalExistingPath(homedir2());
+  const workingDirectory = canonicalExistingPath(process.cwd());
+  const exactForbidden = /* @__PURE__ */ new Map([
+    [parse2(canonical).root, "filesystem root"],
+    [userHome, "user home directory"],
+    [workingDirectory, "current working directory"]
+  ]);
+  const reason = exactForbidden.get(canonical);
+  if (reason) throw new Error(`refusing to uninstall from ${reason}: ${target}`);
+  if (containsPath(canonical, userHome)) {
+    throw new Error(`refusing to uninstall from an ancestor of the user home directory: ${target}`);
+  }
+  if (containsPath(canonical, workingDirectory)) {
+    throw new Error(
+      `refusing to uninstall from an ancestor of the current working directory: ${target}`
+    );
+  }
+  return target;
+}
 var uninstallCommand = defineCommand27({
   meta: {
     name: "uninstall",
@@ -6052,33 +6218,56 @@ var uninstallCommand = defineCommand27({
     home: { type: "string", description: "Override BAZILION_HOME" },
     yes: {
       type: "boolean",
-      description: "Skip confirmations (data tier only unless --all is set)"
+      description: "Skip confirmations (reset tier only unless --all is set)"
     },
     all: {
       type: "boolean",
-      description: "Also remove configs, logs, and skills (full wipe)"
+      description: "Also remove logs and skills (full wipe)"
     }
   },
   async run({ args }) {
     const paths = resolveCliPaths(args.home);
-    const dbFile = join6(paths.home, "bazilion.db");
-    const profilesDir = join6(paths.home, "profiles");
-    const agentsDir = join6(paths.home, "agents");
-    const teamsDir = join6(paths.home, "teams");
-    const skillsDir = join6(paths.home, "skills");
-    const logsDir = join6(paths.home, "logs");
-    if (!existsSync7(paths.home)) {
-      console.log(`nothing to remove: ${paths.home} does not exist`);
+    const targetHome = assertSafeUninstallHome(paths.home);
+    const dbFile = join6(targetHome, "bazilion.db");
+    const profilesDir = join6(targetHome, "profiles");
+    const agentsDir = join6(targetHome, "agents");
+    const teamsDir = join6(targetHome, "teams");
+    const legacyGroupsDir = join6(targetHome, "groups");
+    const skillsDir = join6(targetHome, "skills");
+    const logsDir = join6(targetHome, "logs");
+    const legacyConfigFile = join6(targetHome, "config.json");
+    const legacySecretsFile = join6(targetHome, "secrets.enc");
+    if (!existsSync7(targetHome)) {
+      const uninstallLock2 = await acquireHomeRestoreLock(targetHome, "uninstalling");
+      try {
+        console.log(`nothing to remove: ${targetHome} does not exist`);
+        uninstallLock2.markUninstallComplete();
+      } finally {
+        uninstallLock2.release();
+      }
       return;
     }
-    console.log(`about to uninstall bazilion at ${paths.home}`);
+    const homeIsSymlink = lstatSync3(targetHome).isSymbolicLink();
+    console.log(`about to uninstall bazilion at ${targetHome}`);
     console.log("");
-    const dataTargets = [dbFile, `${dbFile}-wal`, `${dbFile}-shm`, profilesDir, agentsDir, teamsDir];
+    const resetTargets = [
+      dbFile,
+      `${dbFile}-wal`,
+      `${dbFile}-shm`,
+      `${dbFile}-journal`,
+      join6(targetHome, "auth.json"),
+      legacyConfigFile,
+      legacySecretsFile,
+      profilesDir,
+      agentsDir,
+      teamsDir,
+      legacyGroupsDir
+    ];
     const needsPrompt = !args.yes;
     const readLine = needsPrompt ? makeLineReader() : null;
     const wipeData = args.yes || await askYes(
       readLine,
-      "remove DB + agent / profile / workspace data?"
+      "remove DB + auth/config + agent / profile / team data?"
     );
     if (!wipeData) {
       console.log("aborted");
@@ -6087,27 +6276,37 @@ var uninstallCommand = defineCommand27({
     }
     const wipeAll = args.all || (args.yes ? false : await askYes(
       readLine,
-      "also remove configs, logs, and skills? (full wipe of ~/.bazilion)"
+      `also remove logs and skills? (full wipe of ${targetHome})`
     ));
     process.stdin.pause();
-    for (const p of dataTargets) {
-      if (removePath(p)) console.log(`removed ${p}`);
-    }
-    if (wipeAll) {
-      const configTargets = [paths.authFile, logsDir, skillsDir];
-      for (const p of configTargets) {
+    const uninstallLock = await acquireHomeRestoreLock(targetHome, "uninstalling");
+    try {
+      for (const p of resetTargets) {
         if (removePath(p)) console.log(`removed ${p}`);
       }
-      if (readdirSync2(paths.home).length === 0) {
-        rmSync4(paths.home, { recursive: true, force: true });
-        console.log(`removed ${paths.home}`);
+      if (wipeAll) {
+        const fullWipeTargets = [logsDir, skillsDir];
+        for (const p of fullWipeTargets) {
+          if (removePath(p)) console.log(`removed ${p}`);
+        }
+        if (readdirSync2(targetHome).length === 0 && !homeIsSymlink) {
+          rmSync4(targetHome, { recursive: true, force: true });
+          console.log(`removed ${targetHome}`);
+        } else if (homeIsSymlink && readdirSync2(targetHome).length === 0) {
+          console.log(`kept ${targetHome}: symlinked BAZILION_HOME root is now empty`);
+        } else {
+          console.log(`${targetHome} still has unmanaged files; left in place`);
+        }
       } else {
-        console.log(`${paths.home} still has unmanaged files; left in place`);
+        console.log("");
+        console.log("kept: logs/, skills/");
+        console.log(
+          `re-run 'bazilion serve' to create a fresh DB and matching auth.json when you're ready.`
+        );
       }
-    } else {
-      console.log("");
-      console.log("kept: auth.json, logs/, skills/");
-      console.log(`re-run 'bazilion serve' to recreate the DB when you're ready.`);
+      uninstallLock.markUninstallComplete();
+    } finally {
+      uninstallLock.release();
     }
   }
 });