indusagi 0.13.8 → 0.13.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+- **OpenAI browser redirect**: retries the registered `localhost:1457` callback when port `1455` is unavailable, and uses the selected redirect URI for both authorization and token exchange.
+- **Framework build dependency**: declares the `proxy-agent` package already used by the Bedrock adapter.
+
 ## [0.13.3]
 
 ### Changed

package/dist/agent.js

@@ -5,8 +5,13 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 
 // src/facade/ml/kit/streaming-state-manager.ts
@@ -4689,6 +4694,75 @@ var MODELS = {
       contextWindow: 1e6,
       maxTokens: 128e3
     },
+    "gpt-5.6-sol": {
+      id: "gpt-5.6-sol",
+      name: "GPT-5.6 Sol",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-terra": {
+      id: "gpt-5.6-terra",
+      name: "GPT-5.6 Terra",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 2,
+        output: 12,
+        // ponytail: 0 means unavailable cached-input pricing; allow null if the catalog must distinguish it from free.
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-luna": {
+      id: "gpt-5.6-luna",
+      name: "GPT-5.6 Luna",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 0.2,
+        output: 1.2,
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6": {
+      id: "gpt-5.6",
+      name: "GPT-5.6",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
     "o1": {
       id: "o1",
       name: "o1",
@@ -5013,6 +5087,75 @@ var MODELS = {
       },
       contextWindow: 1e6,
       maxTokens: 128e3
+    },
+    "gpt-5.6-sol": {
+      id: "gpt-5.6-sol",
+      name: "GPT-5.6 Sol",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-terra": {
+      id: "gpt-5.6-terra",
+      name: "GPT-5.6 Terra",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 2,
+        output: 12,
+        // ponytail: 0 means unavailable cached-input pricing; allow null if the catalog must distinguish it from free.
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-luna": {
+      id: "gpt-5.6-luna",
+      name: "GPT-5.6 Luna",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 0.2,
+        output: 1.2,
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6": {
+      id: "gpt-5.6",
+      name: "GPT-5.6",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
     }
   },
   "opencode": {
@@ -16864,8 +17007,8 @@ function buildHeaders(initHeaders, additionalHeaders, accountId, token, sessionI
   headers.set("Authorization", `Bearer ${token}`);
   headers.set("chatgpt-account-id", accountId);
   headers.set("OpenAI-Beta", "responses=experimental");
-  headers.set("originator", "indusagi");
-  const userAgent = _os ? `indusagi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "indusagi (browser)";
+  headers.set("originator", "pi");
+  const userAgent = _os ? `pi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "pi (browser)";
   headers.set("User-Agent", userAgent);
   headers.set("accept", "text/event-stream");
   headers.set("content-type", "application/json");
@@ -18394,7 +18537,12 @@ function ensureNodeBuiltins() {
   });
 }
 ensureNodeBuiltins();
