anygate 0.6.2 → 0.6.3

package/dist/{command-N3R2ZVVS.js → command-JOEFUFLD.js}

@@ -1,15 +1,18 @@
 #!/usr/bin/env node
 import {
+  ISSUER,
   addCustomEndpointProvider,
   addProviderFromTemplate,
   aggregateAnalytics,
   buildAntigravityAuthUrl,
   buildDedupedModelRows,
+  buildOpenAiBrowserAuthUrl,
   checkForUpdates,
   completeAntigravityExchange,
   createGatewayModelCatalog,
   detectConflicts,
   emitAppEvent,
+  exchangeOpenAiBrowserToken,
   favoriteProviderDisplayName,
   fetchProviderCatalog,
   filterServerModelsByFavorites,
@@ -53,6 +56,7 @@ import {
   requestXaiDeviceCode,
   resolveInputTypes,
   resolveProviderCredential,
+  resolveReasoning,
   resolveServerUpstreamApiKey,
   saveLaunchPresets,
   saveNativeOAuthCredential,
@@ -66,17 +70,19 @@ import {
   setServerFreeModelsOnly,
   setServerListenMode,
   setServerMaskGatewayIds,
+  startCallbackServer,
   startServer,
   subscribeToAppEvents,
   summarizeServerProviders,
   validateCustomEndpointUrl,
   writeSecureLogLine
-} from "./chunk-EMBABL33.js";
+} from "./chunk-NU4KMZIM.js";
 import {
   BACKENDS,
   GATEWAY_PORT,
-  MAX_MODEL_CATALOG
-} from "./chunk-S5WL3M5G.js";
+  MAX_MODEL_CATALOG,
+  VERSION
+} from "./chunk-RNW2MGKL.js";
 import {
   getTemplateById,
   listAddableTemplates,
@@ -86,7 +92,6 @@ import "./chunk-UT3JLF3M.js";
 
 // src/ui/command.ts
 import { createServer as createServer2 } from "http";
-import { execSync } from "child_process";
 import {
   readFileSync,
   readdirSync,
@@ -785,6 +790,8 @@ function handleUiApiRequest(req, res, opts = {}) {
     handleGetPresets(res);
   } else if (url === "/api/presets" && req.method === "POST") {
     handleSavePresets(req, res);
+  } else if (url === "/api/ping" && req.method === "GET") {
+    handleGetPing(res);
   } else if (url === "/api/health" && req.method === "GET") {
     handleGetHealth(res);
   } else if (url.startsWith("/api/analytics") && req.method === "GET") {
@@ -865,6 +872,9 @@ async function handleSavePresets(req, res) {
     sendJson(res, 500, { error: String(err) });
   }
 }
+function handleGetPing(res) {
+  sendJson(res, 200, { app: "anygate", version: VERSION, pid: process.pid });
+}
 async function handleGetHealth(res) {
   try {
     const gatewayRunning = (await getServerStatus()).running;
@@ -945,7 +955,8 @@ async function handleGetModels(res) {
         contextWindow: m.contextWindow,
         cost: m.cost,
         providerId: p2.id,
-        inputTypes: resolveInputTypes(m.family, p2.id, m.id)
+        inputTypes: resolveInputTypes(m.family, p2.id, m.id),
+        reasoning: m.reasoning ?? resolveReasoning(p2.id, m.id)
       }))
     }));
     const materializedIds = new Set(catalog.map((p2) => p2.id));
@@ -1367,12 +1378,141 @@ async function handleAddProvider(req, res) {
       sendJson(res, 400, { error: "templateId required" });
       return;
     }
-    const { listSupportedTemplates } = await import("./provider-templates-336QE7ZV.js");
-    const template = listSupportedTemplates().find((t) => t.id === templateId);
+    const { getTemplateById: getTemplateById2 } = await import("./provider-templates-336QE7ZV.js");
+    const template = getTemplateById2(templateId);
     if (!template) {
       sendJson(res, 404, { error: `Template '${templateId}' not found` });
       return;
     }
