@quantiya/codevibe-core 2.0.79 → 2.0.81

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() {
@@ -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);
@@ -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");
@@ -8927,7 +8943,15 @@ var import_zod = require("zod"), MAX_SYNC_SOURCE_ANCHOR_BYTES = 64 * 1024, count
   anchor,
   reason: import_zod.z.enum(["BACKLOG_LIMIT", "OVERSIZED_RECORD", "PARTIAL_RECORD", "MALFORMED_RECORD", "EMPTY_RECORD"]),
   discardUntilNewline: import_zod.z.boolean()
-}).strict().refine((value) => value.endOffset > value.startOffset && value.anchor.endOffset === value.endOffset && value.anchor.startOffset >= value.startOffset && (!value.discardUntilNewline || ["BACKLOG_LIMIT", "OVERSIZED_RECORD", "PARTIAL_RECORD"].includes(value.reason))), position = import_zod.z.object({ byteOffset: count2, anchor: anchor.nullable(), discardUntilNewline: import_zod.z.boolean() }).strict().refine((value) => value.byteOffset === 0 ? value.anchor === null && !value.discardUntilNewline : value.anchor?.endOffset === value.byteOffset), frameAnchor = (value) => value.anchor ?? {
+}).strict().refine((value) => value.endOffset > value.startOffset && value.anchor.endOffset === value.endOffset && value.anchor.startOffset >= value.startOffset && (!value.discardUntilNewline || ["BACKLOG_LIMIT", "OVERSIZED_RECORD", "PARTIAL_RECORD"].includes(value.reason))), position = import_zod.z.object({ byteOffset: count2, anchor: anchor.nullable(), discardUntilNewline: import_zod.z.boolean() }).strict().refine((value) => value.byteOffset === 0 ? value.anchor === null && !value.discardUntilNewline : value.anchor?.endOffset === value.byteOffset);
+function validSourceRebase(previous, target2, skipped) {
+  return position.safeParse({
+    byteOffset: previous.byteOffset,
+    anchor: previous.anchor,
+    discardUntilNewline: previous.discardUntilNewline
+  }).success && previous.byteOffset > 0 && anchor.safeParse(target2).success && typeof skipped == "boolean";
+}
+var frameAnchor = (value) => value.anchor ?? {
   startOffset: value.startOffset,
   endOffset: value.endOffset,
   sha256: value.sourceSha256
@@ -9039,6 +9063,26 @@ function createSourceJournal(options) {
         row3.byteOffset = next.endOffset, row3.anchor = next.anchor, row3.discardUntilNewline = next.discardUntilNewline, row3.skippedBytes += next.endOffset - next.startOffset, row3.lastGap = next, row3.lastFrame = null, row3.projection = null, await write(row3, assertOwnership);
       });
     },
