@quantiya/codevibe-core 2.0.80 → 2.0.82

package/dist/orchestration-shell/cli.js

@@ -149,7 +149,7 @@ async function fireBeacon(name, params, clientId = getClientId()) {
       client_id: clientId,
       events: [{ name, params }]
     });
-    await new Promise((resolve28) => {
+    await new Promise((resolve29) => {
       let req = https.request(
         {
           hostname: GA4_HOSTNAME,
@@ -157,9 +157,9 @@ async function fireBeacon(name, params, clientId = getClientId()) {
           method: "POST",
           headers: { "Content-Type": "application/json" }
         },
-        () => resolve28()
+        () => resolve29()
       );
-      req.on("error", () => resolve28()), req.write(payload), req.end(), setTimeout(resolve28, 2e3);
+      req.on("error", () => resolve29()), req.write(payload), req.end(), setTimeout(resolve29, 2e3);
     });
   } catch {
   }
@@ -641,7 +641,7 @@ var import_node_child_process8, path66, GIT_TIMEOUT_MS, SCRUBBED_ENV, defaultGit
     import_node_child_process8 = require("node:child_process"), path66 = __toESM(require("node:path")), GIT_TIMEOUT_MS = 5e3, SCRUBBED_ENV = (() => {
       let out = {};
       return process.env.PATH && (out.PATH = process.env.PATH), process.env.LANG && (out.LANG = process.env.LANG), process.env.LC_ALL && (out.LC_ALL = process.env.LC_ALL), out;
-    })(), defaultGitExec = (args, options) => new Promise((resolve28, reject) => {
+    })(), defaultGitExec = (args, options) => new Promise((resolve29, reject) => {
       (0, import_node_child_process8.execFile)(
         "git",
         args,
@@ -658,7 +658,7 @@ var import_node_child_process8, path66, GIT_TIMEOUT_MS, SCRUBBED_ENV, defaultGit
             return;
           }
           let out = stdout;
-          resolve28(typeof out == "string" ? out : out.toString("utf8"));
+          resolve29(typeof out == "string" ? out : out.toString("utf8"));
         }
       ).on("error", reject);
     });
@@ -887,8 +887,8 @@ var import_node_fs28, path67, os39, crypto26, import_json_freeze15, import_yaml,
           this.locked = !0;
           return;
         }
