agent-shim 11.86.3 → 11.86.5

package/dist/cli.cjs

@@ -16281,8 +16281,8 @@ function rewriteKeyNames(ctx) {
       bySchema.set(entry.schema, entry);
   }
   const rewrites = /* @__PURE__ */ new Map();
-  for (const record2 of pendingRecords.get(ctx) ?? []) {
-    const seen = ctx.seen.get(record2);
+  for (const record3 of pendingRecords.get(ctx) ?? []) {
+    const seen = ctx.seen.get(record3);
     const names = (seen?.def ?? seen?.schema)?.propertyNames;
     if (!names || names === true || rewrites.has(names))
       continue;
@@ -30516,9 +30516,9 @@ function frontDoorOrigin(state) {
   const port = state?.directPort ?? state?.lastDirectPort;
   return port === void 0 ? void 0 : directOrigin(port);
 }
-function writeFrontDoorDirectRecord(fs35, recordsDir, record2) {
+function writeFrontDoorDirectRecord(fs35, recordsDir, record3) {
   fs35.mkdirp(recordsDir);
-  fs35.writeFilePrivate(import_node_path7.default.join(recordsDir, `${String(record2.pid)}.json`), `${JSON.stringify({ directPort: record2.directPort })}
+  fs35.writeFilePrivate(import_node_path7.default.join(recordsDir, `${String(record3.pid)}.json`), `${JSON.stringify({ directPort: record3.directPort })}
 `);
 }
 function removeFrontDoorDirectRecord(fs35, recordsDir, pid) {
@@ -30576,12 +30576,12 @@ function pruneMalformedFrontDoorDirectFiles(fs35, recordsDir, isRunning) {
   }
 }
 function liveFrontDoorDirectRecords(records, liveness) {
-  return records.filter((record2) => liveness.doors.has(record2.pid) || liveness.unknown.has(record2.pid));
+  return records.filter((record3) => liveness.doors.has(record3.pid) || liveness.unknown.has(record3.pid));
 }
 function pruneDeadFrontDoorDirectRecords(fs35, recordsDir, records, liveness) {
-  for (const record2 of records) {
-    if (!liveness.doors.has(record2.pid) && !liveness.unknown.has(record2.pid)) {
-      removeFrontDoorDirectRecord(fs35, recordsDir, record2.pid);
+  for (const record3 of records) {
+    if (!liveness.doors.has(record3.pid) && !liveness.unknown.has(record3.pid)) {
+      removeFrontDoorDirectRecord(fs35, recordsDir, record3.pid);
     }
   }
 }
@@ -30613,9 +30613,9 @@ function readFrontDoorSessionRecord(fs35, sessionsDir, name) {
 function listFrontDoorSessions(fs35, sessionsDir) {
   const sessions = [];
   for (const name of fs35.readdir(sessionsDir)) {
-    const record2 = isSessionRecordName(name) ? readFrontDoorSessionRecord(fs35, sessionsDir, name) : void 0;
-    if (record2 !== void 0) {
-      sessions.push(summaryOf(record2));
+    const record3 = isSessionRecordName(name) ? readFrontDoorSessionRecord(fs35, sessionsDir, name) : void 0;
+    if (record3 !== void 0) {
+      sessions.push(summaryOf(record3));
     }
   }
   return sessions.sort((a10, b) => a10.pid - b.pid);
@@ -31127,8 +31127,8 @@ function captureFromEnv(env, logsDir) {
 function createFileCapture(file2, now = () => /* @__PURE__ */ new Date()) {
   fs3.mkdirSync(path9.dirname(file2), { recursive: true });
   let nextId = 0;
-  const append = (record2) => {
-    fs3.appendFileSync(file2, `${JSON.stringify({ ts: now().toISOString(), ...record2 })}
+  const append = (record3) => {
+    fs3.appendFileSync(file2, `${JSON.stringify({ ts: now().toISOString(), ...record3 })}
 `, { mode: CAPTURE_FILE_MODE });
   };
   return {
@@ -31755,16 +31755,16 @@ async function runSupervisor(initialConfig, ports, options = {}) {
   }
 }
 function undeterminedFrontDoors(inputs) {
-  return inputs.frontDoorRecords.flatMap((record2) => {
-    const reason = inputs.frontDoorLiveness.unknown.get(record2.pid);
-    return reason === void 0 ? [] : [{ pid: record2.pid, origin: directOrigin(record2.directPort), reason }];
+  return inputs.frontDoorRecords.flatMap((record3) => {
+    const reason = inputs.frontDoorLiveness.unknown.get(record3.pid);
+    return reason === void 0 ? [] : [{ pid: record3.pid, origin: directOrigin(record3.directPort), reason }];
   });
 }
 function currentHeadroomAllowlistInputs(fs35, paths, frontDoorLiveness) {
   const named = frontDoorOrigin(readFrontDoorState(fs35, paths.frontdoorStateFile));
   const records = listFrontDoorDirectRecords(fs35, paths.frontdoorDirectRecordsDir);
-  const liveness = frontDoorLiveness(records.map((record2) => record2.pid));
-  const live = liveFrontDoorDirectRecords(records, liveness).map((record2) => directOrigin(record2.directPort));
+  const liveness = frontDoorLiveness(records.map((record3) => record3.pid));
+  const live = liveFrontDoorDirectRecords(records, liveness).map((record3) => directOrigin(record3.directPort));
   return {
     frontDoorRecords: records,
     frontDoorLiveness: liveness,
@@ -33130,30 +33130,30 @@ function readIdentityRecords(port, identitiesDir) {
     }
   }
   const sorted = [...records].map(([id2, name]) => ({ id: id2, name })).sort((left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0);
-  return sorted.filter((record2) => {
-    const twins = sorted.filter((other) => other.name === record2.name && port.sameDirectory(import_node_path14.default.join(identitiesDir, other.id), import_node_path14.default.join(identitiesDir, record2.id)));
+  return sorted.filter((record3) => {
+    const twins = sorted.filter((other) => other.name === record3.name && port.sameDirectory(import_node_path14.default.join(identitiesDir, other.id), import_node_path14.default.join(identitiesDir, record3.id)));
     const kept = twins.find((twin) => !port.isSymlink(import_node_path14.default.join(identitiesDir, twin.id))) ?? twins[0];
-    return kept === void 0 || kept.id === record2.id;
+    return kept === void 0 || kept.id === record3.id;
   });
 }
 function duplicateIdentityNames(records) {
   const byName = /* @__PURE__ */ new Map();
-  for (const record2 of records) {
-    if (record2.name !== void 0) {
-      byName.set(record2.name, [...byName.get(record2.name) ?? [], record2.id]);
+  for (const record3 of records) {
+    if (record3.name !== void 0) {
+      byName.set(record3.name, [...byName.get(record3.name) ?? [], record3.id]);
     }
   }
   return [...byName].filter(([, ids]) => ids.length > 1).map(([name, ids]) => ({ name, ids }));
 }
 function identityIdIn(records, name) {
-  const matches2 = records.filter((record2) => record2.name === name);
+  const matches2 = records.filter((record3) => record3.name === name);
   if (matches2.length > 1) {
-    throw new DuplicateIdentityNameError(name, matches2.map((record2) => record2.id));
+    throw new DuplicateIdentityNameError(name, matches2.map((record3) => record3.id));
   }
-  return matches2[0]?.id ?? records.find((record2) => record2.name === void 0 && record2.id === name)?.id;
+  return matches2[0]?.id ?? records.find((record3) => record3.name === void 0 && record3.id === name)?.id;
 }
 function identityNameIn(records, id2) {
-  return records.find((record2) => record2.id === id2)?.name;
+  return records.find((record3) => record3.id === id2)?.name;
 }
 function freeIdentityId(name, taken) {
   if (!taken(name)) {
@@ -34249,9 +34249,9 @@ function readUsageLog(fs35, logDir, options = {}) {
       continue;
     }
     invalidLines += read.invalidLines;
-    for (const record2 of read.records) {
-      if (sinceMs === void 0 || Date.parse(record2.at) >= sinceMs) {
-        records.push(record2);
+    for (const record3 of read.records) {
+      if (sinceMs === void 0 || Date.parse(record3.at) >= sinceMs) {
+        records.push(record3);
       }
     }
   }
@@ -34343,13 +34343,13 @@ function listUsageSnapshots(fs35, snapshotsDir) {
 }
 function summariseUsage(records) {
   const groups = /* @__PURE__ */ new Map();
-  for (const record2 of records) {
-    const key = `${record2.identity ?? ""}\0${record2.provider}`;
+  for (const record3 of records) {
+    const key = `${record3.identity ?? ""}\0${record3.provider}`;
     const group = groups.get(key);
     if (group === void 0) {
-      groups.set(key, [record2]);
+      groups.set(key, [record3]);
     } else {
-      group.push(record2);
+      group.push(record3);
     }
   }
   const summaries = [...groups.values()].flatMap((group) => {
@@ -34359,21 +34359,21 @@ function summariseUsage(records) {
       return [];
     }
     const modelCounts = /* @__PURE__ */ new Map();
-    for (const record2 of group) {
-      if (record2.model !== void 0) {
-        modelCounts.set(record2.model, (modelCounts.get(record2.model) ?? 0) + 1);
+    for (const record3 of group) {
+      if (record3.model !== void 0) {
+        modelCounts.set(record3.model, (modelCounts.get(record3.model) ?? 0) + 1);
       }
     }
-    const sum2 = (field) => group.reduce((total, record2) => total + (record2.usage?.[field] ?? 0), 0);
+    const sum2 = (field) => group.reduce((total, record3) => total + (record3.usage?.[field] ?? 0), 0);
     return [
       {
         identity: first.identity,
         provider: first.provider,
         requests: group.length,
-        failed: group.filter((record2) => record2.status >= FIRST_ERROR_STATUS).length,
+        failed: group.filter((record3) => record3.status >= FIRST_ERROR_STATUS).length,
         limits: {
-          "rate-limited": group.filter((record2) => record2.limit?.kind === "rate-limited").length,
-          "quota-exhausted": group.filter((record2) => record2.limit?.kind === "quota-exhausted").length
+          "rate-limited": group.filter((record3) => record3.limit?.kind === "rate-limited").length,
+          "quota-exhausted": group.filter((record3) => record3.limit?.kind === "quota-exhausted").length
         },
         tokens: {
           inputTokens: sum2("inputTokens"),
@@ -35538,8 +35538,8 @@ function acquireIdentityLock(params) {
   }
   let lastHolderPid;
   for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-    const record2 = { identity: params.identity, pid: params.pid, token, acquiredAtMs: params.nowMs() };
-    if (params.fs.writeFileExclusive(lockPath, `${JSON.stringify(record2)}
+    const record3 = { identity: params.identity, pid: params.pid, token, acquiredAtMs: params.nowMs() };
+    if (params.fs.writeFileExclusive(lockPath, `${JSON.stringify(record3)}
 `)) {
       return {
         path: lockPath,
@@ -36717,10 +36717,10 @@ function windowBlockedUntil(windows) {
 }
 function windowBurn(records, which) {
   const points = [];
-  for (const record2 of records) {
-    const window = record2.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record2.rateLimitHeaders)?.[which];
+  for (const record3 of records) {
+    const window = record3.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record3.rateLimitHeaders)?.[which];
     if (window?.utilization !== void 0 && window.resetsAt !== void 0) {
-      points.push({ resetsAt: window.resetsAt, point: { atMs: Date.parse(record2.at), utilization: window.utilization } });
+      points.push({ resetsAt: window.resetsAt, point: { atMs: Date.parse(record3.at), utilization: window.utilization } });
     }
   }
   const latest = points.at(-1)?.resetsAt;
@@ -36732,16 +36732,16 @@ function windowBurn(records, which) {
   }
   return (last.utilization - first.utilization) / (last.atMs - first.atMs);
 }
-function billedTokensOf(record2) {
-  const usage = record2.usage;
+function billedTokensOf(record3) {
+  const usage = record3.usage;
   return (usage?.inputTokens ?? 0) + (usage?.cacheCreationInputTokens ?? 0) + (usage?.outputTokens ?? 0);
 }
 function utilisationPerBilledToken(records, which) {
   const points = [];
-  for (const record2 of records) {
-    const window = record2.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record2.rateLimitHeaders)?.[which];
+  for (const record3 of records) {
+    const window = record3.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record3.rateLimitHeaders)?.[which];
     if (window?.utilization !== void 0 && window.resetsAt !== void 0) {
-      points.push({ resetsAt: window.resetsAt, utilization: window.utilization, billed: billedTokensOf(record2) });
+      points.push({ resetsAt: window.resetsAt, utilization: window.utilization, billed: billedTokensOf(record3) });
     }
   }
   const latest = points.at(-1)?.resetsAt;
@@ -36756,8 +36756,8 @@ function utilisationPerBilledToken(records, which) {
 }
 function windowRatio(records) {
   const points = [];
-  for (const record2 of records) {
-    const unified = record2.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record2.rateLimitHeaders);
+  for (const record3 of records) {
+    const unified = record3.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record3.rateLimitHeaders);
     const five = unified?.fiveHour;
     const seven = unified?.sevenDay;
     if (five?.utilization !== void 0 && five.resetsAt !== void 0 && seven?.utilization !== void 0 && seven.resetsAt !== void 0) {
@@ -37007,21 +37007,21 @@ function pruneUsageLog(fs35, logDir, nowMs) {
 function later(left, right) {
   return left.localeCompare(right) >= 0 ? left : right;
 }
-function observedAt(record2) {
-  return new Date(Date.parse(record2.at) + record2.latencyMs).toISOString();
+function observedAt(record3) {
+  return new Date(Date.parse(record3.at) + record3.latencyMs).toISOString();
 }
-function foldProviderState(current, record2) {
-  const seen = observedAt(record2);
-  const newest = current?.lastRequestAt === void 0 || record2.at.localeCompare(current.lastRequestAt) >= 0;
-  const rateLimit = record2.rateLimitHeaders === void 0 || current?.rateLimit !== void 0 && current.rateLimit.observedAt.localeCompare(seen) > 0 ? current?.rateLimit : (() => {
-    const unified = parseUnifiedRateLimit(record2.rateLimitHeaders);
-    return { observedAt: seen, headers: record2.rateLimitHeaders, ...unified === void 0 ? {} : { unified } };
+function foldProviderState(current, record3) {
+  const seen = observedAt(record3);
+  const newest = current?.lastRequestAt === void 0 || record3.at.localeCompare(current.lastRequestAt) >= 0;
+  const rateLimit = record3.rateLimitHeaders === void 0 || current?.rateLimit !== void 0 && current.rateLimit.observedAt.localeCompare(seen) > 0 ? current?.rateLimit : (() => {
+    const unified = parseUnifiedRateLimit(record3.rateLimitHeaders);
+    return { observedAt: seen, headers: record3.rateLimitHeaders, ...unified === void 0 ? {} : { unified } };
   })();
-  const lastLimit = record2.limit === void 0 || current?.lastLimit !== void 0 && current.lastLimit.observedAt.localeCompare(seen) > 0 ? current?.lastLimit : { ...record2.limit, observedAt: seen, status: record2.status };
-  const lastModel = newest ? record2.model ?? current?.lastModel : current.lastModel ?? record2.model;
+  const lastLimit = record3.limit === void 0 || current?.lastLimit !== void 0 && current.lastLimit.observedAt.localeCompare(seen) > 0 ? current?.lastLimit : { ...record3.limit, observedAt: seen, status: record3.status };
+  const lastModel = newest ? record3.model ?? current?.lastModel : current.lastModel ?? record3.model;
   return {
-    lastRequestAt: current?.lastRequestAt === void 0 ? record2.at : later(current.lastRequestAt, record2.at),
-    ...newest ? { lastStatus: record2.status } : current.lastStatus === void 0 ? {} : { lastStatus: current.lastStatus },
+    lastRequestAt: current?.lastRequestAt === void 0 ? record3.at : later(current.lastRequestAt, record3.at),
+    ...newest ? { lastStatus: record3.status } : current.lastStatus === void 0 ? {} : { lastStatus: current.lastStatus },
     ...lastModel === void 0 ? {} : { lastModel },
     ...rateLimit === void 0 ? {} : { rateLimit },
     ...lastLimit === void 0 ? {} : { lastLimit },
@@ -37073,7 +37073,7 @@ function createUsageStore(deps) {
   };
   return {
     record: (input2) => {
-      const record2 = UsageRecordSchema.parse(input2);
+      const record3 = UsageRecordSchema.parse(input2);
       const nowMs = deps.now();
       fs35.mkdirPrivate(paths.usageDir);
       fs35.mkdirPrivate(paths.usageLogDir);
@@ -37082,11 +37082,11 @@ function createUsageStore(deps) {
         pruneUsageLog(fs35, paths.usageLogDir, nowMs);
         prunedDay = day;
       }
-      fs35.appendFilePrivate(import_node_path22.default.join(paths.usageLogDir, segmentName(day, deps.pid)), `${JSON.stringify(record2)}
+      fs35.appendFilePrivate(import_node_path22.default.join(paths.usageLogDir, segmentName(day, deps.pid)), `${JSON.stringify(record3)}
 `);
-      deps.onRecord?.(record2);
-      if (record2.identity !== void 0) {
-        rewriteSnapshot(record2.identity, (current) => ({ ...current?.providers, [record2.provider]: foldProviderState(current?.providers[record2.provider], record2) }));
+      deps.onRecord?.(record3);
+      if (record3.identity !== void 0) {
+        rewriteSnapshot(record3.identity, (current) => ({ ...current?.providers, [record3.provider]: foldProviderState(current?.providers[record3.provider], record3) }));
       }
     },
     recordQuota: (identity, provider, quota) => rewriteSnapshot(identity, (current) => {
@@ -37133,7 +37133,7 @@ function loadPoolMembers(fs35, paths, identities, nowMs, idOf) {
     if (id2 === void 0) {
       return { identity, records: [] };
     }
-    const records = log.records.filter((record2) => record2.identity === id2 && record2.provider === ANTHROPIC_PROVIDER && Date.parse(record2.at) >= windowStartMs);
+    const records = log.records.filter((record3) => record3.identity === id2 && record3.provider === ANTHROPIC_PROVIDER && Date.parse(record3.at) >= windowStartMs);
     try {
       const snapshot = readUsageSnapshot(fs35, paths.usageSnapshotsDir, id2);
       const account = readAccountMetadata(fs35, paths.identitiesDir, id2) ?? snapshot?.account;
@@ -37489,9 +37489,9 @@ function readNameRenameRecords(paths) {
 function strayNameRenameRecordFiles(paths) {
   return readRecordFiles(paths).filter((entry) => !isFiledForItsPair(entry)).map((entry) => entry.file);
 }
-function writeNameRenameRecord(paths, record2) {
+function writeNameRenameRecord(paths, record3) {
   realFarmFs.mkdirPrivate(paths.identityNameRenamesDir);
-  realFarmFs.writeFilePrivate(recordFile(paths, record2.from, record2.to), `${JSON.stringify(NameRenameRecordSchema.parse(record2), null, 2)}
+  realFarmFs.writeFilePrivate(recordFile(paths, record3.from, record3.to), `${JSON.stringify(NameRenameRecordSchema.parse(record3), null, 2)}
 `, { durable: true });
 }
 function removeNameRenameRecord(paths, from, to2) {
@@ -37512,20 +37512,20 @@ function referencesToName(paths, name) {
   const picked = picksText === void 0 ? void 0 : picksWithIdentityRenamed(picksText, name, name)?.renamed;
   return [...pools, ...jobs, ...models, ...profiles, ...rules, ...active, ...picked === void 0 ? [] : [`${String(picked)} recorded pool pick${picked === 1 ? "" : "s"}`]];
 }
-function isSettled(paths, record2, records) {
-  const stored2 = records.find((candidate) => candidate.id === record2.id);
+function isSettled(paths, record3, records) {
+  const stored2 = records.find((candidate) => candidate.id === record3.id);
   if (stored2 === void 0) {
     return true;
   }
-  if (stored2.name !== record2.to) {
+  if (stored2.name !== record3.to) {
     return false;
   }
-  const shared = records.some((candidate) => candidate.id !== record2.id && candidate.name === record2.from);
-  return shared || referencesToName(paths, record2.from).length === 0;
+  const shared = records.some((candidate) => candidate.id !== record3.id && candidate.name === record3.from);
+  return shared || referencesToName(paths, record3.from).length === 0;
 }
 function unfinishedNameRenames(paths) {
   const records = identityRecordsOver(realFarmFs, paths.identitiesDir);
-  return readNameRenameRecords(paths).filter((record2) => !isSettled(paths, record2, records));
+  return readNameRenameRecords(paths).filter((record3) => !isSettled(paths, record3, records));
 }
 function removeSettledNameRenames(paths) {
   const records = identityRecordsOver(realFarmFs, paths.identitiesDir);
@@ -37533,19 +37533,19 @@ function removeSettledNameRenames(paths) {
     import_node_fs10.default.rmSync(entry.file, { force: true });
   }
 }
-function describeInterruptedNameRename(paths, record2) {
-  const references = referencesToName(paths, record2.to);
-  const rewritten = references.length === 0 ? "" : ` and has already rewritten references to "${record2.to}" (${references.join(", ")})`;
-  const claimants = identityRecordsOver(realFarmFs, paths.identitiesDir).filter((candidate) => candidate.name === record2.from).length;
-  const finish = claimants > 1 || record2.id !== record2.from ? `agent-shim identity rename ${record2.id} ${record2.to} --id` : `agent-shim identity rename ${record2.from} ${record2.to}`;
-  return `A rename of identity "${record2.from}" to "${record2.to}" was interrupted${rewritten}. Finish it with \`${finish}\`.`;
+function describeInterruptedNameRename(paths, record3) {
+  const references = referencesToName(paths, record3.to);
+  const rewritten = references.length === 0 ? "" : ` and has already rewritten references to "${record3.to}" (${references.join(", ")})`;
+  const claimants = identityRecordsOver(realFarmFs, paths.identitiesDir).filter((candidate) => candidate.name === record3.from).length;
+  const finish = claimants > 1 || record3.id !== record3.from ? `agent-shim identity rename ${record3.id} ${record3.to} --id` : `agent-shim identity rename ${record3.from} ${record3.to}`;
+  return `A rename of identity "${record3.from}" to "${record3.to}" was interrupted${rewritten}. Finish it with \`${finish}\`.`;
 }
 function missingIdentityRemedy(paths, name) {
-  const giving = unfinishedNameRenames(paths).find((record2) => record2.to === name);
+  const giving = unfinishedNameRenames(paths).find((record3) => record3.to === name);
   return giving === void 0 ? `Run \`agent-shim identity add ${name}\` first.` : describeInterruptedNameRename(paths, giving);
 }
 function requireNoInterruptedNameRename(paths, name, action, except) {
-  const held = unfinishedNameRenames(paths).find((record2) => (record2.from === name || record2.to === name) && !(record2.id === except?.id && record2.from === except.from && record2.to === except.to));
+  const held = unfinishedNameRenames(paths).find((record3) => (record3.from === name || record3.to === name) && !(record3.id === except?.id && record3.from === except.from && record3.to === except.to));
   if (held !== void 0) {
     throw new InterruptedNameRenameError(action, describeInterruptedNameRename(paths, held));
   }
@@ -37607,14 +37607,14 @@ function readRecord(fs35, directory, name) {
 function registerLaunch(fs35, directory, owner, isRunning) {
   fs35.mkdirPrivate(directory);
   for (const name of fs35.readdir(directory)) {
-    const record3 = readRecord(fs35, directory, name);
-    if (record3 !== void 0 && !isRunning(record3.pid)) {
+    const record4 = readRecord(fs35, directory, name);
+    if (record4 !== void 0 && !isRunning(record4.pid)) {
       fs35.removeRecursive(import_node_path26.default.join(directory, name));
     }
   }
   const file2 = recordFile2(directory, owner.pid);
-  const record2 = { pid: owner.pid, identity: owner.identity, startedAt: new Date(owner.startedAtMs).toISOString() };
-  fs35.writeFilePrivate(file2, `${JSON.stringify(record2)}
+  const record3 = { pid: owner.pid, identity: owner.identity, startedAt: new Date(owner.startedAtMs).toISOString() };
+  fs35.writeFilePrivate(file2, `${JSON.stringify(record3)}
 `);
   return () => {
     fs35.removeRecursive(file2);
@@ -37622,8 +37622,8 @@ function registerLaunch(fs35, directory, owner, isRunning) {
 }
 function liveLaunchesOn(fs35, directory, identity, isRunning) {
   return fs35.readdir(directory).flatMap((name) => {
-    const record2 = readRecord(fs35, directory, name);
-    return record2?.identity === identity && isRunning(record2.pid) ? [record2.pid] : [];
+    const record3 = readRecord(fs35, directory, name);
+    return record3?.identity === identity && isRunning(record3.pid) ? [record3.pid] : [];
   }).sort((left, right) => left - right);
 }
 var import_node_path26, import_node_crypto9, LaunchRecordSchema, RECORD_SUFFIX2;
@@ -37716,10 +37716,10 @@ function createIdentityNameReader(paths) {
   };
 }
 function identityLabeller(paths) {
-  const records = new Map(identityRecords(paths).map((record2) => [record2.id, record2]));
+  const records = new Map(identityRecords(paths).map((record3) => [record3.id, record3]));
   return (id2) => {
-    const record2 = records.get(id2);
-    return record2 === void 0 ? goneIdentityLabel(id2) : record2.name ?? unreadableIdentityLabel(id2);
+    const record3 = records.get(id2);
+    return record3 === void 0 ? goneIdentityLabel(id2) : record3.name ?? unreadableIdentityLabel(id2);
   };
 }
 function unreadableIdentityLabel(id2) {
@@ -37771,7 +37771,7 @@ function idKeyedFiles(paths, id2) {
 function loggedIdentityIds(paths) {
   let logged;
   return () => {
-    logged ??= new Set(readUsageLog(realUsageReadFs, paths.usageLogDir).records.flatMap((record2) => record2.identity === void 0 ? [] : [record2.identity]));
+    logged ??= new Set(readUsageLog(realUsageReadFs, paths.usageLogDir).records.flatMap((record3) => record3.identity === void 0 ? [] : [record3.identity]));
     return logged;
   };
 }
@@ -37781,7 +37781,7 @@ function idAllocation(paths, keychain, loggedIds) {
     loggedIds,
     keychain,
     recordIds: () => {
-      recordIds ??= identityRecords(paths).map((record2) => record2.id);
+      recordIds ??= identityRecords(paths).map((record3) => record3.id);
       return recordIds;
     }
   };
@@ -37956,7 +37956,7 @@ function listIdentities(paths) {
     return [];
   }
   const active = readActiveIdentity2(paths);
-  const names = new Map(identityRecords(paths).map((record2) => [record2.id, record2.name]));
+  const names = new Map(identityRecords(paths).map((record3) => [record3.id, record3.name]));
   const result = [];
   for (const id2 of listIdentityDirectories(paths).names) {
     const read = readIdentityForListing(paths, id2);
@@ -37971,9 +37971,9 @@ function listIdentities(paths) {
     result.push("problem" in read ? { name, id: id2, isActive, problem: read.problem } : { name, id: id2, identity: read, isActive });
   }
   const unreachable = new Set(listIdentityDirectories(paths).unreachable.map((entry) => entry.name));
-  for (const record2 of identityRecords(paths).filter((candidate) => !identityIdExists(paths, candidate.id) && !unreachable.has(candidate.id))) {
-    const name = record2.name ?? record2.id;
-    result.push({ name, id: record2.id, isActive: name === active, problem: DISPLACED_PROBLEM, displaced: true });
+  for (const record3 of identityRecords(paths).filter((candidate) => !identityIdExists(paths, candidate.id) && !unreachable.has(candidate.id))) {
+    const name = record3.name ?? record3.id;
+    result.push({ name, id: record3.id, isActive: name === active, problem: DISPLACED_PROBLEM, displaced: true });
   }
   return result.sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : left.id < right.id ? -1 : left.id > right.id ? 1 : 0);
 }
@@ -41958,7 +41958,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.86.3",
+      version: "11.86.5",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -57497,17 +57497,17 @@ var require_dns = __commonJS({
         const timestamp = Date.now();
         const records = { records: { 4: null, 6: null } };
         let minTTL = this.#maxTTL;
-        for (const record2 of addresses) {
-          record2.timestamp = timestamp;
-          if (typeof record2.ttl === "number") {
-            record2.ttl = Math.min(record2.ttl, this.#maxTTL);
-            minTTL = Math.min(minTTL, record2.ttl);
+        for (const record3 of addresses) {
+          record3.timestamp = timestamp;
+          if (typeof record3.ttl === "number") {
+            record3.ttl = Math.min(record3.ttl, this.#maxTTL);
+            minTTL = Math.min(minTTL, record3.ttl);
           } else {
-            record2.ttl = this.#maxTTL;
+            record3.ttl = this.#maxTTL;
           }
-          const familyRecords = records.records[record2.family] ?? { ips: [] };
-          familyRecords.ips.push(record2);
-          records.records[record2.family] = familyRecords;
+          const familyRecords = records.records[record3.family] ?? { ips: [] };
+          familyRecords.ips.push(record3);
+          records.records[record3.family] = familyRecords;
         }
         this.storage.set(origin.hostname, records, { ttl: minTTL });
       }
@@ -73926,9 +73926,9 @@ function createProviderLookup(ports) {
     };
   };
 }
-function withQuotaRefresh(record2, refresher) {
+function withQuotaRefresh(record3, refresher) {
   return (usageRecord) => {
-    record2(usageRecord);
+    record3(usageRecord);
     if (usageRecord.identity !== void 0 && usageRecord.provider !== ANTHROPIC_PROVIDER) {
       void refresher.refresh(usageRecord.identity, usageRecord.provider);
     }
@@ -122545,18 +122545,18 @@ var NamelessIdentityError = class extends CliError {
 };
 function renamedIdentity(paths, from, options) {
   const records = identityRecords(paths);
-  const record2 = options.byId === true ? records.find((candidate) => candidate.id === from) : records.find((candidate) => candidate.id === requireIdentityId(paths, from));
-  if (record2 === void 0) {
+  const record3 = options.byId === true ? records.find((candidate) => candidate.id === from) : records.find((candidate) => candidate.id === requireIdentityId(paths, from));
+  if (record3 === void 0) {
     throw new UnknownIdentityIdError(from);
   }
-  const { name } = record2;
+  const { name } = record3;
   if (name === void 0) {
-    throw new NamelessIdentityError(record2.id);
+    throw new NamelessIdentityError(record3.id);
   }
-  if (!identityIdExists(paths, record2.id)) {
-    throw displacedIdentity(paths, "renamed", name, record2.id);
+  if (!identityIdExists(paths, record3.id)) {
+    throw displacedIdentity(paths, "renamed", name, record3.id);
   }
-  return { id: record2.id, name, shared: records.some((other) => other.id !== record2.id && other.name === name) };
+  return { id: record3.id, name, shared: records.some((other) => other.id !== record3.id && other.name === name) };
 }
 
 // src/identityRename.ts
@@ -123126,7 +123126,7 @@ function snapshotStep(paths, ports, from, to2) {
 function usageWindowNote(paths, ports, from, to2) {
   const windowStartMs = ports.lock.nowMs() - FIVE_HOUR_WINDOW_MS;
   const { records } = readUsageLog(ports.fs, paths.usageLogDir, { sinceMs: windowStartMs });
-  const logged = records.some((record2) => record2.identity === from && record2.provider === ANTHROPIC_PROVIDER && Date.parse(record2.at) >= windowStartMs);
+  const logged = records.some((record3) => record3.identity === from && record3.provider === ANTHROPIC_PROVIDER && Date.parse(record3.at) >= windowStartMs);
   return logged ? `Usage already logged for "${from}" in the last five hours stays filed under that id: the usage log is appended to by the running front door, so it is not rewritten. Until those hours pass, pool ranking has no burn rate or five-hour to seven-day ratio for "${to2}" from them. Its quota windows come from its snapshot, which moved, and are unaffected.` : void 0;
 }
 function credentialHolderSteps(paths, ports, from, to2, moved) {
@@ -123462,7 +123462,7 @@ async function applyUnderLocks(paths, from, to2, ports, gathered, hooks) {
     const marks = [...carried.map((step2) => ({ started: true, done: step2.done })), ...plan.steps.map(() => ({ started: false, done: false }))];
     const descriptions = [...carried.map((step2) => step2.description), ...plan.steps.map((step2) => step2.description)];
     const startedAt = resumed?.startedAt ?? new Date(ports.lock.nowMs()).toISOString();
-    const record2 = () => {
+    const record3 = () => {
       writeRenameJournal(ports.fs, file2, { version: 1, from, to: to2, startedAt, pid: ports.lock.pid, steps: descriptions.map((description, position) => ({ description, started: marks[position]?.started === true, done: marks[position]?.done === true })) });
     };
     const positionOf = (index) => carried.length + index;
@@ -123475,14 +123475,14 @@ async function applyUnderLocks(paths, from, to2, ports, gathered, hooks) {
     };
     const save = (index, when) => {
       try {
-        record2();
+        record3();
       } catch (failure2) {
         throw new JournalWriteError(failure2, `${when} "${descriptions[positionOf(index)] ?? String(index)}"`);
       }
     };
     try {
       try {
-        record2();
+        record3();
       } catch (failure2) {
         throw new JournalWriteError(failure2, "before the first step", rolledBackOutcome(resumed !== void 0));
       }
@@ -123508,7 +123508,7 @@ async function applyUnderLocks(paths, from, to2, ports, gathered, hooks) {
           const mark = markOf(index);
           mark.started = false;
           mark.done = false;
-          record2();
+          record3();
         }
       });
     } catch (error63) {
@@ -123583,7 +123583,7 @@ async function renameIdentity(paths, from, to2, ports, options = {}) {
   });
   try {
     const plan = planNameChange(paths, from, to2, ports, options);
-    const resumed = unfinishedNameRenames(paths).find((record2) => record2.id === id2 && record2.from === plan.name && record2.to === to2);
+    const resumed = unfinishedNameRenames(paths).find((record3) => record3.id === id2 && record3.from === plan.name && record3.to === to2);
     writeNameRenameRecord(paths, { version: 1, id: id2, from: plan.name, to: to2, startedAt: resumed?.startedAt ?? new Date(ports.lock.nowMs()).toISOString() });
     try {
       await applyAll(plan.steps, {
@@ -125851,7 +125851,7 @@ function committedContextTokens(sessions, records) {
       continue;
     }
     const sinceMs = Date.parse(session.since);
-    const written = records.some((record2) => record2.sessionId === session.sessionId && record2.identity === session.identity && Date.parse(record2.at) >= sinceMs);
+    const written = records.some((record3) => record3.sessionId === session.sessionId && record3.identity === session.identity && Date.parse(record3.at) >= sinceMs);
     if (!written) {
       committed[session.identity] = (committed[session.identity] ?? 0) + session.carriedTokens;
     }
@@ -125915,8 +125915,8 @@ async function supervisedSessionOf(fs35, paths, sessionId, runningAmong) {
 init_read();
 
 // src/selection/signals.ts
-function targetOf(record2) {
-  return record2.model === void 0 ? void 0 : `${record2.provider}/${record2.model}`;
+function targetOf(record3) {
+  return record3.model === void 0 ? void 0 : `${record3.provider}/${record3.model}`;
 }
 function median(values) {
   if (values.length === 0) {
@@ -125929,18 +125929,18 @@ function median(values) {
   return sorted.length % 2 === 0 && above !== void 0 && below !== void 0 ? (above + below) / 2 : sorted[middle];
 }
 var OBSERVATION_WINDOW = 20;
-function observeRecord(observations, record2) {
-  const target = targetOf(record2);
+function observeRecord(observations, record3) {
+  const target = targetOf(record3);
   if (target === void 0) {
     return new Map(observations);
   }
-  const kept = [...observations.get(target) ?? [], record2].slice(-OBSERVATION_WINDOW);
+  const kept = [...observations.get(target) ?? [], record3].slice(-OBSERVATION_WINDOW);
   return new Map(observations).set(target, kept);
 }
 function observationOf(records) {
-  const completed = records.filter((record2) => record2.outcome === "completed");
-  const latencies = completed.map((record2) => record2.latencyMs);
-  const usage = records.flatMap((record2) => record2.usage === void 0 ? [] : [record2.usage]);
+  const completed = records.filter((record3) => record3.outcome === "completed");
+  const latencies = completed.map((record3) => record3.latencyMs);
+  const usage = records.flatMap((record3) => record3.usage === void 0 ? [] : [record3.usage]);
   const input2 = usage.reduce((sum2, entry) => sum2 + (entry.inputTokens ?? 0), 0);
   const output2 = usage.reduce((sum2, entry) => sum2 + (entry.outputTokens ?? 0), 0);
   const cacheRead = usage.reduce((sum2, entry) => sum2 + (entry.cacheReadInputTokens ?? 0), 0);
@@ -125963,12 +125963,12 @@ var SEED_LOOKBACK_RECORDS = 500;
 function createTargetObservationStore(fs35, paths) {
   let observations = /* @__PURE__ */ new Map();
   const seeded = readRecentUsageRecords(fs35, paths.usageLogDir, SEED_LOOKBACK_RECORDS);
-  for (const record2 of seeded) {
-    observations = observeRecord(observations, record2);
+  for (const record3 of seeded) {
+    observations = observeRecord(observations, record3);
   }
   return {
-    observe: (record2) => {
-      observations = observeRecord(observations, record2);
+    observe: (record3) => {
+      observations = observeRecord(observations, record3);
     },
     observation: (target) => {
       const records = observations.get(target);
@@ -126531,8 +126531,8 @@ function createCredentialCustody(randomId) {
       held.delete(hopId);
     },
     redeem: (hopId, provider) => {
-      const record2 = held.get(hopId);
-      return record2?.provider === provider ? record2.credentials : void 0;
+      const record3 = held.get(hopId);
+      return record3?.provider === provider ? record3.credentials : void 0;
     }
   };
 }
@@ -126774,20 +126774,20 @@ var SYSTEM_SUBTYPES = ["task_started", "task_progress", "task_updated", "task_no
 function isRecord10(value3) {
   return typeof value3 === "object" && value3 !== null && !Array.isArray(value3);
 }
-function stringField(record2, field) {
-  const value3 = record2[field];
+function stringField(record3, field) {
+  const value3 = record3[field];
   return typeof value3 === "string" && value3 !== "" ? value3 : void 0;
 }
-function numberField(record2, field) {
-  const value3 = record2[field];
+function numberField(record3, field) {
+  const value3 = record3[field];
   return typeof value3 === "number" && Number.isFinite(value3) ? value3 : void 0;
 }
-function booleanField(record2, field) {
-  const value3 = record2[field];
+function booleanField(record3, field) {
+  const value3 = record3[field];
   return typeof value3 === "boolean" ? value3 : void 0;
 }
-function usageOf(record2) {
-  const raw = record2.usage;
+function usageOf(record3) {
+  const raw = record3.usage;
   if (!isRecord10(raw)) {
     return void 0;
   }
@@ -126961,12 +126961,12 @@ function parseJsonObject(body) {
   }
   return isRecord11(parsed) ? parsed : void 0;
 }
-function nonEmptyString(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function nonEmptyString(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   return typeof value3 === "string" && value3 !== "" ? value3 : void 0;
 }
-function finiteNumber(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function finiteNumber(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   return typeof value3 === "number" && Number.isFinite(value3) ? value3 : void 0;
 }
 function excerpt(text5) {
@@ -127064,9 +127064,9 @@ function createRcSessionTracker(deps) {
   const timer = setInterval(sweep, deps.idleMs);
   timer.unref();
   const birth = (id2, facts) => {
-    const record2 = { id: id2, createdAt: deps.now(), lastSeenAt: deps.now(), ...facts, pending: /* @__PURE__ */ new Map(), workerState: void 0, workerIdleSeconds: void 0, sequenceNum: void 0, liveTasks: /* @__PURE__ */ new Map() };
-    entries.set(id2, record2);
-    return record2;
+    const record3 = { id: id2, createdAt: deps.now(), lastSeenAt: deps.now(), ...facts, pending: /* @__PURE__ */ new Map(), workerState: void 0, workerIdleSeconds: void 0, sequenceNum: void 0, liveTasks: /* @__PURE__ */ new Map() };
+    entries.set(id2, record3);
+    return record3;
   };
   const persistCredential = (entry) => {
     if (entry.oauthAuthorization !== void 0) {
@@ -128942,7 +128942,7 @@ function identityRecordFindings(records, displaced, nameRenames, strayNameRename
     })),
     ...displaced.map(({ id: id2, name, directoryPresent }) => ({
       severity: "warn",
-      message: `${name === void 0 ? `The identity stored under identities/${id2}` : `Identity "${name}"`} has no identity.json in identities/${id2}, which ${directoryPresent ? "holds none yet" : "is missing"}: its identity.json is in a superseded farm a resync left when it was interrupted. ${name === void 0 ? `Its identity.json gives no name that can be read, ${records.some((record2) => record2.name === id2) ? `and its id is the name of another identity, so a launch by its id reaches that one: repair the file in the superseded farm and launch it by the name the file gives, or rename the identity named "${id2}" first and then launch this one by its id (\`agent-shim run @${id2}\`) to put it back.` : `so launch it by its id (\`agent-shim run @${id2}\`) to put it back, then repair the file.`}` : `The next launch of "${name}" puts it back.`}`,
+      message: `${name === void 0 ? `The identity stored under identities/${id2}` : `Identity "${name}"`} has no identity.json in identities/${id2}, which ${directoryPresent ? "holds none yet" : "is missing"}: its identity.json is in a superseded farm a resync left when it was interrupted. ${name === void 0 ? `Its identity.json gives no name that can be read, ${records.some((record3) => record3.name === id2) ? `and its id is the name of another identity, so a launch by its id reaches that one: repair the file in the superseded farm and launch it by the name the file gives, or rename the identity named "${id2}" first and then launch this one by its id (\`agent-shim run @${id2}\`) to put it back.` : `so launch it by its id (\`agent-shim run @${id2}\`) to put it back, then repair the file.`}` : `The next launch of "${name}" puts it back.`}`,
       subject: name ?? id2
     }))
   ];
@@ -130005,8 +130005,8 @@ function collectDoctorReport(params) {
   const { paths } = params;
   const { names: identityNames, unreachable: unreachableIdentities } = listIdentityDirectories(paths);
   const records = identityRecords(paths);
-  const displacedIdentities = records.filter((record2) => !identityIdExists(paths, record2.id) && !unreachableIdentities.some((entry) => entry.name === record2.id));
-  const identities = identityNames.filter((id2) => (records.some((record2) => record2.id === id2) || !import_node_fs26.default.existsSync(import_node_path62.default.join(paths.identitiesDir, id2, "identity.json"))) && !displacedIdentities.some((record2) => record2.id === id2)).map((id2) => {
+  const displacedIdentities = records.filter((record3) => !identityIdExists(paths, record3.id) && !unreachableIdentities.some((entry) => entry.name === record3.id));
+  const identities = identityNames.filter((id2) => (records.some((record3) => record3.id === id2) || !import_node_fs26.default.existsSync(import_node_path62.default.join(paths.identitiesDir, id2, "identity.json"))) && !displacedIdentities.some((record3) => record3.id === id2)).map((id2) => {
     const farmRoot = import_node_path62.default.join(paths.identitiesDir, id2);
     const identityPath = import_node_path62.default.join(farmRoot, "identity.json");
     return { name: identityNameIn(records, id2) ?? id2, id: id2, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs26.default.existsSync(credentialsFilePath(farmRoot)), account: readIdentityAccount(realFsPort, paths.identitiesDir, id2)?.account };
@@ -130074,7 +130074,7 @@ function collectDoctorReport(params) {
     providerAliases: readProviderAliases(paths),
     renameJournals: listRenameJournals(realFarmFs, paths.identityRenamesDir),
     unreachableIdentities,
-    identityRecords: { all: records, displaced: displacedIdentities.map((record2) => ({ ...record2, directoryPresent: import_node_fs26.default.existsSync(import_node_path62.default.join(paths.identitiesDir, record2.id)) })), nameRenames: unfinishedNameRenames(paths).map((record2) => ({ from: record2.from, description: describeInterruptedNameRename(paths, record2) })), strayNameRenameFiles: strayNameRenameRecordFiles(paths) },
+    identityRecords: { all: records, displaced: displacedIdentities.map((record3) => ({ ...record3, directoryPresent: import_node_fs26.default.existsSync(import_node_path62.default.join(paths.identitiesDir, record3.id)) })), nameRenames: unfinishedNameRenames(paths).map((record3) => ({ from: record3.from, description: describeInterruptedNameRename(paths, record3) })), strayNameRenameFiles: strayNameRenameRecordFiles(paths) },
     directoryRules: { path: paths.directoryRulesFile, raw: realFsPort.readFileUtf8(paths.directoryRulesFile) },
     globalConfig: { path: paths.globalConfigFile, raw: realFsPort.readFileUtf8(paths.globalConfigFile) },
     models: readableOr(() => readGlobalConfig(paths)?.models, void 0),
@@ -141763,9 +141763,9 @@ function createLiveSessionRegistry(ports) {
   let bySessionId = /* @__PURE__ */ new Map();
   const recordNames = () => fs35.readdir(sessionsDir).filter(isSessionRecordName);
   const rebuildIndexes = () => {
-    const records = [...known.values()].flatMap(({ record: record2 }) => record2 === void 0 ? [] : [record2]);
-    tokens = new Set(records.map((record2) => record2.token));
-    bySessionId = new Map(records.flatMap((record2) => record2.sessionId === void 0 ? [] : [[record2.sessionId, record2]]));
+    const records = [...known.values()].flatMap(({ record: record3 }) => record3 === void 0 ? [] : [record3]);
+    tokens = new Set(records.map((record3) => record3.token));
+    bySessionId = new Map(records.flatMap((record3) => record3.sessionId === void 0 ? [] : [[record3.sessionId, record3]]));
   };
   const load = (name, stat) => {
     known.set(name, { stat: { mtimeMs: stat.mtimeMs, sizeBytes: stat.sizeBytes }, record: readFrontDoorSessionRecord(fs35, sessionsDir, name) });
@@ -141815,7 +141815,7 @@ function createLiveSessionRegistry(ports) {
         }
       }
       rebuildIndexes();
-      return [...known.values()].flatMap(({ record: record2 }) => record2 === void 0 ? [] : [summaryOf(record2)]).sort((a10, b) => a10.pid - b.pid);
+      return [...known.values()].flatMap(({ record: record3 }) => record3 === void 0 ? [] : [summaryOf(record3)]).sort((a10, b) => a10.pid - b.pid);
     },
     forget: (pids) => {
       for (const pid of pids) {
@@ -143326,6 +143326,54 @@ function createAntigravityRelay(params) {
   return { pushChunk, finish, message };
 }
 
+// src/antigravity/recursiveSchema.ts
+function rejectedPath(body) {
+  try {
+    const value3 = JSON.parse(body);
+    if (!record2(value3) || !record2(value3.error) || typeof value3.error.message !== "string") return void 0;
+    const match = /ref loop of required fields was found at (\$defs\.[A-Za-z0-9_.$-]+)\s*$/u.exec(value3.error.message);
+    return match?.[1]?.split(".");
+  } catch {
+    return void 0;
+  }
+}
+function record2(value3) {
+  return typeof value3 === "object" && value3 !== null && !Array.isArray(value3);
+}
+function descend(value3, key) {
+  if (Array.isArray(value3) && /^\d+$/u.test(key)) return value3[Number(key)];
+  return record2(value3) && Object.hasOwn(value3, key) ? value3[key] : void 0;
+}
+function relaxRejectedRecursiveProperty(request7, body) {
+  const path90 = rejectedPath(body);
+  if (path90 === void 0) return void 0;
+  const propertyIndex = path90.lastIndexOf("properties");
+  const name = path90[propertyIndex + 1];
+  if (propertyIndex < 0 || name === void 0) return void 0;
+  const copy2 = structuredClone(request7);
+  let changed = false;
+  for (const tool of copy2.tools ?? []) {
+    for (const declaration of tool.functionDeclarations) {
+      const schema = declaration.parametersJsonSchema;
+      if (schema === void 0) continue;
+      let leaf = schema;
+      for (const part of path90) leaf = descend(leaf, part);
+      if (!record2(leaf) || typeof leaf.$ref !== "string") continue;
+      let owner = schema;
+      for (const part of path90.slice(0, propertyIndex)) owner = descend(owner, part);
+      if (!record2(owner) || !Array.isArray(owner.required) || !owner.required.includes(name) || !record2(owner.properties)) continue;
+      const property = owner.properties[name];
+      if (!record2(property)) continue;
+      owner.required = owner.required.filter((item) => item !== name);
+      const description = typeof property.description === "string" ? `${property.description}
+` : "";
+      property.description = `${description}This property is required by the original tool schema.`;
+      changed = true;
+    }
+  }
+  return changed ? copy2 : void 0;
+}
+
 // src/antigravity/route.ts
 init_translate();
 init_cloudUpstream();
@@ -143513,6 +143561,7 @@ async function* callLocalAntigravity(params) {
 init_quota();
 var MS_PER_SECOND13 = 1e3;
 var ROUTING_MEMORY_SESSIONS = 256;
+var MAX_SCHEMA_RETRIES = 16;
 function exhaustedMessage(exhaustion) {
   const window = exhaustion.window === "five_hour" ? "5-hour" : "weekly";
   return `Antigravity ${window} limit reached; it resets at ${new Date(exhaustion.resetSec * MS_PER_SECOND13).toISOString()}.`;
@@ -143600,6 +143649,7 @@ function createAntigravityRoute(ports) {
     const tried = /* @__PURE__ */ new Set();
     let iterator;
     let firstResult;
+    let schemaRetries = 0;
     for (; ; ) {
       tried.add(translated.model);
       const upstreamChunks2 = config2.mode === "local" ? callLocalAntigravity({
@@ -143625,6 +143675,14 @@ function createAntigravityRoute(ports) {
         break;
       } catch (error63) {
         if (error63 instanceof AntigravityUpstreamError) {
+          if (error63.status === HTTP_STATUS.badRequest && schemaRetries < MAX_SCHEMA_RETRIES) {
+            const repaired = relaxRejectedRecursiveProperty(translated.request, error63.body);
+            if (repaired !== void 0) {
+              schemaRetries += 1;
+              translated = { ...translated, request: repaired };
+              continue;
+            }
+          }
           const is429 = error63.status === HTTP_STATUS.tooManyRequests;
           const learned = is429 ? parseQuotaExhaustion(error63.body, nowMs) : void 0;
           if (learned !== void 0) {
@@ -144754,8 +144812,8 @@ function createRcSelfHostLocal(deps) {
       if (host === RC_SELF_HOST_OAUTH_HOST) {
         if (method === "POST" && pathname === "/v1/oauth/token") {
           const body = parseJsonObject2(await deps.readBody(request7, CONTROL_BODY_CAP_BYTES));
-          const record2 = deps.credentialRecord();
-          if (record2 === void 0) {
+          const record3 = deps.credentialRecord();
+          if (record3 === void 0) {
             answerServerJson(response, HTTP_SERVICE_UNAVAILABLE, { error: "the front door's self-hosted Remote Control surface is on but no credential has been minted for it" });
             return true;
           }
@@ -144763,7 +144821,7 @@ function createRcSelfHostLocal(deps) {
             answerServerJson(response, HTTP_STATUS.badRequest, { error: "unsupported_grant_type" });
             return true;
           }
-          answerServerJson(response, HTTP_STATUS.ok, { access_token: record2.accessToken, refresh_token: record2.refreshToken, expires_in: RC_SELF_HOST_OAUTH_TOKEN_TTL_SECONDS, scope: RC_SELF_HOST_SCOPE_LIST.join(" ") });
+          answerServerJson(response, HTTP_STATUS.ok, { access_token: record3.accessToken, refresh_token: record3.refreshToken, expires_in: RC_SELF_HOST_OAUTH_TOKEN_TTL_SECONDS, scope: RC_SELF_HOST_SCOPE_LIST.join(" ") });
           return true;
         }
         if (method === "GET" && pathname === "/v1/oauth/hello") {
@@ -144778,14 +144836,14 @@ function createRcSelfHostLocal(deps) {
         return true;
       }
       if (method === "GET" && pathname === "/api/oauth/profile") {
-        const record2 = deps.credentialRecord();
-        if (record2 === void 0) {
+        const record3 = deps.credentialRecord();
+        if (record3 === void 0) {
           answerServerJson(response, HTTP_SERVICE_UNAVAILABLE, { error: "the front door's self-hosted Remote Control surface is on but no credential has been minted for it" });
           return true;
         }
         answerServerJson(response, HTTP_STATUS.ok, {
-          account: { uuid: record2.accountUuid, display_name: "agent-shim self-hosted", created_at: (/* @__PURE__ */ new Date(0)).toISOString() },
-          organization: { uuid: record2.organizationUuid, organization_type: "claude_max" }
+          account: { uuid: record3.accountUuid, display_name: "agent-shim self-hosted", created_at: (/* @__PURE__ */ new Date(0)).toISOString() },
+          organization: { uuid: record3.organizationUuid, organization_type: "claude_max" }
         });
         return true;
       }
@@ -144795,12 +144853,12 @@ function createRcSelfHostLocal(deps) {
       }
       if (method === "POST" && pathname === "/api/oauth/validate") {
         await deps.readBody(request7, CONTROL_BODY_CAP_BYTES);
-        const record2 = deps.credentialRecord();
-        if (record2 === void 0) {
+        const record3 = deps.credentialRecord();
+        if (record3 === void 0) {
           answerServerJson(response, HTTP_SERVICE_UNAVAILABLE, { error: "the front door's self-hosted Remote Control surface is on but no credential has been minted for it" });
           return true;
         }
-        answerServerJson(response, HTTP_STATUS.ok, { scopes: [...RC_SELF_HOST_SCOPE_LIST], expiresAt: null, subscriptionType: "max", account_uuid: record2.accountUuid, organization_uuid: record2.organizationUuid });
+        answerServerJson(response, HTTP_STATUS.ok, { scopes: [...RC_SELF_HOST_SCOPE_LIST], expiresAt: null, subscriptionType: "max", account_uuid: record3.accountUuid, organization_uuid: record3.organizationUuid });
         return true;
       }
       if (method === "POST" && (pathname === "/api/event_logging/v2/batch" || pathname === "/api/claude_code/metrics" || pathname === "/api/claude_cli_feedback")) {
@@ -145318,8 +145376,8 @@ function createRcCredentialStore(fs35, dir) {
         return;
       }
       const cursor3 = sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
-      const record2 = { ...credential, ...cursor3 === void 0 ? {} : { highestSequenceNum: cursor3 } };
-      fs35.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record2, null, 2)}
+      const record3 = { ...credential, ...cursor3 === void 0 ? {} : { highestSequenceNum: cursor3 } };
+      fs35.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record3, null, 2)}
 `);
     },
     readCursor: (sessionId) => {
@@ -145333,8 +145391,8 @@ function createRcCredentialStore(fs35, dir) {
         return;
       }
       const credential = credentialOfJson(readParsed(sessionId));
-      const record2 = credential === void 0 ? { highestSequenceNum } : { ...credential, highestSequenceNum };
-      fs35.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record2, null, 2)}
+      const record3 = credential === void 0 ? { highestSequenceNum } : { ...credential, highestSequenceNum };
+      fs35.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record3, null, 2)}
 `);
     },
     remove: (sessionId) => {
@@ -145884,12 +145942,12 @@ function parseJsonObject3(body) {
   }
   return isRecord18(parsed) ? parsed : void 0;
 }
-function nonEmptyString2(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function nonEmptyString2(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   return typeof value3 === "string" && value3 !== "" ? value3 : void 0;
 }
-function numberOf(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function numberOf(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   if (typeof value3 === "number" && Number.isFinite(value3)) {
     return value3;
   }
@@ -146068,8 +146126,8 @@ function parseJsonObject4(body) {
   }
   return isRecord19(parsed) ? parsed : void 0;
 }
-function nonEmptyString3(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function nonEmptyString3(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   return typeof value3 === "string" && value3 !== "" ? value3 : void 0;
 }
 function newRcSelfHostConversation(newUuid, now) {
@@ -146419,12 +146477,12 @@ function isRecord20(value3) {
 function isWebSearchRefusal(value3) {
   return !Array.isArray(value3);
 }
-function nonEmptyString4(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function nonEmptyString4(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   return typeof value3 === "string" && value3 !== "" ? value3 : void 0;
 }
-function numberOf2(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function numberOf2(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   if (typeof value3 === "number" && Number.isFinite(value3)) {
     return value3;
   }
@@ -146433,8 +146491,8 @@ function numberOf2(record2, field) {
   }
   return void 0;
 }
-function stringArray(record2, field) {
-  const value3 = record2 === void 0 ? void 0 : record2[field];
+function stringArray(record3, field) {
+  const value3 = record3 === void 0 ? void 0 : record3[field];
   if (!Array.isArray(value3)) {
     return void 0;
   }
@@ -147933,8 +147991,8 @@ function realFrontDoorSupervisorPorts(paths, respawnGeneration, lifecycle, track
       routingSnapshots.set(snapshot.identity, snapshot);
       publishUsageEvent(snapshot);
     },
-    onRecord: (record2) => {
-      observations.observe(record2);
+    onRecord: (record3) => {
+      observations.observe(record3);
     }
   });
   const quotaRefresher = createRealQuotaRefresher({ paths, store: usageStore, log });
@@ -148038,22 +148096,22 @@ function realFrontDoorSupervisorPorts(paths, respawnGeneration, lifecycle, track
     log
   });
   const headroomDecision = createHeadroomDecision(createRoutingSettingReader(paths));
-  const recordUsage = (record2) => {
-    withQuotaRefresh(usageStore.record, quotaRefresher)(record2);
+  const recordUsage = (record3) => {
+    withQuotaRefresh(usageStore.record, quotaRefresher)(record3);
   };
   const usageMiddleware = createUsageMiddleware({
     // Each finished response also tells the per-session headroom decision when the session's cache was last touched and whether it read from it.
-    record: (record2, event) => {
-      const { usage } = record2;
+    record: (record3, event) => {
+      const { usage } = record3;
       headroomDecision.observe({
-        sessionId: record2.sessionId,
-        startedAtMs: Date.parse(record2.at),
-        viaHeadroom: record2.viaHeadroom === true,
+        sessionId: record3.sessionId,
+        startedAtMs: Date.parse(record3.at),
+        viaHeadroom: record3.viaHeadroom === true,
         lineage: event.lineage,
-        endedAtMs: Date.parse(record2.at) + record2.durationMs,
+        endedAtMs: Date.parse(record3.at) + record3.durationMs,
         cache: usage === void 0 ? void 0 : { readTokens: usage.cacheReadInputTokens ?? 0, writtenTokens: usage.cacheCreationInputTokens ?? 0, uncachedTokens: usage.inputTokens ?? 0 }
       });
-      recordUsage(record2);
+      recordUsage(record3);
     },
     defer: (task) => {
       setImmediate(task);
@@ -148665,10 +148723,12 @@ function enrichStatuslinePayload(params) {
   const clientEmail = isObject4(params.payload) && typeof params.payload.email === "string" && params.payload.email !== "" ? params.payload.email : void 0;
   const clientPlan = clientEmail !== void 0 && isObject4(params.payload) && typeof params.payload.plan_tier === "string" && params.payload.plan_tier !== "" ? params.payload.plan_tier : void 0;
   const account = clientEmail === void 0 ? params.account : void 0;
+  const routedProvider = routedProviderOf(params);
+  const launchProvider = params.env.AGENT_SHIM_PROVIDER;
   let summary = {
     identity: params.identityName ?? identity,
     identityLabel: params.identityLabel,
-    provider: params.env.AGENT_SHIM_PROVIDER === void 0 || params.env.AGENT_SHIM_PROVIDER === "" ? void 0 : params.env.AGENT_SHIM_PROVIDER,
+    provider: launchProvider === void 0 || launchProvider === "" ? routedProvider : routedProvider !== void 0 && routedProvider.toLowerCase() !== (params.providerName ?? launchProvider).toLowerCase() ? routedProvider : launchProvider,
     providerAccountEmail: void 0,
     providerAccountSub: void 0,
     providerPlan: void 0,
@@ -148690,9 +148750,8 @@ function enrichStatuslinePayload(params) {
     ...params.doorCostUsd === void 0 ? {} : { doorCostUsd: params.doorCostUsd }
   };
   let scopedName;
-  const routedProvider = routedProviderOf(params);
   if (params.snapshot !== void 0) {
-    scopedName = providerScopedState(params.snapshot, params.providerName, params.env.AGENT_SHIM_PROVIDER) ?? providerScopedState(params.snapshot, routedProvider, routedProvider);
+    scopedName = routedProvider === void 0 ? providerScopedState(params.snapshot, params.providerName, params.env.AGENT_SHIM_PROVIDER) : providerScopedState(params.snapshot, routedProvider, routedProvider);
     const scopedState = scopedName === void 0 ? void 0 : params.snapshot.providers[scopedName];
     const states = summary.provider === void 0 && routedProvider === void 0 && scopedState === void 0 ? Object.values(params.snapshot.providers) : scopedState === void 0 ? [] : [scopedState];
     let email3;
@@ -148748,6 +148807,11 @@ function enrichStatuslinePayload(params) {
   return { payload: enriched, summary };
 }
 function routedProviderOf(params) {
+  const model = isObject4(params.payload) && isObject4(params.payload.model) ? params.payload.model : void 0;
+  const selectedProvider = prefixBeforeSlash(typeof model?.id === "string" ? model.id : void 0) ?? prefixBeforeSlash(typeof model?.display_name === "string" ? model.display_name : void 0);
+  if (selectedProvider !== void 0) {
+    return selectedProvider;
+  }
   if (params.modelChoice?.provider !== void 0 && params.modelChoice.provider !== "") {
     return params.modelChoice.provider;
   }
@@ -148755,8 +148819,7 @@ function routedProviderOf(params) {
   if (targetPrefix !== void 0) {
     return targetPrefix;
   }
-  const model = isObject4(params.payload) && isObject4(params.payload.model) ? params.payload.model : void 0;
-  return prefixBeforeSlash(typeof model?.id === "string" ? model.id : void 0) ?? prefixBeforeSlash(typeof model?.display_name === "string" ? model.display_name : void 0);
+  return void 0;
 }
 function prefixBeforeSlash(value3) {
   if (value3 === void 0) {
@@ -148839,12 +148902,12 @@ var CACHE_READ_PRICE_RATIO = 0.1;
 function doorCostUsdOf(records, prices) {
   let totalUsd = 0;
   let costed = 0;
-  for (const record2 of records) {
-    const { usage } = record2;
+  for (const record3 of records) {
+    const { usage } = record3;
     if (usage === void 0) {
       continue;
     }
-    const price = record2.model === void 0 ? void 0 : prices[`${record2.provider}/${record2.model}`];
+    const price = record3.model === void 0 ? void 0 : prices[`${record3.provider}/${record3.model}`];
     if (price === void 0) {
       return void 0;
     }
@@ -148894,7 +148957,7 @@ function readDoorCostUsd(params) {
   const sinceMs = sessionDurationMs === void 0 ? void 0 : Date.parse(`${segmentDay(nowMs - sessionDurationMs)}T00:00:00.000Z`);
   const { records } = readUsageLog(params.fs, params.logDir, sinceMs === void 0 ? {} : { sinceMs });
   return doorCostUsdOf(
-    records.filter((record2) => record2.clientSessionId === params.conversationId),
+    records.filter((record3) => record3.clientSessionId === params.conversationId),
     params.prices
   );
 }
@@ -150774,8 +150837,8 @@ function afterCompaction(frame, compaction) {
   }
   return { ...frame, used_percentage: Math.min(FULL_PERCENT3, postTokens / windowTokens * FULL_PERCENT3) };
 }
-function restored(frame, record2) {
-  return { ...frame, used_percentage: record2.usedPercentage, total_input_tokens: record2.totalInputTokens, current_usage: record2.currentUsage, context_window_size: frame.context_window_size ?? record2.windowTokens };
+function restored(frame, record3) {
+  return { ...frame, used_percentage: record3.usedPercentage, total_input_tokens: record3.totalInputTokens, current_usage: record3.currentUsage, context_window_size: frame.context_window_size ?? record3.windowTokens };
 }
 function recordOf2(frame, usedPercentage, observedAtMs, nowMs) {
   const usage = frame.current_usage;
@@ -150822,14 +150885,14 @@ function contextFrameOf(input2) {
   let observedAtMs = nowMs;
   if (isSuspiciousZero(frame) && !input2.drawsPercent) {
     const loaded = loadCache(ports, file2, ContextRecordSchema);
-    const record2 = loaded !== void 0 && nowMs - loaded.savedAtMs <= CONTEXT_RECORD_MAX_AGE_MS ? loaded : void 0;
+    const record3 = loaded !== void 0 && nowMs - loaded.savedAtMs <= CONTEXT_RECORD_MAX_AGE_MS ? loaded : void 0;
     const compaction = input2.compaction();
-    if (compaction !== void 0 && (record2 === void 0 || compaction.atMs > record2.observedAtMs)) {
+    if (compaction !== void 0 && (record3 === void 0 || compaction.atMs > record3.observedAtMs)) {
       drawn = afterCompaction(frame, compaction);
       observedAtMs = compaction.atMs;
-    } else if (record2 !== void 0) {
-      drawn = restored(frame, record2);
-      observedAtMs = record2.observedAtMs;
+    } else if (record3 !== void 0) {
+      drawn = restored(frame, record3);
+      observedAtMs = record3.observedAtMs;
     }
   }
   const goodPercent = goodPercentOf(drawn);
@@ -151520,9 +151583,9 @@ function wholeTokens(count2) {
 function writtenCountsKey(usage) {
   return [usage.input_tokens, usage.output_tokens, usage.cache_creation_input_tokens, usage.cache_read_input_tokens].map(String).join("|");
 }
-function foldTokens(state, record2) {
-  const usage = record2.message?.usage;
-  if (record2.type !== "assistant" || usage === void 0) {
+function foldTokens(state, record3) {
+  const usage = record3.message?.usage;
+  if (record3.type !== "assistant" || usage === void 0) {
     return state;
   }
   const counts = {
@@ -151531,7 +151594,7 @@ function foldTokens(state, record2) {
     cacheCreationTokens: wholeTokens(usage.cache_creation_input_tokens),
     cacheReadTokens: wholeTokens(usage.cache_read_input_tokens)
   };
-  const key = record2.message?.id ?? writtenCountsKey(usage);
+  const key = record3.message?.id ?? writtenCountsKey(usage);
   if (state.open?.key === key) {
     return { totals: sum(state.totals, increase(state.open.usage, counts)), open: { key, usage: larger(state.open.usage, counts) } };
   }
@@ -151629,15 +151692,15 @@ function identityOfLine(line) {
   } catch {
     return void 0;
   }
-  const record2 = RecordSchema.safeParse(parsed);
-  if (!record2.success || record2.data.type !== "assistant") {
+  const record3 = RecordSchema.safeParse(parsed);
+  if (!record3.success || record3.data.type !== "assistant") {
     return void 0;
   }
-  const model = boundedDisplayText(record2.data.message?.model ?? "");
+  const model = boundedDisplayText(record3.data.message?.model ?? "");
   if (model === "" || model === SYNTHETIC_MODEL) {
     return void 0;
   }
-  const advisor = boundedDisplayText(record2.data.advisorModel ?? "");
+  const advisor = boundedDisplayText(record3.data.advisorModel ?? "");
   return { model, advisor: advisor === "" ? void 0 : advisor };
 }
 function joined2(pieces) {
@@ -152178,11 +152241,11 @@ function parseTranscriptRecord(line) {
   }
   return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? TranscriptRecordSchema.parse(parsed) : void 0;
 }
-function recordTimeMs(record2) {
-  if (record2.timestamp === void 0) {
+function recordTimeMs(record3) {
+  if (record3.timestamp === void 0) {
     return void 0;
   }
-  const ms = Date.parse(record2.timestamp);
+  const ms = Date.parse(record3.timestamp);
   return Number.isNaN(ms) ? void 0 : ms;
 }
 
@@ -152546,32 +152609,32 @@ function withUnanswered(tools, agents) {
 function foldNewResponse(state, key) {
   return { ...state, responseKey: key, ...withUnanswered(state.tools, state.agents) };
 }
-function foldActivityLatest(state, record2) {
-  if (record2.isSidechain === true) {
+function foldActivityLatest(state, record3) {
+  if (record3.isSidechain === true) {
     return state;
   }
-  const atMs = recordTimeMs(record2);
+  const atMs = recordTimeMs(record3);
   let next = state;
-  if (record2.type === "queue-operation" && record2.operation === "enqueue" && record2.content !== void 0 && atMs !== void 0) {
-    const toolUseId = QUEUED_TOOL_USE_ID.exec(record2.content)?.[1];
-    if (toolUseId !== void 0 && QUEUED_TASK_ID.test(record2.content)) {
+  if (record3.type === "queue-operation" && record3.operation === "enqueue" && record3.content !== void 0 && atMs !== void 0) {
+    const toolUseId = QUEUED_TOOL_USE_ID.exec(record3.content)?.[1];
+    if (toolUseId !== void 0 && QUEUED_TASK_ID.test(record3.content)) {
       next = foldAgentAnnouncement(next, toolUseId, atMs);
     }
   }
-  const responseKey = record2.type === "assistant" ? record2.message?.id ?? record2.requestId : void 0;
+  const responseKey = record3.type === "assistant" ? record3.message?.id ?? record3.requestId : void 0;
   if (responseKey !== void 0 && responseKey !== next.responseKey) {
     next = next.responseKey === void 0 ? { ...next, responseKey } : foldNewResponse(next, responseKey);
   }
-  const content = record2.message?.content;
+  const content = record3.message?.content;
   if (!Array.isArray(content)) {
     return next;
   }
   const resultCount = content.filter((block2) => block2.type === "tool_result").length;
   for (const block2 of content) {
-    if (record2.type === "assistant" && block2.type === "tool_use" && block2.id !== void 0 && block2.name !== void 0 && !isRemembered(next, block2.id, atMs)) {
+    if (record3.type === "assistant" && block2.type === "tool_use" && block2.id !== void 0 && block2.name !== void 0 && !isRemembered(next, block2.id, atMs)) {
       next = foldToolUse(remember2(next, block2.id, atMs), { id: block2.id, name: block2.name, input: block2.input }, atMs);
-    } else if (record2.type === "user" && block2.type === "tool_result" && block2.tool_use_id !== void 0) {
-      const outcome = resultCount === 1 ? record2.toolUseResult : void 0;
+    } else if (record3.type === "user" && block2.type === "tool_result" && block2.tool_use_id !== void 0) {
+      const outcome = resultCount === 1 ? record3.toolUseResult : void 0;
       const taskId = createdTaskId(block2.content, outcome);
       next = foldToolResult(next, {
         id: block2.tool_use_id,
@@ -152604,9 +152667,9 @@ function withName(set3, name) {
   }
   return { ...set3, others: [...set3.others, digest2] };
 }
-function foldActivityCumulative(state, record2) {
-  const content = record2.message?.content;
-  if (record2.isSidechain === true || record2.type !== "assistant" || !Array.isArray(content)) {
+function foldActivityCumulative(state, record3) {
+  const content = record3.message?.content;
+  if (record3.isSidechain === true || record3.type !== "assistant" || !Array.isArray(content)) {
     return state;
   }
   let { skills, mcpServers } = state;
@@ -152623,8 +152686,8 @@ function foldActivityCumulative(state, record2) {
   }
   return skills === state.skills && mcpServers === state.mcpServers ? state : { skills, mcpServers };
 }
-function foldActivity(state, record2) {
-  return { cumulative: foldActivityCumulative(state.cumulative, record2), latest: foldActivityLatest(state.latest, record2) };
+function foldActivity(state, record3) {
+  return { cumulative: foldActivityCumulative(state.cumulative, record3), latest: foldActivityLatest(state.latest, record3) };
 }
 function isLive(startedAtMs, nowMs, maxMs) {
   return startedAtMs === void 0 || nowMs - startedAtMs <= maxMs;
@@ -152703,8 +152766,8 @@ var LOCAL_ONLY_USER_TEXT_PREFIXES = ["<command-name>", "<command-message>", "<lo
 function isLocalOnlyUserText(text5) {
   return LOCAL_ONLY_USER_TEXT_PREFIXES.some((prefix) => text5.startsWith(prefix));
 }
-function opensRequest(record2) {
-  const content = record2.message?.content;
+function opensRequest(record3) {
+  const content = record3.message?.content;
   if (typeof content === "string") {
     return !isLocalOnlyUserText(content);
   }
@@ -152713,34 +152776,34 @@ function opensRequest(record2) {
   }
   return true;
 }
-function ttlOf(record2) {
-  const writes = record2.message?.usage?.cache_creation;
+function ttlOf(record3) {
+  const writes = record3.message?.usage?.cache_creation;
   if ((writes?.ephemeral_5m_input_tokens ?? 0) > 0) {
     return PROMPT_CACHE_TTL_SECONDS.fiveMinutes;
   }
   return (writes?.ephemeral_1h_input_tokens ?? 0) > 0 ? PROMPT_CACHE_TTL_SECONDS.oneHour : void 0;
 }
-function foldPromptCache(cache, record2, atMs) {
+function foldPromptCache(cache, record3, atMs) {
   if (atMs === void 0) {
     return cache;
   }
   let next = cache;
-  if (record2.type === "assistant") {
-    const startsRequest = record2.requestId === void 0 || record2.requestId !== cache.requestId;
+  if (record3.type === "assistant") {
+    const startsRequest = record3.requestId === void 0 || record3.requestId !== cache.requestId;
     const requestAnchorAtMs = startsRequest ? cache.previousMainAtMs : cache.requestAnchorAtMs;
     const anchorAtMs = requestAnchorAtMs !== void 0 && requestAnchorAtMs <= atMs ? requestAnchorAtMs : atMs;
-    const ttlSeconds = ttlOf(record2) ?? cache.ttlSeconds;
-    next = { ...cache, requestId: startsRequest ? record2.requestId : cache.requestId, requestAnchorAtMs, anchorAtMs, ttlSeconds, pendingAtMs: void 0 };
+    const ttlSeconds = ttlOf(record3) ?? cache.ttlSeconds;
+    next = { ...cache, requestId: startsRequest ? record3.requestId : cache.requestId, requestAnchorAtMs, anchorAtMs, ttlSeconds, pendingAtMs: void 0 };
   }
-  if (record2.type === "user" && opensRequest(record2)) {
+  if (record3.type === "user" && opensRequest(record3)) {
     next = { ...next, pendingAtMs: atMs };
   }
   return { ...next, previousMainAtMs: atMs };
 }
-function foldCumulative(state, record2) {
-  const atMs = recordTimeMs(record2);
+function foldCumulative(state, record3) {
+  const atMs = recordTimeMs(record3);
   const next = { ...state };
-  if (record2.type === "system" && record2.subtype === "compact_boundary" && atMs !== void 0) {
+  if (record3.type === "system" && record3.subtype === "compact_boundary" && atMs !== void 0) {
     next.compactions += 1;
   }
   if (atMs !== void 0 && next.startedAtMs === void 0 && next.startUnknown !== true) {
@@ -152751,30 +152814,30 @@ function foldCumulative(state, record2) {
 function laterCompaction(held, met) {
   return held === void 0 || met !== void 0 && met.atMs > held.atMs ? met : held;
 }
-function foldLatest(state, record2) {
-  const atMs = recordTimeMs(record2);
+function foldLatest(state, record3) {
+  const atMs = recordTimeMs(record3);
   const next = { ...state };
-  if (record2.type === "custom-title" && record2.customTitle !== void 0) {
-    next.customTitle = record2.customTitle;
-  } else if (record2.type === "ai-title" && record2.aiTitle !== void 0) {
-    next.aiTitle = record2.aiTitle;
-  } else if (record2.slug !== void 0) {
-    next.slug = record2.slug;
-  }
-  if (record2.type === "assistant" && atMs !== void 0) {
+  if (record3.type === "custom-title" && record3.customTitle !== void 0) {
+    next.customTitle = record3.customTitle;
+  } else if (record3.type === "ai-title" && record3.aiTitle !== void 0) {
+    next.aiTitle = record3.aiTitle;
+  } else if (record3.slug !== void 0) {
+    next.slug = record3.slug;
+  }
+  if (record3.type === "assistant" && atMs !== void 0) {
     next.lastAssistantAtMs = atMs;
   }
-  if (record2.type === "system" && record2.subtype === "compact_boundary" && atMs !== void 0) {
-    const postTokens = record2.compactMetadata?.postTokens;
+  if (record3.type === "system" && record3.subtype === "compact_boundary" && atMs !== void 0) {
+    const postTokens = record3.compactMetadata?.postTokens;
     next.compaction = laterCompaction(state.compaction, { atMs, ...postTokens === void 0 ? {} : { postTokens: Math.trunc(postTokens) } });
   }
-  if (record2.isSidechain !== true) {
-    next.cache = foldPromptCache(state.cache, record2, atMs);
+  if (record3.isSidechain !== true) {
+    next.cache = foldPromptCache(state.cache, record3, atMs);
   }
   return next;
 }
-function foldSession(state, record2) {
-  return { cumulative: foldCumulative(state.cumulative, record2), latest: foldLatest(state.latest, record2) };
+function foldSession(state, record3) {
+  return { cumulative: foldCumulative(state.cumulative, record3), latest: foldLatest(state.latest, record3) };
 }
 function hasRequest(cache) {
   return cache.anchorAtMs !== void 0 || cache.pendingAtMs !== void 0;
@@ -152819,19 +152882,19 @@ var TranscriptCacheSchema = external_exports.strictObject({
 function eachRecord(bytes, visit2) {
   const end = bytes.lastIndexOf(NEWLINE2) + 1;
   for (const line of new TextDecoder().decode(bytes.subarray(0, end)).split("\n")) {
-    const record2 = line === "" ? void 0 : parseTranscriptRecord(line);
-    if (record2 !== void 0) {
-      visit2(record2);
+    const record3 = line === "" ? void 0 : parseTranscriptRecord(line);
+    if (record3 !== void 0) {
+      visit2(record3);
     }
   }
   return end;
 }
 function foldLines(state, bytes) {
   let { session, tokens, activity } = state;
-  const consumed = eachRecord(bytes, (record2) => {
-    session = foldSession(session, record2);
-    tokens = foldTokens(tokens, record2);
-    activity = foldActivity(activity, record2);
+  const consumed = eachRecord(bytes, (record3) => {
+    session = foldSession(session, record3);
+    tokens = foldTokens(tokens, record3);
+    activity = foldActivity(activity, record3);
   });
   return { session, tokens, activity, consumed };
 }
@@ -152898,9 +152961,9 @@ function newerFrom(ports, transcriptPath, size, previous, cumulative) {
 }
 function foldNewer(from, bytes, offset) {
   let { state, activity } = from;
-  const consumed = eachRecord(bytes, (record2) => {
-    state = foldLatest(state, record2);
-    activity = foldActivityLatest(activity, record2);
+  const consumed = eachRecord(bytes, (record3) => {
+    state = foldLatest(state, record3);
+    activity = foldActivityLatest(activity, record3);
   });
   return { offset: offset + consumed, state, activity };
 }
@@ -153111,7 +153174,7 @@ function registerStatuslineCommand(program2, deps) {
       let modelChoice;
       if (sessionHeader !== void 0) {
         try {
-          const last = readUsageLog(realFarmFs, deps.paths.usageLogDir, { sinceMs: nowMs - ROUTED_TARGET_LOOKBACK_MS }).records.filter((record2) => record2.sessionId === sessionHeader).at(-1);
+          const last = readUsageLog(realFarmFs, deps.paths.usageLogDir, { sinceMs: nowMs - ROUTED_TARGET_LOOKBACK_MS }).records.filter((record3) => record3.sessionId === sessionHeader).at(-1);
           if (last?.model !== void 0) {
             if (last.provider !== providerName) {
               routedTarget = `${last.provider}/${last.model}`;
@@ -163417,7 +163480,7 @@ function registerCredentialCommand(program2, deps, ports = realCommandPorts(deps
     process.stdout.write(REMOTE_LOCK_FRAME);
     try {
       withIdentityNamesLock(deps.paths, nonWaitingIdentityNamesLockPorts, () => {
-        if (!identityRecords(deps.paths).some((record2) => record2.name === name)) {
+        if (!identityRecords(deps.paths).some((record3) => record3.name === name)) {
           process.exitCode = REMOTE_NO_IDENTITY_STATUS;
           return;
         }
@@ -164996,12 +165059,12 @@ function registerProviderCommand(program2, deps) {
         const door = readFrontDoorState(realFarmFs, paths.frontdoorStateFile);
         const recordedPid = door?.port === void 0 ? void 0 : door.supervisorPid;
         const pid = recordedPid !== void 0 && realIsProcessAlive(recordedPid) ? recordedPid : void 0;
-        const record2 = pid === void 0 ? void 0 : readFrontDoorCodexRecord(realFarmFs, paths.frontdoorDir, pid);
-        const home = record2?.codexHome;
-        const generation = record2?.generation;
-        if (pid !== void 0 && record2 === void 0) throw new UsageError("The serving front door's Codex home or catalogue generation is unavailable.");
+        const record3 = pid === void 0 ? void 0 : readFrontDoorCodexRecord(realFarmFs, paths.frontdoorDir, pid);
+        const home = record3?.codexHome;
+        const generation = record3?.generation;
+        if (pid !== void 0 && record3 === void 0) throw new UsageError("The serving front door's Codex home or catalogue generation is unavailable.");
         const env = home === void 0 ? process.env : { ...process.env, CODEX_HOME: home };
-        const cache2 = options.refresh === true ? await (pid === void 0 || record2 === void 0 ? refreshCatalogueForReal(paths, name, env) : refreshCatalogueForReal(paths, name, env, pid, record2.generation)) : parseCatalogueCache(realFsPort.readFileUtf8(catalogueCachePath(paths, name, pid, generation)));
+        const cache2 = options.refresh === true ? await (pid === void 0 || record3 === void 0 ? refreshCatalogueForReal(paths, name, env) : refreshCatalogueForReal(paths, name, env, pid, record3.generation)) : parseCatalogueCache(realFsPort.readFileUtf8(catalogueCachePath(paths, name, pid, generation)));
         if (options.refresh === true) {
           const currentDoor = readFrontDoorState(realFarmFs, paths.frontdoorStateFile);
           const recordedCurrentPid = currentDoor?.port === void 0 ? void 0 : currentDoor.supervisorPid;
@@ -165575,12 +165638,12 @@ function collectUsageReport(fs35, paths, filters) {
   const id2 = filters.identity === void 0 ? void 0 : requireIdentityId(paths, filters.identity);
   const label2 = identityLabeller(paths);
   const log = readUsageLog(fs35, paths.usageLogDir, sinceMs === void 0 ? {} : { sinceMs });
-  const records = log.records.filter((record2) => (id2 === void 0 || record2.identity === id2) && (provider === void 0 || record2.provider === provider));
+  const records = log.records.filter((record3) => (id2 === void 0 || record3.identity === id2) && (provider === void 0 || record3.provider === provider));
   const snapshots = (id2 === void 0 ? listUsageSnapshots(fs35, paths.usageSnapshotsDir) : [readUsageSnapshot(fs35, paths.usageSnapshotsDir, id2)].flatMap((snapshot) => snapshot === void 0 ? [] : [snapshot])).map((snapshot) => provider === void 0 ? snapshot : { ...snapshot, providers: Object.fromEntries(Object.entries(snapshot.providers).filter(([name]) => name === provider)) }).filter((snapshot) => Object.keys(snapshot.providers).length > 0).map((snapshot) => ({ ...snapshot, identity: label2(snapshot.identity) }));
   return {
     since: sinceMs === void 0 ? void 0 : new Date(sinceMs).toISOString(),
     logDir: paths.usageLogDir,
-    summaries: summariseUsage(records.map((record2) => record2.identity === void 0 ? record2 : { ...record2, identity: label2(record2.identity) })),
+    summaries: summariseUsage(records.map((record3) => record3.identity === void 0 ? record3 : { ...record3, identity: label2(record3.identity) })),
     snapshots,
     invalidLines: log.invalidLines
   };
@@ -165743,7 +165806,7 @@ async function refreshQuotas(paths, filters) {
   const warnings = [];
   if (filters.provider === void 0 || filters.provider === ANTHROPIC_PROVIDER) {
     const anthropic = createRealAnthropicUsageRefresher({ paths, store, cwd: process.cwd(), spawnDaemon: spawnDetachedSupervisor, log: () => void 0 });
-    const names = new Map(identityRecords(paths).map((record2) => [record2.id, record2.name]));
+    const names = new Map(identityRecords(paths).map((record3) => [record3.id, record3.name]));
     const subscribed = (id2 === void 0 ? listUsageSnapshots(realFarmFs, paths.usageSnapshotsDir).map((snapshot) => snapshot.identity) : [id2]).flatMap((snapshotId) => {
       const name = names.get(snapshotId);
       return name === void 0 ? [] : [{ name, snapshot: readUsageSnapshot(realFarmFs, paths.usageSnapshotsDir, snapshotId), account: readAccountMetadata(realFarmFs, paths.identitiesDir, snapshotId) }];
@@ -166325,7 +166388,7 @@ function createCompactionDeps(wiring) {
       return decideCompaction({
         atUtilisation: wiring.policy.compactAtUtilisation,
         snapshot: readUsageSnapshot(fs35, paths.usageSnapshotsDir, identity),
-        records: () => readUsageLog(fs35, paths.usageLogDir, { sinceMs: nowMs - FIVE_HOUR_WINDOW_MS }).records.filter((record2) => record2.identity === identity),
+        records: () => readUsageLog(fs35, paths.usageLogDir, { sinceMs: nowMs - FIVE_HOUR_WINDOW_MS }).records.filter((record3) => record3.identity === identity),
         sessions,
         sessionId,
         nowMs
@@ -166364,9 +166427,9 @@ function quotaHitOf(fs35, paths, identity, sessionId, sinceMs, nowMs) {
   }
   const { records } = readUsageLog(fs35, paths.usageLogDir, { sinceMs });
   for (let index = records.length - 1; index >= 0; index -= 1) {
-    const record2 = records[index];
-    if (record2?.sessionId === sessionId && record2.identity === identity && record2.limit?.kind === "quota-exhausted") {
-      return { reason, ...record2.limit.resetAt === void 0 ? {} : { resetAt: record2.limit.resetAt } };
+    const record3 = records[index];
+    if (record3?.sessionId === sessionId && record3.identity === identity && record3.limit?.kind === "quota-exhausted") {
+      return { reason, ...record3.limit.resetAt === void 0 ? {} : { resetAt: record3.limit.resetAt } };
     }
   }
   return void 0;
@@ -166459,7 +166522,7 @@ function createIdentityMover(deps) {
       throw error63;
     }
     try {
-      const toRecord = identityRecordsOver(farmFs, paths.identitiesDir).find((record2) => record2.id === request7.to);
+      const toRecord = identityRecordsOver(farmFs, paths.identitiesDir).find((record3) => record3.id === request7.to);
       const toName = toRecord === void 0 ? void 0 : toRecord.name ?? toRecord.id;
       if (toName === void 0) {
         return { kind: "stay", reason: `no identity is stored under identities/${request7.to}` };
@@ -166927,8 +166990,8 @@ async function runSupervised(params) {
       log,
       // An identity whose name cannot be read is named by its id, which reaches it, so its relaunch reports the file.
       nameOf: (id2) => {
-        const record2 = identityRecordsOver(realFarmFs, paths.identitiesDir).find((candidate) => candidate.id === id2);
-        return record2 === void 0 ? void 0 : record2.name ?? record2.id;
+        const record3 = identityRecordsOver(realFarmFs, paths.identitiesDir).find((candidate) => candidate.id === id2);
+        return record3 === void 0 ? void 0 : record3.name ?? record3.id;
       }
     },
     launch