+    rebase: async (previous, target2, skippedHistory, recordedAt, recoveryProjection = null) => {
+      if (!validSourceRebase(previous, target2, skippedHistory) || !Number.isSafeInteger(recordedAt) || recordedAt < 1 || !projection.safeParse(recoveryProjection).success) return options.invalid();
+      await options.locked(async (assertOwnership) => {
+        await recoverLocked(assertOwnership);
+        let row3 = await required(), occurrence = `rebase:${previous.byteOffset}:${previous.anchor.sha256}:${Number(skippedHistory)}:${recordedAt}`;
+        if (row3.lastFrame?.occurrence === occurrence && row3.byteOffset === target2.endOffset && JSON.stringify(row3.anchor) === JSON.stringify(target2))
+          return row3.projection !== recoveryProjection ? options.invalid() : void 0;
+        if (row3.entries.length) throw Error("SYNC_SOURCE_RECOVERY_PENDING");
+        if (row3.byteOffset !== previous.byteOffset || row3.discardUntilNewline !== previous.discardUntilNewline || JSON.stringify(row3.anchor) !== JSON.stringify(previous.anchor)) return options.invalid();
+        if (row3.skippedBytes > target2.endOffset) throw Error("SYNC_SOURCE_RECOVERY_UNAVAILABLE");
+        row3.byteOffset = target2.endOffset, row3.anchor = { ...target2 }, row3.discardUntilNewline = !1, row3.lastGap = null, row3.projection = recoveryProjection, row3.lastFrame = {
+          ...stream,
+          occurrence,
+          sourceSha256: target2.sha256,
+          startOffset: target2.startOffset,
+          endOffset: target2.endOffset,
+          anchor: { ...target2 }
+        }, await write(row3, assertOwnership);
+      });
+    },
     recover: () => options.locked(recoverLocked),
     drain: (maximum = 64, signal) => options.drainLocked(async () => {
       if (!Number.isSafeInteger(maximum) || maximum < 1 || maximum > 256) return options.invalid();
@@ -9063,6 +9107,23 @@ function createSourceJournal(options) {
 function createSourcePair(options) {
   let { source: source2, lanes, laneStreams } = options, recover = async () => {
     for (let lane of lanes) await lane.recover();
+  }, rebaseMarker = (row3) => /^rebase:([1-9][0-9]*):([a-f0-9]{64}):([01]):([1-9][0-9]*)$/.exec(row3.lastFrame?.occurrence ?? ""), finishRebase = async () => {
+    let rows = await Promise.all(lanes.map((lane) => lane.load())), candidates = [];
+    for (let index2 of [0, 1]) {
+      let row4 = rows[index2];
+      if (!row4) continue;
+      let marker2 = rebaseMarker(row4);
+      if (!marker2) continue;
+      let peer2 = rows[1 - index2];
+      if (!peer2) return options.invalid();
+      row4.byteOffset === peer2.byteOffset && JSON.stringify(row4.anchor) === JSON.stringify(peer2.anchor) && row4.projection === peer2.projection && row4.lastFrame?.occurrence === peer2.lastFrame?.occurrence || peer2.byteOffset === Number(marker2[1]) && peer2.anchor?.sha256 === marker2[2] && candidates.push({ index: index2, marker: marker2 });
+    }
+    if (!candidates.length) return;
+    if (candidates.sort((a, b) => Number(b.marker[4]) - Number(a.marker[4])), candidates.length > 1 && candidates[0].marker[4] === candidates[1].marker[4])
+      throw Error("SYNC_SOURCE_RECOVERY_UNAVAILABLE");
+    let { index, marker } = candidates[0], row3 = rows[index], peer = rows[1 - index];
+    if (row3.entries.length || peer.entries.length) throw Error("SYNC_SOURCE_RECOVERY_PENDING");
+    await lanes[1 - index].rebase(position2(peer), row3.anchor, marker[3] === "1", Number(marker[4]), row3.projection);
   }, position2 = (row3) => ({
     byteOffset: row3.byteOffset,
     anchor: row3.anchor ? { ...row3.anchor } : null,
@@ -9070,14 +9131,33 @@ function createSourcePair(options) {
   }), earliest = (rows) => {
     let ordered = [...rows].sort((a, b) => a.byteOffset - b.byteOffset);
     if (ordered.length === 2 && ordered[0].byteOffset === ordered[1].byteOffset && JSON.stringify(position2(ordered[0])) !== JSON.stringify(position2(ordered[1]))) return options.invalid();
-    let baseline = position2(ordered[0]), pending2 = rows.flatMap((row3) => row3.entries.filter((entry5) => entry5.state === "PREPARING" && entry5.frame.startOffset === baseline.byteOffset).map((entry5) => entry5.frame.endOffset));
-    return { ...baseline, ...pending2.length && { pendingFrameEndOffset: Math.min(...pending2) } };
+    let baseline = position2(ordered[0]), pending2 = rows.flatMap((row3) => {
+      let frames = row3.entries.filter((entry5) => entry5.state === "PREPARING" && entry5.frame.startOffset === baseline.byteOffset).map((entry5) => entry5.frame);
+      return row3.byteOffset > baseline.byteOffset && row3.lastFrame && !rebaseMarker(row3) && row3.lastFrame.startOffset === baseline.byteOffset && row3.lastFrame.endOffset === row3.byteOffset && frames.push(row3.lastFrame), frames.map((frame3) => ({
+        startOffset: frame3.startOffset,
+        endOffset: frame3.endOffset,
+        sourceSha256: frame3.sourceSha256
+      }));
+    });
+    if (pending2.some((value) => JSON.stringify(value) !== JSON.stringify(pending2[0]))) return options.invalid();
+    let marker = rebaseMarker(ordered[0]);
+    return {
+      ...baseline,
+      ...pending2.length && { pendingFrameEndOffset: pending2[0].endOffset, pendingFrame: pending2[0] },
+      ...marker && { recovered: {
+        previousOffset: Number(marker[1]),
+        boundaryOffset: baseline.byteOffset,
+        skippedHistory: marker[3] === "1",
+        recordedAt: Number(marker[4]),
+        projection: ordered[0].projection
+      } }
+    };
   };
   return Object.freeze({
     open: (initial, validateInitial) => {
       let snapshot2 = typeof initial == "number" ? initial : position2(initial);
       return options.locked(async () => {
-        await recover();
+        await recover(), await finishRebase();
         let present = (await Promise.all(lanes.map((lane) => lane.load()))).filter((row3) => row3 !== null);
         if (present.length === 1 && (present[0].lastFrame !== null || present[0].entries.length !== 0 || present[0].skippedBytes !== 0 || present[0].projection !== null))
           return options.invalid();
@@ -9092,8 +9172,14 @@ function createSourcePair(options) {
       let snapshot2 = { ...frame3, ...frame3.anchor && { anchor: { ...frame3.anchor } } }, factories = [...prepare];
       return options.locked(async () => {
         let result = [null, null];
-        for (let index of [0, 1])
-          result[index] = await lanes[index].admit({ ...snapshot2, streamSha256: laneStreams[index] }, factories[index]);
+        for (let index of [0, 1]) {
+          let row3 = await lanes[index].load();
+          result[index] = await lanes[index].admit(
+            { ...snapshot2, streamSha256: laneStreams[index] },
+            factories[index],
+            row3 && rebaseMarker(row3) ? null : void 0
+          );
+        }
         return result;
       });
     },
@@ -9104,6 +9190,20 @@ function createSourcePair(options) {
         for (let lane of lanes) await lane.skip(snapshot2);
       });
     },
+    rebase: async (previous, target2, skippedHistory, recoveryProjection = null) => {
+      if (!validSourceRebase(previous, target2, skippedHistory)) return options.invalid();
+      let before = position2(previous), next = { ...target2 };
+      return options.locked(async () => {
+        await recover(), await finishRebase();
+        let rows = await Promise.all(lanes.map((lane) => lane.load()));
+        if (rows.some((row3) => !row3)) return options.invalid();
+        if (rows.some((row3) => row3.entries.length || JSON.stringify(position2(row3)) !== JSON.stringify(before)))
+          throw Error("SYNC_SOURCE_RECOVERY_PENDING");
+        let recordedAt = Math.max(Date.now(), ...rows.map((row3) => Number(rebaseMarker(row3)?.[4] ?? 0) + 1));
+        for (let lane of lanes) await lane.rebase(before, next, skippedHistory, recordedAt, recoveryProjection);
+        return earliest(await Promise.all(lanes.map(async (lane) => await lane.load())));
+      });
+    },
     recover: () => options.locked(recover),
     drain: async (maximumPerLane = 64, signal) => {
       let count4 = 0, failure2, failed = !1;
@@ -10166,7 +10266,19 @@ var import_zod6 = require("zod"), import_node_crypto11 = require("node:crypto"),
   sessionGenerationId: uuid7,
   provider: import_zod6.z.enum(["codex", "claude", "agy"]),
   entries: import_zod6.z.array(entry3).max(64)
-}).strict(), normalize = (text2, mode) => mode === "trim" ? text2.trim() : text2.replace(/\s+/g, " ").trim(), tokenFor = (target2) => (0, import_node_crypto11.createHash)("sha256").update(JSON.stringify(target2)).digest("hex");
+}).strict(), normalize = (text2, mode) => mode === "trim" ? text2.trim() : text2.replace(/\s+/g, " ").trim(), tokenFor = (target2) => (0, import_node_crypto11.createHash)("sha256").update(JSON.stringify(target2)).digest("hex"), omissionPlan = import_zod6.z.object({
+  kind: import_zod6.z.literal("omitted-echoes-v1"),
+  ownerSha256: hash2,
+  matches: import_zod6.z.array(import_zod6.z.tuple([hash2, hash2, hash2])).max(64)
+}).strict(), ownerHash = (row3) => (0, import_node_crypto11.createHash)("sha256").update(JSON.stringify([
+  row3.operationId,
+  row3.sessionId,
+  row3.sessionGenerationId,
+  row3.provider
+])).digest("hex"), reservationHash = (e) => (0, import_node_crypto11.createHash)("sha256").update(JSON.stringify({ ...e, claim: null, claimedEchoSha256: null })).digest("hex"), matchesText = (e, content, nativeMs) => {
+  let normalized = normalize(content, e.normalization);
+  return nativeMs >= Math.floor(e.armedAt / e.clockPrecisionMs) * e.clockPrecisionMs && nativeMs <= e.expiresAt && (e.normalized === normalized || e.allowSuffix && normalized.length >= 16 && normalized.length / e.normalized.length >= 0.35 && e.normalized.endsWith(normalized));
+};
 function decodeMobileEcho(value) {
   let parsed = row2.parse(value);
   if (new Set(parsed.entries.map((e) => e.token)).size !== parsed.entries.length || parsed.entries.some((e) => e.token !== tokenFor(e.target))) throw Error("SYNC_MOBILE_ECHO_INVALID");
@@ -10196,6 +10308,31 @@ function createMobileEchoJournal(options) {
         row3.entries.push(snapshot2), await save();
       });
     },
+    planOmitted: (records) => options.mutate(async (row3) => {
+      let eligible = row3.entries.filter((e) => !e.claim), used = /* @__PURE__ */ new Set(), proofs = /* @__PURE__ */ new Set(), matches2 = [];
+      if (eligible.length) for (let record2 of records) {
+        hash2.parse(record2.sourceSha256);
+        let nativeMs = Date.parse(record2.timestamp);
+        if (!Number.isFinite(nativeMs) || proofs.has(record2.sourceSha256)) continue;
+        let match = eligible.find((e) => !used.has(e.token) && matchesText(e, record2.content, nativeMs));
+        if (match && (used.add(match.token), proofs.add(record2.sourceSha256), matches2.push([match.token, reservationHash(match), record2.sourceSha256])), used.size === eligible.length) break;
+      }
+      let plan = JSON.stringify({ kind: "omitted-echoes-v1", ownerSha256: ownerHash(row3), matches: matches2 });
+      if (Buffer.byteLength(plan) > 16384) throw Error("SYNC_MOBILE_ECHO_INVALID");
+      return plan;
+    }),
+    settleOmitted: (value) => {
+      if (Buffer.byteLength(value) > 16384) throw Error("SYNC_MOBILE_ECHO_INVALID");
+      let plan = omissionPlan.parse(JSON.parse(value)), tokens = new Set(plan.matches.map((m) => m[0])), proofs = new Set(plan.matches.map((m) => m[2]));
+      if (tokens.size !== plan.matches.length || proofs.size !== plan.matches.length) throw Error("SYNC_MOBILE_ECHO_INVALID");
+      return options.mutate(async (row3, save) => {
+        if (ownerHash(row3) !== plan.ownerSha256) throw Error("SYNC_MOBILE_ECHO_INVALID");
+        let exact2 = new Map(plan.matches.map(([token4, fingerprint2]) => [token4, fingerprint2])), before = row3.entries.length;
+        row3.entries = row3.entries.filter((e) => e.claim || exact2.get(e.token) !== reservationHash(e));
+        let count4 = before - row3.entries.length;
+        return count4 && await save(), count4;
+      });
+    },
     claim: (value, content, timestamp5) => {
       let next = frame2.parse(value), echoHash = (e) => (0, import_node_crypto11.createHash)("sha256").update(normalize(content, e.normalization)).digest("hex"), nativeMs = Date.parse(timestamp5);
       if (!Number.isFinite(nativeMs)) throw Error("SYNC_MOBILE_ECHO_TIMESTAMP_INVALID");
@@ -10203,10 +10340,7 @@ function createMobileEchoJournal(options) {
         let claimed = row3.entries.find((e) => e.claim?.streamSha256 === next.streamSha256 && e.claim?.occurrence === next.occurrence);
         if (claimed)
           return JSON.stringify(claimed.claim) !== JSON.stringify(next) || claimed.claimedEchoSha256 !== echoHash(claimed) ? options.collision() : !0;
-        let pending2 = row3.entries.find((e) => {
-          let normalized = normalize(content, e.normalization);
-          return !e.claim && nativeMs >= Math.floor(e.armedAt / e.clockPrecisionMs) * e.clockPrecisionMs && nativeMs <= e.expiresAt && (e.normalized === normalized || e.allowSuffix && normalized.length >= 16 && normalized.length / e.normalized.length >= 0.35 && e.normalized.endsWith(normalized));
-        });
+        let pending2 = row3.entries.find((e) => !e.claim && matchesText(e, content, nativeMs));
         return pending2 ? (pending2.claim = next, pending2.claimedEchoSha256 = echoHash(pending2), await save(), !0) : !1;
       });
     },
@@ -10882,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();
@@ -10903,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 {
@@ -11631,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
     });
   }
@@ -11849,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 () => {
@@ -12108,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", () => {
@@ -12119,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);
@@ -12874,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
@@ -13335,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 {
@@ -13975,6 +14111,7 @@ var AppSyncClient = class _AppSyncClient {
     this.syncRegistrations = /* @__PURE__ */ new Map();
     // MARK: - Heartbeat
     this.heartbeatTimers = /* @__PURE__ */ new Map();
+    this.heartbeatReadiness = /* @__PURE__ */ new Map();
     /** Identity tokens invalidate in-flight pulses when a session is stopped. */
     this.heartbeatTokens = /* @__PURE__ */ new Map();
     /** Shared initial confirmation makes duplicate start calls idempotent. */
@@ -14087,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));
       };
