@prestyj/core 5.28.0 → 5.29.0

package/dist/{chunk-ZCXAIMZF.js → chunk-N73LFQ3N.js}

@@ -8,6 +8,14 @@ import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { arch, hostname, release, type } from "os";
 import path from "path";
+
+// src/oauth/request-timeout.ts
+var OAUTH_REQUEST_TIMEOUT_MS = 3e4;
+function oauthRequestSignal() {
+  return AbortSignal.timeout(OAUTH_REQUEST_TIMEOUT_MS);
+}
+
+// src/oauth/kimi.ts
 var CLIENT_ID = "17e5f671-d194-4dfb-9706-5516cb48c098";
 var DEFAULT_OAUTH_HOST = "https://auth.kimi.com";
 var DEFAULT_CODING_BASE_URL = "https://api.kimi.com/coding/v1";
@@ -94,7 +102,8 @@ async function postForm(endpoint, params) {
       "Content-Type": "application/x-www-form-urlencoded",
       Accept: "application/json"
     },
-    body: new URLSearchParams(params).toString()
+    body: new URLSearchParams(params).toString(),
+    signal: oauthRequestSignal()
   });
   let data = {};
   try {
@@ -568,7 +577,12 @@ async function postTokenRequest(body, label) {
   for (const url of TOKEN_URLS) {
     let response;
     try {
-      response = await fetch(url, { method: "POST", headers, body: encoded });
+      response = await fetch(url, {
+        method: "POST",
+        headers,
+        body: encoded,
+        signal: oauthRequestSignal()
+      });
     } catch (err) {
       lastError = err instanceof Error ? err : new Error(String(err));
       continue;
@@ -817,7 +831,8 @@ async function exchangeOpenAICode(code, verifier) {
       code,
       redirect_uri: REDIRECT_URI2,
       code_verifier: verifier
-    })
+    }),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -838,7 +853,8 @@ async function refreshOpenAIToken(refreshToken) {
       grant_type: "refresh_token",
       refresh_token: refreshToken,
       client_id: CLIENT_ID3
-    })
+    }),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -1048,7 +1064,8 @@ async function postTokenRequest2(body) {
   const response = await fetch(TOKEN_URL2, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams(body)
+    body: new URLSearchParams(body),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -1177,7 +1194,8 @@ async function codeAssistGet(accessToken, operationName) {
 async function codeAssistRequest(url, accessToken, label, init) {
   const response = await fetch(url, {
     ...init,
-    headers: codeAssistHeaders(accessToken)
+    headers: codeAssistHeaders(accessToken),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -1263,7 +1281,8 @@ async function postForm2(endpoint, params) {
       Accept: "application/json",
       "User-Agent": `grok-cli/${grokCliVersion()}`
     },
-    body: new URLSearchParams(params).toString()
+    body: new URLSearchParams(params).toString(),
+    signal: oauthRequestSignal()
   });
   let data = {};
   try {
@@ -2099,7 +2118,7 @@ var MODELS = [
   // ── OpenAI (Codex) ─────────────────────────────────────
   {
     // GPT-6 Astra — "Our most capable model for complex, demanding work."
-    // (Codex catalog priority 1, listed for every ChatGPT plan, requires a
+    // (Codex catalog priority 2, listed for every ChatGPT plan, requires a
     // Codex client >= 0.153.0 — see CODEX_CLIENT_VERSION). Same split as 5.6:
     // 1.05M on the public Responses API, 272K on the ChatGPT OAuth route
     // (openai/codex models.json, `gpt-6-astra`). Reasoning ladder low → medium
@@ -2123,32 +2142,36 @@ var MODELS = [
   },
   // GPT-6 Sol + Luna — released 2026-09-22 below Astra, replacing the whole
   // GPT-5.6 family (Sol/Terra/Luna; there is no GPT-6 Terra — OpenAI's Codex
-  // catalog upgrades 5.6 Terra to 6 Sol). Both need a Codex client >= 0.155.0
-  // on the ChatGPT OAuth route. Same window split as Astra: 1.05M on the public
-  // Responses API, 272K on the Codex route; 128K output, text+image input,
-  // freeform apply_patch, responses-lite transport. The 5.6 ids are retired —
-  // a saved session on one falls back to the provider default on next start.
+  // catalog upgrades 5.6 Terra to 6 Sol). GPT-6.1 Sol (2026-09-29) then replaced
+  // GPT-6 Sol. Same window split as Astra: 1.05M on the public Responses API,
+  // 272K on the Codex route; 128K output, text+image input, freeform
+  // apply_patch, responses-lite transport. The GPT-5.6 ids and `gpt-6-sol` are
+  // retired — a saved session on one falls back to the provider default on
+  // next start.
   {
-    // Sol — "Workhorse model for coding and everyday work." (Codex priority 2,
-    // default medium). $2/$10 MTok. Ladder low → medium → high → xhigh → max →
-    // ultra; ultra is the Codex orchestration preset (max effort on the wire +
-    // proactive local subagent delegation).
-    id: "gpt-6-sol",
-    name: "GPT-6 Sol",
+    // GPT-6.1 Sol — "Latest workhorse model for coding and everyday work."
+    // (Codex priority 1, default low). The catalog says Codex client >= 0.153.0,
+    // but the ChatGPT backend only serves it from 0.159.0 (see
+    // CODEX_CLIENT_VERSION). $2/$10 MTok, cached input $0.10. Ladder low →
+    // medium → high → xhigh → max → ultra; ultra is the Codex orchestration
+    // preset (max effort on the wire + proactive local subagent delegation).
+    id: "gpt-6.1-sol",
+    name: "GPT-6.1 Sol",
     provider: "openai",
     contextWindow: 105e4,
     codexContextWindow: 272e3,
     maxOutputTokens: 128e3,
     supportsThinking: true,
-    defaultThinkingLevel: "medium",
+    defaultThinkingLevel: "low",
     supportsImages: true,
     supportsVideo: false,
     costTier: "medium",
     maxThinkingLevel: "ultra"
   },
   {
-    // Luna — "Fast and affordable model for easier tasks." (Codex priority 3,
-    // default medium). $0.10/$0.50 MTok. Reasoning tops out at `max`.
+    // Luna — "Fast and affordable model for easier tasks." (Codex priority 4,
+    // default medium, needs a Codex client >= 0.155.0). $0.10/$0.50 MTok.
+    // Reasoning tops out at `max`.
     id: "gpt-6-luna",
     name: "GPT-6 Luna",
     provider: "openai",
@@ -2281,9 +2304,7 @@ var MODELS = [
     // Sent over our Code Assist (OAuth) transport ahead of gemini-cli — upstream
     // hasn't listed 3.7 yet (google-gemini/gemini-cli#28802, still open) — so
     // free/personal accounts 404 (entitlement-gated) while Code Assist
-    // Standard/Enterprise accounts get it. Kept after the working flash-lite:
-    // getFastModel picks the first low-tier entry, and flash-lite is the one
-    // that works on every account.
+    // Standard/Enterprise accounts get it.
     id: "gemini-3.7-flash",
     name: "Gemini 3.7 Flash",
     provider: "gemini",
@@ -2644,7 +2665,7 @@ function getVideoByteLimit(modelId) {
 }
 function getDefaultModel(provider) {
   if (provider === "xiaomi") return MODELS.find((m) => m.id === "mimo-v2.6-pro");
-  if (provider === "openai") return MODELS.find((m) => m.id === "gpt-6-sol");
+  if (provider === "openai") return MODELS.find((m) => m.id === "gpt-6.1-sol");
   if (provider === "gemini") return MODELS.find((m) => m.id === "gemini-3.1-flash-lite");
   if (provider === "glm") return MODELS.find((m) => m.id === "glm-5.3");
   if (provider === "moonshot") return MODELS.find((m) => m.id === "kimi-k3");
@@ -2694,19 +2715,17 @@ function getDefaultThinkingLevel(modelId, options) {
   if (model?.id === "kimi-k3" && isKimiCodingEndpoint(options?.baseUrl)) return "high";
   return model?.defaultThinkingLevel ?? model?.maxThinkingLevel ?? "high";
 }
+var SUMMARY_COST_TIER = {
+  anthropic: "medium",
+  openai: "low",
+  glm: "low",
+  deepseek: "low",
+  huggingface: "low"
+};
 function getSummaryModel(provider, currentModelId) {
-  if (provider === "anthropic") {
-    return MODELS.find((m) => m.id === "claude-sonnet-5-5");
-  }
-  if (provider === "openai" || provider === "glm" || provider === "deepseek" || provider === "huggingface") {
-    const low = getModelsForProvider(provider).find((m) => m.costTier === "low");
-    if (low) return low;
-  }
-  return getModel(currentModelId) ?? getDefaultModel(provider);
-}
-function getFastModel(provider, currentModelId) {
-  const low = getModelsForProvider(provider).find((m) => m.costTier === "low");
-  return low ?? getModel(currentModelId) ?? getDefaultModel(provider);
+  const tier = SUMMARY_COST_TIER[provider];
+  const tagged = tier ? getModelsForProvider(provider).find((m) => m.costTier === tier) : void 0;
+  return tagged ?? getModel(currentModelId) ?? getDefaultModel(provider);
 }
 
 export {
@@ -2765,7 +2784,6 @@ export {
   getContextWindow,
   getMaxThinkingLevel,
   getDefaultThinkingLevel,
-  getSummaryModel,
-  getFastModel
+  getSummaryModel
 };
-//# sourceMappingURL=chunk-ZCXAIMZF.js.map
+//# sourceMappingURL=chunk-N73LFQ3N.js.map