-        return new Promise((resolve28) => {
-          this.waiters.push(resolve28);
+        return new Promise((resolve29) => {
+          this.waiters.push(resolve29);
         });
       }
       release() {
@@ -951,7 +951,7 @@ function companionPreferenceFilePath() {
 async function readCompanionPreference() {
   let filePath = companionPreferenceFilePath(), raw, st;
   try {
-    st = await fs64.stat(filePath);
+    st = await fs65.stat(filePath);
   } catch (err) {
     return err?.code !== "ENOENT" && logger.debug("[companion-preference] stat error \u2014 treating as missing", {
       filePath,
@@ -964,7 +964,7 @@ async function readCompanionPreference() {
 `
     ), null;
   try {
-    raw = await fs64.readFile(filePath, "utf8");
+    raw = await fs65.readFile(filePath, "utf8");
   } catch (err) {
     return logger.debug("[companion-preference] read error \u2014 treating as missing", {
       filePath,
@@ -982,19 +982,19 @@ async function readCompanionPreference() {
 }
 async function persistCompanionPreference(pref) {
   let filePath = companionPreferenceFilePath(), dir = path85.dirname(filePath);
-  await fs64.mkdir(dir, { recursive: !0 }), await fs64.writeFile(filePath, JSON.stringify(pref, null, 2), {
+  await fs65.mkdir(dir, { recursive: !0 }), await fs65.writeFile(filePath, JSON.stringify(pref, null, 2), {
     encoding: "utf8",
     mode: 384
   });
   try {
-    await fs64.chmod(filePath, 384);
+    await fs65.chmod(filePath, 384);
   } catch {
   }
 }
-var fs64, path85, os52, import_zod16, CompanionPreferenceSchema, init_persist_preference = __esm({
+var fs65, path85, os52, import_zod16, CompanionPreferenceSchema, init_persist_preference = __esm({
   "src/companion-mode/persist-preference.ts"() {
     "use strict";
-    fs64 = __toESM(require("fs/promises")), path85 = __toESM(require("path")), os52 = __toESM(require("os")), import_zod16 = require("zod");
+    fs65 = __toESM(require("fs/promises")), path85 = __toESM(require("path")), os52 = __toESM(require("os")), import_zod16 = require("zod");
     init_logger2();
     CompanionPreferenceSchema = import_zod16.z.object({
       lastAgent: import_zod16.z.union([
@@ -1018,8 +1018,8 @@ CodeVibe \u2014 choose an agent:
       out.write(`  ${marker} [${i + 1}] ${a.kind.padEnd(8)} ${a.binPath}
 `);
     }); ; ) {
-      let trimmed = (await new Promise((resolve28) => {
-        rl.question(`Agent [1-${args.healthy.length}] (default ${args.defaultIndex + 1}): `, resolve28);
+      let trimmed = (await new Promise((resolve29) => {
+        rl.question(`Agent [1-${args.healthy.length}] (default ${args.defaultIndex + 1}): `, resolve29);
       })).trim();
       if (trimmed === "") return args.healthy[args.defaultIndex];
       let n = Number.parseInt(trimmed, 10);
@@ -1059,13 +1059,13 @@ function isContainedPath(parent, candidate) {
 }
 function resolveDeclaredCompanionLauncher(packageJsonPath) {
   try {
-    let packageRoot = fs65.realpathSync(path86.dirname(packageJsonPath)), declared = JSON.parse(
-      fs65.readFileSync(packageJsonPath, "utf8")
+    let packageRoot = fs66.realpathSync(path86.dirname(packageJsonPath)), declared = JSON.parse(
+      fs66.readFileSync(packageJsonPath, "utf8")
     ).codevibe?.companionLauncher;
     if (typeof declared != "string" || declared.trim().length === 0)
       return null;
-    let launcherPath = fs65.realpathSync(path86.resolve(packageRoot, declared));
-    return !isContainedPath(packageRoot, launcherPath) || !fs65.statSync(launcherPath).isFile() ? null : (fs65.accessSync(launcherPath, fs65.constants.X_OK), launcherPath);
+    let launcherPath = fs66.realpathSync(path86.resolve(packageRoot, declared));
+    return !isContainedPath(packageRoot, launcherPath) || !fs66.statSync(launcherPath).isFile() ? null : (fs66.accessSync(launcherPath, fs66.constants.X_OK), launcherPath);
   } catch {
     return null;
   }
@@ -1175,10 +1175,10 @@ async function runCompanionMode(args) {
     process.kill(process.pid, signal);
   }))(child.signal), 1) : child.status ?? 1;
 }
-var import_child_process10, import_module, path86, fs65, NoAgentInstalledError, COMPANION_PLUGIN, ACTIVE_COMPANION_AGENTS, ACTIVATION_AGENT, init_companion_mode = __esm({
+var import_child_process10, import_module, path86, fs66, NoAgentInstalledError, COMPANION_PLUGIN, ACTIVE_COMPANION_AGENTS, ACTIVATION_AGENT, init_companion_mode = __esm({
   "src/companion-mode/index.ts"() {
     "use strict";
-    import_child_process10 = require("child_process"), import_module = require("module"), path86 = __toESM(require("path")), fs65 = __toESM(require("fs"));
+    import_child_process10 = require("child_process"), import_module = require("module"), path86 = __toESM(require("path")), fs66 = __toESM(require("fs"));
     init_env_scrub();
     init_logger2();
     init_detect_agents();
@@ -1702,7 +1702,14 @@ function getConfig() {
 // src/credential-broker/oauth-account-lock.ts
 var import_node_fs = require("node:fs"), os4 = __toESM(require("node:os")), path3 = __toESM(require("node:path")), import_node_crypto = require("node:crypto");
 init_logger2();
-var DEFAULT_TTL_MS = 3e4, DEFAULT_HEARTBEAT_MS = 5e3, DEFAULT_MAX_WAIT_MS = 6e4, DEFAULT_BACKOFF_MS = 25;
+var LocalLockBusyError = class extends Error {
+  constructor(diagnostic) {
+    super(`[oauth-account-lock] timed out acquiring OAuth-account lock after ${diagnostic.waitMs}ms (holder not reclaimable) ${JSON.stringify(diagnostic)}`);
+    this.diagnostic = diagnostic;
+    this.code = "LOCAL_LOCK_BUSY";
+    this.name = "LocalLockBusyError";
+  }
+}, DEFAULT_TTL_MS = 3e4, DEFAULT_HEARTBEAT_MS = 5e3, DEFAULT_MAX_WAIT_MS = 6e4, DEFAULT_BACKOFF_MS = 25;
 function errCode(err) {
   return err?.code;
 }
@@ -1719,7 +1726,7 @@ function defaultIsProcessAlive(selfHost) {
 }
 var OAuthAccountLock = class {
   constructor(opts) {
-    this.lockDir = opts.lockDir, this.requireRemovalOnRelease = opts.requireRemovalOnRelease === !0, this.ownerFile = path3.join(this.lockDir, "owner.json"), this.reclaimGuardDir = `${this.lockDir}.reclaim`, this.ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS, this.heartbeatMs = opts.heartbeatMs ?? DEFAULT_HEARTBEAT_MS, this.maxWaitMs = opts.maxWaitMs ?? DEFAULT_MAX_WAIT_MS, this.ownerlessGraceMs = opts.ownerlessGraceMs ?? this.ttlMs * 2, this.backoffMs = opts.backoffMs ?? DEFAULT_BACKOFF_MS, this.now = opts.now ?? Date.now, this.delayFn = opts.delay ?? ((ms) => new Promise((r) => setTimeout(r, ms))), this.pid = opts.pid ?? process.pid, this.hostId = opts.hostId ?? os4.hostname(), this.isProcessAlive = opts.isProcessAlive ?? defaultIsProcessAlive(this.hostId), this.randomId = opts.randomId ?? (() => (0, import_node_crypto.randomUUID)()), this.utimesFn = opts.utimesFn ?? ((dir) => import_node_fs.promises.utimes(dir, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date())), this.disableAutoHeartbeat = opts.disableAutoHeartbeat ?? !1;
+    this.lockDir = opts.lockDir, this.role = opts.role ?? "oauth-account", this.requireRemovalOnRelease = opts.requireRemovalOnRelease === !0, this.ownerFile = path3.join(this.lockDir, "owner.json"), this.reclaimGuardDir = `${this.lockDir}.reclaim`, this.ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS, this.heartbeatMs = opts.heartbeatMs ?? DEFAULT_HEARTBEAT_MS, this.maxWaitMs = opts.maxWaitMs ?? DEFAULT_MAX_WAIT_MS, this.ownerlessGraceMs = opts.ownerlessGraceMs ?? this.ttlMs * 2, this.backoffMs = opts.backoffMs ?? DEFAULT_BACKOFF_MS, this.now = opts.now ?? Date.now, this.delayFn = opts.delay ?? ((ms) => new Promise((r) => setTimeout(r, ms))), this.pid = opts.pid ?? process.pid, this.hostId = opts.hostId ?? os4.hostname(), this.isProcessAlive = opts.isProcessAlive ?? defaultIsProcessAlive(this.hostId), this.randomId = opts.randomId ?? (() => (0, import_node_crypto.randomUUID)()), this.utimesFn = opts.utimesFn ?? ((dir) => import_node_fs.promises.utimes(dir, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date())), this.disableAutoHeartbeat = opts.disableAutoHeartbeat ?? !1;
   }
   /**
    * Acquire the lock (bounded by `maxWaitMs`). Resolves a {@link LockHandle} on
@@ -1746,12 +1753,21 @@ var OAuthAccountLock = class {
         if (handle) return handle;
       }
       if (this.now() - start >= this.maxWaitMs)
-        throw new Error(
-          `[oauth-account-lock] timed out acquiring OAuth-account lock after ${this.maxWaitMs}ms (holder not reclaimable)`
-        );
+        throw await this.contentionError();
       await this.backoff(attempt);
     }
   }
+  async contentionError() {
+    let snapshot2 = await this.readOwnerState(this.lockDir), owner = snapshot2.kind === "owner" ? snapshot2.owner : null, startedAt = owner ? Date.parse(owner.startedAt) : NaN;
+    return new LocalLockBusyError({
+      role: this.role,
+      lockId: (0, import_node_crypto.createHash)("sha256").update(path3.resolve(this.lockDir)).digest("hex"),
+      holderPid: owner?.pid ?? null,
+      holderState: owner ? this.isProcessAlive(owner.pid, owner.host) : snapshot2.kind,
+      heldMs: Number.isFinite(startedAt) ? Math.max(0, this.now() - startedAt) : null,
+      waitMs: this.maxWaitMs
+    });
+  }
   /** Whether the EXISTING lockdir holder is reclaimable (dead), an ownerless strand
    *  (F6), or must be waited on. */
   async classifyExistingHolder() {
@@ -4362,8 +4378,8 @@ async function settleWithin(p, ms) {
   try {
     return await Promise.race([
       p,
-      new Promise((resolve28) => {
-        timer = setTimeout(() => resolve28(void 0), Math.max(0, ms));
+      new Promise((resolve29) => {
+        timer = setTimeout(() => resolve29(void 0), Math.max(0, ms));
       })
     ]);
   } finally {
@@ -4432,9 +4448,9 @@ async function classifyGitWorkspace(workspaceRoot, timeoutMs) {
   }
 }
 async function probeAdvisoryWorkspaceFingerprint(workspaceRoot, options = {}) {
-  let started = Date.now(), timeoutMs = options.timeoutMs ?? ADVISORY_WALK_FINGERPRINT_TIMEOUT_MS, state = { method: "marker", expired: !1 }, timer, deadlineHit = new Promise((resolve28) => {
+  let started = Date.now(), timeoutMs = options.timeoutMs ?? ADVISORY_WALK_FINGERPRINT_TIMEOUT_MS, state = { method: "marker", expired: !1 }, timer, deadlineHit = new Promise((resolve29) => {
     timer = setTimeout(() => {
-      state.expired = !0, resolve28({ kind: "probe-failed", method: state.method, reason: "timeout", durationMs: Date.now() - started });
+      state.expired = !0, resolve29({ kind: "probe-failed", method: state.method, reason: "timeout", durationMs: Date.now() - started });
     }, Math.max(0, timeoutMs));
   });
   try {
@@ -6096,8 +6112,8 @@ async function cleanExitFieldsAfterPrime(sessionId, maxWaitMs = PRIME_WAIT_MAX_M
   let pending2 = pendingPrimes.get(sessionId);
   if (pending2) {
     let timer;
-    await Promise.race([pending2, new Promise((resolve28) => {
-      timer = setTimeout(resolve28, maxWaitMs), timer.unref?.();
+    await Promise.race([pending2, new Promise((resolve29) => {
+      timer = setTimeout(resolve29, maxWaitMs), timer.unref?.();
     })]), timer && clearTimeout(timer);
   }
   return buildCleanExitFields(sessionId);
@@ -6134,7 +6150,7 @@ async function holdAfterResumeLock(predecessorSessionId, opts = {}) {
   let write = opts.write ?? ((text2) => process.stdout.write(text2));
   write(`CODEVIBE_E2E_HOLD ${predecessorSessionId}
 `);
-  let exists = opts.exists ?? import_node_fs2.existsSync, sleep2 = opts.sleep ?? ((ms) => new Promise((resolve28) => setTimeout(resolve28, ms))), now = opts.now ?? Date.now, started = now();
+  let exists = opts.exists ?? import_node_fs2.existsSync, sleep2 = opts.sleep ?? ((ms) => new Promise((resolve29) => setTimeout(resolve29, ms))), now = opts.now ?? Date.now, started = now();
   for (; !exists(releaseFile); ) {
     if (now() - started >= E2E_HOLD_MAX_MS) {
       write(`CODEVIBE_E2E_HOLD_TIMEOUT ${predecessorSessionId}
@@ -6304,7 +6320,7 @@ function validPid(pid) {
   return Number.isSafeInteger(pid) && pid > 0;
 }
 async function boundedExec(command, args) {
-  return new Promise((resolve28) => {
+  return new Promise((resolve29) => {
     let child;
     try {
       child = (0, import_node_child_process2.spawn)(command, args, {
@@ -6313,11 +6329,11 @@ async function boundedExec(command, args) {
         env: scrubSearchApiKeys({ ...process.env })
       });
     } catch {
-      resolve28(null);
+      resolve29(null);
       return;
     }
     let chunks = [], bytes = 0, settled = !1, finish = (value) => {
-      settled || (settled = !0, clearTimeout(timer), resolve28(value));
+      settled || (settled = !0, clearTimeout(timer), resolve29(value));
     }, timer = setTimeout(() => {
       try {
         child.kill("SIGKILL");
@@ -11000,8 +11016,8 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
    * serializes original callers and restarted owners without holding the
    * account store lock across network awaits. Only an exact ACK permits removal.
    * Admission closure/PAUSED does not authorize dropping pending control work. */
-  async runPromptResolution(value, resolve28, options = {}) {
-    if (typeof resolve28 != "function") return invalid7();
+  async runPromptResolution(value, resolve29, options = {}) {
+    if (typeof resolve29 != "function") return invalid7();
     let input = snapshotSyncPromptResolution(value), id5 = input.clientOperationId, expected = decodePromptResolution({ schemaVersion: 1, kind: "PROMPT_RESOLUTION", operationId: id5, input }, this.options.userId, invalid7);
     if (!this.matchesPromptResolutionScope(input)) return invalid7();
     this.options.assertAccount(), await this.ensureDirectory();
@@ -11021,7 +11037,7 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
         let sealed = this.seal(expected, key);
         return await this.checkCapacity(Buffer.byteLength(sealed), id5 + ".resolution"), await this.write(id5, sealed, ".resolution"), expected;
       });
-      return await fence(), row3 ? await resolve28(row3.input, fence) !== !0 ? (await fence(), !1) : (await fence(), await this.withStore(async (key) => {
+      return await fence(), row3 ? await resolve29(row3.input, fence) !== !0 ? (await fence(), !1) : (await fence(), await this.withStore(async (key) => {
         await this.readValue(id5, key, ".resolution", validate) && (await fence(), await import_node_fs5.promises.unlink(this.file(id5, ".resolution")), await this.syncDirectory(this.directory));
       }), await fence(), !0) : !0;
     } finally {
@@ -11749,6 +11765,7 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
       lockDir: path19.join(this.directory, name),
       ownerlessGraceMs: 1 / 0,
       maxWaitMs: 2e3,
+      role: name === "store.lockdir" ? "sync-journal-store" : "sync-journal",
       requireRemovalOnRelease
     });
   }
@@ -11967,8 +11984,8 @@ var count3 = import_zod9.z.string().regex(/^(0|[1-9][0-9]{0,18})$/).refine((s) =
     if (this.starting) return this.starting;
     if (this.phase !== "new") return Promise.reject(failure());
     this.phase = "opening";
-    let ready = new Promise((resolve28, reject) => {
-      this.resolveReady = resolve28, this.rejectReady = reject;
+    let ready = new Promise((resolve29, reject) => {
+      this.resolveReady = resolve29, this.rejectReady = reject;
     });
     return ready.catch(() => {
     }), this.starting = Promise.resolve().then(async () => {
@@ -12226,9 +12243,9 @@ var count3 = import_zod9.z.string().regex(/^(0|[1-9][0-9]{0,18})$/).refine((s) =
     this.phase = "closed", this.abort.abort(failure()), this.rejectReady?.(failure()), clearTimeout(this.controlTimer), clearTimeout(this.pongTimer), clearTimeout(this.heartbeatTimer), clearTimeout(this.recoveryTimer), clearInterval(this.pingTimer);
     let ws = this.ws;
     this.ws = void 0;
-    let socketClosed = new Promise((resolve28) => {
+    let socketClosed = new Promise((resolve29) => {
       if (!ws || ws.readyState === import_ws.default.CLOSED) {
-        resolve28();
+        resolve29();
         return;
       }
       ws.removeAllListeners(), ws.on("error", () => {
@@ -12237,7 +12254,7 @@ var count3 = import_zod9.z.string().regex(/^(0|[1-9][0-9]{0,18})$/).refine((s) =
         ws.terminate();
       }, 5e3);
       timer.unref?.(), ws.once("close", () => {
-        clearTimeout(timer), resolve28();
+        clearTimeout(timer), resolve29();
       });
       try {
         ws.close(1e3);
@@ -12992,6 +13009,7 @@ var RESERVED_STATE_FILES = /* @__PURE__ */ new Set(["ledger.json", "legacy-owned
     if (!identity.isDirectory() || identity.isSymbolicLink() || typeof process.getuid == "function" && identity.uid !== process.getuid()) throw new Error("Tool sync directory invalid");
     let owner = await createOAuthAccountLock({
       lockDir: path22.join(dir, ".sync-recovery.lockdir"),
+      role: "tool-sync-recovery",
       ownerlessGraceMs: 1 / 0,
       maxWaitMs: 2e3,
       requireRemovalOnRelease: !0
@@ -13453,8 +13471,8 @@ var DecisionAttemptReceiptStore = class _DecisionAttemptReceiptStore {
     return path23.join(path23.resolve(this.rootDir), opaqueSegment(sessionId));
   }
   async withSessionLock(sessionId, operation) {
-    let key = this.sessionQueueKey(sessionId), prior = _DecisionAttemptReceiptStore.sessionQueues.get(key) ?? Promise.resolve(), release, gate = new Promise((resolve28) => {
-      release = resolve28;
+    let key = this.sessionQueueKey(sessionId), prior = _DecisionAttemptReceiptStore.sessionQueues.get(key) ?? Promise.resolve(), release, gate = new Promise((resolve29) => {
+      release = resolve29;
     }), tail = prior.then(() => gate);
     _DecisionAttemptReceiptStore.sessionQueues.set(key, tail), await prior;
     try {
@@ -14206,9 +14224,9 @@ var AppSyncClient = class _AppSyncClient {
     if (signal?.aborted) throw _AppSyncClient.abortReason(signal);
   }
   static async waitForSyncStateRetry(delayMs, signal) {
-    _AppSyncClient.throwIfAborted(signal), await new Promise((resolve28, reject) => {
+    _AppSyncClient.throwIfAborted(signal), await new Promise((resolve29, reject) => {
       let timer = setTimeout(() => {
-        signal?.removeEventListener("abort", onAbort), resolve28();
+        signal?.removeEventListener("abort", onAbort), resolve29();
       }, delayMs), onAbort = () => {
         clearTimeout(timer), signal?.removeEventListener("abort", onAbort), reject(_AppSyncClient.abortReason(signal));
       };
@@ -14256,7 +14274,7 @@ var AppSyncClient = class _AppSyncClient {
    * the operation itself settles.
    */
   static awaitSharedFlightForCaller(flight, signal) {
-    return signal ? (_AppSyncClient.throwIfAborted(signal), new Promise((resolve28, reject) => {
+    return signal ? (_AppSyncClient.throwIfAborted(signal), new Promise((resolve29, reject) => {
       let settled = !1, finish = (operation) => {
         settled || (settled = !0, signal.removeEventListener("abort", onAbort), operation());
       }, onAbort = () => {
@@ -14267,7 +14285,7 @@ var AppSyncClient = class _AppSyncClient {
         return;
       }
       flight.then(
-        (value) => finish(() => resolve28(value)),
+        (value) => finish(() => resolve29(value)),
         (error) => finish(() => reject(error))
       );
     })) : flight;
@@ -14605,7 +14623,7 @@ var AppSyncClient = class _AppSyncClient {
       owned2.promise.then(settled, settled);
     }
     let owned = flight;
-    return owned.waiters++, new Promise((resolve28, reject) => {
+    return owned.waiters++, new Promise((resolve29, reject) => {
       let finished = !1, finish = (error) => {
         if (!finished) {
           finished = !0, signal?.removeEventListener("abort", onAbort), --owned.waiters === 0 && !owned.settled && (this.syncStateRead === owned && (this.syncStateRead = null), owned.controller.abort(new Error("Sync state read has no callers")));
@@ -14613,7 +14631,7 @@ var AppSyncClient = class _AppSyncClient {
             if (check(), error !== void 0) throw error;
             let state = this.companionSyncStatusSnapshot(userId);
             if (!state) throw new SyncEventClientError("INVALID_SYNC_STATE");
-            resolve28(state);
+            resolve29(state);
           } catch (failure2) {
             reject(failure2);
           }
@@ -15310,8 +15328,8 @@ var AppSyncClient = class _AppSyncClient {
    * its existing domain authority to obtain a validated resolution ACK. This
    * method grants no backend authority and creates no new visible occurrence.
    * False, thrown or account-switched acknowledgements retain the source. */
-  resolvePromptPublication(value, resolve28, options = {}) {
-    if (!value || typeof value != "object" || Array.isArray(value) || typeof resolve28 != "function" || Object.keys(value).some((field2) => !["sessionId", "promptId"].includes(field2)) || typeof value.sessionId != "string" || !/^[A-Za-z0-9_-]{1,256}$/.test(value.sessionId) || typeof value.promptId != "string" || !/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(value.promptId))
+  resolvePromptPublication(value, resolve29, options = {}) {
+    if (!value || typeof value != "object" || Array.isArray(value) || typeof resolve29 != "function" || Object.keys(value).some((field2) => !["sessionId", "promptId"].includes(field2)) || typeof value.sessionId != "string" || !/^[A-Za-z0-9_-]{1,256}$/.test(value.sessionId) || typeof value.promptId != "string" || !/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(value.promptId))
       return Promise.reject(new SyncEventClientError("INVALID_SYNC_INPUT"));
     let input = { ...value }, { root, signal } = options, userId = this.getCurrentUserId(), check = () => {
       this.assertSyncAccount(userId), _AppSyncClient.throwIfAborted(signal);
@@ -15322,7 +15340,7 @@ var AppSyncClient = class _AppSyncClient {
       let journals = records.map((scope) => this.desktopSyncWriter({ root, sessionScope: scope }).promptPublication(input.promptId));
       for (let journal of journals)
         await journal.settle(signal), check();
-      let acknowledged = await resolve28(records.length > 0);
+      let acknowledged = await resolve29(records.length > 0);
       if (check(), acknowledged !== !0) return !1;
       for (let journal of journals)
         await journal.close(), check();
@@ -15742,16 +15760,16 @@ var AppSyncClient = class _AppSyncClient {
   /**
    * Update a session
    */
-  async updateSession(input) {
+  async updateSession(input, options = {}) {
     if (input.status === void 0)
-      return this.doUpdateSession(input);
-    let next = (this.statusWriteChains.get(input.sessionId) ?? Promise.resolve()).catch(() => {
-    }).then(() => this.doUpdateSession(input));
+      return this.doUpdateSession(input, options.expectedUserId);
+    let prior = this.statusWriteChains.get(input.sessionId) ?? Promise.resolve(), expectedUserId = options.expectedUserId, next = prior.catch(() => {
+    }).then(() => this.doUpdateSession(input, expectedUserId));
     return this.statusWriteChains.set(input.sessionId, next.catch(() => {
     })), next;
   }
-  async doUpdateSession(input) {
-    input.status === "INACTIVE" /* INACTIVE */ && (this.syncRetiringSessions.add(input.sessionId), this.cleanupSubscription(input.sessionId), await Promise.all([
+  async doUpdateSession(input, expectedUserId) {
+    expectedUserId !== void 0 && this.assertSyncAccount(expectedUserId), input.status === "INACTIVE" /* INACTIVE */ && (this.syncRetiringSessions.add(input.sessionId), this.cleanupSubscription(input.sessionId), await Promise.all([
       this.joinSyncSubscriptionClosures(input.sessionId),
       ...[...this.syncReadOwners.get(input.sessionId) ?? []].map((reader) => reader.close())
     ]));
@@ -15760,12 +15778,12 @@ var AppSyncClient = class _AppSyncClient {
       metadata: input.metadata ? JSON.stringify(input.metadata) : void 0
     }, response;
     try {
-      response = await this.graphqlRequest(mutations.updateSession, { input: preparedInput });
+      response = await this.graphqlRequest(mutations.updateSession, { input: preparedInput }, !1, void 0, expectedUserId);
     } catch (error) {
       if (!hasCleanExitFields(preparedInput) || !isUnknownCleanExitFieldError(error)) throw error;
       logger.warn("[AppSyncClient] Server rejected the P61 clean-exit fields; retrying without them", {
         sessionId: input.sessionId
-      }), response = await this.graphqlRequest(mutations.updateSession, { input: withoutCleanExitFields(preparedInput) });
+      }), response = await this.graphqlRequest(mutations.updateSession, { input: withoutCleanExitFields(preparedInput) }, !1, void 0, expectedUserId);
     }
     logger.debug("[AppSyncClient] Session updated", { sessionId: response.data.updateSession.sessionId });
     let session2 = response.data.updateSession;
@@ -19326,7 +19344,7 @@ async function prepareSessionEncryption(sessionId, appSyncClient, logger2) {
           sessionId,
           attempt: attempt + 1,
           delayMs
-        }), await new Promise((resolve28) => setTimeout(resolve28, delayMs));
+        }), await new Promise((resolve29) => setTimeout(resolve29, delayMs));
       }
     }
     if (serviceDeviceKeys.length === 0)
@@ -20988,8 +21006,8 @@ function finishedResumeMessage(predecessorSessionId, successorSessionId) {
 async function publishThenRetire(args) {
   let { deps } = args, preview = args.encryptedLastPrompt ? { encryptedLastPrompt: args.encryptedLastPrompt } : {}, note = { successorSessionId: args.successorSessionId, predecessorSessionId: args.predecessorSessionId, marker: args.marker, ...preview };
   try {
-    let timer, drained = deps.drain(args.successorSessionId).then(() => !0, () => !1), timedOut = new Promise((resolve28) => {
-      timer = setTimeout(() => resolve28(!1), deps.timeoutMs ?? PUBLISH_DRAIN_TIMEOUT_MS), timer.unref?.();
+    let timer, drained = deps.drain(args.successorSessionId).then(() => !0, () => !1), timedOut = new Promise((resolve29) => {
+      timer = setTimeout(() => resolve29(!1), deps.timeoutMs ?? PUBLISH_DRAIN_TIMEOUT_MS), timer.unref?.();
     }), ok = await Promise.race([drained, timedOut]);
     return timer && clearTimeout(timer), ok ? (await deps.updateSession({
       sessionId: args.successorSessionId,
@@ -21500,22 +21518,22 @@ function ResumeChoice(props) {
 }
 async function runResumePicker(rows) {
   let { ink } = getInkRuntime();
-  return new Promise((resolve28) => {
+  return new Promise((resolve29) => {
     let instance = null, done = (value) => {
-      instance?.unmount(), resolve28(value);
+      instance?.unmount(), resolve29(value);
     };
     instance = ink.render(React.createElement(ResumePicker, { rows, onSelect: (id5) => done(id5), onCancel: () => done(null) }));
   });
 }
 async function runResumeChoice(prompt, continueLabel) {
   let { ink } = getInkRuntime();
-  return new Promise((resolve28) => {
+  return new Promise((resolve29) => {
     let instance = null;
     instance = ink.render(React.createElement(ResumeChoice, {
       prompt,
       ...continueLabel ? { continueLabel } : {},
       onChoose: (value) => {
-        instance?.unmount(), resolve28(value);
+        instance?.unmount(), resolve29(value);
       }
     }));
   });
@@ -21626,8 +21644,8 @@ CodeVibe \u2014 choose mode (${tier} tier):
 `), process.stdout.write(`  \x1B[36m[1]\x1B[0m \x1B[1mCompanion\x1B[0m     \x1B[2m(route to local agent wrapper)\x1B[0m
 `), process.stdout.write(`  \x1B[35m[2]\x1B[0m \x1B[1mOrchestration\x1B[0m \x1B[2m(CodeVibe-owned shell)\x1B[0m
 `)); ; ) {
-      let promptStr = plain6 ? "Mode [1/2]: " : "\x1B[36mMode [1/2]: \x1B[0m", trimmed = (await new Promise((resolve28) => {
-        rl.question(promptStr, resolve28);
+      let promptStr = plain6 ? "Mode [1/2]: " : "\x1B[36mMode [1/2]: \x1B[0m", trimmed = (await new Promise((resolve29) => {
+        rl.question(promptStr, resolve29);
       })).trim();
       if (trimmed === "1" || trimmed.toLowerCase() === "companion") return "companion";
       if (trimmed === "2" || trimmed.toLowerCase() === "orchestration") return "orchestration";
@@ -21808,7 +21826,7 @@ async function clearRetiredPlannerCache(userId, cacheRoot = process.env.CODEVIBE
 }
 
 // src/orchestration-shell/index.ts
-var path79 = __toESM(require("path")), os48 = __toESM(require("os")), import_promises = require("node:fs/promises"), import_node_fs37 = require("node:fs"), import_node_child_process10 = require("node:child_process"), import_node_util3 = require("node:util"), import_node_async_hooks = require("node:async_hooks");
+var path79 = __toESM(require("path")), os48 = __toESM(require("os")), import_promises = require("node:fs/promises"), fs59 = __toESM(require("node:fs")), import_node_fs37 = require("node:fs"), import_node_child_process10 = require("node:child_process"), import_node_util3 = require("node:util"), import_node_async_hooks = require("node:async_hooks");
 
 // src/orchestration-shell/web/sanitize.ts
 function sanitizeForTerminal(input) {
@@ -22505,7 +22523,7 @@ function requestOllamaJson(config, pathname, body, opts) {
     let err = new Error("Ollama request aborted by signal");
     return err.name = "AbortError", Promise.reject(err);
   }
-  return new Promise((resolve28, reject) => {
+  return new Promise((resolve29, reject) => {
     let settled = !1, responseBytes = 0, responseBody = "", finish = (fn) => {
       settled || (settled = !0, clearTimeout(timeout), fn());
     }, req = chooseHttpClient(url).request(
@@ -22532,7 +22550,7 @@ function requestOllamaJson(config, pathname, body, opts) {
           }
           responseBody += decoder.write(chunk);
         }), res.on("end", () => {
-          responseBody += decoder.end(), finish(() => resolve28(responseBody));
+          responseBody += decoder.end(), finish(() => resolve29(responseBody));
         });
       }
     ), timeout = setTimeout(() => {
@@ -22672,7 +22690,7 @@ function requestOllamaGenerateStream(config, promptText, opts) {
       num_ctx: numCtx
     }
   }), url = new URL("/api/generate", config.host), timeoutMs = opts?.timeoutMs ?? config.timeoutMs;
-  return opts?.signal?.aborted ? Promise.reject(new Error("Ollama generation aborted by signal")) : new Promise((resolve28, reject) => {
+  return opts?.signal?.aborted ? Promise.reject(new Error("Ollama generation aborted by signal")) : new Promise((resolve29, reject) => {
     let settled = !1, responseBytes = 0, buffer = "", decoder = new import_string_decoder.StringDecoder("utf8"), out = { text: "" }, emptyRun = 0, chunks = 0, sawDone = !1, lastDone, ndjson = !1, timeout = null, idleTimer = null, activeRes = null, clearIdle = () => {
       idleTimer && (clearTimeout(idleTimer), idleTimer = null);
     }, finish = (fn) => {
@@ -22696,7 +22714,7 @@ function requestOllamaGenerateStream(config, promptText, opts) {
           visibleChars: out.text.length,
           idleMs: streamIdleCutoffMs,
           chunks
-        }), finish(() => resolve28(out)), activeRes?.destroy());
+        }), finish(() => resolve29(out)), activeRes?.destroy());
       }, streamIdleCutoffMs);
     }, handleLine = (line, res) => {
       if (settled) return;
@@ -22729,14 +22747,14 @@ function requestOllamaGenerateStream(config, promptText, opts) {
         return;
       }
       if (lastDone = chunk.done, chunk.done === !0) {
-        sawDone = !0, finish(() => resolve28(out));
+        sawDone = !0, finish(() => resolve29(out));
         return;
       }
       out.text.length > 0 && armIdle(), emptyRun = piece.length === 0 ? emptyRun + 1 : 0, emptyRun >= EMPTY_TOKEN_WATCHDOG && (out.cutOff = "empty-token-loop", logger.warn("[ollama] generation cut off \u2014 empty-token loop", {
         visibleChars: out.text.length,
         emptyRun,
         chunks
-      }), finish(() => resolve28(out)), res.destroy());
+      }), finish(() => resolve29(out)), res.destroy());
     }, req = chooseHttpClient(url).request(
       url,
       {
@@ -22778,7 +22796,7 @@ function requestOllamaGenerateStream(config, promptText, opts) {
               );
               return;
             }
-            finish(() => resolve28(out));
+            finish(() => resolve29(out));
           }
         }));
       }
@@ -22808,7 +22826,7 @@ function describeRecordError(value) {
 function requestOllamaPull(config, onProgress = () => {
 }, options) {
   let url = new URL("/api/pull", config.host), body = JSON.stringify({ name: config.model, stream: !0 }), stallTimeoutMs = typeof options?.stallTimeoutMs == "number" && options.stallTimeoutMs > 0 ? options.stallTimeoutMs : PULL_STALL_TIMEOUT_MS;
-  return new Promise((resolve28, reject) => {
+  return new Promise((resolve29, reject) => {
     let settled = !1, buffer = "", pullDecoder = new import_string_decoder.StringDecoder("utf8"), stallTimer = null, clearStall = () => {
       stallTimer && (clearTimeout(stallTimer), stallTimer = null);
     }, finish = (fn) => {
@@ -22850,7 +22868,7 @@ function requestOllamaPull(config, onProgress = () => {
         status,
         completed: typeof parsed.completed == "number" ? parsed.completed : void 0,
         total: typeof parsed.total == "number" ? parsed.total : void 0
-      }), status === "success" && finish(() => resolve28()));
+      }), status === "success" && finish(() => resolve29()));
     }, req = chooseHttpClient(url).request(
       url,
       {
@@ -22887,7 +22905,7 @@ function requestOllamaPull(config, onProgress = () => {
           }
           buffer.length > MAX_PULL_LINE_BYTES && (finish(() => reject(new Error("Ollama pull response line exceeded the size limit"))), res.destroy());
         })), res.on("end", () => guarded(() => {
-          settled || (buffer += pullDecoder.end(), handleLine(buffer), buffer = "", finish(() => resolve28()));
+          settled || (buffer += pullDecoder.end(), handleLine(buffer), buffer = "", finish(() => resolve29()));
         }));
       }
     );
@@ -24156,8 +24174,8 @@ function createBoundedSharedShutdownOperation(options) {
   let operation = null, normalWait = null, signalWait = null, getOperation = () => {
     if (!operation) {
       let resolveOperation, rejectOperation;
-      operation = new Promise((resolve28, reject) => {
-        resolveOperation = resolve28, rejectOperation = reject;
+      operation = new Promise((resolve29, reject) => {
+        resolveOperation = resolve29, rejectOperation = reject;
       });
       try {
         Promise.resolve(options.start()).then(resolveOperation, rejectOperation);
@@ -24171,8 +24189,8 @@ function createBoundedSharedShutdownOperation(options) {
     try {
       if (await Promise.race([
         getOperation().then(() => "settled"),
-        new Promise((resolve28) => {
-          timer = setTimeout(() => resolve28("timeout"), timeoutMs), timer.unref?.();
+        new Promise((resolve29) => {
+          timer = setTimeout(() => resolve29("timeout"), timeoutMs), timer.unref?.();
         })
       ]) === "timeout") {
         options.onTimeout?.(deadlineClass, timeoutMs);
@@ -24286,8 +24304,8 @@ function createExplicitTtyExitCoordinator(deps) {
   let started = !1, resolveCompletion = () => {
   };
   return {
-    completion: new Promise((resolve28) => {
-      resolveCompletion = resolve28;
+    completion: new Promise((resolve29) => {
+      resolveCompletion = resolve29;
     }),
     start: () => {
       started || (started = !0, Promise.resolve().then(deps.runTeardown).catch(() => {
@@ -28703,8 +28721,8 @@ function spawnIsolatedHelper(command, args, options) {
   }), child;
 }
 function observeChildClose(child) {
-  return new Promise((resolve28, reject) => {
-    child.once("error", reject), child.once("close", resolve28);
+  return new Promise((resolve29, reject) => {
+    child.once("error", reject), child.once("close", resolve29);
   });
 }
 async function withHelperDeadline(work, timeoutMs, label, signal) {
@@ -28735,8 +28753,8 @@ async function waitBounded(work, timeoutMs) {
       work.then(() => {
       }, () => {
       }),
-      new Promise((resolve28) => {
-        timer = setTimeout(resolve28, timeoutMs), timer.unref?.();
+      new Promise((resolve29) => {
+        timer = setTimeout(resolve29, timeoutMs), timer.unref?.();
       })
     ]);
   } finally {
@@ -28975,7 +28993,7 @@ async function ensureDurableDirectoryTree(target2, opts = {}) {
       process.env[key] !== void 0 && (env[key] = process.env[key]);
   let child, closed4;
   try {
-    let resultPromise = new Promise((resolve28, reject) => {
+    let resultPromise = new Promise((resolve29, reject) => {
       try {
         child = spawnIsolatedHelper(process.execPath, ["-e", DURABLE_DIRECTORY_BOOTSTRAP], {
           env,
@@ -29002,7 +29020,7 @@ async function ensureDurableDirectoryTree(target2, opts = {}) {
         try {
           let value = JSON.parse(Buffer.concat(chunks, bytes).toString("utf8"));
           if (typeof value.canonicalPath != "string" || typeof value.dev != "string" || typeof value.ino != "string" || typeof value.birthtimeNs != "string" || !/^\d+$/.test(value.birthtimeNs) || typeof value.mtimeMs != "number" || typeof value.created != "boolean") throw new Error("invalid durable-directory result");
-          resolve28(value);
+          resolve29(value);
         } catch (err) {
           reject(err);
         }
@@ -29126,13 +29144,13 @@ async function acquireWorkspaceRootLease(authority, opts = {}) {
     }), closed4 = observeChildClose(child);
     let stderr = new BoundedOutputBuffer(4096);
     child.stderr?.on("data", (chunk) => stderr.push(chunk));
-    let ready = await withHelperDeadline(new Promise((resolve28, reject) => {
+    let ready = await withHelperDeadline(new Promise((resolve29, reject) => {
       let value = "";
       child.stdout?.on("data", (chunk) => {
         value += chunk.toString("utf8"), value.length > 4096 && reject(new Error("workspace-lease helper exceeded output limit"));
         let at = value.indexOf(`
 `);
-        at >= 0 && resolve28(value.slice(0, at));
+        at >= 0 && resolve29(value.slice(0, at));
       }), child.once("error", reject), closed4.then((code) => {
         code !== null && code !== 0 && reject(new Error(`workspace-lease helper failed (${code}): ${stderr.toString()}`));
       });
@@ -29192,7 +29210,7 @@ async function captureWorkspaceRootAuthority(workingDir, opts = {}) {
       process.env[key] !== void 0 && (env[key] = process.env[key]);
   let child, closed4;
   try {
-    let resultPromise = new Promise((resolve28, reject) => {
+    let resultPromise = new Promise((resolve29, reject) => {
       try {
         child = spawnIsolatedHelper(process.execPath, ["-e", WORKSPACE_AUTHORITY_BOOTSTRAP], {
           env,
@@ -29227,7 +29245,7 @@ async function captureWorkspaceRootAuthority(workingDir, opts = {}) {
         }
         try {
           let value = JSON.parse(Buffer.concat(chunks, bytes).toString("utf8"));
-          assertWorkspaceRootAuthoritySchema(value), resolve28(value);
+          assertWorkspaceRootAuthoritySchema(value), resolve29(value);
         } catch (err) {
           reject(err);
         }
@@ -32345,8 +32363,8 @@ async function runAnchoredReadWithinRoot(root, relativePath, opts) {
     let nextMessage = () => {
       let queued = messages.shift();
       return queued ? Promise.resolve(queued) : protocolError ? Promise.reject(protocolError) : withHelperDeadline(Promise.race([
-        new Promise((resolve28, reject) => {
-          waiter = { resolve: resolve28, reject };
+        new Promise((resolve29, reject) => {
+          waiter = { resolve: resolve29, reject };
         }),
         childClosed.then((code) => {
           throw new Error(`anchored read helper closed before result (${code}): ${stderr.toString()}`);
@@ -32824,8 +32842,8 @@ var writeChains = /* @__PURE__ */ new Map();
 function withWriteLock(filePath, operation, opts) {
   if (opts?.signal?.aborted)
     return Promise.reject(new Error("anchored operation aborted by signal"));
-  let prior = writeChains.get(filePath) ?? Promise.resolve(), isCancelled = !1, timer, abortListener, rejectCaller, resolveCaller, callerPromise = new Promise((resolve28, reject) => {
-    resolveCaller = resolve28, rejectCaller = reject;
+  let prior = writeChains.get(filePath) ?? Promise.resolve(), isCancelled = !1, timer, abortListener, rejectCaller, resolveCaller, callerPromise = new Promise((resolve29, reject) => {
+    resolveCaller = resolve29, rejectCaller = reject;
   }), cleanupWait = () => {
     timer !== void 0 && (clearTimeout(timer), timer = void 0), abortListener !== void 0 && opts?.signal && (opts.signal.removeEventListener("abort", abortListener), abortListener = void 0);
   };
@@ -32904,8 +32922,8 @@ async function runAnchored(parent, request3, beforeCommit, afterRename, afterWri
     let nextLine = async () => {
       let line = lines.shift();
       return line !== void 0 ? (backlog.onLineConsumed(utf8Bytes(line)), line) : withHelperDeadline(Promise.race([
-        new Promise((resolve28) => {
-          waiter = resolve28;
+        new Promise((resolve29) => {
+          waiter = resolve29;
         }),
         childClosed.then((code2) => {
           throw new Error(`anchored-fs helper closed before replying (${code2}): ${stderr.toString()}`);
@@ -34656,8 +34674,8 @@ function ReviewerSetupWizard(props) {
 // src/orchestration-shell/resume-modal.ts
 var pending = /* @__PURE__ */ new WeakMap();
 function open9(store, modal) {
-  return pending.get(store)?.(modal.kind === "picker" ? null : !1), new Promise((resolve28) => {
-    pending.set(store, resolve28), store.dispatch({ type: "RESUME_MODAL_OPEN", modal });
+  return pending.get(store)?.(modal.kind === "picker" ? null : !1), new Promise((resolve29) => {
+    pending.set(store, resolve29), store.dispatch({ type: "RESUME_MODAL_OPEN", modal });
   });
 }
 async function pickInShell(store, rows) {
@@ -34668,8 +34686,8 @@ async function chooseInShell(store, prompt, continueLabel) {
   return await open9(store, { kind: "choice", prompt, continueLabel }) === !0;
 }
 function settleResumeModal(store, value) {
-  let resolve28 = pending.get(store);
-  pending.delete(store), store.dispatch({ type: "RESUME_MODAL_CLOSE" }), resolve28?.(value);
+  let resolve29 = pending.get(store);
+  pending.delete(store), store.dispatch({ type: "RESUME_MODAL_CLOSE" }), resolve29?.(value);
 }
 
 // src/orchestration-shell/task-lifecycle-lines.ts
@@ -35154,7 +35172,7 @@ async function htmlToTextWorker(html, options) {
   if (signal?.aborted)
     throw new WebExtractAbortError();
   let workerPath = resolveExtractWorkerPath();
-  return new Promise((resolve28, reject) => {
+  return new Promise((resolve29, reject) => {
     let settled = !1, timer = null, worker = null, cleanup = () => {
       timer && (clearTimeout(timer), timer = null), signal && signal.removeEventListener("abort", onAbort);
     }, onAbort = () => {
@@ -35175,7 +35193,7 @@ async function htmlToTextWorker(html, options) {
       }), reject(new WebExtractTimeoutError(timeoutMs)));
     }, timeoutMs), worker.on("message", (msg) => {
       settled || (settled = !0, cleanup(), worker?.terminate().catch(() => {
-      }), msg.success && msg.result ? resolve28(msg.result) : reject(new Error(msg.error || "HTML extraction failed in worker")));
+      }), msg.success && msg.result ? resolve29(msg.result) : reject(new Error(msg.error || "HTML extraction failed in worker")));
     }), worker.on("error", (err) => {
       settled || (settled = !0, cleanup(), worker?.terminate().catch(() => {
       }), reject(err));
@@ -35839,14 +35857,14 @@ async function resolveValidatedIps(host, signal, customLookup = dns2.lookup) {
   }
   let records;
   try {
-    records = await new Promise((resolve28, reject) => {
+    records = await new Promise((resolve29, reject) => {
       if (signal?.aborted) {
         reject(new FetchError("timeout", "aborted before DNS"));
         return;
       }
       let onAbort = () => reject(new FetchError("timeout", "DNS aborted"));
       signal?.addEventListener("abort", onAbort, { once: !0 }), customLookup(host, { all: !0 }, (err, addrs) => {
-        signal?.removeEventListener("abort", onAbort), err ? reject(err) : resolve28(addrs);
+        signal?.removeEventListener("abort", onAbort), err ? reject(err) : resolve29(addrs);
       });
     });
   } catch (e) {
@@ -35898,7 +35916,7 @@ function decodeBody(buf, contentType) {
   return buf.toString("utf-8");
 }
 function getOnce(url, frozen, signal, options) {
-  return new Promise((resolve28, reject) => {
+  return new Promise((resolve29, reject) => {
     let req = (url.protocol === "https:" ? https3 : http2).request(
       url,
       {
@@ -35918,7 +35936,7 @@ function getOnce(url, frozen, signal, options) {
       (res) => {
         let status = res.statusCode ?? 0, contentType = String(res.headers["content-type"] ?? "");
         if (status >= 300 && status < 400 && res.headers.location) {
-          res.resume(), resolve28({ status, location: res.headers.location, contentType });
+          res.resume(), resolve29({ status, location: res.headers.location, contentType });
           return;
         }
         if (status >= 400) {
@@ -35949,7 +35967,7 @@ function getOnce(url, frozen, signal, options) {
             return;
           }
           chunks.push(c);
-        }), stream.on("end", () => resolve28({ status, contentType, body: Buffer.concat(chunks) })), stream.on("error", (e) => reject(new FetchError("network", e?.code ?? "stream error")));
+        }), stream.on("end", () => resolve29({ status, contentType, body: Buffer.concat(chunks) })), stream.on("error", (e) => reject(new FetchError("network", e?.code ?? "stream error")));
       }
     );
     req.setTimeout(TIMEOUT_MS, () => {
@@ -36611,10 +36629,10 @@ async function startAgentWebTurn(options) {
     });
   });
   try {
-    await new Promise((resolve28, reject) => {
+    await new Promise((resolve29, reject) => {
       server.listen(socketPath, () => {
         try {
-          fs33.chmodSync(socketPath, 384), resolve28();
+          fs33.chmodSync(socketPath, 384), resolve29();
         } catch (err) {
           reject(err);
         }
@@ -37509,7 +37527,7 @@ function isTransientDirectoryEnumeration(error) {
   return error instanceof Error && error.message.includes(TRANSIENT_DIRECTORY_ENUMERATION);
 }
 function sleep(ms) {
-  return new Promise((resolve28) => setTimeout(resolve28, ms));
+  return new Promise((resolve29) => setTimeout(resolve29, ms));
 }
 async function withTransientDirectoryEnumerationRetry(operation, opts = {}) {
   let maxAttempts = opts.maxAttempts ?? 4, retryDelaysMs = opts.retryDelaysMs ?? [10, 25, 50], sleepFn = opts.sleep ?? sleep;
@@ -37649,8 +37667,8 @@ function nextDirectoryWorkerMessage(worker, deadlineAt, label, signal) {
   if (worker.protocolError) return Promise.reject(worker.protocolError);
   let remaining = deadlineAt - Date.now();
   return remaining <= 0 ? Promise.reject(new Error(`${label} helper timed out`)) : withHelperDeadline(Promise.race([
-    new Promise((resolve28, reject) => {
-      worker.waiter = { resolve: resolve28, reject };
+    new Promise((resolve29, reject) => {
+      worker.waiter = { resolve: resolve29, reject };
     }),
     worker.closed.then((code) => {
       throw new Error(
@@ -38179,10 +38197,10 @@ function readPosixHostProtocol(child, persistOwner, syncOwnerDirectory) {
   let status = child.stdio?.[3];
   if (!status || typeof status.on != "function")
     return { cleanupSafe: Promise.resolve(!1), owner: Promise.resolve(void 0) };
-  let resolveCleanup, resolveOwner, cleanupSafe = new Promise((resolve28) => {
-    resolveCleanup = resolve28;
-  }), owner = new Promise((resolve28) => {
-    resolveOwner = resolve28;
+  let resolveCleanup, resolveOwner, cleanupSafe = new Promise((resolve29) => {
+    resolveCleanup = resolve29;
+  }), owner = new Promise((resolve29) => {
+    resolveOwner = resolve29;
   }), pending2 = "", bytes = 0, ownerSettled = !1, cleanupSettled = !1, finish = () => {
     ownerSettled || (ownerSettled = !0, resolveOwner(void 0)), cleanupSettled || (cleanupSettled = !0, resolveCleanup(!1));
   }, consume = (line) => {
@@ -38545,11 +38563,11 @@ async function spawnWindowsJobProcess(command, args, options, seams = {}) {
     throw await anchoredRemoveTree(hostDir, hostIdentity).catch(() => {
     }), err;
   }
-  let cleanupStarted = !1, cleanupPromise = new Promise((resolve28) => {
+  let cleanupStarted = !1, cleanupPromise = new Promise((resolve29) => {
     let cleanup = () => {
       cleanupStarted || (cleanupStarted = !0, anchoredRemoveTree(hostDir, hostIdentity).then(
-        () => resolve28(!0),
-        () => resolve28(!1)
+        () => resolve29(!0),
+        () => resolve29(!1)
       ));
     };
     child.once("close", cleanup), child.once("error", cleanup);
@@ -38584,7 +38602,7 @@ async function waitForProcessIdentity(pid) {
   for (let attempt = 0; attempt < 100; attempt++) {
     let identity = await readProcessIdentity(pid);
     if (identity) return identity;
-    await new Promise((resolve28) => setTimeout(resolve28, 10));
+    await new Promise((resolve29) => setTimeout(resolve29, 10));
   }
   return null;
 }
@@ -38803,7 +38821,7 @@ async function terminateOwnedProcessTree(args) {
       } catch (err) {
         err.code !== "ESRCH" && directKill();
       }
-      let timeoutMs = args.timeoutMs ?? 1e4, deadline = Date.now() + timeoutMs, sleep2 = args.sleep ?? ((ms) => new Promise((resolve28) => setTimeout(resolve28, ms)));
+      let timeoutMs = args.timeoutMs ?? 1e4, deadline = Date.now() + timeoutMs, sleep2 = args.sleep ?? ((ms) => new Promise((resolve29) => setTimeout(resolve29, ms)));
       for (; ; ) {
         try {
           kill(-pid, 0);
@@ -38944,17 +38962,17 @@ function isInsideDir(candidate, dir) {
   return root.startsWith("/") ? candidate === root || candidate.startsWith(`${root}/`) : !1;
 }
 function run(command, args, okExitCodes = []) {
-  return new Promise((resolve28, reject) => {
+  return new Promise((resolve29, reject) => {
     (0, import_node_child_process5.execFile)(
       command,
       args,
       // `LC_ALL=C` pins the `lstart` column format the parser reads.
       { timeout: 5e3, maxBuffer: 64 * 1024 * 1024, windowsHide: !0, env: { ...process.env, LC_ALL: "C" } },
       (err, stdout) => {
-        if (!err) return resolve28(stdout);
+        if (!err) return resolve29(stdout);
         let code = err.code;
         if (typeof code == "number" && okExitCodes.includes(code) && !err.killed)
-          return resolve28(stdout);
+          return resolve29(stdout);
         reject(err);
       }
     );
@@ -39218,8 +39236,8 @@ function wireLifecycle(internal, args) {
     }
     return descendantReap;
   }, resolveDone = () => {
-  }, done = new Promise((resolve28) => {
-    resolveDone = resolve28;
+  }, done = new Promise((resolve29) => {
+    resolveDone = resolve29;
   }), cleanupAbort = () => {
   }, cleanupTimeout = () => {
   }, settling = !1, forcedExit = null, settle = async (failureClass, exitCode, workspaceCleanupSafe = !0) => {
@@ -41674,8 +41692,8 @@ async function runShellCommand(args) {
   }, aborted = args.signal?.aborted === !0, onAbort = () => {
     aborted = !0, killProcessTree();
   }, resolveResult = () => {
-  }, settled = new Promise((resolve28) => {
-    resolveResult = resolve28;
+  }, settled = new Promise((resolve29) => {
+    resolveResult = resolve29;
   }), settle = (result) => {
     alreadySettled || (alreadySettled = !0, timer !== void 0 && clearTimeout(timer), args.signal?.removeEventListener("abort", onAbort), resolveResult(result));
   }, finalize = async (exitCode, workspaceCleanupSafe = !0) => {
@@ -42385,8 +42403,8 @@ function createWorkspaceMaterializerSession(opts) {
     if (queued) return Promise.resolve(queued);
     if (protocolError) return Promise.reject(protocolError);
     let remaining = deadlineAt - Date.now();
-    return remaining <= 0 ? Promise.reject(new Error("workspace-materializer helper timed out")) : withHelperDeadline(new Promise((resolve28, reject) => {
-      waiter = { resolve: resolve28, reject };
+    return remaining <= 0 ? Promise.reject(new Error("workspace-materializer helper timed out")) : withHelperDeadline(new Promise((resolve29, reject) => {
+      waiter = { resolve: resolve29, reject };
     }), remaining, "workspace-materializer helper");
   }
   function serialize(operation) {
@@ -43663,8 +43681,8 @@ async function runAnchoredCasHelper(workingDir, relativePath, expectedRoot, requ
     "anchored CAS helper exit"
   ), nextMessageRaw = () => {
     let queued = messages.shift();
-    return queued !== void 0 && backlog.onLineConsumed(messageSizes.shift() ?? 0), queued ? Promise.resolve(queued) : closed4 ? Promise.reject(new Error(`anchored CAS helper exited ${closeCode}: ${stderr.toString()}`)) : new Promise((resolve28, reject) => {
-      lineWaiter = { resolve: resolve28, reject };
+    return queued !== void 0 && backlog.onLineConsumed(messageSizes.shift() ?? 0), queued ? Promise.resolve(queued) : closed4 ? Promise.reject(new Error(`anchored CAS helper exited ${closeCode}: ${stderr.toString()}`)) : new Promise((resolve29, reject) => {
+      lineWaiter = { resolve: resolve29, reject };
     });
   }, nextMessage = () => withHelperDeadline(
     nextMessageRaw(),
@@ -46059,8 +46077,8 @@ async function readSnapshotOwnerAnchor(shadowDir, opts) {
       });
       !hasError && !opts?.signal?.aborted ? await closePromise : await Promise.race([
         closePromise,
-        new Promise((resolve28) => {
-          let t = setTimeout(resolve28, 0);
+        new Promise((resolve29) => {
+          let t = setTimeout(resolve29, 0);
           typeof t.unref == "function" && t.unref();
         })
       ]);
@@ -47945,8 +47963,8 @@ var WorkspaceShadow = class _WorkspaceShadow {
     this.exposureFileAuthority = { ...fileAuthority };
   }
   async runOwnedStateFileWrite(write) {
-    let settle, admission = new Promise((resolve28) => {
-      settle = resolve28;
+    let settle, admission = new Promise((resolve29) => {
+      settle = resolve29;
     });
     this.stateFileWriteAdmissions.add(admission);
     try {
@@ -49376,7 +49394,7 @@ var DEFAULT_MERGE_PLAN_MAX_WORK = 16e6, DEFAULT_MERGE_PLAN_TIMEOUT_MS = 5e3, MER
     this.used += units, this.workSinceYield += units, this.assertActive();
   }
   async cooperate(force = !1) {
-    this.assertActive(), !(!force && this.workSinceYield < MERGE_PLAN_YIELD_INTERVAL) && (this.workSinceYield = 0, await new Promise((resolve28) => setImmediate(resolve28)), this.assertActive());
+    this.assertActive(), !(!force && this.workSinceYield < MERGE_PLAN_YIELD_INTERVAL) && (this.workSinceYield = 0, await new Promise((resolve29) => setImmediate(resolve29)), this.assertActive());
   }
 };
 function assertSnapshotBundleFileOccurrenceBounds(bundles, budget = createMetadataBudget(), label = "snapshot bundle file-occurrence aggregate") {
@@ -50732,7 +50750,7 @@ init_logger2();
 var import_node_child_process7 = require("node:child_process"), crypto20 = __toESM(require("node:crypto")), fs44 = __toESM(require("node:fs/promises")), os32 = __toESM(require("node:os")), path56 = __toESM(require("node:path")), import_node_util = require("node:util");
 
 // src/local-executor/git-lock-retry.ts
-var realSleep = (ms) => new Promise((resolve28) => setTimeout(resolve28, ms));
+var realSleep = (ms) => new Promise((resolve29) => setTimeout(resolve29, ms));
 function isGitLockContention(msg) {
   let m = msg.toLowerCase();
   return (
@@ -51020,7 +51038,7 @@ async function pinnedGit(repoDir, args, opts = {}) {
 }
 async function pinnedGitWithInput(repoDir, args, input, opts = {}) {
   let configPrefix = [...W2_HERMETIC_CONFIG, ...PINNED_GIT_CONFIG];
-  return await new Promise((resolve28, reject) => {
+  return await new Promise((resolve29, reject) => {
     let child = (0, import_node_child_process7.spawn)("git", ["-C", repoDir, ...configPrefix, ...args], {
       env: sanitizeGitEnv(),
       stdio: ["pipe", "pipe", "pipe"]
@@ -51030,7 +51048,7 @@ async function pinnedGitWithInput(repoDir, args, input, opts = {}) {
     }), child.stderr.on("data", (c) => {
       stderr += c.toString("utf8");
     }), child.on("error", (err) => reject(err)), child.on("close", (code) => {
-      code === 0 || opts.allowFail ? resolve28({ stdout, stderr, code: code ?? -1 }) : reject(new Error(`git ${args[0] ?? ""} exited ${code}: ${stderr.slice(0, 400)}`));
+      code === 0 || opts.allowFail ? resolve29({ stdout, stderr, code: code ?? -1 }) : reject(new Error(`git ${args[0] ?? ""} exited ${code}: ${stderr.slice(0, 400)}`));
     }), child.stdin.on("error", () => {
     }), child.stdin.end(input);
   });
@@ -56795,8 +56813,8 @@ var LocalExecutorImpl = class {
       throw new Error("LocalExecutor session shutdown has fenced new advisory spawns");
     let resolveSettled, admission = {
       controller: new AbortController(),
-      settled: new Promise((resolve28) => {
-        resolveSettled = resolve28;
+      settled: new Promise((resolve29) => {
+        resolveSettled = resolve29;
       }),
       resolveSettled: () => resolveSettled(),
       handle: null,
@@ -57884,7 +57902,7 @@ var LocalExecutorImpl = class {
         this.integrationAbort.signal
       ), ranGate || this.workspaceShutdown) return;
       let remaining = deadline - Date.now();
-      !retryMissing || remaining <= 0 || await new Promise((resolve28) => setTimeout(resolve28, Math.min(TRACK_TIP_POLL_MS, remaining)));
+      !retryMissing || remaining <= 0 || await new Promise((resolve29) => setTimeout(resolve29, Math.min(TRACK_TIP_POLL_MS, remaining)));
     }
   }
   /** True only for a missing exact current-generation bundle; malformed input is classified inside the gate. */
@@ -59568,8 +59586,8 @@ var RevertManifestStore = class {
       let nextLine = async () => {
         let line = lines.shift();
         return line !== void 0 ? (backlog.onLineConsumed(utf8Bytes(line)), line) : withHelperDeadline(Promise.race([
-          new Promise((resolve28) => {
-            waiter = resolve28;
+          new Promise((resolve29) => {
+            waiter = resolve29;
           }),
           childClosed.then((code2) => {
             throw new Error(`store helper closed before replying (${code2}): ${stderr.toString()}`);
@@ -61142,6 +61160,9 @@ function resolveTeamExecution(_override, _env = process.env) {
   return DEFAULT_TEAM_EXECUTION;
 }
 
+// src/local-executor/spawn-sweep.ts
+init_logger2();
+
 // src/orchestration-shell/quorum-loop.ts
 init_env_scrub();
 
@@ -62492,7 +62513,7 @@ var import_node_child_process9 = require("node:child_process");
 init_env_scrub();
 var ChildProcessCommandRunner = class {
   run(argv, opts = {}) {
-    return new Promise((resolve28, reject) => {
+    return new Promise((resolve29, reject) => {
       let child = (0, import_node_child_process9.spawn)(argv[0], argv.slice(1), {
         stdio: ["pipe", "pipe", "pipe"],
         windowsHide: !0,
@@ -62508,7 +62529,7 @@ var ChildProcessCommandRunner = class {
       }, opts.timeoutMs)), child.on("error", (err) => {
         timer && clearTimeout(timer), reject(err);
       }), child.on("close", (code) => {
-        timer && clearTimeout(timer), resolve28({
+        timer && clearTimeout(timer), resolve29({
           exitCode: code,
           stdout: Buffer.concat(stdoutChunks).toString("utf8"),
           stderr: Buffer.concat(stderrChunks).toString("utf8")
@@ -62531,6 +62552,7 @@ var ChildProcessCommandRunner = class {
     let spawnOptions = {
       stdio: opts.stdinTty ? ["pipe", "pipe", "pipe"] : ["ignore", "pipe", "pipe"],
       windowsHide: !0,
+      detached: opts.detached ?? !1,
       signal: opts.signal,
       env: opts.env !== void 0 ? scrubSearchApiKeys({ ...opts.env }) : scrubSearchApiKeys({ ...process.env }),
       ...opts.cwd !== void 0 ? { cwd: opts.cwd } : {}
@@ -62595,12 +62617,12 @@ var denialCounter = 0, HostEgressForwarder = class {
    */
   async start() {
     return await import_node_fs29.promises.rm(this.udsPath, { force: !0 }).catch(() => {
-    }), new Promise((resolve28, reject) => {
+    }), new Promise((resolve29, reject) => {
       let onError = (err) => {
         this.server.removeListener("error", onError), reject(err);
       };
       this.server.once("error", onError), this.server.listen(this.udsPath, () => {
-        this.server.removeListener("error", onError), this.listening = !0, resolve28({ udsPath: this.udsPath });
+        this.server.removeListener("error", onError), this.listening = !0, resolve29({ udsPath: this.udsPath });
       });
     });
   }
@@ -62618,8 +62640,8 @@ var denialCounter = 0, HostEgressForwarder = class {
       });
       return;
     }
-    this.listening = !1, await new Promise((resolve28) => {
-      this.server.close(() => resolve28());
+    this.listening = !1, await new Promise((resolve29) => {
+      this.server.close(() => resolve29());
     }), await import_node_fs29.promises.rm(this.udsPath, { force: !0 }).catch(() => {
     });
   }
@@ -63063,7 +63085,17 @@ function buildSeatbeltProfile(workdir, execPath = process.execPath, extraReadDir
     '(allow file-read* (subpath "/Library"))',
     '(allow file-read* (subpath "/private/var/db"))',
     '(allow file-read* (subpath "/private/var/select"))',
-    '(allow file-read* (subpath "/dev"))',
+    // PD-MAC-DEV (§6.1): grant only literal reads of the device nodes agents
+    // use, plus `/dev/fd`. Replaces the broad `/dev` subpath read so a confined
+    // agent cannot open another terminal session's tty or its own controlling
+    // terminal (/dev/tty, /dev/ttys*).
+    '(allow file-read* (literal "/dev/null"))',
+    '(allow file-read* (literal "/dev/zero"))',
+    '(allow file-read* (literal "/dev/random"))',
+    '(allow file-read* (literal "/dev/urandom"))',
+    '(allow file-read* (literal "/dev/dtracehelper"))',
+    '(allow file-read* (literal "/dev/autofs_nowait"))',
+    '(allow file-read* (subpath "/dev/fd"))',
     // Ordinary POSIX tooling opens `/dev/null` rw. Grant only that literal
     // device (the `/dev` read above does not cover writes).
     '(allow file-write* (literal "/dev/null"))'
@@ -63106,11 +63138,13 @@ function buildSeatbeltProfile(workdir, execPath = process.execPath, extraReadDir
     );
   }
   return networkPosture === "open" ? lines.push(
-    // A1d resolver-confinement row: deny all network, then re-allow ALL
-    // OUTBOUND (external inbound stays denied). Loopback bind/inbound is permitted
+    // A1d resolver-confinement row (§6.1, SP-A5, SP-A5b): deny all network,
+    // then allow IP outbound + only mDNSResponder Unix socket for name resolution
+    // (external inbound stays denied). Loopback bind/inbound is permitted
     // for local IPC (e.g. Antigravity local RPC daemon on 127.0.0.1).
     "(deny network*)",
-    "(allow network-outbound)",
+    '(allow network-outbound (remote ip "*:*"))',
+    '(allow network-outbound (remote unix-socket (path-literal "/private/var/run/mDNSResponder")))',
     '(allow network-bind (local ip "localhost:*"))',
     '(allow network-inbound (local ip "localhost:*"))',
     ""
@@ -63713,7 +63747,7 @@ async function runReviewer(opts) {
       });
     }
   let acquiredChild = child;
-  return new Promise((resolve28, reject) => {
+  return new Promise((resolve29, reject) => {
     let child2 = acquiredChild, settled = !1, stdoutChunks = [], stderrChunks = [], cleanupStreams = () => {
       try {
         child2.stdin && !child2.stdin.destroyed && child2.stdin.destroy();
@@ -63735,7 +63769,7 @@ async function runReviewer(opts) {
     }, cleanupAbortListener = () => {
     }, cleanupTimeoutTimer = () => {
     }, settleSuccess = (outcome2) => {
-      settled || (settled = !0, cleanupAbortListener(), cleanupTimeoutTimer(), resolve28(outcome2));
+      settled || (settled = !0, cleanupAbortListener(), cleanupTimeoutTimer(), resolve29(outcome2));
     }, settleError = (err) => {
       settled || (settled = !0, cleanupAbortListener(), cleanupTimeoutTimer(), cleanupStreams(), killChild(), reject(err));
     };
@@ -66533,8 +66567,8 @@ var QuorumLoop = class _QuorumLoop {
     return this.trackExistingSessionWork(recovery);
   }
   acquireRecoveryRelaunchPermit() {
-    return this.shuttingDown ? Promise.resolve(!1) : this.activeRecoveryRelaunches < TEAM_RECOVERY_RELAUNCH_CONCURRENCY ? (this.activeRecoveryRelaunches++, Promise.resolve(!0)) : new Promise((resolve28) => {
-      this.recoveryRelaunchWaiters.push(resolve28);
+    return this.shuttingDown ? Promise.resolve(!1) : this.activeRecoveryRelaunches < TEAM_RECOVERY_RELAUNCH_CONCURRENCY ? (this.activeRecoveryRelaunches++, Promise.resolve(!0)) : new Promise((resolve29) => {
+      this.recoveryRelaunchWaiters.push(resolve29);
     });
   }
   releaseRecoveryRelaunchPermit() {
@@ -66565,12 +66599,12 @@ var QuorumLoop = class _QuorumLoop {
       }
   }
   awaitBackgroundRecoveryStep(work, signal) {
-    return signal ? signal.aborted ? Promise.reject(BACKGROUND_RECOVERY_ABORTED) : new Promise((resolve28, reject) => {
+    return signal ? signal.aborted ? Promise.reject(BACKGROUND_RECOVERY_ABORTED) : new Promise((resolve29, reject) => {
       let settled = !1, finish = (complete) => {
         settled || (settled = !0, signal.removeEventListener("abort", onAbort), complete());
       }, onAbort = () => finish(() => reject(BACKGROUND_RECOVERY_ABORTED));
       signal.addEventListener("abort", onAbort, { once: !0 }), work.then(
-        (value) => finish(() => resolve28(value)),
+        (value) => finish(() => resolve29(value)),
         (err) => finish(() => reject(err))
       );
     }) : work;
@@ -66699,8 +66733,8 @@ var QuorumLoop = class _QuorumLoop {
       gateId,
       entry: entry5,
       authority,
-      settled: new Promise((resolve28) => {
-        settle = resolve28;
+      settled: new Promise((resolve29) => {
+        settle = resolve29;
       })
     }, admissions = this.teamDispatchAdmissionsByTask.get(taskId) ?? /* @__PURE__ */ new Set();
     admissions.add(admission), this.teamDispatchAdmissionsByTask.set(taskId, admissions);
@@ -67981,8 +68015,8 @@ ${section}`);
         taskId: args.taskId,
         gateId,
         abortController,
-        settled: new Promise((resolve28) => {
-          settlePending = resolve28;
+        settled: new Promise((resolve29) => {
+          settlePending = resolve29;
         }),
         ...args.teamAuthority ? { teamAuthority: args.teamAuthority } : {}
       }, needsWeb = this.webAccessByTask.get(args.taskId);
@@ -70187,8 +70221,8 @@ ${section}`);
         () => {
         }
       ));
-      let displayTimeout = new Promise((resolve28) => {
-        timeout = setTimeout(() => resolve28(void 0), TICK_SCAN_TIMEOUT_MS);
+      let displayTimeout = new Promise((resolve29) => {
+        timeout = setTimeout(() => resolve29(void 0), TICK_SCAN_TIMEOUT_MS);
       });
       return await Promise.race([scan, displayTimeout]);
     } catch {
@@ -76328,7 +76362,7 @@ var AdvisoryAttachmentJournal = class {
       artifactTargets.add(target2);
     }
     if (retirementNames.length > 0 && Date.now() < retirementDeadlineMs)
-      return await new Promise((resolve28) => setTimeout(resolve28, 20)), this.listRecords(root, retirementDeadlineMs, artifactRetry);
+      return await new Promise((resolve29) => setTimeout(resolve29, 20)), this.listRecords(root, retirementDeadlineMs, artifactRetry);
     for (let name of retirementNames.sort()) {
       let retired = await this.readRetirementRecord(root, name), currentOwner = await this.currentOwner(), ownedHere = sameProcessIdentity(retired.value.owner, currentOwner) && this.activeBatchIds.has(retired.value.batchId), ownerDead = !await this.ownerIsAlive(retired.value.owner);
       if (!ownedHere && !ownerDead)
@@ -80552,8 +80586,8 @@ var PromptPublicationTracker = class {
     return this.active.has(promptId2);
   }
   async run(promptId2, publish) {
-    let settle, settled = new Promise((resolve28) => {
-      settle = resolve28;
+    let settle, settled = new Promise((resolve29) => {
+      settle = resolve29;
     }), writes = this.active.get(promptId2) ?? /* @__PURE__ */ new Set();
     writes.add(settled), this.active.set(promptId2, writes);
     try {
@@ -82926,9 +82960,9 @@ async function runOrchestrationShellSession(args) {
     await durableDecisionEffectDispatcher.dispatch(resolution);
   }, settleInitialSubscription = () => {
   }, rejectInitialSubscription = () => {
-  }, initialSubscriptionSettled = !startupReadinessRequired, initialCatchUpStarted = !1, initialSubscriptionTimer = null, initialSubscriptionReady = startupReadinessRequired ? new Promise((resolve28, reject) => {
+  }, initialSubscriptionSettled = !startupReadinessRequired, initialCatchUpStarted = !1, initialSubscriptionTimer = null, initialSubscriptionReady = startupReadinessRequired ? new Promise((resolve29, reject) => {
     settleInitialSubscription = () => {
-      initialSubscriptionSettled || (initialSubscriptionSettled = !0, resolve28());
+      initialSubscriptionSettled || (initialSubscriptionSettled = !0, resolve29());
     }, rejectInitialSubscription = (error) => {
       initialSubscriptionSettled || (initialSubscriptionSettled = !0, reject(error));
     }, initialSubscriptionTimer = setTimeout(() => {
@@ -83111,9 +83145,9 @@ async function runOrchestrationShellSession(args) {
   }
   let unsubscribePromptActions = null, promptActionStartupSettled = !startupReadinessRequired, settlePromptActionStartup = () => {
   }, rejectPromptActionStartup = () => {
-  }, promptActionStartupTimer = null, promptActionStartupReady = startupReadinessRequired ? new Promise((resolve28, reject) => {
+  }, promptActionStartupTimer = null, promptActionStartupReady = startupReadinessRequired ? new Promise((resolve29, reject) => {
     settlePromptActionStartup = () => {
-      promptActionStartupSettled || (promptActionStartupSettled = !0, resolve28());
+      promptActionStartupSettled || (promptActionStartupSettled = !0, resolve29());
     }, rejectPromptActionStartup = (error) => {
       promptActionStartupSettled || (promptActionStartupSettled = !0, reject(error));
     }, promptActionStartupTimer = setTimeout(() => {
@@ -83428,9 +83462,9 @@ async function runOrchestrationShellSession(args) {
     try {
       let released = await Promise.race([
         args.appsyncClient.releaseSessionWork(args.session.sessionId, { signal: controller.signal }),
-        new Promise((resolve28) => {
+        new Promise((resolve29) => {
           timer = setTimeout(() => {
-            controller.abort(), resolve28(null);
+            controller.abort(), resolve29(null);
           }, SESSION_WORK_RELEASE_TIMEOUT_MS), timer.unref?.();
         })
       ]);
@@ -83611,8 +83645,8 @@ async function runOrchestrationShellSession(args) {
                   errorName: reason?.name ?? "Error"
                 });
               }),
-              new Promise((resolve28) => {
-                timer = setTimeout(resolve28, SESSION_RETIRE_TIMEOUT_MS2), timer.unref?.();
+              new Promise((resolve29) => {
+                timer = setTimeout(resolve29, SESSION_RETIRE_TIMEOUT_MS2), timer.unref?.();
               })
             ]);
           } finally {
@@ -83658,8 +83692,8 @@ async function runOrchestrationShellSession(args) {
     disableBracketedPaste();
     let teardownSweepAbort = new AbortController(), TEARDOWN_SWEEP_TIMEOUT_MS = 2e3, teardownSweepTimer = setTimeout(() => teardownSweepAbort.abort(), TEARDOWN_SWEEP_TIMEOUT_MS);
     teardownSweepTimer.unref?.();
-    let hardDeadline = new Promise((resolve28) => {
-      setTimeout(resolve28, SIGNAL_SHUTDOWN_TIMEOUT_MS + SESSION_RETIRE_TIMEOUT_MS2 + 500).unref?.();
+    let hardDeadline = new Promise((resolve29) => {
+      setTimeout(resolve29, SIGNAL_SHUTDOWN_TIMEOUT_MS + SESSION_RETIRE_TIMEOUT_MS2 + 500).unref?.();
     }), teardownOperations = Promise.allSettled([
       runPlannerTeardown("signal"),
       reapOrphanShadows(/* @__PURE__ */ new Set(), {
@@ -84324,9 +84358,9 @@ function maybeFetchAndDispatchReviewSummary(event, envelope, store, reviewSummar
 }
 async function fetchAndDispatchReviewSummary(event, envelope, store, reviewSummaryFetcher) {
   try {
-    let abandoned = !1, timer, timeout = new Promise((resolve28) => {
+    let abandoned = !1, timer, timeout = new Promise((resolve29) => {
       timer = setTimeout(() => {
-        abandoned = !0, resolve28(null);
+        abandoned = !0, resolve29(null);
       }, TASK_REVIEW_SUMMARY_FETCH_TIMEOUT_MS);
     }), summary;
     try {
@@ -84882,14 +84916,138 @@ function uniqueDetectedAgents(detected) {
     item2 !== "CLAUDE" && item2 !== "CODEX" && item2 !== "ANTIGRAVITY" || out.includes(item2) || out.push(item2);
   return out;
 }
-function agyReadOnlyWorkdirPreamble(workdir) {
-  return [
+var AGY_ADVISORY_LISTING_MAX_ENTRIES = 500, AGY_ADVISORY_LISTING_MAX_BYTES = 16384, AGY_ADVISORY_IGNORED_DIRS = /* @__PURE__ */ new Set([
+  ".git",
+  "node_modules",
+  "dist",
+  "build",
+  "coverage",
+  "target",
+  "venv",
+  ".venv",
+  "__pycache__",
+  "Pods",
+  "DerivedData",
+  ".gradle",
+  ".idea",
+  ".next",
+  ".turbo",
+  ".cache",
+  ".gemini",
+  ".codevibe",
+  ".codevibe-audit",
+  ".codevibe-attachments",
+  ".agent-worktrees",
+  ".review-worktrees",
+  ".hard-gate",
+  ".dev-marketplace",
+  ".dev-marketplace-next"
+]), AGY_COMMAND_TOOL_SEATBELT_WARNING = "Your command tool cannot run in this sandbox: do not call it. CodeVibe listed the folder for you below (relative paths with '/' separator; literal backslashes escaped as \\\\, control characters escaped as \\xNN or \\uNNNN; a trailing / marks a folder). Read files with your file-reading tool, using absolute paths under the folder.";
+function sanitizeListingPath(relPath) {
+  return relPath.replace(/\\/g, "\\\\").replace(/[\x00-\x1f\x7f]/g, (c) => `\\x${c.charCodeAt(0).toString(16).padStart(2, "0")}`).replace(/[\u0080-\u009f\u061c\u200e\u200f\u2028\u2029\u202a-\u202e\u2066-\u2069\ufeff]/g, (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
+function formatAgyWorkspaceListing(workdir, maxEntries = AGY_ADVISORY_LISTING_MAX_ENTRIES, maxBytes = AGY_ADVISORY_LISTING_MAX_BYTES) {
+  try {
+    if (!fs59.existsSync(workdir))
+      return "Folder listing unavailable (directory does not exist)";
+    if (!fs59.statSync(workdir).isDirectory())
+      return "Folder listing unavailable (not a directory)";
+    if (maxBytes <= 0 || maxEntries <= 0)
+      return "Folder listing (listing omitted \u2014 prompt budget exhausted)";
+    let entries = [], skippedTopLevel = [], totalBytes = 0, truncated = !1, hasUnreadableDirs = !1, queue = [""];
+    for (; queue.length > 0 && !truncated; ) {
+      let relDir = queue.shift(), absDir = relDir === "" ? workdir : path79.join(workdir, relDir), dir;
+      try {
+        dir = fs59.opendirSync(absDir);
+      } catch (err) {
+        if (relDir === "")
+          return `Folder listing unavailable (directory unreadable: ${err?.code || (err instanceof Error ? err.message : String(err))})`;
+        hasUnreadableDirs = !0;
+        continue;
+      }
+      let dirEntries = [], dirScanLimit = maxEntries * 2;
+      try {
+        let entry5;
+        for (; (entry5 = dir.readSync()) !== null; )
+          if (dirEntries.push(entry5), dirEntries.length > dirScanLimit) {
+            truncated = !0;
+            break;
+          }
+      } catch (err) {
+        if (relDir === "" && dirEntries.length === 0)
+          return `Folder listing unavailable (directory unreadable: ${err?.code || (err instanceof Error ? err.message : String(err))})`;
+        hasUnreadableDirs = !0;
+      } finally {
+        try {
+          dir.closeSync();
+        } catch {
+        }
+      }
+      dirEntries.sort((a, b) => a.name.localeCompare(b.name));
+      for (let entry5 of dirEntries) {
+        let isDir = entry5.isDirectory(), isSymlinkToDir = !1;
+        if (!isDir && entry5.isSymbolicLink())
+          try {
+            fs59.statSync(path79.join(absDir, entry5.name)).isDirectory() && (isSymlinkToDir = !0, isDir = !0);
+          } catch {
+          }
+        if (entry5.name === ".git") {
+          relDir === "" && skippedTopLevel.push(isDir ? ".git/" : ".git");
+          continue;
+        }
+        if (isDir && AGY_ADVISORY_IGNORED_DIRS.has(entry5.name)) {
+          relDir === "" && skippedTopLevel.push(`${entry5.name}/`);
+          continue;
+        }
+        let rawRelPath = relDir === "" ? entry5.name : `${relDir}/${entry5.name}`, sanitizedRel = sanitizeListingPath(rawRelPath);
+        if (entry5.isDirectory()) {
+          let entryStr = `${sanitizedRel}/`, entryBytes = Buffer.byteLength(entryStr, "utf8") + 1;
+          if (entries.length >= maxEntries || totalBytes + entryBytes > maxBytes) {
+            truncated = !0;
+            break;
+          }
+          entries.push(entryStr), totalBytes += entryBytes, queue.push(rawRelPath);
+        } else if (isSymlinkToDir) {
+          let entryStr = `${sanitizedRel}/`, entryBytes = Buffer.byteLength(entryStr, "utf8") + 1;
+          if (entries.length >= maxEntries || totalBytes + entryBytes > maxBytes) {
+            truncated = !0;
+            break;
+          }
+          entries.push(entryStr), totalBytes += entryBytes;
+        } else {
+          let entryStr = sanitizedRel, entryBytes = Buffer.byteLength(entryStr, "utf8") + 1;
+          if (entries.length >= maxEntries || totalBytes + entryBytes > maxBytes) {
+            truncated = !0;
+            break;
+          }
+          entries.push(entryStr), totalBytes += entryBytes;
+        }
+      }
+    }
+    if (entries.length === 0)
+      return truncated ? "Folder listing (listing omitted \u2014 prompt budget exhausted)" : hasUnreadableDirs ? "Folder listing unavailable (directory unreadable)" : skippedTopLevel.length > 0 ? `Folder listing (0 entries listed, complete; not listed: ${skippedTopLevel.join(", ")}):
+(no other files found)` : `Folder listing (0 entries, complete):
+(no files found)`;
+    let status = truncated ? "truncated" : hasUnreadableDirs ? "partial, some subdirectories unreadable" : "complete", notListedPart = skippedTopLevel.length > 0 ? `; not listed: ${skippedTopLevel.join(", ")}` : "";
+    return `${`Folder listing (${entries.length} entries, ${status}${notListedPart}):`}
+${entries.join(`
+`)}`;
+  } catch (err) {
+    return `Folder listing unavailable (${err?.code || (err instanceof Error ? err.message : String(err))})`;
+  }
+}
+function agyReadOnlyWorkdirPreamble(workdir, listing) {
+  let parts = [
     `You are reading the directory \`${workdir}\` (added to your workspace via --add-dir).`,
     `Use absolute paths under \`${workdir}\` when you reference files.`,
     "Do NOT use a relative 'current directory' \u2014 your process cwd is NOT the workspace.",
-    "This is read-only advisory work: do not create, edit, delete, or move files.",
-    ""
-  ].join(`
+    "This is read-only advisory work: do not create, edit, delete, or move files."
+  ];
+  return listing !== void 0 && listing.length > 0 && parts.push(
+    AGY_COMMAND_TOOL_SEATBELT_WARNING,
+    "",
+    listing
+  ), parts.push(""), parts.join(`
 `);
 }
 function readOnlyAgentPrompt(args) {
@@ -84910,8 +85068,17 @@ function readOnlyAgentPrompt(args) {
     args.advisoryBrief || args.intent.promptForPlanning || args.intent.rawMention,
     ""
   ].join(`
-`);
-  return args.agent === "ANTIGRAVITY" && args.allowRepositoryTools ? `${agyReadOnlyWorkdirPreamble(args.workingDir)}${body}` : body;
+`), fullPrompt;
+  if (args.agent === "ANTIGRAVITY" && args.allowRepositoryTools) {
+    let basePreamble = agyReadOnlyWorkdirPreamble(args.workingDir), bodyBytes = Buffer.byteLength(body, "utf8"), basePreambleBytes = Buffer.byteLength(basePreamble, "utf8"), instructionPreambleText = `${AGY_COMMAND_TOOL_SEATBELT_WARNING}
+
+`, instructionBytes = Buffer.byteLength(instructionPreambleText, "utf8"), totalScaffoldBytes = bodyBytes + basePreambleBytes + instructionBytes + 128 + 512, availableListingBytes = Math.max(0, 122880 - totalScaffoldBytes), maxListingBytes = Math.min(AGY_ADVISORY_LISTING_MAX_BYTES, availableListingBytes), listing;
+    args.folderListing !== void 0 ? (listing = args.folderListing, Buffer.byteLength(listing, "utf8") > availableListingBytes && (listing = "Folder listing (listing omitted \u2014 prompt budget exhausted)")) : maxListingBytes >= 64 ? listing = formatAgyWorkspaceListing(args.workingDir, AGY_ADVISORY_LISTING_MAX_ENTRIES, maxListingBytes) : listing = "Folder listing (listing omitted \u2014 prompt budget exhausted)";
+    let candidatePrompt = `${agyReadOnlyWorkdirPreamble(args.workingDir, listing)}${body}`;
+    Buffer.byteLength(candidatePrompt, "utf8") <= 122880 ? fullPrompt = candidatePrompt : fullPrompt = `${basePreamble}${body}`;
+  } else
+    fullPrompt = body;
+  return fullPrompt;
 }
 function readOnlyAdvisoryAllowsRepositoryTools(_input) {
   return !0;
@@ -88879,8 +89046,8 @@ async function loadTrackBudgetForStatus(args) {
   try {
     let budget = await Promise.race([
       args.appsyncClient.getTrackBudgetStatus(args.session.sessionId),
-      new Promise((resolve28) => {
-        timer = setTimeout(() => resolve28(null), TRACK_BUDGET_STATUS_TIMEOUT_MS), timer.unref?.();
+      new Promise((resolve29) => {
+        timer = setTimeout(() => resolve29(null), TRACK_BUDGET_STATUS_TIMEOUT_MS), timer.unref?.();
       })
     ]);
     if (budget && typeof args.quorumLoop.markQueuedTaskCancelled == "function")
@@ -89282,14 +89449,14 @@ var OllamaGemmaRunner = class {
 };
 
 // src/orchestration-shell/cli.ts
-var import_uuid18 = require("uuid"), fs66 = __toESM(require("fs"));
+var import_uuid18 = require("uuid"), fs67 = __toESM(require("fs"));
 
 // src/orchestration-shell/doctor-cli.ts
-var fs60 = __toESM(require("fs")), path80 = __toESM(require("path")), crypto32 = __toESM(require("crypto")), import_child_process7 = require("child_process");
+var fs61 = __toESM(require("fs")), path80 = __toESM(require("path")), crypto32 = __toESM(require("crypto")), import_child_process7 = require("child_process");
 init_detect_agents();
 
 // src/auth/auth-service.ts
-var crypto31 = __toESM(require("crypto")), fs59 = __toESM(require("fs")), http3 = __toESM(require("http")), import_child_process6 = require("child_process");
+var crypto31 = __toESM(require("crypto")), fs60 = __toESM(require("fs")), http3 = __toESM(require("http")), import_child_process6 = require("child_process");
 init_env_scrub();
 init_logger2();
 init_auth_telemetry();
@@ -89299,7 +89466,7 @@ async function bindOAuthServer(handler) {
   for (let i = 0; i < PORT_RANGE_SIZE; i++) {
     let port = PRIMARY_PORT + i;
     try {
-      let server = await new Promise((resolve28, reject) => {
+      let server = await new Promise((resolve29, reject) => {
         let s = http3.createServer(handler), onError = (err) => {
           s.removeListener("listening", onListening), reject(err);
         }, onListening = () => {
@@ -89309,7 +89476,7 @@ async function bindOAuthServer(handler) {
               code: postErr?.code,
               message: postErr?.message
             });
-          }), resolve28(s);
+          }), resolve29(s);
         };
         s.once("error", onError), s.once("listening", onListening), s.listen(port, "localhost");
       });
@@ -89371,7 +89538,7 @@ var AuthService = class _AuthService {
   isRunningInWSL() {
     if (process.platform !== "linux") return !1;
     try {
-      let osRelease = fs59.readFileSync("/proc/sys/kernel/osrelease", "utf8");
+      let osRelease = fs60.readFileSync("/proc/sys/kernel/osrelease", "utf8");
       return /microsoft|wsl/i.test(osRelease);
     } catch {
       return !1;
@@ -89532,14 +89699,14 @@ var AuthService = class _AuthService {
     if (existing && !keychainManager.isTokenExpired(existing))
       return existing;
     let state = this.generateState();
-    return new Promise((resolve28, reject) => {
+    return new Promise((resolve29, reject) => {
       let serverRef = {}, timeoutHandle = null, isResolved = !1, callbackInFlight = !1, forceCloseSockets = (srv) => {
         srv.closeAllConnections?.();
       }, cleanupAndResolve = (tokens) => {
         if (isResolved) return;
         isResolved = !0, timeoutHandle && (clearTimeout(timeoutHandle), timeoutHandle = null);
         let srv = serverRef.server;
-        srv ? (forceCloseSockets(srv), srv.close(() => resolve28(tokens))) : resolve28(tokens);
+        srv ? (forceCloseSockets(srv), srv.close(() => resolve29(tokens))) : resolve29(tokens);
       }, cleanupAndReject = (err) => {
         if (isResolved) return;
         isResolved = !0, timeoutHandle && (clearTimeout(timeoutHandle), timeoutHandle = null);
@@ -89600,7 +89767,7 @@ var AuthService = class _AuthService {
             </html>
           `), isResolved = !0, timeoutHandle && (clearTimeout(timeoutHandle), timeoutHandle = null), setTimeout(() => {
                 let srv = serverRef.server;
-                srv ? (forceCloseSockets(srv), srv.close(() => resolve28(tokenData))) : resolve28(tokenData);
+                srv ? (forceCloseSockets(srv), srv.close(() => resolve29(tokenData))) : resolve29(tokenData);
               }, 500);
             } catch (err) {
               let safeMessage = String(err?.message || err).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -89640,12 +89807,12 @@ var AuthService = class _AuthService {
    */
   async logout() {
     let config = getConfig(), deleted = await keychainManager.deleteTokens(getEnvironment());
-    return deleted && new Promise((resolve28) => {
+    return deleted && new Promise((resolve29) => {
       let serverRef = {}, timeoutHandle = null, isCleanedUp = !1, cleanupAndResolve = (value) => {
         if (isCleanedUp) return;
         isCleanedUp = !0, timeoutHandle && (clearTimeout(timeoutHandle), timeoutHandle = null);
         let srv = serverRef.server;
-        srv ? (srv.closeAllConnections?.(), srv.close(() => resolve28(value))) : resolve28(value);
+        srv ? (srv.closeAllConnections?.(), srv.close(() => resolve29(value))) : resolve29(value);
       };
       (async () => {
         try {
@@ -89865,9 +90032,9 @@ var colors = {
 function probeAgentClis(env = process.env) {
   return AGENT_SPECS.map(({ agent, command, name }) => {
     let binPath;
-    if (agent === "ANTIGRAVITY" && env.AGY_PATH && fs60.existsSync(env.AGY_PATH))
+    if (agent === "ANTIGRAVITY" && env.AGY_PATH && fs61.existsSync(env.AGY_PATH))
       try {
-        fs60.statSync(env.AGY_PATH).isFile() && (binPath = env.AGY_PATH);
+        fs61.statSync(env.AGY_PATH).isFile() && (binPath = env.AGY_PATH);
       } catch {
         binPath = void 0;
       }
@@ -89995,19 +90162,19 @@ async function probeBackendConnectivity(appsyncUrl) {
 function readBoundedUtf8File(filePath, maxBytes) {
   let fd;
   try {
-    let stat14 = fs60.statSync(filePath);
+    let stat14 = fs61.statSync(filePath);
     if (!stat14.isFile()) return { ok: !1, error: "not a regular file" };
     if (stat14.size > maxBytes) return { ok: !1, error: `file exceeds ${maxBytes} byte limit (${stat14.size} bytes)` };
     if (stat14.size === 0) return { ok: !1, error: "empty file (0 bytes)" };
-    fd = fs60.openSync(filePath, "r");
-    let buf = Buffer.alloc(stat14.size), bytesRead = fs60.readSync(fd, buf, 0, stat14.size, 0);
+    fd = fs61.openSync(filePath, "r");
+    let buf = Buffer.alloc(stat14.size), bytesRead = fs61.readSync(fd, buf, 0, stat14.size, 0);
     return { ok: !0, content: buf.subarray(0, bytesRead).toString("utf8") };
   } catch (err) {
     return { ok: !1, error: err.message };
   } finally {
     if (fd !== void 0)
       try {
-        fs60.closeSync(fd);
+        fs61.closeSync(fd);
       } catch {
       }
   }
@@ -90133,8 +90300,8 @@ async function probeOrphanStatus(stateRoot, ownerRootOverride, shadowRootOverrid
           scanErrors.push(`Exposure retention ${record2.marker.taskId}: ${err.message}`);
         }
     let ownerRoot = ownerRootOverride ?? resolveOwnerRoot({}, stateRoot), deadProcessOwnersCount = 0;
-    if (fs60.existsSync(ownerRoot)) {
-      let entries = fs60.readdirSync(ownerRoot, { withFileTypes: !0 });
+    if (fs61.existsSync(ownerRoot)) {
+      let entries = fs61.readdirSync(ownerRoot, { withFileTypes: !0 });
       for (let entry5 of entries) {
         if (!entry5.isFile() || !/^owner-[0-9a-f-]{36}\.json$/i.test(entry5.name)) continue;
         let readResult = readBoundedUtf8File(path80.join(ownerRoot, entry5.name), 4096);
@@ -90192,7 +90359,7 @@ function shadowStateRoot() {
 function readRegistry(stateRoot) {
   let file = path80.join(stateRoot, SHADOW_ROOT_REGISTRY_FILE), raw;
   try {
-    raw = fs60.readFileSync(file, "utf8");
+    raw = fs61.readFileSync(file, "utf8");
   } catch {
     return null;
   }
@@ -90204,7 +90371,7 @@ function readRegistry(stateRoot) {
 function collectMarkers(stateRoot) {
   let index = /* @__PURE__ */ new Map(), taskDirs;
   try {
-    taskDirs = fs60.readdirSync(stateRoot, { withFileTypes: !0 });
+    taskDirs = fs61.readdirSync(stateRoot, { withFileTypes: !0 });
   } catch {
     return index;
   }
@@ -90212,7 +90379,7 @@ function collectMarkers(stateRoot) {
     if (!taskDir.isDirectory() || taskDir.name.startsWith(".")) continue;
     let dir = path80.join(stateRoot, taskDir.name), files;
     try {
-      files = fs60.readdirSync(dir);
+      files = fs61.readdirSync(dir);
     } catch {
       continue;
     }
@@ -90220,8 +90387,8 @@ function collectMarkers(stateRoot) {
       if (!SHADOW_STATE_FILE_RE.test(name) && !SHADOW_EXPOSURE_RETENTION_FILE_RE.test(name)) continue;
       let file = path80.join(dir, name), marker;
       try {
-        if (fs60.statSync(file).size > MAX_STATE_MARKER_BYTES) continue;
-        marker = JSON.parse(fs60.readFileSync(file, "utf8"));
+        if (fs61.statSync(file).size > MAX_STATE_MARKER_BYTES) continue;
+        marker = JSON.parse(fs61.readFileSync(file, "utf8"));
       } catch {
         continue;
       }
@@ -90237,19 +90404,19 @@ function inodeSurvivesInParent(root) {
   if (!root.ino) return;
   let parent = path80.dirname(root.path);
   try {
-    fs60.lstatSync(parent);
+    fs61.lstatSync(parent);
   } catch (err) {
     return err.code === "ENOENT" ? !1 : void 0;
   }
   let entries;
   try {
-    entries = fs60.readdirSync(parent);
+    entries = fs61.readdirSync(parent);
   } catch {
     return;
   }
   for (let name of entries)
     try {
-      if (fs60.lstatSync(path80.join(parent, name), { bigint: !0 }).ino.toString() === root.ino) return !0;
+      if (fs61.lstatSync(path80.join(parent, name), { bigint: !0 }).ino.toString() === root.ino) return !0;
     } catch {
       continue;
     }
@@ -90260,7 +90427,7 @@ function diagnose(stateRoot, roots) {
   return roots.map((root) => {
     let markers = markerIndex.get(root.path) ?? [], present = !1;
     try {
-      present = fs60.lstatSync(root.path).isDirectory();
+      present = fs61.lstatSync(root.path).isDirectory();
     } catch {
       present = !1;
     }
@@ -90418,29 +90585,29 @@ ${colors.red}\u2717${colors.reset} ${withheld.length} entr${withheld.length ===
   Nothing was written. Re-run with ${colors.bold}--yes${colors.reset} to apply${withheld.length ? " the entries listed first" : ""}.`), 0;
   let locks = path80.join(stateRoot, SHADOW_QUOTA_LOCK_DIR), held = [];
   try {
-    held = fs60.readdirSync(locks);
+    held = fs61.readdirSync(locks);
   } catch {
     held = [];
   }
   if (held.length)
     return console.error(`${colors.red}\u2717${colors.reset} A CodeVibe session is registering a root right now. Try again once it is idle.`), 1;
-  let file = path80.join(stateRoot, SHADOW_ROOT_REGISTRY_FILE), current = fs60.readFileSync(file, "utf8");
+  let file = path80.join(stateRoot, SHADOW_ROOT_REGISTRY_FILE), current = fs61.readFileSync(file, "utf8");
   if (crypto32.createHash("sha256").update(current).digest("hex") !== crypto32.createHash("sha256").update(registry.raw).digest("hex"))
     return console.error(`${colors.red}\u2717${colors.reset} The registry changed while this ran. Nothing was written; re-run.`), 1;
   let stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-"), backupDir = path80.join(path80.dirname(stateRoot), "shadow-root-backups", stamp), backup = path80.join(backupDir, "shadow-roots.json");
   try {
-    fs60.mkdirSync(backupDir, { recursive: !0, mode: 448 }), fs60.copyFileSync(file, backup);
+    fs61.mkdirSync(backupDir, { recursive: !0, mode: 448 }), fs61.copyFileSync(file, backup);
   } catch (err) {
     return console.error(`${colors.red}\u2717${colors.reset} Could not write the backup at ${backupDir} (${err.code ?? "unknown error"}). Nothing was changed \u2014 this command will not clear an entry it cannot restore.`), 1;
   }
   let removed = new Set(clearable.map((d) => d.root.path)), kept = registry.roots.filter((r) => !removed.has(r.path)), tmp = path80.join(backupDir, `.registry.next.${process.pid}`);
   try {
-    fs60.writeFileSync(tmp, JSON.stringify({ version: 2, roots: kept }), { mode: 384 }), fs60.renameSync(tmp, file);
+    fs61.writeFileSync(tmp, JSON.stringify({ version: 2, roots: kept }), { mode: 384 }), fs61.renameSync(tmp, file);
   } catch (err) {
     return console.error(`${colors.red}\u2717${colors.reset} Could not replace the registry (${err.code ?? "unknown error"}). Nothing was changed; a copy of it is at ${backup}.`), 1;
   } finally {
     try {
-      fs60.unlinkSync(tmp);
+      fs61.unlinkSync(tmp);
     } catch {
     }
   }
@@ -90449,7 +90616,7 @@ ${colors.red}\u2717${colors.reset} ${withheld.length} entr${withheld.length ===
     for (let marker of d.markers) {
       let copy = path80.join(backupDir, `marker-${savedMarkers.length}-${path80.basename(marker)}`);
       try {
-        fs60.copyFileSync(marker, copy), savedMarkers.push({ copy: path80.basename(copy), original: marker });
+        fs61.copyFileSync(marker, copy), savedMarkers.push({ copy: path80.basename(copy), original: marker });
       } catch (err) {
         if (err.code !== "ENOENT") {
           unbackedMarkers.push(marker);
@@ -90457,16 +90624,16 @@ ${colors.red}\u2717${colors.reset} ${withheld.length} entr${withheld.length ===
         }
       }
       try {
-        fs60.unlinkSync(marker);
+        fs61.unlinkSync(marker);
       } catch {
       }
       try {
-        fs60.rmdirSync(path80.dirname(marker));
+        fs61.rmdirSync(path80.dirname(marker));
       } catch {
       }
     }
   try {
-    fs60.writeFileSync(path80.join(backupDir, "manifest.json"), `${JSON.stringify({
+    fs61.writeFileSync(path80.join(backupDir, "manifest.json"), `${JSON.stringify({
       clearedAtUtc: (/* @__PURE__ */ new Date()).toISOString(),
       registry: file,
       registryBackup: path80.basename(backup),
@@ -90486,7 +90653,7 @@ ${colors.green}\u2713${colors.reset} Cleared ${clearable.length} entr${clearable
 }
 
 // src/substrate-launch/engage-substrate.ts
-var import_node_fs38 = require("node:fs"), os49 = __toESM(require("node:os")), path81 = __toESM(require("node:path"));
+var import_node_fs38 = require("node:fs"), os49 = __toESM(require("node:os")), path81 = __toESM(require("node:path")), crypto33 = __toESM(require("node:crypto"));
 
 // src/credential-broker/types.ts
 var BROKER_ROUTES = [
@@ -91714,9 +91881,9 @@ var LocalModelGatewayBroker = class {
     let server = http4.createServer((req, res) => {
       this.handleHttp(req, res);
     });
-    await new Promise((resolve28, reject) => {
+    await new Promise((resolve29, reject) => {
       server.once("error", reject), server.listen(0, "127.0.0.1", () => {
-        server.removeListener("error", reject), resolve28();
+        server.removeListener("error", reject), resolve29();
       });
     });
     let addr = server.address();
@@ -91760,7 +91927,7 @@ var LocalModelGatewayBroker = class {
       }
     if (await Promise.allSettled(survivors.map((r) => r.done)), this.upstreamKeys.clear(), this.credentialGeneration.clear(), this.inflightRefresh.clear(), this.tokenMinter.clear(), this.server) {
       let server = this.server;
-      this.server = null, this.boundAddr = null, await new Promise((resolve28) => server.close(() => resolve28()));
+      this.server = null, this.boundAddr = null, await new Promise((resolve29) => server.close(() => resolve29()));
     }
     logger.info("[Broker] Stopped + zeroized upstream credentials", {
       taskId: this.taskId
@@ -92329,9 +92496,9 @@ var LocalModelGatewayBroker = class {
       return auth.slice(7).trim();
   }
   readBody(req) {
-    return new Promise((resolve28, reject) => {
+    return new Promise((resolve29, reject) => {
       let chunks = [];
-      req.on("data", (c) => chunks.push(c)), req.on("end", () => resolve28(Buffer.concat(chunks).toString("utf8"))), req.on("error", reject);
+      req.on("data", (c) => chunks.push(c)), req.on("end", () => resolve29(Buffer.concat(chunks).toString("utf8"))), req.on("error", reject);
     });
   }
   writeJson(res, status, body) {
@@ -92777,8 +92944,7 @@ async function engageSubstrate(input) {
   }
 }
 var RESOLVER_AGENT_STATE_DIR_SEGMENTS = {
-  GEMINI: [".gemini"],
-  ANTIGRAVITY: [".gemini"]
+  GEMINI: [".gemini"]
 };
 async function engageWriteConfinedResolverSandbox(input) {
   let agentKind = input.agentKind;
@@ -92803,36 +92969,94 @@ async function engageWriteConfinedResolverSandbox(input) {
       teardown: async () => {
       }
     };
-  let homedir41 = os49.homedir(), stateDir = path81.join(
-    homedir41,
-    ...RESOLVER_AGENT_STATE_DIR_SEGMENTS[agentKind]
-  );
-  await import_node_fs38.promises.mkdir(stateDir, { recursive: !0 }).catch(() => {
-  });
-  let env = {}, nodeDir = process.execPath.slice(0, process.execPath.lastIndexOf("/"));
-  env.PATH = `${SANDBOX_DEFAULT_PATH}:${nodeDir}`, env.HOME = homedir41;
-  let safeSource = input.localeSource ?? {};
-  for (let key of SAFE_ENV_ALLOWLIST) {
-    let v = safeSource[key];
-    typeof v == "string" && v.length > 0 && (env[key] = v);
+  let homedir41 = input.homedir ?? os49.homedir(), stateDir, privateHomeDir = null, spawnParentDir = null, spawnParentDirCreated = !1, env = {}, handle, finalEnv;
+  if (agentKind === "ANTIGRAVITY") {
+    let spawnId = input.spawnId ?? crypto33.randomUUID().slice(0, 8), taskSegment = input.taskId || "advisory";
+    if (process.platform === "darwin")
+      input.taskId ? (spawnParentDir = path81.join(homedir41, "Library", "Caches", "CodeVibe", "shadows", taskSegment, "agy-home", spawnId), privateHomeDir = spawnParentDir) : (spawnParentDir = path81.join(homedir41, "Library", "Caches", "CodeVibe", "shadows", `advisory-${spawnId}`), privateHomeDir = path81.join(spawnParentDir, "agy-home"));
+    else {
+      let cacheBase = process.env.XDG_CACHE_HOME || path81.join(homedir41, ".cache");
+      input.taskId ? (spawnParentDir = path81.join(cacheBase, "codevibe", "shadows", taskSegment, "spawn", spawnId), privateHomeDir = path81.join(spawnParentDir, "home")) : (spawnParentDir = path81.join(cacheBase, "codevibe", "shadows", `advisory-${spawnId}`), privateHomeDir = path81.join(spawnParentDir, "home"));
+    }
+    stateDir = privateHomeDir, await import_node_fs38.promises.mkdir(path81.dirname(spawnParentDir), { recursive: !0 }), await import_node_fs38.promises.mkdir(spawnParentDir), spawnParentDirCreated = !0;
+    try {
+      let agyCliDir = path81.join(privateHomeDir, ".gemini", "antigravity-cli");
+      await import_node_fs38.promises.mkdir(agyCliDir, { recursive: !0 });
+      let hostAgyDir = path81.join(homedir41, ".gemini", "antigravity-cli"), tokenFile = path81.join(hostAgyDir, "antigravity-oauth-token"), idFile = path81.join(hostAgyDir, "installation_id");
+      try {
+        await import_node_fs38.promises.copyFile(tokenFile, path81.join(agyCliDir, "antigravity-oauth-token")), await import_node_fs38.promises.chmod(path81.join(agyCliDir, "antigravity-oauth-token"), 384);
+      } catch {
+      }
+      try {
+        await import_node_fs38.promises.copyFile(idFile, path81.join(agyCliDir, "installation_id")), await import_node_fs38.promises.chmod(path81.join(agyCliDir, "installation_id"), 384);
+      } catch {
+      }
+      env.HOME = privateHomeDir;
+      let nodeDir = process.execPath.slice(0, process.execPath.lastIndexOf("/"));
+      env.PATH = `${SANDBOX_DEFAULT_PATH}:${nodeDir}`;
+      let safeSource = input.localeSource ?? {};
+      for (let key of SAFE_ENV_ALLOWLIST) {
+        let v = safeSource[key];
+        typeof v == "string" && v.length > 0 && (env[key] = v);
+      }
+      assertNoAmbientCreds(env), finalEnv = buildSubstrateImplementorEnv(input.role, env, input.processTreeId);
+      let spec = {
+        isolationTech: "sandbox_exec",
+        workdir: input.workdir,
+        ...input.workdirAuthority ? { workdirAuthority: input.workdirAuthority } : {},
+        hostBrokerAddr: "",
+        sandboxBrokerUrl: "",
+        taskId: input.taskId,
+        sanitizedEnv: finalEnv,
+        agentConfig: { hostDir: stateDir, sandboxDir: stateDir },
+        networkPosture: "open",
+        writableWorkdir: input.writableWorkdir !== !1
+      };
+      handle = await selection.substrate.launch(spec);
+    } catch (launchErr) {
+      let rollbackErrors = [];
+      if (spawnParentDirCreated && spawnParentDir !== null)
+        try {
+          await import_node_fs38.promises.rm(spawnParentDir, { recursive: !0, force: !0 });
+        } catch (rmErr) {
+          rollbackErrors.push(rmErr);
+        }
+      if (rollbackErrors.length > 0) {
+        let combinedError = new Error(
+          `engageSubstrate initialization or launch failed and rollback failed: ${launchErr instanceof Error ? launchErr.message : String(launchErr)} (rollback: ${rollbackErrors.map((e) => e instanceof Error ? e.message : String(e)).join("; ")})`
+        );
+        throw combinedError.cause = launchErr, combinedError;
+      }
+      throw launchErr;
+    }
+  } else {
+    stateDir = path81.join(
+      homedir41,
+      ...RESOLVER_AGENT_STATE_DIR_SEGMENTS[agentKind]
+    ), await import_node_fs38.promises.mkdir(stateDir, { recursive: !0 }).catch(() => {
+    }), env.HOME = homedir41;
+    let nodeDir = process.execPath.slice(0, process.execPath.lastIndexOf("/"));
+    env.PATH = `${SANDBOX_DEFAULT_PATH}:${nodeDir}`;
+    let safeSource = input.localeSource ?? {};
+    for (let key of SAFE_ENV_ALLOWLIST) {
+      let v = safeSource[key];
+      typeof v == "string" && v.length > 0 && (env[key] = v);
+    }
+    assertNoAmbientCreds(env), finalEnv = buildSubstrateImplementorEnv(input.role, env, input.processTreeId);
+    let spec = {
+      isolationTech: "sandbox_exec",
+      workdir: input.workdir,
+      ...input.workdirAuthority ? { workdirAuthority: input.workdirAuthority } : {},
+      hostBrokerAddr: "",
+      sandboxBrokerUrl: "",
+      taskId: input.taskId,
+      sanitizedEnv: finalEnv,
+      agentConfig: { hostDir: stateDir, sandboxDir: stateDir },
+      networkPosture: "open",
+      writableWorkdir: input.writableWorkdir !== !1
+    };
+    handle = await selection.substrate.launch(spec);
   }
-  assertNoAmbientCreds(env);
-  let finalEnv = buildSubstrateImplementorEnv(input.role, env, input.processTreeId), spec = {
-    isolationTech: "sandbox_exec",
-    workdir: input.workdir,
-    ...input.workdirAuthority ? { workdirAuthority: input.workdirAuthority } : {},
-    // No broker on this row — the addr/url fields are informational for A5
-    // (the profile, not these strings, governs egress) and deliberately empty.
-    hostBrokerAddr: "",
-    sandboxBrokerUrl: "",
-    taskId: input.taskId,
-    sanitizedEnv: finalEnv,
-    // The agent's own auth/state home — writable, read-granted (A5: sandbox fs
-    // == host fs, so sandboxDir == hostDir).
-    agentConfig: { hostDir: stateDir, sandboxDir: stateDir },
-    networkPosture: "open",
-    writableWorkdir: input.writableWorkdir !== !1
-  }, handle = await selection.substrate.launch(spec);
   return logger.info(
     `[A1d] Resolver-confinement row engaged (tier=sandbox_exec, egress=open) \u2014 writes fenced to the disposable workspace; ${agentKind} runs on its own file-based auth (no broker)`,
     { taskId: input.taskId, agent: agentKind }
@@ -92850,8 +93074,18 @@ async function engageWriteConfinedResolverSandbox(input) {
     refreshBrokerToken: async () => {
     },
     teardown: async () => {
-      await handle.teardown().catch(() => {
-      });
+      try {
+        await handle.teardown();
+      } catch (err) {
+        throw logger.warn(
+          "[engageSubstrate] resolver sandbox handle teardown failed, retaining state for recovery",
+          {
+            err,
+            spawnParentDir
+          }
+        ), err;
+      }
+      spawnParentDirCreated && spawnParentDir !== null && await import_node_fs38.promises.rm(spawnParentDir, { recursive: !0, force: !0 });
     }
   };
 }
@@ -93370,7 +93604,7 @@ var LocalGemmaProcessRunner = class {
   }
   invoke(promptText, purpose, options) {
     let responseFormat = options?.responseFormat ?? "json";
-    return new Promise((resolve28, reject) => {
+    return new Promise((resolve29, reject) => {
       let stdout = "", stderr = "", settled = !1, terminalError = null, timeoutTimer, killTimer = null, child = (0, import_child_process8.spawn)(this.config.command, this.config.args, {
         env: scrubSearchApiKeys({
           ...this.config.env,
@@ -93430,11 +93664,11 @@ var LocalGemmaProcessRunner = class {
             return;
           }
           if (responseFormat === "text") {
-            resolve28(trimmed);
+            resolve29(trimmed);
             return;
           }
           try {
-            resolve28(enforceStrictJsonStdout(trimmed));
+            resolve29(enforceStrictJsonStdout(trimmed));
           } catch (err) {
             reject(err);
           }
@@ -93535,12 +93769,12 @@ var FileSystemLocalModelStore = class {
 }, defaultLocalModelStore = new FileSystemLocalModelStore();
 async function fileDigest(pathname) {
   let hash3 = (0, import_crypto19.createHash)("sha256"), bytes = 0;
-  return await new Promise((resolve28, reject) => {
+  return await new Promise((resolve29, reject) => {
     let stream = (0, import_fs4.createReadStream)(pathname);
     stream.on("data", (chunk) => {
       let buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
       bytes += buffer.byteLength, hash3.update(buffer);
-    }), stream.on("error", reject), stream.on("end", resolve28);
+    }), stream.on("error", reject), stream.on("end", resolve29);
   }), { sha256: hash3.digest("hex"), bytes };
 }
 function resolveRedirectUrl(currentUrl, location) {
@@ -93553,7 +93787,7 @@ function resolveRedirectUrl(currentUrl, location) {
   }
 }
 async function downloadHttpsToFile(url, destinationPath, expectedBytes, redirectBudget = 3) {
-  await new Promise((resolve28, reject) => {
+  await new Promise((resolve29, reject) => {
     let req = import_https2.default.get(url, (res) => {
       let status = res.statusCode ?? 0;
       if ([301, 302, 303, 307, 308].includes(status)) {
@@ -93563,7 +93797,7 @@ async function downloadHttpsToFile(url, destinationPath, expectedBytes, redirect
           reject(new Error("local Gemma download redirect was invalid or exceeded the limit"));
           return;
         }
-        downloadHttpsToFile(redirected, destinationPath, expectedBytes, redirectBudget - 1).then(resolve28).catch(reject);
+        downloadHttpsToFile(redirected, destinationPath, expectedBytes, redirectBudget - 1).then(resolve29).catch(reject);
         return;
       }
       if (status !== 200) {
@@ -93591,7 +93825,7 @@ async function downloadHttpsToFile(url, destinationPath, expectedBytes, redirect
             `local Gemma download exceeded pinned bytes ${expectedBytes}`
           )
         );
-      }), (0, import_promises3.pipeline)(res, file).then(() => resolve28()).catch(reject);
+      }), (0, import_promises3.pipeline)(res, file).then(() => resolve29()).catch(reject);
     });
     req.on("error", reject), req.setTimeout(3e4, () => {
       req.destroy(new Error("local Gemma download timed out"));
@@ -93609,7 +93843,7 @@ var defaultLocalModelDownloadTransport = {
     this.stallTimeoutMs = stallTimeoutMs;
   }
   pull(model, localOllamaHost, onProgress) {
-    return new Promise((resolve28, reject) => {
+    return new Promise((resolve29, reject) => {
       let env = scrubSearchApiKeys({ ...process.env });
       localOllamaHost ? env.OLLAMA_HOST = localOllamaHost : delete env.OLLAMA_HOST;
       let resolvedCommand = this.command || process.env.CODEVIBE_OLLAMA_COMMAND || DEFAULT_OLLAMA_COMMAND, child = this.spawnPull(resolvedCommand, ["pull", model], {
@@ -93645,7 +93879,7 @@ var defaultLocalModelDownloadTransport = {
       }), child.on("close", (code, signal) => {
         if (timer && clearTimeout(timer), !stalled) {
           if (code === 0) {
-            resolve28();
+            resolve29();
             return;
           }
           reject(
@@ -94340,8 +94574,8 @@ async function retireUnownedAdmittedSession(appsyncClient, sessionId) {
   try {
     await Promise.race([
       appsyncClient.updateSession({ sessionId, status: "INACTIVE" /* INACTIVE */, ...cleanExit }),
-      new Promise((resolve28) => {
-        timer = setTimeout(resolve28, SESSION_RETIRE_TIMEOUT_MS), timer.unref?.();
+      new Promise((resolve29) => {
+        timer = setTimeout(resolve29, SESSION_RETIRE_TIMEOUT_MS), timer.unref?.();
       })
     ]);
   } catch (err) {
@@ -94636,10 +94870,10 @@ Run \`codevibe vendor-key setup\`` + (checksCodex ? " (or `codevibe vendor-key i
 async function promptInstallLocalModel() {
   let rl = require("readline").createInterface({ input: process.stdin, output: process.stdout });
   try {
-    let trimmed = (await new Promise((resolve28) => {
+    let trimmed = (await new Promise((resolve29) => {
       rl.question(
         "Orchestration Mode needs the local model (~7GB), which isn't installed. Install it now? [Y/n]: ",
-        resolve28
+        resolve29
       );
     })).trim().toLowerCase();
     return trimmed === "" || trimmed.startsWith("y");
@@ -94742,7 +94976,7 @@ Note: --export will overwrite any existing file at <path>.
     offset: parsed.offset
   });
   if (result.kind === "ok" && parsed.exportPath) {
-    let writeFile4 = deps?.writeFileFn ?? ((p, c) => fs66.writeFileSync(p, c, "utf8"));
+    let writeFile4 = deps?.writeFileFn ?? ((p, c) => fs67.writeFileSync(p, c, "utf8"));
     try {
       let formatted = formatAuditExport(
         result.model,