@@ -14137,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 = () => {
@@ -14148,7 +14285,7 @@ var AppSyncClient = class _AppSyncClient {
         return;
       }
       flight.then(
-        (value) => finish(() => resolve28(value)),
+        (value) => finish(() => resolve29(value)),
         (error) => finish(() => reject(error))
       );
     })) : flight;
@@ -14486,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")));
@@ -14494,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);
           }
@@ -15191,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);
@@ -15203,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();
@@ -15623,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())
     ]));
@@ -15641,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;
@@ -18300,6 +18437,13 @@ var AppSyncClient = class _AppSyncClient {
   cleanupApplyUserDecisionWatcherState(state) {
     state.destroyed = !0, this.cancelReconnectReconciliationWait(state), state.reconnectTimer && (clearTimeout(state.reconnectTimer), state.reconnectTimer = void 0), state.keepAliveTimer && (clearTimeout(state.keepAliveTimer), state.keepAliveTimer = void 0), state.ws && (disposeWatcherSocket(state.ws, state.subscriptionId), state.ws = null);
   }
+  /** Local producer health, not a quota/transport flag. Reconnect must not
+   * advertise readiness while the owning transcript reader is degraded. */
+  setHeartbeatReadiness(sessionId, ready) {
+    return this.heartbeatReadiness.set(sessionId, ready), () => {
+      this.heartbeatReadiness.get(sessionId) === ready && this.heartbeatReadiness.delete(sessionId);
+    };
+  }
   /**
    * Start periodic heartbeat for a session.
    * Updates lastHeartbeatAt on the session every intervalMs (default 2 minutes).
@@ -18382,6 +18526,11 @@ var AppSyncClient = class _AppSyncClient {
    */
   async sendHeartbeat(sessionId, token4) {
     if (this.heartbeatTokens.get(sessionId) !== token4) return "stopped";
+    try {
+      if (this.heartbeatReadiness.get(sessionId)?.() === !1) return "stopped";
+    } catch {
+      return "stopped";
+    }
     try {
       let heartbeatAt = (/* @__PURE__ */ new Date()).toISOString(), refreshed = await this.updateSession({
         sessionId,
@@ -18750,6 +18899,14 @@ async function updateMobileInputStatus(update, event, status) {
   return receipt2;
 }
 
+// src/appsync/sync-source-recovery.ts
+var DEFAULT_SYNC_SOURCE_RECOVERY_POLICY = Object.freeze({
+  staleAfterMs: 5 * 6e4,
+  maximumRecentMessages: 20,
+  anchorSearchBytes: 8 * 1024 * 1024,
+  maximumScanBytes: 64 * 1024 * 1024
+});
+
 // src/appsync/sync-source-file.ts
 var CHUNK = 64 * 1024;
 
@@ -19187,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)
@@ -20849,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,
@@ -21361,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);
       }
     }));
   });
