bazilion 0.20.0 → 0.21.0-beta.2

package/dist/cli.js

@@ -6,7 +6,7 @@ import { defineCommand as defineCommand39, runCommand, showUsage } from "citty";
 // package.json
 var package_default = {
   name: "bazilion",
-  version: "0.20.0",
+  version: "0.21.0-beta.2",
   description: "Multi-agent runtime CLI \u2014 spawn LLM agents, manage profiles/teams/skills, and run the local daemon.",
   license: "MIT",
   repository: {
@@ -375,12 +375,29 @@ function readAuthFile(authFile) {
 }
 
 // src/paths.ts
+import { realpathSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { basename, dirname, join, resolve } from "path";
 function resolveCliPaths(home) {
-  const root = home ?? process.env.BAZILION_HOME ?? join(homedir(), ".bazilion");
+  const root = canonicalHome(resolve(home ?? process.env.BAZILION_HOME ?? join(homedir(), ".bazilion")));
   return { home: root, authFile: join(root, "auth.json") };
 }
+function canonicalHome(root) {
+  let resolved = root;
+  const unresolvedTail = [];
+  while (true) {
+    try {
+      resolved = realpathSync(resolved);
+      break;
+    } catch {
+      const parent = dirname(resolved);
+      if (parent === resolved) break;
+      unresolvedTail.unshift(basename(resolved));
+      resolved = parent;
+    }
+  }
+  return join(resolved, ...unresolvedTail);
+}
 
 // src/client.ts
 function loadClientConfig() {
@@ -721,7 +738,7 @@ var questionCommand = defineCommand3({
 // src/commands/queue.ts
 import { randomUUID as randomUUID3 } from "crypto";
 import { readFileSync as readFileSync2, statSync } from "fs";
-import { basename, extname } from "path";
+import { basename as basename2, extname } from "path";
 import { defineCommand as defineCommand4 } from "citty";
 var positional4 = { type: "positional", required: true };
 var output3 = (value) => console.log(JSON.stringify(value, null, 2));
@@ -796,7 +813,7 @@ async function submit(args2, replacement) {
       ".pdf": "application/pdf"
     };
     return {
-      name: basename(path),
+      name: basename2(path),
       mimeType: mime[extname(path).toLowerCase()] ?? "application/octet-stream",
       data: readFileSync2(path).toString("base64")
     };
@@ -886,7 +903,7 @@ var queueCommand = defineCommand4({
 // src/commands/agent.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import { readFileSync as readFileSync3, writeFileSync } from "fs";
-import { basename as basename2, extname as extname2 } from "path";
+import { basename as basename3, extname as extname2 } from "path";
 import { stdin, stdout } from "process";
 import { createInterface } from "readline/promises";
 import { defineCommand as defineCommand5 } from "citty";
@@ -978,7 +995,7 @@ function loadImages(paths) {
   return paths.map((p) => {
     const mimeType = IMAGE_MIME[extname2(p).toLowerCase()];
     if (!mimeType) throw new Error(`unsupported image type: ${p} (png/jpg/gif/webp only)`);
-    return { name: basename2(p), mimeType, data: readFileSync3(p).toString("base64") };
+    return { name: basename3(p), mimeType, data: readFileSync3(p).toString("base64") };
   });
 }
 var FILE_MIME = {
@@ -992,7 +1009,7 @@ var FILE_MIME = {
 };
 function loadFiles(paths) {
   return paths.map((p) => ({
-    name: basename2(p),
+    name: basename3(p),
     mimeType: FILE_MIME[extname2(p).toLowerCase()] ?? "application/octet-stream",
     data: readFileSync3(p).toString("base64")
   }));
@@ -1268,7 +1285,7 @@ function printEvent(e, state) {
         process.stdout.write("\n");
         state.inDeltaStream = false;
       }
-      const out = basename2(e.name).replace(/[^\w.-]/g, "_") || "file";
+      const out = basename3(e.name).replace(/[^\w.-]/g, "_") || "file";
       writeFileSync(out, Buffer.from(e.data, "base64"));
       console.log(`  [file received: saved to ./${out} (${e.mimeType})]`);
       break;
@@ -1387,69 +1404,34 @@ var chatCmd = defineCommand5({
       }
       return;
     }
+    if (bashApprovalMode === "interactive") {
+      console.error(
+        `usage: bazilion agent chat ${args2.id} --message "..." (one-shot) \u2014 for a conversational surface, use the web UI`
+      );
+      process.exitCode = 1;
+      return;
+    }
     console.log(`chatting with ${resolved.agent.name} (${resolved.model})`);
-    console.log("(type /exit to quit)");
+    console.log("(type /exit to quit; input is piped, commands run with auto_deny)");
     const rl = createInterface({ input: stdin, output: stdout });
     try {
-      if (bashApprovalMode === "interactive") {
-        let retryDraft = "";
-        while (true) {
-          const observed = await client.get(
-            `/api/agents/${resolved.agent.id}/sessions/head`
-          );
-          let line;
-          try {
-            const answer = rl.question("> ");
-            if (retryDraft) {
-              rl.write(retryDraft);
-              retryDraft = "";
-            }
-            line = await answer;
-          } catch {
-            break;
-          }
-          const trimmed = line.trim();
-          if (trimmed === "/exit" || trimmed === "/quit") break;
-          if (!trimmed) continue;
-          try {
-            await streamTurn(client, resolved.agent.id, trimmed, void 0, {
-              bashApprovalMode,
-              expectedSelection: observed.selection,
-              questionPrompt: {
-                question: (text2, signal) => rl.question(text2, { signal }),
-                write: (line2) => console.log(line2)
-              },
-              approvalPrompt: {
-                question: (question) => rl.question(question),
-                write: (output4) => console.log(output4)
-              }
-            });
-          } catch (err) {
-            retryDraft = trimmed;
-            console.error(
-              `error: ${err.message}. Review the preserved draft before retrying.`
-            );
-          }
-        }
-      } else {
-        rl.setPrompt("> ");
-        rl.prompt();
-        for await (const line of rl) {
-          const trimmed = line.trim();
-          if (trimmed === "/exit" || trimmed === "/quit") break;
-          if (!trimmed) {
-            rl.prompt();
-            continue;
-          }
-          try {
-            await streamTurn(client, resolved.agent.id, trimmed, void 0, {
-              bashApprovalMode
-            });
-          } catch (err) {
-            console.error(`error: ${err.message}`);
-          }
+      rl.setPrompt("> ");
+      rl.prompt();
+      for await (const line of rl) {
+        const trimmed = line.trim();
+        if (trimmed === "/exit" || trimmed === "/quit") break;
+        if (!trimmed) {
           rl.prompt();
+          continue;
+        }
+        try {
+          await streamTurn(client, resolved.agent.id, trimmed, void 0, {
+            bashApprovalMode
+          });
+        } catch (err) {
+          console.error(`error: ${err.message}`);
         }
+        rl.prompt();
       }
     } finally {
       rl.close();
@@ -1593,8 +1575,8 @@ var chatCompactCmd = defineCommand5({
       process.stdout.write(
         `compact chat history for ${args2.id}? head turns become a summary; tail is preserved. [y/N] `
       );
-      const answer = await new Promise((resolve6) => {
-        process.stdin.once("data", (d) => resolve6(String(d).trim().toLowerCase()));
+      const answer = await new Promise((resolve7) => {
+        process.stdin.once("data", (d) => resolve7(String(d).trim().toLowerCase()));
       });
       if (answer !== "y" && answer !== "yes") {
         console.log("aborted");
@@ -2121,7 +2103,7 @@ function answerCliOpenAIPrompt(prompt, input = process.stdin, output4 = process.
     );
   }
   output4.write(`${prompt.message}: `);
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     let settled = false;
     const signal = prompt.signal;
     let readingInput = true;
@@ -2142,7 +2124,7 @@ function answerCliOpenAIPrompt(prompt, input = process.stdin, output4 = process.
       if (settled) return;
       settled = true;
       cleanup();
-      resolve6(String(data).trim());
+      resolve7(String(data).trim());
     };
     const onAbort = () => {
       if (settled || !signal) return;
@@ -2318,16 +2300,17 @@ import {
   mkdirSync as mkdirSync2,
   mkdtempSync,
   openSync as openSync2,
-  readdirSync,
-  readFileSync as readFileSync5,
+  readdirSync as readdirSync2,
+  readFileSync as readFileSync6,
   readSync,
+  realpathSync as realpathSync3,
   renameSync as renameSync2,
   rmSync as rmSync2,
   writeFileSync as writeFileSync2
 } from "fs";
 import { tmpdir } from "os";
-import { basename as basename4, dirname as dirname2, isAbsolute, parse, posix, relative, resolve as resolve3 } from "path";
-import { DatabaseSync as DatabaseSync2, backup as sqliteBackup } from "node:sqlite";
+import { basename as basename5, dirname as dirname4, isAbsolute, join as join4, parse, posix, relative, resolve as resolve4 } from "path";
+import { DatabaseSync as DatabaseSync4, backup as sqliteBackup } from "node:sqlite";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
 import { Decrypter, Encrypter } from "age-encryption";
@@ -2336,7 +2319,7 @@ import { extract, list as list5 } from "tar";
 
 // src/backup-coding-recovery.ts
 import { lstatSync } from "fs";
-import { resolve } from "path";
+import { resolve as resolve2 } from "path";
 function invalidateRestoredCodingEvidence(db, payload, targetHome) {
   const rows = db.prepare("SELECT id, receipt_json FROM coding_commands").all();
   for (const row2 of rows) {
@@ -2399,8 +2382,8 @@ function invalidateRestoredCodingEvidence(db, payload, targetHome) {
   const teams = db.prepare("SELECT id FROM teams").all();
   const rebase = db.prepare("UPDATE workspace_writers SET root_path = ? WHERE team_id = ?");
   for (const team of teams) {
-    if (lstatSync(resolve(payload, "teams", team.id)).isDirectory())
-      rebase.run(resolve(targetHome, "teams", team.id), team.id);
+    if (lstatSync(resolve2(payload, "teams", team.id)).isDirectory())
+      rebase.run(resolve2(targetHome, "teams", team.id), team.id);
   }
 }
 
@@ -2475,174 +2458,180 @@ function pauseRestoredUserQueue(database) {
 
 // src/backup-schema.ts
 import { createHash } from "crypto";
-var CANONICAL_MIGRATION = "0001_init";
-var CANONICAL_SCHEMA_HASH = "469e6610e0f1030aa9e699bff1083a54305a77bc48f573eeae908d96a48d5396";
-var CANONICAL_OBJECTS = [
-  ["table", "team_coding_environments"],
-  ["table", "workspace_writers"],
-  ["table", "workspace_resources"],
-  ["table", "coding_commands"],
-  ["index", "coding_command_history"],
-  ["table", "coding_command_logs"],
-  ["index", "coding_command_logs_retention"],
-  ["index", "coding_command_logs_team_time"],
-  ["table", "source_snapshots"],
-  ["index", "source_snapshots_retention"],
-  ["index", "source_snapshots_team_time"],
-  ["table", "review_packets"],
-  ["index", "review_packets_team_time"],
-  ["index", "review_packets_reviewer_dispatch"],
-  ["index", "review_packets_retention"],
-  ["table", "review_findings"],
-  ["index", "review_findings_packet"],
-  ["index", "review_findings_unresolved"],
-  ["table", "review_conclusions"],
-  ["index", "review_conclusions_packet"],
-  ["table", "review_attempts"],
-  ["index", "review_attempts_one_open_per_packet"],
-  ["index", "review_attempts_lease"],
-  ["table", "verification_requests"],
-  ["index", "verification_requests_team_time"],
-  ["index", "verification_requests_recipient_dispatch"],
-  ["index", "verification_requests_retention"],
-  ["table", "verification_checks"],
-  ["table", "verification_attempts"],
-  ["index", "verification_attempts_one_open_per_request"],
-  ["index", "verification_attempts_lease"],
-  ["table", "verification_check_outcomes"],
-  ["index", "verification_check_outcomes_command"],
-  ["table", "notification_settings"],
-  ["table", "notification_receipts"],
-  ["index", "notification_receipts_state"],
-  ["index", "notification_receipts_time"],
-  ["table", "agent_questions"],
-  ["table", "question_receipt_key"],
-  ["index", "agent_questions_one_pending"],
-  ["index", "agent_questions_agent_time"],
-  ["table", "user_queue_controls"],
-  ["table", "user_queue_items"],
-  ["table", "user_queue_attachments"],
-  ["index", "user_queue_agent_order"],
-  ["index", "user_queue_status"],
-  ["index", "agent_conversations_agent_time"],
-  ["table", "agent_conversations"],
-  ["table", "agent_conversation_selection"],
-  ["index", "agent_results_team_time"],
-  ["index", "agent_results_session_source"],
-  ["index", "agent_results_packet_source"],
-  ["index", "agent_triggers_agent"],
-  ["index", "agent_triggers_enabled"],
-  ["index", "agent_loop_break_events_agent_time"],
-  ["index", "agent_loop_break_events_team_time"],
-  ["index", "agent_lesson_proposals_agent_status_time"],
-  ["index", "agent_lesson_proposals_review"],
-  ["index", "agent_reviews_agent_time"],
-  ["index", "agent_reviews_claimable"],
-  ["index", "agent_reviews_one_open_per_agent"],
-  ["index", "communication_approval_events_attempt"],
-  ["index", "communication_approvals_queue"],
-  ["index", "communication_approvals_teams"],
-  ["index", "idx_agents_telegram_topic_id"],
-  ["index", "idx_provider_models_provider"],
-  ["index", "messages_policy_delivery_queue"],
-  ["index", "messages_causal_chain"],
-  ["index", "messages_to_unread"],
-  ["index", "team_policy_baseline_owner"],
-  ["index", "team_policy_blocks_team_time"],
-  ["index", "team_template_active_position"],
-  ["index", "trigger_dispatches_claimable"],
-  ["index", "trigger_dispatches_trigger_time"],
-  ["index", "web_tokens_active"],
-  ["index", "web_sessions_active"],
-  ["index", "web_sessions_device"],
-  ["table", "agent_results"],
-  ["table", "agent_skills"],
-  ["table", "agent_loop_break_events"],
-  ["table", "agent_lesson_proposals"],
-  ["table", "agent_reviews"],
-  ["table", "agent_triggers"],
-  ["table", "agents"],
-  ["table", "attention_acknowledgements"],
-  ["table", "communication_approval_events"],
-  ["table", "communication_approval_message_grants"],
-  ["table", "communication_approvals"],
-  ["table", "config"],
-  ["table", "mcp_servers"],
-  ["table", "messages"],
-  ["table", "profile_communication_defaults"],
-  ["table", "profile_default_skills"],
-  ["table", "profiles"],
-  ["table", "provider_models"],
-  ["table", "provider_state"],
-  ["table", "schema_migrations"],
-  ["table", "secrets"],
-  ["table", "skill_meta"],
-  ["table", "source_slot_bindings"],
-  ["table", "team_agent_state"],
-  ["table", "team_policies"],
-  ["table", "team_policy_block_events"],
-  ["table", "team_policy_edges"],
-  ["table", "team_template_edges"],
-  ["table", "team_template_revision_edges"],
-  ["table", "team_template_revision_slots"],
-  ["table", "team_template_revisions"],
-  ["table", "team_template_slots"],
-  ["table", "team_templates"],
-  ["table", "teams"],
-  ["table", "telegram_allowed_users"],
-  ["table", "telegram_pairing_challenge"],
-  ["table", "template_instantiations"],
-  ["table", "trigger_dispatches"],
-  ["table", "web_tokens"],
-  ["table", "web_sessions"],
-  ["trigger", "create_team_policy"],
-  ["trigger", "prevent_detached_team_policy_delete"],
-  ["trigger", "validate_source_binding_insert"],
-  ["trigger", "validate_team_agent_state_insert"],
-  ["trigger", "validate_team_policy_baseline_update"],
-  ["trigger", "validate_team_policy_edge_insert"],
-  ["trigger", "validate_team_template_edge_insert"],
-  // BAZ-046: one operator-approved publication of a reviewed revision to a code host.
-  ["table", "publications"],
-  ["index", "publications_team_time"],
-  ["index", "publications_packet_published"],
-  ["index", "publications_lease"]
-];
+
+// ../daemon/src/core/db/migrate.ts
+import { readdirSync, readFileSync as readFileSync4 } from "fs";
+import { dirname as dirname2, join as join2 } from "path";
+import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
+import { fileURLToPath } from "url";
+
+// ../daemon/src/core/db/client.ts
+import { backup, DatabaseSync as DatabaseSync2 } from "node:sqlite";
+function wrap(rawDb) {
+  const cache = /* @__PURE__ */ new Map();
+  let transactionDepth = 0;
+  let savepointSequence = 0;
+  function getStmt(sql) {
+    let s = cache.get(sql);
+    if (!s) {
+      s = rawDb.prepare(sql);
+      cache.set(sql, s);
+    }
+    return s;
+  }
+  return {
+    query(sql) {
+      const stmt = getStmt(sql);
+      return {
+        get(...params) {
+          const result = stmt.get(...params);
+          return result ?? null;
+        },
+        all(...params) {
+          return stmt.all(...params);
+        },
+        run(...params) {
+          return stmt.run(...params);
+        }
+      };
+    },
+    run(sql, params) {
+      const stmt = getStmt(sql);
+      return stmt.run(...params ?? []);
+    },
+    exec(sql) {
+      rawDb.exec(sql);
+    },
+    // node:sqlite has no callable `transaction` wrapper; use manual BEGIN/COMMIT/ROLLBACK.
+    transaction(fn) {
+      return () => {
+        const outermost = transactionDepth === 0;
+        const savepoint = outermost ? null : `bazilion_nested_${++savepointSequence}`;
+        if (outermost) rawDb.exec("BEGIN");
+        else rawDb.exec(`SAVEPOINT ${savepoint}`);
+        transactionDepth++;
+        try {
+          const result = fn();
+          if (outermost) rawDb.exec("COMMIT");
+          else rawDb.exec(`RELEASE SAVEPOINT ${savepoint}`);
+          return result;
+        } catch (err) {
+          if (outermost) rawDb.exec("ROLLBACK");
+          else {
+            rawDb.exec(`ROLLBACK TO SAVEPOINT ${savepoint}`);
+            rawDb.exec(`RELEASE SAVEPOINT ${savepoint}`);
+          }
+          throw err;
+        } finally {
+          transactionDepth--;
+        }
+      };
+    }
+  };
+}
+function applyPragmas(rawDb, includeWal) {
+  if (includeWal) {
+    try {
+      rawDb.exec("PRAGMA journal_mode = WAL");
+    } catch {
+    }
+  }
+  rawDb.exec("PRAGMA foreign_keys = ON");
+}
+function openInMemoryDb() {
+  const raw = new DatabaseSync2(":memory:");
+  applyPragmas(raw, false);
+  return {
+    raw: wrap(raw),
+    backupTo(path) {
+      return backup(raw, path);
+    },
+    close() {
+      raw.close();
+    }
+  };
+}
+
+// ../daemon/src/core/db/migrate.ts
+var migrationsDir = join2(dirname2(fileURLToPath(import.meta.url)), "migrations");
+var schemaMigrationsSql = `
+  CREATE TABLE IF NOT EXISTS schema_migrations (
+    version    TEXT PRIMARY KEY,
+    applied_at INTEGER NOT NULL
+  )
+`;
+function listMigrations() {
+  return readdirSync(migrationsDir).filter((file) => file.endsWith(".sql")).sort().map((file) => ({
+    version: file.replace(/\.sql$/, ""),
+    sql: readFileSync4(join2(migrationsDir, file), "utf8")
+  }));
+}
+var canonicalSchemaObjectsByPrefix = /* @__PURE__ */ new Map();
+function schemaObjects(db) {
+  return db.raw.query(
+    `SELECT type, name, tbl_name, sql
+       FROM sqlite_schema
+       WHERE sql IS NOT NULL AND substr(name, 1, 7) <> 'sqlite_'
+       ORDER BY type, name`
+  ).all();
+}
 function normalizeSql(sql) {
   return sql.replace(/\s+/g, " ").trim();
 }
-function assertCanonicalBackupSchema(db) {
-  const migrations = db.prepare("SELECT version FROM schema_migrations ORDER BY version").all();
-  if (migrations.length !== 1 || migrations[0]?.version !== CANONICAL_MIGRATION) {
+function expectedSchema(files, prefixLength) {
+  const cached = canonicalSchemaObjectsByPrefix.get(prefixLength);
+  if (cached) return cached;
+  const canonical = openInMemoryDb();
+  try {
+    canonical.raw.exec(schemaMigrationsSql);
+    for (const file of files.slice(0, prefixLength)) canonical.raw.exec(file.sql);
+    const objects = schemaObjects(canonical);
+    canonicalSchemaObjectsByPrefix.set(prefixLength, objects);
+    return objects;
+  } finally {
+    canonical.close();
+  }
+}
+function assertSchemaMatchesCanonicalChain(raw) {
+  const files = listMigrations();
+  const expectedVersions = files.map((file) => file.version);
+  const applied = raw.prepare("SELECT version FROM schema_migrations ORDER BY version").all().map((row2) => row2.version);
+  if (applied.length !== expectedVersions.length || applied.some((version, index) => version !== expectedVersions[index])) {
     throw new Error(
-      `schema_migrations must contain exactly ${CANONICAL_MIGRATION}; found ` + (migrations.map((row2) => row2.version).join(", ") || "none")
+      `schema_migrations must contain exactly ${expectedVersions.join(", ")}; found ` + (applied.join(", ") || "none")
     );
   }
-  const rows = db.prepare(
+  const rows = raw.prepare(
     `SELECT type, name, tbl_name, sql
        FROM sqlite_schema
-       WHERE sql IS NOT NULL AND name NOT LIKE 'sqlite_%'`
+       WHERE sql IS NOT NULL AND substr(name, 1, 7) <> 'sqlite_'
+       ORDER BY type, name`
   ).all();
-  const byKey = new Map(rows.map((row2) => [`${row2.type}\0${row2.name}`, row2]));
-  const canonicalKeys = new Set(CANONICAL_OBJECTS.map(([type, name]) => `${type}\0${name}`));
+  const canonical = expectedSchema(files, files.length);
+  const canonicalKeys = new Set(canonical.map((row2) => `${row2.type}\0${row2.name}`));
+  const actualKeys = new Map(rows.map((row2) => [`${row2.type}\0${row2.name}`, row2]));
+  for (const row2 of canonical) {
+    if (!actualKeys.has(`${row2.type}\0${row2.name}`)) {
+      throw new Error(`required canonical schema ${row2.type} is missing: ${row2.name}`);
+    }
+  }
   for (const row2 of rows) {
     if (!canonicalKeys.has(`${row2.type}\0${row2.name}`)) {
       throw new Error(`unexpected schema ${row2.type} is not canonical: ${row2.name}`);
     }
   }
-  const canonicalRows = [];
-  for (const [type, name] of CANONICAL_OBJECTS) {
-    const row2 = byKey.get(`${type}\0${name}`);
-    if (!row2) throw new Error(`required canonical schema ${type} is missing: ${name}`);
-    canonicalRows.push(row2);
-  }
-  const payload = canonicalRows.map((row2) => [row2.type, row2.name, row2.tbl_name, normalizeSql(row2.sql)].join("\0")).join("\n");
-  const actualHash = createHash("sha256").update(payload).digest("hex");
-  if (actualHash !== CANONICAL_SCHEMA_HASH) {
+  const payload = rows.map((row2) => [row2.type, row2.name, row2.tbl_name, normalizeSql(row2.sql)].join("\0")).join("\n");
+  const canonicalPayload = canonical.map((row2) => [row2.type, row2.name, row2.tbl_name, normalizeSql(row2.sql)].join("\0")).join("\n");
+  if (payload !== canonicalPayload) {
     throw new Error(
-      "canonical schema fingerprint does not match this Bazilion release; restore a backup created from the current clean-install schema"
+      "database schema does not match this release\u2019s canonical migration chain; restore a backup created from the current release"
     );
   }
+}
+
+// src/backup-schema.ts
+function assertCanonicalBackupSchema(db) {
+  assertSchemaMatchesCanonicalChain(db);
   for (const row2 of db.prepare("SELECT id, bytes, byte_length, sha256 FROM agent_results WHERE deleted_at IS NULL").iterate()) {
     const bytes = row2.bytes;
     if (!(bytes instanceof Uint8Array) || bytes.byteLength !== row2.byte_length || createHash("sha256").update(bytes).digest("hex") !== row2.sha256) {
@@ -2663,31 +2652,31 @@ import {
   lstatSync as lstatSync2,
   mkdirSync,
   openSync,
-  readFileSync as readFileSync4,
-  realpathSync,
+  readFileSync as readFileSync5,
+  realpathSync as realpathSync2,
   renameSync,
   rmSync,
   writeSync
 } from "fs";
-import { basename as basename3, dirname, join as join2, resolve as resolve2 } from "path";
+import { basename as basename4, dirname as dirname3, join as join3, resolve as resolve3 } from "path";
 var DAEMON_LIVENESS_FILENAME = "daemon-runtime.json";
 var STALE_AFTER_MS = 6e4;
 var PROBE_TIMEOUT_MS = 750;
 function canonicalHomeIdentity(home) {
-  const absolute = resolve2(home);
+  const absolute = resolve3(home);
   try {
-    return realpathSync.native(absolute);
+    return realpathSync2.native(absolute);
   } catch (error) {
     if (errorCode(error) !== "ENOENT") throw error;
-    const parent = dirname(absolute);
+    const parent = dirname3(absolute);
     if (parent === absolute) throw error;
-    return join2(canonicalHomeIdentity(parent), basename3(absolute));
+    return join3(canonicalHomeIdentity(parent), basename4(absolute));
   }
 }
 function daemonLivenessPath(home) {
-  const canonicalHome = canonicalHomeIdentity(home);
-  const identity = createHash2("sha256").update(canonicalHome).digest("hex").slice(0, 24);
-  return join2(dirname(canonicalHome), `.bazilion-runtime-${identity}.json`);
+  const canonicalHome3 = canonicalHomeIdentity(home);
+  const identity = createHash2("sha256").update(canonicalHome3).digest("hex").slice(0, 24);
+  return join3(dirname3(canonicalHome3), `.bazilion-runtime-${identity}.json`);
 }
 function errorCode(error) {
   return error instanceof Error && "code" in error && typeof error.code === "string" ? error.code : void 0;
@@ -2725,7 +2714,7 @@ function parseRecord(raw) {
 function readRecord(path) {
   try {
     const stat = lstatSync2(path);
-    const raw = stat.isFile() ? readFileSync4(path, "utf8") : "";
+    const raw = stat.isFile() ? readFileSync5(path, "utf8") : "";
     return { raw, stat, record: stat.isFile() ? parseRecord(raw) : null };
   } catch (error) {
     if (errorCode(error) === "ENOENT") return null;
@@ -2782,7 +2771,7 @@ function writeRecord(fd, record) {
 function fsyncParentDirectory(path) {
   let directoryFd = null;
   try {
-    directoryFd = openSync(dirname(path), "r");
+    directoryFd = openSync(dirname3(path), "r");
     fsyncSync(directoryFd);
   } catch (error) {
     if (process.platform !== "win32") throw error;
@@ -2804,7 +2793,7 @@ function reclaimRecord(path, existing) {
     return null;
   }
   try {
-    renameSync(path, join2(claim, "stale-record.json"));
+    renameSync(path, join3(claim, "stale-record.json"));
     return claim;
   } catch (error) {
     if (errorCode(error) === "ENOENT") return null;
@@ -2812,10 +2801,10 @@ function reclaimRecord(path, existing) {
   }
 }
 async function acquireHomeRestoreLock(home, operation = "restoring") {
-  const targetHome = resolve2(home);
-  mkdirSync(dirname(targetHome), { recursive: true });
+  const targetHome = resolve3(home);
+  mkdirSync(dirname3(targetHome), { recursive: true });
   const path = daemonLivenessPath(targetHome);
-  mkdirSync(dirname(path), { recursive: true });
+  mkdirSync(dirname3(path), { recursive: true });
   const instanceId = randomUUID6();
   let fd = null;
   let reclaimClaim = null;
@@ -2941,7 +2930,7 @@ async function acquireHomeRestoreLock(home, operation = "restoring") {
     markSwapping(recoveryPath, hadPrevious) {
       if (released || !stillOwnsPath()) throw new Error("restore ownership was lost");
       record.state = "swapping";
-      record.recoveryPath = resolve2(recoveryPath);
+      record.recoveryPath = resolve3(recoveryPath);
       record.hadPrevious = hadPrevious;
       writeRecord(fd, record);
       fsyncParentDirectory(path);
@@ -2956,7 +2945,7 @@ async function acquireHomeRestoreLock(home, operation = "restoring") {
     markRecoveryRequired(recoveryPath, hadPrevious) {
       if (released || !stillOwnsPath()) throw new Error("restore ownership was lost");
       record.state = "recovery-required";
-      record.recoveryPath = resolve2(recoveryPath);
+      record.recoveryPath = resolve3(recoveryPath);
       record.hadPrevious = hadPrevious;
       writeRecord(fd, record);
     },
@@ -3008,10 +2997,10 @@ var createCmd = defineCommand9({
     const cfg = loadClientConfig();
     const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
     const defaultSuffix = args2.recipient ? ".tar.gz.age" : ".tar.gz";
-    const outAbs = resolve3(args2.output ?? `bazilion-backup-${date}${defaultSuffix}`);
+    const outAbs = resolve4(args2.output ?? `bazilion-backup-${date}${defaultSuffix}`);
     if (existsSync2(outAbs)) throw new Error(`refusing to overwrite existing backup: ${outAbs}`);
-    const configuredHome = resolve3(resolveCliPaths().home);
-    const outputFromHome = relative(configuredHome, outAbs);
+    const configuredHome = canonicalHome2(resolveCliPaths().home);
+    const outputFromHome = relative(configuredHome, canonicalHome2(outAbs));
     if (!outputFromHome || !outputFromHome.startsWith("..") && !isAbsolute(outputFromHome)) {
       throw new Error(
         `backup output must be outside BAZILION_HOME (${configuredHome}) to avoid nesting backups`
@@ -3033,8 +3022,8 @@ var createCmd = defineCommand9({
       }
       throw new Error(`backup failed: ${err}`);
     }
-    const downloadDir = mkdtempSync(resolve3(tmpdir(), "bazilion-download-"));
-    const partial = resolve3(downloadDir, "backup.tar.gz");
+    const downloadDir = mkdtempSync(resolve4(tmpdir(), "bazilion-download-"));
+    const partial = resolve4(downloadDir, "backup.tar.gz");
     try {
       if (args2.recipient) {
         const [encryptSource, validateSource] = res.body.tee();
@@ -3059,9 +3048,9 @@ var createCmd = defineCommand9({
         renameSync2(partial, outAbs);
       } catch (error) {
         if (!(error instanceof Error) || !("code" in error) || error.code !== "EXDEV") throw error;
-        const installPartial = resolve3(
-          dirname2(outAbs),
-          `.${basename4(outAbs)}.${randomUUID7()}.installing`
+        const installPartial = resolve4(
+          dirname4(outAbs),
+          `.${basename5(outAbs)}.${randomUUID7()}.installing`
         );
         try {
           copyFileSync(partial, installPartial);
@@ -3247,7 +3236,7 @@ function validateArchiveEntries(entries) {
 function validateAuthFile(path) {
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync5(path, "utf8"));
+    parsed = JSON.parse(readFileSync6(path, "utf8"));
   } catch (error) {
     const detail = error instanceof Error ? error.message : String(error);
     throw new Error(`backup auth.json is invalid: ${detail}`);
@@ -3260,7 +3249,7 @@ function validateAuthFile(path) {
 function validateDatabase(path, authToken) {
   let db = null;
   try {
-    db = new DatabaseSync2(path, { readOnly: true });
+    db = new DatabaseSync4(path, { readOnly: true });
     const integrity = db.prepare("PRAGMA integrity_check").all();
     if (integrity.length !== 1 || integrity[0]?.integrity_check !== "ok") {
       const detail = integrity.map((row2) => row2.integrity_check).join("; ") || "no result";
@@ -3290,6 +3279,22 @@ function validateDatabase(path, authToken) {
     db?.close();
   }
 }
+function canonicalHome2(root) {
+  let resolved = resolve4(root);
+  const unresolvedTail = [];
+  while (true) {
+    try {
+      resolved = realpathSync3(resolved);
+      break;
+    } catch {
+      const parent = dirname4(resolved);
+      if (parent === resolved) break;
+      unresolvedTail.unshift(basename5(resolved));
+      resolved = parent;
+    }
+  }
+  return join4(resolved, ...unresolvedTail);
+}
 var SLUG_ID = /^[a-z0-9][a-z0-9-]*$/;
 var AGENT_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
 function validateEntityId(id, pattern, entity) {
@@ -3299,7 +3304,7 @@ function validateEntityId(id, pattern, entity) {
   return id;
 }
 function containedChildDirectory(root, id, rowLabel) {
-  const child = resolve3(root, id);
+  const child = resolve4(root, id);
   const fromRoot = relative(root, child);
   if (!fromRoot || fromRoot.startsWith("..") || isAbsolute(fromRoot)) {
     throw new Error(`${rowLabel} directory escapes its canonical root: ${JSON.stringify(id)}`);
@@ -3324,7 +3329,9 @@ function requireExtractedTeamSlot(path, rowLabel) {
 function rebaseRestoredHomeDirectories(database, payload, targetHome) {
   let db = null;
   try {
-    db = new DatabaseSync2(database);
+    const canonicalTarget = canonicalHome2(targetHome);
+    const canonicalPayload = realpathSync3(payload);
+    db = new DatabaseSync4(database);
     db.exec("PRAGMA foreign_keys = ON");
     const profiles = db.prepare("SELECT id FROM profiles ORDER BY id").all();
     const agents = db.prepare("SELECT id FROM agents ORDER BY id").all();
@@ -3335,8 +3342,8 @@ function rebaseRestoredHomeDirectories(database, payload, targetHome) {
       ["agents", agents, AGENT_ID]
     ]) {
       const collection = table;
-      const stagedRoot = resolve3(payload, collection);
-      const targetRoot = resolve3(targetHome, collection);
+      const stagedRoot = resolve4(canonicalPayload, collection);
+      const targetRoot = resolve4(canonicalTarget, collection);
       for (const row2 of rows) {
         const id = validateEntityId(row2.id, idPattern, `${table} row`);
         const rowLabel = `${table} row ${JSON.stringify(id)}`;
@@ -3349,7 +3356,7 @@ function rebaseRestoredHomeDirectories(database, payload, targetHome) {
         });
       }
     }
-    const stagedTeamsRoot = resolve3(payload, "teams");
+    const stagedTeamsRoot = resolve4(canonicalPayload, "teams");
     for (const row2 of teams) {
       const id = validateEntityId(row2.id, SLUG_ID, "teams row");
       const rowLabel = `teams row ${JSON.stringify(id)}`;
@@ -3399,21 +3406,21 @@ function rebaseRestoredHomeDirectories(database, payload, targetHome) {
   }
 }
 function removeRebuildableQmdIndexes(payload) {
-  const teamsDir = resolve3(payload, "teams");
+  const teamsDir = resolve4(payload, "teams");
   if (!existsSync2(teamsDir) || !lstatSync3(teamsDir).isDirectory()) return;
-  for (const team of readdirSync(teamsDir, { withFileTypes: true })) {
+  for (const team of readdirSync2(teamsDir, { withFileTypes: true })) {
     if (!team.isDirectory() || team.isSymbolicLink()) continue;
-    const memoryDir = resolve3(teamsDir, team.name, "memory");
+    const memoryDir = resolve4(teamsDir, team.name, "memory");
     if (!existsSync2(memoryDir) || !lstatSync3(memoryDir).isDirectory()) continue;
-    for (const entry3 of readdirSync(memoryDir, { withFileTypes: true })) {
+    for (const entry3 of readdirSync2(memoryDir, { withFileTypes: true })) {
       if (entry3.isFile() && entry3.name.startsWith(".qmd-index.sqlite")) {
-        rmSync2(resolve3(memoryDir, entry3.name), { force: true });
+        rmSync2(resolve4(memoryDir, entry3.name), { force: true });
       }
     }
   }
 }
 function revokeRestoredBrowserSessions(database) {
-  const db = new DatabaseSync2(database);
+  const db = new DatabaseSync4(database);
   try {
     db.prepare("UPDATE web_sessions SET revoked_at = ? WHERE revoked_at IS NULL").run(Date.now());
   } finally {
@@ -3421,9 +3428,9 @@ function revokeRestoredBrowserSessions(database) {
   }
 }
 function installValidatedPayload(payload, targetHome, staging, lifecycle, operations = { rename: renameSync2 }) {
-  const previous = resolve3(staging, "previous-home");
+  const previous = resolve4(staging, "previous-home");
   const hadPrevious = existsSync2(targetHome);
-  const targetParent = dirname2(targetHome);
+  const targetParent = dirname4(targetHome);
   const syncDirectory = operations.fsyncDirectory ?? fsyncDirectory;
   const recoveryError = (message, recoveryPath, cause) => {
     let markerError;
@@ -3534,7 +3541,7 @@ function fsyncDirectory(path) {
   }
 }
 function fsyncFile(path) {
-  const fd = openSync2(path, "r");
+  const fd = openSync2(path, "r+");
   try {
     fsyncSync2(fd);
   } finally {
@@ -3552,13 +3559,13 @@ function isAgeEncrypted(path) {
   }
 }
 function readAgeIdentity(rawPath) {
-  const path = resolve3(rawPath);
+  const path = resolve4(rawPath);
   const entry3 = lstatSync3(path);
   if (!entry3.isFile()) throw new Error(`age identity is not a regular file: ${path}`);
   if (process.platform !== "win32" && (entry3.mode & 63) !== 0) {
     throw new Error(`age identity must be owner-only (chmod 600): ${path}`);
   }
-  const identities = readFileSync5(path, "utf8").split(/\r?\n/).map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
+  const identities = readFileSync6(path, "utf8").split(/\r?\n/).map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
   if (identities.length !== 1 || !identities[0]?.startsWith("AGE-SECRET-KEY-")) {
     throw new Error("age identity file must contain exactly one supported AGE-SECRET-KEY entry");
   }
@@ -3586,18 +3593,18 @@ var restoreCmd = defineCommand9({
     }
   },
   async run({ args: args2 }) {
-    const file = resolve3(args2.file);
+    const file = resolve4(args2.file);
     if (!existsSync2(file)) throw new Error(`backup file not found: ${file}`);
     const paths = resolveCliPaths(args2.home);
-    const targetHome = resolve3(paths.home);
+    const targetHome = resolve4(paths.home);
     if (targetHome === parse(targetHome).root) {
       throw new Error(`refusing to restore over filesystem root: ${targetHome}`);
     }
-    const targetParent = dirname2(targetHome);
+    const targetParent = dirname4(targetHome);
     mkdirSync2(targetParent, { recursive: true });
     const restoreLock = await acquireHomeRestoreLock(targetHome);
     try {
-      const targetsConfiguredHome = targetHome === resolve3(resolveCliPaths().home);
+      const targetsConfiguredHome = targetHome === resolve4(resolveCliPaths().home);
       if (targetsConfiguredHome) {
         for (const serverUrl of configuredLoopbackUrls()) {
           if (await probeServerRunning(serverUrl)) {
@@ -3611,16 +3618,16 @@ var restoreCmd = defineCommand9({
         if (!lstatSync3(targetHome).isDirectory()) {
           throw new Error(`${targetHome} exists and is not a directory`);
         }
-        const entries = readdirSync(targetHome);
+        const entries = readdirSync2(targetHome);
         if (entries.length > 0 && !args2.force) {
           throw new Error(
             `${targetHome} is not empty. Pass --force to overwrite (destroys existing data).`
           );
         }
       }
-      const staging = mkdtempSync(resolve3(targetParent, ".bazilion-restore-"));
-      const stagedArchive = resolve3(staging, "backup.tar.gz");
-      const payload = resolve3(staging, "payload");
+      const staging = mkdtempSync(resolve4(targetParent, ".bazilion-restore-"));
+      const stagedArchive = resolve4(staging, "backup.tar.gz");
+      const payload = resolve4(staging, "payload");
       let preserveStaging = false;
       try {
         if (isAgeEncrypted(file)) {
@@ -3666,8 +3673,8 @@ var restoreCmd = defineCommand9({
           // payload-relative path by npm-tar.
           preservePaths: true
         });
-        const database = resolve3(payload, "bazilion.db");
-        const authFile = resolve3(payload, "auth.json");
+        const database = resolve4(payload, "bazilion.db");
+        const authFile = resolve4(payload, "auth.json");
         if (!lstatSync3(database).isFile() || !lstatSync3(authFile).isFile()) {
           throw new Error("backup required files did not extract as regular files");
         }
@@ -3730,11 +3737,11 @@ function encryptSecretEnvelope(value, password) {
   });
 }
 function credentialInventory(home) {
-  const authFile = resolve3(home, "auth.json");
-  const database = resolve3(home, "bazilion.db");
+  const authFile = resolve4(home, "auth.json");
+  const database = resolve4(home, "bazilion.db");
   const token = validateAuthFile(authFile);
   validateDatabase(database, token);
-  const db = new DatabaseSync2(database, { readOnly: true });
+  const db = new DatabaseSync4(database, { readOnly: true });
   try {
     const activeTokens = db.prepare(
       "SELECT COUNT(*) AS count FROM web_tokens WHERE revoked_at IS NULL AND kind = 'device' AND expires_at > ?"
@@ -3749,7 +3756,7 @@ var inventoryCmd = defineCommand9({
   meta: { name: "inventory", description: "List credential classes captured by a backup/home" },
   args: { home: { type: "string", description: "Override BAZILION_HOME" } },
   run({ args: args2 }) {
-    const home = resolve3(resolveCliPaths(args2.home).home);
+    const home = resolve4(resolveCliPaths(args2.home).home);
     const inventory = credentialInventory(home);
     console.log("credential classes present (values are never shown):");
     console.log(`  bootstrap token: ${inventory.bootstrap ? "present" : "missing"}`);
@@ -3788,14 +3795,14 @@ var rotateBootstrapCmd = defineCommand9({
   async run({ args: args2 }) {
     if (!args2.yes) throw new Error("--yes is required");
     const paths = resolveCliPaths(args2.home);
-    const targetHome = resolve3(paths.home);
+    const targetHome = resolve4(paths.home);
     if (targetHome === parse(targetHome).root) {
       throw new Error(`refusing to rotate filesystem root: ${targetHome}`);
     }
     const lock = await acquireHomeRestoreLock(targetHome);
-    const parent = dirname2(targetHome);
-    const staging = mkdtempSync(resolve3(parent, ".bazilion-rotate-"));
-    const payload = resolve3(staging, "payload");
+    const parent = dirname4(targetHome);
+    const staging = mkdtempSync(resolve4(parent, ".bazilion-rotate-"));
+    const payload = resolve4(staging, "payload");
     let preserveStaging = false;
     try {
       for (const serverUrl of configuredLoopbackUrls()) {
@@ -3803,20 +3810,20 @@ var rotateBootstrapCmd = defineCommand9({
           throw new Error(`bazilion server appears to be running at ${serverUrl} \u2014 stop it first.`);
         }
       }
-      const oldAuth = JSON.parse(readFileSync5(paths.authFile, "utf8"));
+      const oldAuth = JSON.parse(readFileSync6(paths.authFile, "utf8"));
       if (typeof oldAuth.token !== "string" || !oldAuth.token) {
         throw new Error("auth.json is missing the bootstrap token");
       }
-      validateDatabase(resolve3(targetHome, "bazilion.db"), oldAuth.token);
+      validateDatabase(resolve4(targetHome, "bazilion.db"), oldAuth.token);
       cpSync(targetHome, payload, {
         recursive: true,
         dereference: false,
         verbatimSymlinks: true,
         preserveTimestamps: true
       });
-      const stagedDb = resolve3(payload, "bazilion.db");
+      const stagedDb = resolve4(payload, "bazilion.db");
       rmSync2(stagedDb, { force: true });
-      const sourceDb = new DatabaseSync2(resolve3(targetHome, "bazilion.db"), { readOnly: true });
+      const sourceDb = new DatabaseSync4(resolve4(targetHome, "bazilion.db"), { readOnly: true });
       try {
         await sqliteBackup(sourceDb, stagedDb);
       } finally {
@@ -3825,7 +3832,7 @@ var rotateBootstrapCmd = defineCommand9({
       for (const suffix of ["-wal", "-shm", "-journal"])
         rmSync2(`${stagedDb}${suffix}`, { force: true });
       const newToken = randomBytes(24).toString("hex");
-      const db = new DatabaseSync2(stagedDb);
+      const db = new DatabaseSync4(stagedDb);
       try {
         db.exec("PRAGMA foreign_keys = ON; BEGIN IMMEDIATE");
         try {
@@ -3863,8 +3870,8 @@ var rotateBootstrapCmd = defineCommand9({
       } finally {
         db.close();
       }
-      const stagedAuth = resolve3(payload, "auth.json");
-      const authPartial = resolve3(payload, `.auth.json.${randomUUID7()}.installing`);
+      const stagedAuth = resolve4(payload, "auth.json");
+      const authPartial = resolve4(payload, `.auth.json.${randomUUID7()}.installing`);
       writeFileSync2(authPartial, `${JSON.stringify({ ...oldAuth, token: newToken }, null, 2)}
 `, {
         mode: 384,
@@ -4122,16 +4129,16 @@ var configCommand = defineCommand11({
 import { spawn } from "child_process";
 import { existsSync as existsSync3 } from "fs";
 import { connect } from "net";
-import { join as join3 } from "path";
+import { join as join5 } from "path";
 import { defineCommand as defineCommand12 } from "citty";
-var bundledDaemonEntry = join3(import.meta.dirname, "daemon.js");
-var sourceDaemonEntry = join3(import.meta.dirname, "..", "..", "..", "daemon", "src", "index.ts");
+var bundledDaemonEntry = join5(import.meta.dirname, "daemon.js");
+var sourceDaemonEntry = join5(import.meta.dirname, "..", "..", "..", "daemon", "src", "index.ts");
 var daemonEntry = existsSync3(bundledDaemonEntry) ? bundledDaemonEntry : sourceDaemonEntry;
-var bundledWebServerEntry = join3(import.meta.dirname, "web-server.js");
-var sourceWebServerEntry = join3(import.meta.dirname, "..", "web-server.ts");
+var bundledWebServerEntry = join5(import.meta.dirname, "web-server.js");
+var sourceWebServerEntry = join5(import.meta.dirname, "..", "web-server.ts");
 var webServerEntry = existsSync3(bundledWebServerEntry) ? bundledWebServerEntry : sourceWebServerEntry;
-var bundledWebDist = join3(import.meta.dirname, "web");
-var sourceWebDist = join3(import.meta.dirname, "..", "..", "..", "web", "dist");
+var bundledWebDist = join5(import.meta.dirname, "web");
+var sourceWebDist = join5(import.meta.dirname, "..", "..", "..", "web", "dist");
 var webDist = existsSync3(bundledWebDist) ? bundledWebDist : sourceWebDist;
 function nodeArgs(entry3) {
   return entry3.endsWith(".ts") ? ["--import", "tsx/esm", entry3] : [entry3];
@@ -4150,12 +4157,12 @@ function probeHost(host) {
   return host;
 }
 function isTcpPortOpen(host, port) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     const socket = connect({ host: probeHost(host), port: Number(port) });
     const done = (open) => {
       socket.removeAllListeners();
       socket.destroy();
-      resolve6(open);
+      resolve7(open);
     };
     socket.setTimeout(600);
     socket.once("connect", () => done(true));
@@ -4294,7 +4301,7 @@ var dashboardCommand = defineCommand12({
             `web UI port ${webPort} is already in use. Re-run with --port <free-port>.`
           );
         }
-        if (!existsSync3(join3(webDist, "server", "server.js"))) {
+        if (!existsSync3(join5(webDist, "server", "server.js"))) {
           throw new Error(
             `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.`
           );
@@ -4321,13 +4328,13 @@ var dashboardCommand = defineCommand12({
     if (children.length === 0) return;
     process.on("SIGINT", terminateChildren);
     process.on("SIGTERM", terminateChildren);
-    await new Promise((resolve6) => {
+    await new Promise((resolve7) => {
       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) resolve6();
+          if (remaining === 0) resolve7();
         });
       }
     });
@@ -4699,7 +4706,7 @@ var inboxCommand = defineCommand15({
 });
 
 // src/commands/login.ts
-import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "fs";
 import { defineCommand as defineCommand16 } from "citty";
 function normalizeServer(raw) {
   let url;
@@ -4742,7 +4749,7 @@ var loginCommand = defineCommand16({
         `${paths.authFile} not found. Start the daemon with "bazilion serve" first \u2014 login stores the remote there.`
       );
     }
-    const auth = JSON.parse(readFileSync6(paths.authFile, "utf8"));
+    const auth = JSON.parse(readFileSync7(paths.authFile, "utf8"));
     if (args2.clear) {
       if (!auth.remote) {
         console.log("no remote stored \u2014 nothing to clear");
@@ -4992,9 +4999,9 @@ var memoryCommand = defineCommand18({
 // src/commands/profile.ts
 import { spawn as spawn2 } from "child_process";
 import { randomBytes as randomBytes2 } from "crypto";
-import { readFileSync as readFileSync7, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
+import { readFileSync as readFileSync8, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join4 } from "path";
+import { join as join6 } from "path";
 
 // ../../packages/api-types/src/git-review.ts
 var REVIEW_LIMITS = {
@@ -5071,7 +5078,7 @@ var createCmd2 = defineCommand19({
   },
   async run({ args: args2 }) {
     const skillsMode = parseSkillsMode(args2["skills-mode"]);
-    const readTemplate = (path) => path ? readFileSync7(path, "utf8") : void 0;
+    const readTemplate = (path) => path ? readFileSync8(path, "utf8") : void 0;
     const body = {
       id: args2.id,
       name: args2.name,
@@ -5146,17 +5153,17 @@ var editCmd2 = defineCommand19({
     const { content } = await client.get(
       `/api/profiles/${args2.id}/files/${file}`
     );
-    const tmpPath = join4(tmpdir2(), `bazilion-${args2.id}-${file}-${randomBytes2(4).toString("hex")}`);
+    const tmpPath = join6(tmpdir2(), `bazilion-${args2.id}-${file}-${randomBytes2(4).toString("hex")}`);
     writeFileSync4(tmpPath, content);
     try {
       const editor = process.env.EDITOR ?? process.env.VISUAL ?? "vi";
-      const code = await new Promise((resolve6, reject) => {
+      const code = await new Promise((resolve7, reject) => {
         const child = spawn2(editor, [tmpPath], { stdio: "inherit" });
         child.on("error", reject);
-        child.on("close", (c) => resolve6(c ?? 0));
+        child.on("close", (c) => resolve7(c ?? 0));
       });
       if (code !== 0) throw new Error(`editor exited with code ${code}`);
-      const updated = readFileSync7(tmpPath, "utf8");
+      const updated = readFileSync8(tmpPath, "utf8");
       if (updated === content) {
         console.log("(no changes)");
         return;
@@ -5502,10 +5509,10 @@ var sendCommand = defineCommand22({
 // src/commands/serve.ts
 import { spawn as spawn3 } from "child_process";
 import { existsSync as existsSync5 } from "fs";
-import { join as join5 } from "path";
+import { join as join7 } from "path";
 import { defineCommand as defineCommand23 } from "citty";
-var bundledDaemonEntry2 = join5(import.meta.dirname, "daemon.js");
-var sourceDaemonEntry2 = join5(import.meta.dirname, "..", "..", "..", "daemon", "src", "index.ts");
+var bundledDaemonEntry2 = join7(import.meta.dirname, "daemon.js");
+var sourceDaemonEntry2 = join7(import.meta.dirname, "..", "..", "..", "daemon", "src", "index.ts");
 var daemonEntry2 = existsSync5(bundledDaemonEntry2) ? bundledDaemonEntry2 : sourceDaemonEntry2;
 var serveCommand = defineCommand23({
   meta: {
@@ -5556,17 +5563,17 @@ var serveCommand = defineCommand23({
       signalled = true;
     });
     process.on("SIGTERM", onSigterm);
-    await new Promise((resolve6, reject) => {
+    await new Promise((resolve7, reject) => {
       proc.on("error", (err) => reject(err));
       proc.on("close", (code) => {
         if (signalled) {
           process.exitCode = 0;
-          resolve6();
+          resolve7();
         } else if (code === 0 || code === null) {
-          resolve6();
+          resolve7();
         } else {
           process.exitCode = code;
-          resolve6();
+          resolve7();
         }
       });
     });
@@ -5611,8 +5618,8 @@ var sessionCommand = defineCommand24({
 });
 
 // src/commands/skill.ts
-import { existsSync as existsSync6, readFileSync as readFileSync8, statSync as statSync2 } from "fs";
-import { basename as basename5, resolve as resolve4 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync9, statSync as statSync2 } from "fs";
+import { basename as basename6, resolve as resolve5 } from "path";
 import { defineCommand as defineCommand25 } from "citty";
 function printFindings(findings, prefix = "  ") {
   for (const f of findings) {
@@ -5676,13 +5683,13 @@ var importCmd = defineCommand25({
   },
   async run({ args: args2 }) {
     const client = createClient2();
-    const absFrom = resolve4(args2.from);
+    const absFrom = resolve5(args2.from);
     const isLocalZip = args2.from.toLowerCase().endsWith(".zip") && existsSync6(absFrom) && statSync2(absFrom).isFile();
     let result;
     try {
       if (isLocalZip) {
-        const bytes = readFileSync8(absFrom);
-        const file = new File([bytes], basename5(absFrom), { type: "application/zip" });
+        const bytes = readFileSync9(absFrom);
+        const file = new File([bytes], basename6(absFrom), { type: "application/zip" });
         const fd = new FormData();
         fd.set("file", file);
         if (args2.force) fd.set("force", "true");
@@ -5751,7 +5758,7 @@ var skillCommand = defineCommand25({
 });
 
 // src/commands/team.ts
-import { readFileSync as readFileSync11 } from "fs";
+import { readFileSync as readFileSync12 } from "fs";
 import { stdin as stdin2 } from "process";
 import { defineCommand as defineCommand33 } from "citty";
 
@@ -5813,7 +5820,7 @@ var teamCodingLogCommand = defineCommand26({
 });
 
 // src/commands/team-environment.ts
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync10 } from "fs";
 import { defineCommand as defineCommand27 } from "citty";
 var args = { id: { type: "positional", required: true, description: "Team slug" } };
 var teamEnvironmentCommand = defineCommand27({
@@ -5839,7 +5846,7 @@ var teamEnvironmentCommand = defineCommand27({
       },
       async run({ args: args2 }) {
         const input = JSON.parse(
-          readFileSync9(args2.file, "utf8")
+          readFileSync10(args2.file, "utf8")
         );
         console.log(
           JSON.stringify(await createClient2().codingEnvironment.configure(args2.id, input), null, 2)
@@ -5850,7 +5857,7 @@ var teamEnvironmentCommand = defineCommand27({
 });
 
 // src/commands/team-policy.ts
-import { readFileSync as readFileSync10 } from "fs";
+import { readFileSync as readFileSync11 } from "fs";
 import { defineCommand as defineCommand28 } from "citty";
 
 // src/team-interchange.ts
@@ -6067,7 +6074,7 @@ function edgeDiff(before, after) {
 // src/commands/team-policy.ts
 function readJson(path) {
   try {
-    return JSON.parse(readFileSync10(path, "utf8"));
+    return JSON.parse(readFileSync11(path, "utf8"));
   } catch (error) {
     throw new Error(`invalid JSON: ${error.message}`);
   }
@@ -7357,7 +7364,7 @@ var userMdSetCmd = defineCommand33({
   async run({ args: args2 }) {
     let content;
     if (args2["from-stdin"]) content = await readStdin();
-    else if (args2.file) content = readFileSync11(args2.file, "utf8");
+    else if (args2.file) content = readFileSync12(args2.file, "utf8");
     else if (args2.text !== void 0) content = args2.text;
     else {
       console.error("team user-md set: provide --file, --from-stdin, or --text");
@@ -7503,11 +7510,11 @@ var teamCommand = defineCommand33({
 });
 
 // src/commands/team-template.ts
-import { readFileSync as readFileSync12 } from "fs";
+import { readFileSync as readFileSync13 } from "fs";
 import { defineCommand as defineCommand34 } from "citty";
 function jsonFile(path) {
   try {
-    return JSON.parse(readFileSync12(path, "utf8"));
+    return JSON.parse(readFileSync13(path, "utf8"));
   } catch (error) {
     throw new Error(`invalid JSON: ${error.message}`);
   }
@@ -8025,7 +8032,7 @@ function tokenRow(t) {
   const expired = t.expiresAt !== null && t.expiresAt <= Date.now();
   const state = t.revokedAt ? "revoked" : expired ? "expired" : "active";
   const expires = t.expiresAt ? new Date(t.expiresAt).toISOString() : "(never)";
-  return [t.id, t.kind, state, t.label, `expires: ${expires}`, `last: ${last}`];
+  return [t.id, t.kind, state, t.label, t.scopes.join(" "), `expires: ${expires}`, `last: ${last}`];
 }
 function resolveQrServer(override) {
   const raw = override ?? loadClientConfig().serverUrl;
@@ -8062,19 +8069,29 @@ var createCmd6 = defineCommand36({
     expiresDays: {
       type: "string",
       description: "Device lifetime in days (default 90, maximum 365)"
+    },
+    scope: {
+      type: "string",
+      description: "Authorization scope; repeat for more (read, write, approvals, admin). Default: all scopes."
     }
   },
-  async run({ args: args2 }) {
+  async run({ args: args2, rawArgs }) {
     const client = createClient2();
     const expiresInDays = args2.expiresDays === void 0 ? void 0 : Number(args2.expiresDays);
     if (expiresInDays !== void 0 && !Number.isInteger(expiresInDays)) {
       throw new Error("--expires-days must be an integer");
     }
-    const body = { label: args2.label, expiresInDays };
+    const scopes = collectFlagValues(rawArgs, "scope");
+    const body = {
+      label: args2.label,
+      expiresInDays,
+      ...scopes.length > 0 ? { scopes } : {}
+    };
     const res = await client.post("/api/tokens", body);
-    console.log(`id:    ${res.meta.id}`);
-    console.log(`label: ${res.meta.label}`);
-    console.log(`kind:  ${res.meta.kind}`);
+    console.log(`id:     ${res.meta.id}`);
+    console.log(`label:  ${res.meta.label}`);
+    console.log(`kind:   ${res.meta.kind}`);
+    console.log(`scopes: ${res.meta.scopes.join(" ")}`);
     console.log(
       `expires: ${res.meta.expiresAt ? new Date(res.meta.expiresAt).toISOString() : "(never)"}`
     );
@@ -8090,6 +8107,43 @@ var createCmd6 = defineCommand36({
     qrcode.generate(pairUrl, { small: true }, (qr) => console.log(qr));
   }
 });
+var pairCmd = defineCommand36({
+  meta: {
+    name: "pair",
+    description: "Mint a one-paste pairing setup code for a new device (10 min, single use)"
+  },
+  args: {
+    scope: {
+      type: "string",
+      description: "Authorization scope for the minted device credential; repeat for more. Default: all scopes."
+    },
+    server: {
+      type: "string",
+      description: "Server URL to embed in the setup code (default: detect LAN IP; pass the gateway HTTPS origin for remote devices)"
+    }
+  },
+  async run({ args: args2, rawArgs }) {
+    const client = createClient2();
+    const scopes = collectFlagValues(rawArgs, "scope");
+    const res = await client.post("/api/pair/codes", {
+      ...scopes.length > 0 ? { scopes } : {}
+    });
+    let setupUrl = res.setupUrl;
+    if (args2.server) {
+      const serverUrl = resolveQrServer(args2.server);
+      setupUrl = `bazilion-pair://pair?server=${encodeURIComponent(serverUrl)}&code=${encodeURIComponent(res.code)}`;
+    }
+    console.log(`id:     ${res.meta.id}`);
+    console.log(`scopes: ${res.meta.scopes.join(" ")}`);
+    console.log(`expires: ${new Date(res.meta.expiresAt).toISOString()} (10 minutes, single use)`);
+    console.log("");
+    console.log(`setup URL (paste or scan on the new device):`);
+    console.log(setupUrl);
+    console.log("");
+    console.log("the code admits exactly one credential exchange; after that it is inert.");
+    qrcode.generate(setupUrl, { small: true }, (qr) => console.log(qr));
+  }
+});
 var listCmd14 = defineCommand36({
   meta: { name: "list", description: "List web tokens" },
   args: {
@@ -8131,6 +8185,7 @@ var tokenCommand = defineCommand36({
   meta: { name: "token", description: "Manage web tokens for API/CLI clients" },
   subCommands: {
     create: createCmd6,
+    pair: pairCmd,
     list: listCmd14,
     revoke: revokeCmd2,
     "show-local": showLocalCmd
@@ -8280,9 +8335,9 @@ var triggerCommand = defineCommand37({
 });
 
 // src/commands/uninstall.ts
-import { existsSync as existsSync7, lstatSync as lstatSync4, readdirSync as readdirSync2, realpathSync as realpathSync2, rmSync as rmSync4 } from "fs";
+import { existsSync as existsSync7, lstatSync as lstatSync4, readdirSync as readdirSync3, realpathSync as realpathSync4, 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 resolve5, sep } from "path";
+import { isAbsolute as isAbsolute2, join as join8, parse as parse2, relative as relative2, resolve as resolve6, sep } from "path";
 import { defineCommand as defineCommand38 } from "citty";
 function makeLineReader() {
   let buffer = "";
@@ -8293,8 +8348,8 @@ function makeLineReader() {
       const nlIdx = buffer.indexOf("\n");
       if (nlIdx === -1) {
         if (ended) {
-          const resolve6 = queue.shift();
-          resolve6?.(buffer);
+          const resolve7 = queue.shift();
+          resolve7?.(buffer);
           buffer = "";
         } else {
           return;
@@ -8302,8 +8357,8 @@ function makeLineReader() {
       } else {
         const line = buffer.slice(0, nlIdx);
         buffer = buffer.slice(nlIdx + 1);
-        const resolve6 = queue.shift();
-        resolve6?.(line);
+        const resolve7 = queue.shift();
+        resolve7?.(line);
       }
     }
   };
@@ -8316,8 +8371,8 @@ function makeLineReader() {
     ended = true;
     tryDeliver();
   });
-  return () => new Promise((resolve6) => {
-    queue.push(resolve6);
+  return () => new Promise((resolve7) => {
+    queue.push(resolve7);
     tryDeliver();
   });
 }
@@ -8338,10 +8393,10 @@ function removePath(p) {
 }
 function canonicalExistingPath(path) {
   try {
-    return realpathSync2.native(path);
+    return realpathSync4.native(path);
   } catch (error) {
     if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) throw error;
-    return resolve5(path);
+    return resolve6(path);
   }
 }
 function containsPath(container, candidate) {
@@ -8349,7 +8404,7 @@ function containsPath(container, candidate) {
   return nested === "" || nested !== ".." && !nested.startsWith(`..${sep}`) && !isAbsolute2(nested);
 }
 function assertSafeUninstallHome(home) {
-  const target = resolve5(home);
+  const target = resolve6(home);
   const canonical = canonicalExistingPath(target);
   const userHome = canonicalExistingPath(homedir2());
   const workingDirectory = canonicalExistingPath(process.cwd());
@@ -8389,15 +8444,22 @@ var uninstallCommand = defineCommand38({
   async run({ args: args2 }) {
     const paths = resolveCliPaths(args2.home);
     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");
+    const requestedHome = resolve6(args2.home ?? process.env.BAZILION_HOME ?? join8(homedir2(), ".bazilion"));
+    let requestedIsSymlink = false;
+    try {
+      requestedIsSymlink = lstatSync4(requestedHome).isSymbolicLink();
+    } catch {
+    }
+    const homeIsSymlink = requestedIsSymlink;
+    const dbFile = join8(targetHome, "bazilion.db");
+    const profilesDir = join8(targetHome, "profiles");
+    const agentsDir = join8(targetHome, "agents");
+    const teamsDir = join8(targetHome, "teams");
+    const legacyGroupsDir = join8(targetHome, "groups");
+    const skillsDir = join8(targetHome, "skills");
+    const logsDir = join8(targetHome, "logs");
+    const legacyConfigFile = join8(targetHome, "config.json");
+    const legacySecretsFile = join8(targetHome, "secrets.enc");
     if (!existsSync7(targetHome)) {
       const uninstallLock2 = await acquireHomeRestoreLock(targetHome, "uninstalling");
       try {
@@ -8408,7 +8470,6 @@ var uninstallCommand = defineCommand38({
       }
       return;
     }
-    const homeIsSymlink = lstatSync4(targetHome).isSymbolicLink();
     console.log(`about to uninstall bazilion at ${targetHome}`);
     console.log("");
     const resetTargets = [
@@ -8416,7 +8477,7 @@ var uninstallCommand = defineCommand38({
       `${dbFile}-wal`,
       `${dbFile}-shm`,
       `${dbFile}-journal`,
-      join6(targetHome, "auth.json"),
+      join8(targetHome, "auth.json"),
       legacyConfigFile,
       legacySecretsFile,
       profilesDir,
@@ -8450,10 +8511,10 @@ var uninstallCommand = defineCommand38({
         for (const p of fullWipeTargets) {
           if (removePath(p)) console.log(`removed ${p}`);
         }
-        if (readdirSync2(targetHome).length === 0 && !homeIsSymlink) {
+        if (readdirSync3(targetHome).length === 0 && !homeIsSymlink) {
           rmSync4(targetHome, { recursive: true, force: true });
           console.log(`removed ${targetHome}`);
-        } else if (homeIsSymlink && readdirSync2(targetHome).length === 0) {
+        } else if (homeIsSymlink && readdirSync3(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`);