-var CLIENT_ID2 = process.env.INDUSAGI_OPENAI_CODEX_CLIENT_ID ?? "<UNREGISTERED-OPENAI-CODEX-APP>";
+var DEFAULT_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
+var UNREGISTERED_CLIENT_ID = "<UNREGISTERED-OPENAI-CODEX-APP>";
+function resolveOpenAICodexClientId(configured = process.env.INDUSAGI_OPENAI_CODEX_CLIENT_ID) {
+  return configured && configured !== UNREGISTERED_CLIENT_ID ? configured : DEFAULT_CLIENT_ID;
+}
+var CLIENT_ID2 = resolveOpenAICodexClientId();
 
 // src/facade/ml/kit/overflow.ts
 var OVERFLOW_PATTERN_CONFIG = [

package/dist/ai.js

@@ -8,8 +8,13 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -4813,6 +4818,75 @@ var MODELS = {
       contextWindow: 1e6,
       maxTokens: 128e3
     },
+    "gpt-5.6-sol": {
+      id: "gpt-5.6-sol",
+      name: "GPT-5.6 Sol",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-terra": {
+      id: "gpt-5.6-terra",
+      name: "GPT-5.6 Terra",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 2,
+        output: 12,
+        // ponytail: 0 means unavailable cached-input pricing; allow null if the catalog must distinguish it from free.
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-luna": {
+      id: "gpt-5.6-luna",
+      name: "GPT-5.6 Luna",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 0.2,
+        output: 1.2,
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6": {
+      id: "gpt-5.6",
+      name: "GPT-5.6",
+      api: "openai-responses",
+      provider: "openai",
+      baseUrl: "https://api.openai.com/v1",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
     "o1": {
       id: "o1",
       name: "o1",
@@ -5137,6 +5211,75 @@ var MODELS = {
       },
       contextWindow: 1e6,
       maxTokens: 128e3
+    },
+    "gpt-5.6-sol": {
+      id: "gpt-5.6-sol",
+      name: "GPT-5.6 Sol",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-terra": {
+      id: "gpt-5.6-terra",
+      name: "GPT-5.6 Terra",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 2,
+        output: 12,
+        // ponytail: 0 means unavailable cached-input pricing; allow null if the catalog must distinguish it from free.
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6-luna": {
+      id: "gpt-5.6-luna",
+      name: "GPT-5.6 Luna",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 0.2,
+        output: 1.2,
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
+    },
+    "gpt-5.6": {
+      id: "gpt-5.6",
+      name: "GPT-5.6",
+      api: "openai-codex-responses",
+      provider: "openai-codex",
+      baseUrl: "https://chatgpt.com/backend-api",
+      reasoning: true,
+      input: ["text", "image"],
+      cost: {
+        input: 5,
+        output: 30,
+        cacheRead: 0.5,
+        cacheWrite: 0
+      },
+      contextWindow: 105e4,
+      maxTokens: 128e3
     }
   },
   "opencode": {
@@ -17077,8 +17220,8 @@ function buildHeaders(initHeaders, additionalHeaders, accountId, token, sessionI
   headers.set("Authorization", `Bearer ${token}`);
   headers.set("chatgpt-account-id", accountId);
   headers.set("OpenAI-Beta", "responses=experimental");
-  headers.set("originator", "indusagi");
-  const userAgent = _os ? `indusagi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "indusagi (browser)";
+  headers.set("originator", "pi");
+  const userAgent = _os ? `pi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "pi (browser)";
   headers.set("User-Agent", userAgent);
   headers.set("accept", "text/event-stream");
   headers.set("content-type", "application/json");
@@ -19132,18 +19275,24 @@ function ensureNodeBuiltins() {
   });
 }
 ensureNodeBuiltins();
-var CLIENT_ID2 = process.env.INDUSAGI_OPENAI_CODEX_CLIENT_ID ?? "<UNREGISTERED-OPENAI-CODEX-APP>";
+var DEFAULT_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
+var UNREGISTERED_CLIENT_ID = "<UNREGISTERED-OPENAI-CODEX-APP>";
+function resolveOpenAICodexClientId(configured = process.env.INDUSAGI_OPENAI_CODEX_CLIENT_ID) {
+  return configured && configured !== UNREGISTERED_CLIENT_ID ? configured : DEFAULT_CLIENT_ID;
+}
+var CLIENT_ID2 = resolveOpenAICodexClientId();
 var AUTHORIZE_URL2 = "https://auth.openai.com/oauth/authorize";
 var TOKEN_URL2 = "https://auth.openai.com/oauth/token";
 var REDIRECT_URI2 = "http://localhost:1455/auth/callback";
-var SCOPE = "openid profile email offline_access";
+var FALLBACK_REDIRECT_URI = "http://localhost:1457/auth/callback";
+var SCOPE = "openid profile email offline_access api.connectors.read api.connectors.invoke";
 var JWT_CLAIM_PATH2 = "https://api.openai.com/auth";
 function createState() {
   const { randomBytes } = nodeBuiltins;
   if (!randomBytes) {
     throw new Error("Codex sign-in needs a Node or Bun runtime and cannot run inside a browser.");
   }
-  return randomBytes(16).toString("hex");
+  return randomBytes(32).toString("hex");
 }
 function readCodeAndState(params) {
   return {
@@ -19204,13 +19353,12 @@ async function exchangeAuthorizationCode(code, verifier, redirectUri = REDIRECT_
     })
   });
   if (!response.ok) {
-    const text = await response.text().catch(() => "");
-    console.error("[openai-codex] exchanging the code for a token failed:", response.status, text);
+    console.error("[openai-codex] exchanging the code for a token failed:", response.status);
     return { type: "failed" };
   }
   const json = await response.json();
   if (!json.access_token || !json.refresh_token || typeof json.expires_in !== "number") {
-    console.error("[openai-codex] token response was missing required fields:", json);
+    console.error("[openai-codex] token response was missing required fields");
     return { type: "failed" };
   }
   return {
@@ -19232,13 +19380,12 @@ async function refreshAccessToken(refreshToken) {
       })
     });
     if (!response.ok) {
-      const text = await response.text().catch(() => "");
-      console.error("[openai-codex] refreshing the token failed:", response.status, text);
+      console.error("[openai-codex] refreshing the token failed:", response.status);
       return { type: "failed" };
     }
     const json = await response.json();
     if (!json.access_token || !json.refresh_token || typeof json.expires_in !== "number") {
-      console.error("[openai-codex] refresh response was missing required fields:", json);
+      console.error("[openai-codex] refresh response was missing required fields");
       return { type: "failed" };
     }
     return {
@@ -19247,27 +19394,27 @@ async function refreshAccessToken(refreshToken) {
       refresh: json.refresh_token,
       expires: Date.now() + json.expires_in * 1e3
     };
-  } catch (error) {
-    console.error("[openai-codex] token refresh threw an error:", error);
+  } catch {
+    console.error("[openai-codex] token refresh failed");
     return { type: "failed" };
   }
 }