@@ -21487,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";
@@ -22366,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(
@@ -22393,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(() => {
@@ -22533,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) => {
@@ -22557,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;
@@ -22590,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,
       {
@@ -22639,7 +22796,7 @@ function requestOllamaGenerateStream(config, promptText, opts) {
               );
               return;
             }
-            finish(() => resolve28(out));
+            finish(() => resolve29(out));
           }
         }));
       }
@@ -22669,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) => {
@@ -22711,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,
       {
@@ -22748,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()));
         }));
       }
     );
@@ -24017,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);
@@ -24032,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);
@@ -24147,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(() => {
@@ -28564,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) {
@@ -28596,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 {
@@ -28836,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,
@@ -28863,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);
         }
@@ -28987,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()}`));
       });
@@ -29053,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,
@@ -29088,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);
         }
@@ -32206,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()}`);
@@ -32685,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);
   };
@@ -32765,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()}`);
@@ -34517,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) {
@@ -34529,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
@@ -35015,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 = () => {
@@ -35036,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));
@@ -35700,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) {
@@ -35759,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,
       {
@@ -35779,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) {
@@ -35810,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, () => {
@@ -36472,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);
         }
@@ -37370,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;
@@ -37510,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(
@@ -38040,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) => {
@@ -38406,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);
@@ -38445,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;
 }
@@ -38664,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);
@@ -38805,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);
       }
     );
@@ -39079,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) => {
@@ -41535,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) => {
@@ -42246,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) {
@@ -43524,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(),
@@ -45920,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();
         })
       ]);
@@ -47806,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 {
@@ -49237,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") {
@@ -50593,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 (
@@ -50881,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"]
@@ -50891,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);
   });
@@ -56656,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,
@@ -57745,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. */
@@ -59429,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()}`);
@@ -62353,7 +62510,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,
@@ -62369,7 +62526,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")
@@ -62456,12 +62613,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 });
       });
     });
   }