+    if (template.authType === "oauth") {
+      if (templateId === "claude-code") {
+        sendJson(res, 400, {
+          error: "Claude Code OAuth must be completed in the terminal: anygate providers auth claude-code"
+        });
+        return;
+      }
+      const host = req.headers.host ?? "127.0.0.1";
+      const sessionId = randomUUID();
+      if (templateId === "xai-oauth") {
+        const device2 = await requestXaiDeviceCode();
+        const url2 = device2.verification_uri_complete ?? device2.verification_uri;
+        const session2 = {
+          status: "pending",
+          url: url2,
+          userCode: device2.user_code,
+          providerId: templateId
+        };
+        oauthSessions.set(sessionId, session2);
+        pollXaiDeviceCodeToken(device2).then(async (tokens) => {
+          await saveNativeOAuthCredential(templateId, tokens);
+          await refreshOAuthProviderModels(templateId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        }).catch((err) => {
+          oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        });
+        sendJson(res, 200, { oauth: true, sessionId, url: url2, userCode: device2.user_code });
+        return;
+      }
+      if (templateId === "github-copilot") {
+        const device2 = await requestGithubDeviceCode();
+        const url2 = device2.verification_uri;
+        const session2 = {
+          status: "pending",
+          url: url2,
+          userCode: device2.user_code,
+          providerId: templateId
+        };
+        oauthSessions.set(sessionId, session2);
+        pollGithubDeviceCodeToken(device2).then(async (tokens) => {
+          await saveNativeOAuthCredential(templateId, tokens);
+          await refreshOAuthProviderModels(templateId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        }).catch((err) => {
+          oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        });
+        sendJson(res, 200, { oauth: true, sessionId, url: url2, userCode: device2.user_code });
+        return;
+      }
+      if (templateId === "antigravity") {
+        const redirectUri = guiCallbackRedirectUri(host);
+        const pkce = await buildAntigravityAuthUrl(redirectUri);
+        const { authUrl, codeVerifier, oauthState } = pkce;
+        const session2 = {
+          status: "pending",
+          url: authUrl,
+          providerId: templateId,
+          codeVerifier,
+          oauthState
+        };
+        oauthSessions.set(sessionId, session2);
+        const codePromise = new Promise((resolve, reject) => {
+          session2.codeResolver = resolve;
+          session2.errorRejecter = (err) => reject(err);
+          setTimeout(() => reject(new Error("OAuth timeout \u2014 sign-in not completed")), 10 * 60 * 1e3);
+        });
+        oauthSessions.set(sessionId, session2);
+        codePromise.then(async (code) => {
+          const result2 = await completeAntigravityExchange(code, codeVerifier, redirectUri);
+          const tokens = result2.tokens;
+          const accountId = result2.userInfo.email;
+          const providerData = {};
+          if (result2.projectId) providerData.projectId = result2.projectId;
+          if (result2.tierId) providerData.tier = result2.tierId;
+          await saveNativeOAuthCredential(templateId, tokens, accountId, providerData);
+          await refreshOAuthProviderModels(templateId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        }).catch((err) => {
+          oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        });
+        sendJson(res, 200, { oauth: true, sessionId, authUrl, pkce: true });
+        return;
+      }
+      if (templateId === "openai-oauth") {
+        const redirectUri = `${ISSUER}/deviceauth/callback`;
+        const { authUrl, codeVerifier, oauthState } = await buildOpenAiBrowserAuthUrl(redirectUri);
+        const server = await startCallbackServer();
+        let session2;
+        try {
+          session2 = {
+            status: "pending",
+            url: authUrl,
+            providerId: templateId,
+            codeVerifier,
+            oauthState
+          };
+          oauthSessions.set(sessionId, session2);
+          open(authUrl)?.catch(() => {
+          });
+          const { code } = await server.waitForCallback();
+          if (!code) {
+            throw new Error("No authorization code received from callback");
+          }
+          const { tokens, accountId } = await exchangeOpenAiBrowserToken(code, codeVerifier);
+          await saveNativeOAuthCredential(templateId, tokens, accountId);
+          await refreshOAuthProviderModels(templateId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        } catch (err) {
+          oauthSessions.set(sessionId, { ...session2 ?? {}, status: "error", error: String(err) });
+        } finally {
+          server.close();
+        }
+        sendJson(res, 200, { oauth: true, sessionId, url: authUrl, pkce: true });
+        return;
+      }
+      const device = await requestOpenAiDeviceCode();
+      const url = openAiDeviceCodeUrl();
+      const session = { status: "pending", url, userCode: device.user_code, providerId: templateId };
+      oauthSessions.set(sessionId, session);
+      pollOpenAiDeviceCodeToken(device).then(async ({ tokens, accountId }) => {
+        await saveNativeOAuthCredential(templateId, tokens, accountId);
+        await refreshOAuthProviderModels(templateId);
+        oauthSessions.set(sessionId, { ...session, status: "done" });
+      }).catch((err) => {
+        oauthSessions.set(sessionId, { ...session, status: "error", error: String(err) });
+      });
+      sendJson(res, 200, { oauth: true, sessionId, url, userCode: device.user_code });
+      return;
+    }
     const rawKey = typeof key === "string" ? key.trim() : "";
     if (!rawKey && !template.anonymousFreeModels && !template.apiKeyOptional) {
       sendJson(res, 400, { error: "key must be a non-empty string" });
@@ -1499,43 +1639,47 @@ async function handleOAuthStart(req, res) {
     }
     const sessionId = randomUUID();
     if (providerId === "xai-oauth") {
-      const device2 = await requestXaiDeviceCode();
-      const url2 = device2.verification_uri_complete ?? device2.verification_uri;
-      const session2 = {
-        status: "pending",
-        url: url2,
-        userCode: device2.user_code,
-        providerId
-      };
+      let session2 = { status: "error", url: "", providerId };
       oauthSessions.set(sessionId, session2);
-      pollXaiDeviceCodeToken(device2).then(async (tokens) => {
-        await saveNativeOAuthCredential(providerId, tokens);
-        await refreshOAuthProviderModels(providerId);
-        oauthSessions.set(sessionId, { ...session2, status: "done" });
-      }).catch((err) => {
-        oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
-      });
-      sendJson(res, 200, { sessionId, url: url2, userCode: device2.user_code });
+      try {
+        const device = await requestXaiDeviceCode();
+        const url = device.verification_uri_complete ?? device.verification_uri;
+        session2 = { status: "pending", url, userCode: device.user_code, providerId };
+        oauthSessions.set(sessionId, session2);
+        pollXaiDeviceCodeToken(device).then(async (tokens) => {
+          await saveNativeOAuthCredential(providerId, tokens);
+          await refreshOAuthProviderModels(providerId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        }).catch((err) => {
+          oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        });
+        sendJson(res, 200, { sessionId, url, userCode: device.user_code });
+      } catch (err) {
+        oauthSessions.set(sessionId, { ...session2, error: String(err) });
+        sendJson(res, 500, { error: String(err) });
+      }
       return;
     }
     if (providerId === "github-copilot") {
-      const device2 = await requestGithubDeviceCode();
-      const url2 = device2.verification_uri;
-      const session2 = {
-        status: "pending",
-        url: url2,
-        userCode: device2.user_code,
-        providerId
-      };
+      let session2 = { status: "error", url: "", providerId };
       oauthSessions.set(sessionId, session2);
-      pollGithubDeviceCodeToken(device2).then(async (tokens) => {
-        await saveNativeOAuthCredential(providerId, tokens);
-        await refreshOAuthProviderModels(providerId);
-        oauthSessions.set(sessionId, { ...session2, status: "done" });
-      }).catch((err) => {
-        oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
-      });
-      sendJson(res, 200, { sessionId, url: url2, userCode: device2.user_code });
+      try {
+        const device = await requestGithubDeviceCode();
+        const url = device.verification_uri;
+        session2 = { status: "pending", url, userCode: device.user_code, providerId };
+        oauthSessions.set(sessionId, session2);
+        pollGithubDeviceCodeToken(device).then(async (tokens) => {
+          await saveNativeOAuthCredential(providerId, tokens);
+          await refreshOAuthProviderModels(providerId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        }).catch((err) => {
+          oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        });
+        sendJson(res, 200, { sessionId, url, userCode: device.user_code });
+      } catch (err) {
+        oauthSessions.set(sessionId, { ...session2, error: String(err) });
+        sendJson(res, 500, { error: String(err) });
+      }
       return;
     }
     if (PKCE_PROVIDER_IDS.has(providerId)) {
@@ -1545,64 +1689,72 @@ async function handleOAuthStart(req, res) {
         });
         return;
       }
-      const host = req.headers.host ?? "127.0.0.1";
-      const redirectUri = guiCallbackRedirectUri(host);
-      let pkce;
-      if (providerId === "antigravity") {
-        pkce = await buildAntigravityAuthUrl(redirectUri);
-      } else {
-        sendJson(res, 400, { error: `PKCE flow for "${providerId}" not yet implemented` });
-        return;
-      }
-      const { authUrl, codeVerifier, oauthState } = pkce;
-      const session2 = {
-        status: "pending",
-        url: authUrl,
-        providerId,
-        codeVerifier,
-        oauthState
-      };
-      oauthSessions.set(sessionId, session2);
-      const codePromise = new Promise((resolve, reject) => {
-        session2.codeResolver = resolve;
-        session2.errorRejecter = (err) => reject(new Error(err));
-        setTimeout(() => reject(new Error("OAuth timeout \u2014 sign-in not completed")), 10 * 60 * 1e3);
-      });
+      let session2 = { status: "error", url: "", providerId };
       oauthSessions.set(sessionId, session2);
-      codePromise.then(async (code) => {
-        let providerData = {};
-        let accountId;
-        let tokens;
+      try {
+        const host = req.headers.host ?? "127.0.0.1";
+        const redirectUri = guiCallbackRedirectUri(host);
+        let pkce;
         if (providerId === "antigravity") {
-          const result = await completeAntigravityExchange(code, codeVerifier, redirectUri);
-          tokens = result.tokens;
-          accountId = result.userInfo.email;
-          if (result.projectId) providerData.projectId = result.projectId;
-          if (result.tierId) providerData.tier = result.tierId;
+          pkce = await buildAntigravityAuthUrl(redirectUri);
         } else {
-          throw new Error(`Unknown PKCE provider: ${providerId}`);
+          sendJson(res, 400, { error: `PKCE flow for "${providerId}" not yet implemented` });
+          return;
         }
-        await saveNativeOAuthCredential(providerId, tokens, accountId, providerData);
+        const { authUrl, codeVerifier, oauthState } = pkce;
+        session2 = { status: "pending", url: authUrl, providerId, codeVerifier, oauthState };
+        oauthSessions.set(sessionId, session2);
+        const codePromise = new Promise((resolve, reject) => {
+          session2.codeResolver = resolve;
+          session2.errorRejecter = (err) => reject(new Error(err));
+          setTimeout(() => reject(new Error("OAuth timeout \u2014 sign-in not completed")), 10 * 60 * 1e3);
+        });
+        oauthSessions.set(sessionId, session2);
+        codePromise.then(async (code) => {
+          let providerData = {};
+          let accountId;
+          let tokens;
+          if (providerId === "antigravity") {
+            const result = await completeAntigravityExchange(code, codeVerifier, redirectUri);
+            tokens = result.tokens;
+            accountId = result.userInfo.email;
+            if (result.projectId) providerData.projectId = result.projectId;
+            if (result.tierId) providerData.tier = result.tierId;
+          } else {
+            throw new Error(`Unknown PKCE provider: ${providerId}`);
+          }
+          await saveNativeOAuthCredential(providerId, tokens, accountId, providerData);
+          await refreshOAuthProviderModels(providerId);
+          oauthSessions.set(sessionId, { ...session2, status: "done" });
+        }).catch((err) => {
+          oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        });
+        sendJson(res, 200, { sessionId, authUrl, pkce: true });
+      } catch (err) {
+        oauthSessions.set(sessionId, { ...session2, error: String(err) });
+        sendJson(res, 500, { error: String(err) });
+      }
+      return;
+    }
+    let session = { status: "error", url: "", providerId };
+    oauthSessions.set(sessionId, session);
+    try {
+      const device = await requestOpenAiDeviceCode();
+      const url = openAiDeviceCodeUrl();
+      session = { status: "pending", url, userCode: device.user_code, providerId };
+      oauthSessions.set(sessionId, session);
+      pollOpenAiDeviceCodeToken(device).then(async ({ tokens, accountId }) => {
+        await saveNativeOAuthCredential(providerId, tokens, accountId);
         await refreshOAuthProviderModels(providerId);
-        oauthSessions.set(sessionId, { ...session2, status: "done" });
+        oauthSessions.set(sessionId, { ...session, status: "done" });
       }).catch((err) => {
-        oauthSessions.set(sessionId, { ...session2, status: "error", error: String(err) });
+        oauthSessions.set(sessionId, { ...session, status: "error", error: String(err) });
       });
-      sendJson(res, 200, { sessionId, authUrl, pkce: true });
-      return;
+      sendJson(res, 200, { sessionId, url, userCode: device.user_code });
+    } catch (err) {
+      oauthSessions.set(sessionId, { ...session, error: String(err) });
+      sendJson(res, 500, { error: String(err) });
     }
-    const device = await requestOpenAiDeviceCode();
-    const url = openAiDeviceCodeUrl();
-    const session = { status: "pending", url, userCode: device.user_code, providerId };
-    oauthSessions.set(sessionId, session);
-    pollOpenAiDeviceCodeToken(device).then(async ({ tokens, accountId }) => {
-      await saveNativeOAuthCredential(providerId, tokens, accountId);
-      await refreshOAuthProviderModels(providerId);
-      oauthSessions.set(sessionId, { ...session, status: "done" });
-    }).catch((err) => {
-      oauthSessions.set(sessionId, { ...session, status: "error", error: String(err) });
-    });
-    sendJson(res, 200, { sessionId, url, userCode: device.user_code });
   } catch (err) {
     sendJson(res, 500, { error: String(err) });
   }
@@ -1975,30 +2127,41 @@ function removeLock() {
   } catch {
   }
 }
-function checkExistingServer() {
+function parseUiLock(raw) {
+  try {
+    const { pid, port } = JSON.parse(raw);
+    if (!Number.isInteger(pid) || !Number.isInteger(port)) return null;
+    if (port < 1 || port > 65535) return null;
+    return { pid, port };
+  } catch {
+    return null;
+  }
+}
+var PROBE_TIMEOUT_MS = 1500;
+async function probeUiServer(port, fetchImpl = fetch) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS);
+  try {
+    const res = await fetchImpl(`http://127.0.0.1:${port}/api/ping`, { signal: controller.signal });
+    if (!res.ok) return false;
+    const body = await res.json();
+    return body?.app === "anygate";
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function checkExistingServer(fetchImpl = fetch) {
   if (!existsSync3(LOCK_FILE)) return null;
+  let lock = null;
   try {
-    const { pid, port } = JSON.parse(readFileSync(LOCK_FILE, "utf8"));
-    const isWindows2 = process.platform === "win32";
-    let processExists = false;
-    if (isWindows2) {
-      try {
-        const output = execSync(`tasklist /FI "PID eq ${pid}"`, {
-          encoding: "utf8",
-          stdio: ["pipe", "pipe", "ignore"]
-        });
-        processExists = output.includes(String(pid));
-      } catch {
-        processExists = false;
-      }
-    } else {
-      process.kill(pid, 0);
-      processExists = true;
-    }
-    if (processExists) {
-      return `http://127.0.0.1:${port}`;
-    }
+    lock = parseUiLock(readFileSync(LOCK_FILE, "utf8"));
   } catch {
+    lock = null;
+  }
+  if (lock && await probeUiServer(lock.port, fetchImpl)) {
+    return `http://127.0.0.1:${lock.port}`;
   }
   removeLock();
   return null;
@@ -2022,11 +2185,19 @@ async function resolveUiShutdownDecision(signal, promptClose = () => p.confirm({
   return shouldClose ? "close" : "keep";
 }
 async function runUiCommand(opts = {}) {
-  const existing = checkExistingServer();
+  const existing = await checkExistingServer();
   if (existing) {
-    console.log(`
+    console.log(
+      `
   ${pc2.bold("anygate UI")} already running at ${pc2.cyan(existing)}
-`);
+  ${pc2.dim("Press Ctrl+C in that terminal to stop it")}
+`
+    );
+    try {
+      const { default: open2 } = await import("open");
+      await open2(existing);
+    } catch {
+    }
     return 0;
   }
   if (opts.trace) {
@@ -2081,6 +2252,7 @@ async function runUiCommand(opts = {}) {
   const url = `http://127.0.0.1:${port}`;
   mkdirSync(getAppHome(), { recursive: true });
   writeFileSync2(LOCK_FILE, JSON.stringify({ pid: process.pid, port }));
+  process.on("exit", removeLock);
   const cleanup = () => {
     removeLock();
     server.close();
@@ -2115,8 +2287,8 @@ async function runUiCommand(opts = {}) {
     trace?.(`ui server listening ${url}`);
   }
   try {
-    const { default: open } = await import("open");
-    await open(url);
+    const { default: open2 } = await import("open");
+    await open2(url);
     trace?.(`browser open ${url}`);
   } catch {
     trace?.(`browser open failed ${url}`);
@@ -2126,9 +2298,12 @@ async function runUiCommand(opts = {}) {
   return 0;
 }
 export {
+  checkExistingServer,
   formatUiServerLifecycleMessage,
   isUiApiRoute,
+  parseUiLock,
+  probeUiServer,
   resolveUiShutdownDecision,
   runUiCommand
 };
-//# sourceMappingURL=command-N3R2ZVVS.js.map
+//# sourceMappingURL=command-JOEFUFLD.js.map