agent-shim 11.87.0 → 11.87.1

package/dist/cli.cjs

@@ -41960,7 +41960,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.87.0",
+      version: "11.87.1",
       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>",
@@ -142539,6 +142539,60 @@ async function serveRouted(incoming, deps) {
   }
 }
 
+// src/antigravity/agyCredential.ts
+var PREFIX = "go-keyring-base64:";
+var COMMAND_TIMEOUT_MS = 3e4;
+function envelope(raw) {
+  if (!raw.startsWith(PREFIX)) return void 0;
+  try {
+    const data = JSON.parse(Buffer.from(raw.slice(PREFIX.length), "base64").toString("utf8"));
+    if (typeof data !== "object" || data === null || !("token" in data)) return void 0;
+    const token = data.token;
+    if (typeof token !== "object" || token === null || !("access_token" in token) || !("expiry" in token)) return void 0;
+    if (typeof token.access_token !== "string" || token.access_token === "" || typeof token.expiry !== "string") return void 0;
+    const expiry = Date.parse(token.expiry);
+    return Number.isFinite(expiry) ? { token: token.access_token, expiry } : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function createAgyCredentialResolver(port, now = Date.now) {
+  let inFlight;
+  async function resolve3(result) {
+    if (!result.ok) return result;
+    const source = result.credential.source;
+    if (!("keychain" in source) || source.keychain.service !== "gemini" || source.keychain.account !== "antigravity") return result;
+    const read = async () => {
+      const item2 = await port.runCommand(["security", "find-generic-password", "-s", "gemini", "-a", "antigravity", "-w"], { timeoutMs: 1e4, interactive: false });
+      return item2.status === 0 && !item2.timedOut ? item2.stdout.trim() : void 0;
+    };
+    const raw = await read();
+    if (raw === void 0) return { ok: false, message: "Unable to read the agy credential envelope." };
+    if (!raw.startsWith(PREFIX)) return result;
+    let item = envelope(raw);
+    if (item === void 0) return { ok: false, message: "Unable to read the agy credential envelope." };
+    if (item.expiry <= now()) {
+      const refreshed = await port.runCommand(["agy", "models"], { timeoutMs: COMMAND_TIMEOUT_MS, interactive: false });
+      if (refreshed.status !== 0 || refreshed.timedOut) return { ok: false, message: "agy could not refresh its credential; check agy authentication." };
+      const refreshedRaw = await read();
+      item = refreshedRaw === void 0 ? void 0 : envelope(refreshedRaw);
+      if (item === void 0 || item.expiry <= now()) return { ok: false, message: "agy did not provide a fresh credential." };
+    }
+    return { ok: true, credential: { ...result.credential, token: item.token } };
+  }
+  return async (result) => {
+    if (!result.ok || !("keychain" in result.credential.source) || result.credential.source.keychain.service !== "gemini" || result.credential.source.keychain.account !== "antigravity") return result;
+    if (inFlight !== void 0) return await inFlight;
+    const pending = resolve3(result);
+    inFlight = pending;
+    try {
+      return await pending;
+    } finally {
+      if (inFlight === pending) inFlight = void 0;
+    }
+  };
+}
+
 // src/frontdoor/providerRoute.ts
 init_load();
 init_names();
@@ -143004,8 +143058,8 @@ function createCodexRoute(ports) {
       const detail = (await upstream.text()).slice(0, UPSTREAM_DETAIL_CHARS);
       let quotaError;
       try {
-        const envelope = CodexErrorEnvelopeSchema.safeParse(JSON.parse(detail));
-        quotaError = envelope.success ? envelope.data.error : void 0;
+        const envelope2 = CodexErrorEnvelopeSchema.safeParse(JSON.parse(detail));
+        quotaError = envelope2.success ? envelope2.data.error : void 0;
       } catch {
       }
       const rejected = upstream.status === HTTP_STATUS.tooManyRequests;
@@ -144236,6 +144290,7 @@ function resolveAccountTarget(model, models) {
 function createProviderRouteResolver(deps) {
   const oauthRoute = createPassthroughRoute("anthropic", { baseUrl: `https://${CONNECT_INTERCEPT_HOST}:${String(HTTPS_PORT)}`, stripPrefix: void 0, headroomUpstream: void 0 });
   const resolveCredential2 = shareInFlightResolutions(resolveCredentialAsync);
+  const resolveAgyCredential = createAgyCredentialResolver(deps.credentials);
   const antigravityQuotaSources = /* @__PURE__ */ new Map();
   const antigravityRoutingMemory = /* @__PURE__ */ new Map();
   const antigravityExhaustedModels = /* @__PURE__ */ new Map();
@@ -144274,7 +144329,7 @@ function createProviderRouteResolver(deps) {
     const source = createCachedAntigravityQuotaSource({
       now: () => Date.now(),
       fetchSummary: async (nowMs) => {
-        const res = await resolveCredential2({ credential: definition.credential, env: deps.env, port: deps.credentials, subject: `provider ${provider}` });
+        const res = await resolveAgyCredential(await resolveCredential2({ credential: definition.credential, env: deps.env, port: deps.credentials, subject: `provider ${provider}` }));
         if (!res.ok) {
           return void 0;
         }
@@ -144344,12 +144399,12 @@ function createProviderRouteResolver(deps) {
         route: createAntigravityRouteMount(
           {
             loadProvider: async () => {
-              const res = await resolveCredential2({
+              const res = await resolveAgyCredential(await resolveCredential2({
                 credential: antigravityProvider.credential,
                 env: deps.env,
                 port: deps.credentials,
                 subject: `provider ${provider}`
-              });
+              }));
               if (!res.ok) {
                 return { ok: false, status: HTTP_STATUS.unauthorized, message: res.message };
               }
@@ -145115,10 +145170,10 @@ function formatRcRateLimitInfo(info) {
   return parts.join(" ");
 }
 function formatRcStreamEvent(event) {
-  const { envelope } = event;
+  const { envelope: envelope2 } = event;
   const rateLimit = rcRateLimitInfoOf(event);
-  const sketch = rateLimit !== void 0 ? `  ${formatRcRateLimitInfo(rateLimit)}` : envelope.payload === void 0 ? "" : `  ${eventExcerpt(JSON.stringify(envelope.payload))}`;
-  return `${event.session}  ${envelope.event_type}  sequence_num ${String(envelope.sequence_num)}  source ${envelope.source}${sketch}`;
+  const sketch = rateLimit !== void 0 ? `  ${formatRcRateLimitInfo(rateLimit)}` : envelope2.payload === void 0 ? "" : `  ${eventExcerpt(JSON.stringify(envelope2.payload))}`;
+  return `${event.session}  ${envelope2.event_type}  sequence_num ${String(envelope2.sequence_num)}  source ${envelope2.source}${sketch}`;
 }
 function formatRcSelfHostMint(result) {
   return [
@@ -146688,7 +146743,7 @@ function createRcSelfHostSurface(deps) {
   const workerRefusal = (headers, session) => presentsWorkerJwt(headers, session) ? void 0 : presentationRefusal(headers);
   const workerOrCredentialRefusal = (headers, session) => presentsWorkerJwt(headers, session) || presentsCredential(headers) ? void 0 : presentationRefusal(headers);
   const frameOf = (event) => {
-    const envelope = {
+    const envelope2 = {
       event_id: event.eventId,
       event_type: nonEmptyString4(event.payload, "type") ?? "event",
       sequence_num: event.sequenceNum,
@@ -146698,7 +146753,7 @@ function createRcSelfHostSurface(deps) {
     };
     return `event: ${RC_STREAM_EVENT_NAME}
 id: ${String(event.sequenceNum)}
-data: ${JSON.stringify(envelope)}
+data: ${JSON.stringify(envelope2)}
 
 `;
   };
@@ -147366,14 +147421,14 @@ function createRcStreamHub(deps) {
       attachment.controller.signal.throwIfAborted();
       let lastEventId;
       for (const parsed of parser.write(Buffer.from(chunk2).toString("utf8"))) {
-        const envelope = parseRcStreamEnvelope(parsed);
-        if (envelope === void 0) {
+        const envelope2 = parseRcStreamEnvelope(parsed);
+        if (envelope2 === void 0) {
           continue;
         }
-        deps.fileStreamEvent(attachment.sessionId, envelope);
-        deps.fanout.publish({ session: attachment.sessionId, envelope });
-        if (typeof envelope.event_id === "string" && envelope.event_type !== "mark_read") {
-          lastEventId = envelope.event_id;
+        deps.fileStreamEvent(attachment.sessionId, envelope2);
+        deps.fanout.publish({ session: attachment.sessionId, envelope: envelope2 });
+        if (typeof envelope2.event_id === "string" && envelope2.event_type !== "mark_read") {
+          lastEventId = envelope2.event_id;
         }
       }
       sendReceipt(attachment, headers, lastEventId);

package/dist/index.cjs

@@ -5173,7 +5173,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.87.0",
+      version: "11.87.1",
       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>",

package/dist/index.mjs

@@ -5148,7 +5148,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.87.0",
+      version: "11.87.1",
       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>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "11.87.0",
+  "version": "11.87.1",
   "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>",