@@ -62479,8 +62636,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(() => {
     });
   }
@@ -63574,7 +63731,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();
@@ -63596,7 +63753,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));
     };
@@ -66394,8 +66551,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() {
@@ -66426,12 +66583,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;
@@ -66560,8 +66717,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);
@@ -67842,8 +67999,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);
@@ -70048,8 +70205,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 {
@@ -76189,7 +76346,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)
@@ -80413,8 +80570,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 {
@@ -82787,9 +82944,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(() => {
@@ -82972,9 +83129,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(() => {
@@ -83289,9 +83446,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?.();
         })
       ]);
@@ -83472,8 +83629,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 {
@@ -83519,8 +83676,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(), {
@@ -84185,9 +84342,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 {
@@ -88740,8 +88897,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")
@@ -89160,7 +89317,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 = () => {
@@ -89170,7 +89327,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");
       });
@@ -89393,14 +89550,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);
@@ -89461,7 +89618,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;");
@@ -89501,12 +89658,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 {
@@ -91575,9 +91732,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();
@@ -91621,7 +91778,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
@@ -92190,9 +92347,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) {
@@ -93231,7 +93388,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,
@@ -93291,11 +93448,11 @@ var LocalGemmaProcessRunner = class {
             return;
           }
           if (responseFormat === "text") {
-            resolve28(trimmed);
+            resolve29(trimmed);
             return;
           }
           try {
-            resolve28(enforceStrictJsonStdout(trimmed));
+            resolve29(enforceStrictJsonStdout(trimmed));
           } catch (err) {
             reject(err);
           }
@@ -93396,12 +93553,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) {
@@ -93414,7 +93571,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)) {
@@ -93424,7 +93581,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) {
@@ -93452,7 +93609,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"));
@@ -93470,7 +93627,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], {
@@ -93506,7 +93663,7 @@ var defaultLocalModelDownloadTransport = {
       }), child.on("close", (code, signal) => {
         if (timer && clearTimeout(timer), !stalled) {
           if (code === 0) {
-            resolve28();
+            resolve29();
             return;
           }
           reject(
@@ -94201,8 +94358,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) {
@@ -94497,10 +94654,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");