-async function createAuthorizationFlow(originator = process.env.INDUSAGI_OPENAI_CODEX_ORIGINATOR ?? "indusagi") {
+async function createAuthorizationFlow(originator = process.env.INDUSAGI_OPENAI_CODEX_ORIGINATOR ?? "codex_cli_rs") {
   const { verifier, challenge } = await generatePKCE();
   const state = createState();
-  const query = new URLSearchParams({
-    client_id: CLIENT_ID2,
-    response_type: "code",
-    redirect_uri: REDIRECT_URI2,
-    scope: SCOPE,
-    state,
-    code_challenge: challenge,
-    code_challenge_method: "S256",
-    id_token_add_organizations: "true",
-    codex_cli_simplified_flow: "true",
-    originator
-  });
-  const url = `${AUTHORIZE_URL2}?${query.toString()}`;
+  const query = new URLSearchParams([
+    ["response_type", "code"],
+    ["client_id", CLIENT_ID2],
+    ["redirect_uri", REDIRECT_URI2],
+    ["scope", SCOPE],
+    ["code_challenge", challenge],
+    ["code_challenge_method", "S256"],
+    ["id_token_add_organizations", "true"],
+    ["codex_cli_simplified_flow", "true"],
+    ["state", state],
+    ["originator", originator]
+  ]);
+  const url = `${AUTHORIZE_URL2}?${query}`;
   return { verifier, state, url };
 }
 function createSingleShotGate() {
@@ -19322,27 +19469,47 @@ function startLocalOAuthServer(state) {
     } catch {
     }
   };
-  return new Promise((resolveServer) => {
-    server.listen(1455, "127.0.0.1", () => {
-      resolveServer({
-        close: closeQuietly,
-        cancelWait: () => gate.resolve(null),
-        waitForCode: () => gate.promise
-      });
-    });
-    server.on("error", (err) => {
-      console.error(
-        `[openai-codex] unable to bind http://127.0.0.1:1455 (${err.code}); falling back to manual code entry.`
-      );
-      gate.resolve(null);
-      resolveServer({
-        close: closeQuietly,
-        cancelWait: () => {
-        },
-        waitForCode: async () => null
-      });
-    });
+  const listen = (port) => new Promise((resolve) => {
+    const cleanup = () => {
+      server.off("error", onError);
+      server.off("listening", onListening);
+    };
+    const onError = () => {
+      cleanup();
+      resolve(false);
+    };
+    const onListening = () => {
+      cleanup();
+      resolve(true);
+    };
+    server.once("error", onError);
+    server.once("listening", onListening);
+    server.listen(port, "127.0.0.1");
   });
+  return (async () => {
+    for (const [port, redirectUri] of [
+      [1455, REDIRECT_URI2],
+      [1457, FALLBACK_REDIRECT_URI]
+    ]) {
+      if (await listen(port)) {
+        return {
+          close: closeQuietly,
+          cancelWait: () => gate.resolve(null),
+          redirectUri,
+          waitForCode: () => gate.promise
+        };
+      }
+    }
+    console.error("[openai-codex] callback ports 1455 and 1457 are unavailable; using manual code entry.");
+    gate.resolve(null);
+    return {
+      close: closeQuietly,
+      cancelWait: () => {
+      },
+      redirectUri: REDIRECT_URI2,
+      waitForCode: async () => null
+    };
+  })();
 }
 function getAccountId(accessToken) {
   const payload = decodeJwt(accessToken);
@@ -19353,7 +19520,12 @@ function getAccountId(accessToken) {
 async function loginOpenAICodex(options) {
   const { verifier, state, url } = await createAuthorizationFlow(options.originator);
   const server = await startLocalOAuthServer(state);
-  options.onAuth({ url, instructions: "Opening your browser \u2014 finish signing in there to continue." });
+  const authorizationUrl = new URL(url);
+  authorizationUrl.searchParams.set("redirect_uri", server.redirectUri);
+  options.onAuth({
+    url: authorizationUrl.toString(),
+    instructions: "Opening your browser \u2014 finish signing in there to continue."
+  });
   const codeFromPastedInput = (pasted) => {
     const parsed = parseAuthorizationInput(pasted);
     if (parsed.state && parsed.state !== state) {
@@ -19406,7 +19578,7 @@ async function loginOpenAICodex(options) {
     if (!code) {
       throw new Error("No authorization code was provided to complete sign-in.");
     }
-    const tokenResult = await exchangeAuthorizationCode(code, verifier);
+    const tokenResult = await exchangeAuthorizationCode(code, verifier, server.redirectUri);
     if (tokenResult.type !== "success") {
       throw new Error("Could not trade the authorization code for an access token");
     }