@dexto/tui 1.6.12 → 1.6.13

package/dist/containers/OverlayContainer.cjs

@@ -55,6 +55,9 @@ var import_SessionSubcommandSelector = __toESM(require("../components/overlays/S
 var import_McpCustomTypeSelector = __toESM(require("../components/overlays/McpCustomTypeSelector.js"), 1);
 var import_McpCustomWizard = __toESM(require("../components/overlays/McpCustomWizard.js"), 1);
 var import_CustomModelWizard = __toESM(require("../components/overlays/CustomModelWizard.js"), 1);
+var import_ChatGPTUsageCapOverlay = __toESM(require("../components/overlays/ChatGPTUsageCapOverlay.js"), 1);
+var import_llm_provider_display = require("../utils/llm-provider-display.js");
+var import_chatgpt_rate_limit = require("../utils/chatgpt-rate-limit.js");
 var import_agent_management = require("@dexto/agent-management");
 var import_ApiKeyInput = __toESM(require("../components/overlays/ApiKeyInput.js"), 1);
 var import_SearchOverlay = __toESM(require("../components/overlays/SearchOverlay.js"), 1);
@@ -138,6 +141,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
     const mcpCustomWizardRef = (0, import_react.useRef)(null);
     const customModelWizardRef = (0, import_react.useRef)(null);
     const sessionSubcommandSelectorRef = (0, import_react.useRef)(null);
+    const chatGPTUsageCapRef = (0, import_react.useRef)(null);
     const apiKeyInputRef = (0, import_react.useRef)(null);
     const loginOverlayRef = (0, import_react.useRef)(null);
     const logoutOverlayRef = (0, import_react.useRef)(null);
@@ -217,6 +221,8 @@ const OverlayContainer = (0, import_react.forwardRef)(
               return customModelWizardRef.current?.handleInput(inputStr, key) ?? false;
             case "session-subcommand-selector":
               return sessionSubcommandSelectorRef.current?.handleInput(inputStr, key) ?? false;
+            case "chatgpt-usage-cap":
+              return chatGPTUsageCapRef.current?.handleInput(inputStr, key) ?? false;
             case "api-key-input":
               return apiKeyInputRef.current?.handleInput(inputStr, key) ?? false;
             case "login":
@@ -337,12 +343,17 @@ const OverlayContainer = (0, import_react.forwardRef)(
       return null;
     };
     const persistRecentModel = (0, import_react.useCallback)(
-      async (provider, model) => {
+      async (provider, model, baseURL) => {
         try {
-          await (0, import_agent_management.recordRecentModel)({ provider, model });
+          await (0, import_agent_management.recordRecentModel)({
+            provider,
+            model,
+            ...baseURL ? { baseURL } : {}
+          });
         } catch (error) {
+          const modelKey = baseURL ? `${provider}/${model} (${baseURL})` : `${provider}/${model}`;
           agent.logger.debug(
-            `Failed to persist recent model (${provider}/${model}): ${error instanceof Error ? error.message : String(error)}`
+            `Failed to persist recent model (${modelKey}): ${error instanceof Error ? error.message : String(error)}`
           );
         }
       },
@@ -350,6 +361,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
     );
     const handleModelSelect = (0, import_react.useCallback)(
       async (provider, model, displayName, baseURL, reasoningVariant) => {
+        const providerLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(provider, baseURL);
         if (provider === "dexto-nova") {
           try {
             const canUse = await (0, import_host.canUseDextoProvider)();
@@ -387,7 +399,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
             {
               id: (0, import_idGenerator.generateMessageId)("system"),
               role: "system",
-              content: `\u{1F504} Switching to ${displayName || model} (${provider})...`,
+              content: `\u{1F504} Switching to ${displayName || model} (${providerLabel})...`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
@@ -400,20 +412,24 @@ const OverlayContainer = (0, import_react.forwardRef)(
             },
             session.id || void 0
           );
-          await persistRecentModel(provider, model);
+          await persistRecentModel(provider, model, baseURL);
           setSession((prev) => ({ ...prev, modelName: displayName || model }));
           setMessages((prev) => [
             ...prev,
             {
               id: (0, import_idGenerator.generateMessageId)("system"),
               role: "system",
-              content: `\u2705 Successfully switched to ${displayName || model} (${provider})`,
+              content: `\u2705 Successfully switched to ${displayName || model} (${providerLabel})`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
         } catch (error) {
           const missingProvider = isApiKeyMissingError(error);
           if (missingProvider) {
+            const missingProviderLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(
+              missingProvider,
+              missingProvider === provider ? baseURL : void 0
+            );
             setUi((prev) => ({
               ...prev,
               activeOverlay: "api-key-input",
@@ -430,7 +446,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
               {
                 id: (0, import_idGenerator.generateMessageId)("system"),
                 role: "system",
-                content: `\u{1F511} API key required for ${provider}`,
+                content: `\u{1F511} API key required for ${missingProviderLabel}`,
                 timestamp: /* @__PURE__ */ new Date()
               }
             ]);
@@ -460,6 +476,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
     );
     const handleSetDefaultModel = (0, import_react.useCallback)(
       async (provider, model, displayName, baseURL, reasoningVariant) => {
+        const providerLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(provider, baseURL);
         try {
           let providerEnvVar;
           try {
@@ -511,20 +528,24 @@ const OverlayContainer = (0, import_react.forwardRef)(
               },
               session.id || void 0
             );
-            await persistRecentModel(provider, model);
+            await persistRecentModel(provider, model, baseURL);
             setSession((prev) => ({ ...prev, modelName: displayName || model }));
             setMessages((prev) => [
               ...prev,
               {
                 id: (0, import_idGenerator.generateMessageId)("system"),
                 role: "system",
-                content: `\u2705 Default model set to ${displayName || model} (${provider})`,
+                content: `\u2705 Default model set to ${displayName || model} (${providerLabel})`,
                 timestamp: /* @__PURE__ */ new Date()
               }
             ]);
           } catch (error) {
             const missingProvider = isApiKeyMissingError(error);
             if (missingProvider) {
+              const missingProviderLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(
+                missingProvider,
+                missingProvider === provider ? baseURL : void 0
+              );
               setUi((prev) => ({
                 ...prev,
                 activeOverlay: "api-key-input",
@@ -541,7 +562,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
                 {
                   id: (0, import_idGenerator.generateMessageId)("system"),
                   role: "system",
-                  content: `\u{1F511} API key required for ${provider}`,
+                  content: `\u{1F511} API key required for ${missingProviderLabel}`,
                   timestamp: /* @__PURE__ */ new Date()
                 }
               ]);
@@ -612,6 +633,51 @@ const OverlayContainer = (0, import_react.forwardRef)(
       },
       [setUi, setInput, setMessages, buffer, editingModel, handleModelSelect]
     );
+    const handleChatGPTUsageCapClose = (0, import_react.useCallback)(() => {
+      setUi((prev) => ({
+        ...prev,
+        activeOverlay: "none"
+      }));
+    }, [setUi]);
+    const handleChatGPTUsageCapConfirm = (0, import_react.useCallback)(async () => {
+      const currentLLMConfig2 = session.id ? agent.getCurrentLLMConfig(session.id) : agent.getCurrentLLMConfig();
+      const fallbackTarget = (0, import_chatgpt_rate_limit.resolveChatGPTFallbackModel)(currentLLMConfig2.model);
+      const providerKeyStatus = (0, import_agent_management.getProviderKeyStatus)(fallbackTarget.provider);
+      const reasoningVariant = fallbackTarget.usedDefaultFallback ? void 0 : currentLLMConfig2.reasoning?.variant;
+      if (providerKeyStatus.hasApiKey) {
+        setUi((prev) => ({
+          ...prev,
+          activeOverlay: "none"
+        }));
+        await handleModelSelect(
+          fallbackTarget.provider,
+          fallbackTarget.model,
+          fallbackTarget.displayName,
+          void 0,
+          reasoningVariant
+        );
+        return;
+      }
+      setUi((prev) => ({
+        ...prev,
+        activeOverlay: "api-key-input",
+        pendingModelSwitch: {
+          provider: fallbackTarget.provider,
+          model: fallbackTarget.model,
+          displayName: fallbackTarget.displayName,
+          ...reasoningVariant !== void 0 ? { reasoningVariant } : {}
+        }
+      }));
+      setMessages((prev) => [
+        ...prev,
+        {
+          id: (0, import_idGenerator.generateMessageId)("system"),
+          role: "system",
+          content: "\u{1F511} ChatGPT Login hit its usage cap. Add an OpenAI API key to continue with the API provider.",
+          timestamp: /* @__PURE__ */ new Date()
+        }
+      ]);
+    }, [agent, handleModelSelect, session.id, setMessages, setUi]);
     const handleApiKeySaved = (0, import_react.useCallback)(
       async (meta) => {
         const pending = ui.pendingModelSwitch;
@@ -639,12 +705,16 @@ const OverlayContainer = (0, import_react.forwardRef)(
         ]);
         try {
           const pendingDisplayName = pending.displayName || pending.model;
+          const pendingProviderLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(
+            pending.provider,
+            pending.baseURL
+          );
           setMessages((prev) => [
             ...prev,
             {
               id: (0, import_idGenerator.generateMessageId)("system"),
               role: "system",
-              content: `\u{1F504} Retrying switch to ${pendingDisplayName} (${pending.provider})...`,
+              content: `\u{1F504} Retrying switch to ${pendingDisplayName} (${pendingProviderLabel})...`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
@@ -661,14 +731,18 @@ const OverlayContainer = (0, import_react.forwardRef)(
             },
             session.id || void 0
           );
-          await persistRecentModel(pending.provider, pending.model);
+          await persistRecentModel(
+            pending.provider,
+            pending.model,
+            pending.baseURL
+          );
           setSession((prev) => ({ ...prev, modelName: pendingDisplayName }));
           setMessages((prev) => [
             ...prev,
             {
               id: (0, import_idGenerator.generateMessageId)("system"),
               role: "system",
-              content: `\u2705 Successfully switched to ${pendingDisplayName} (${pending.provider})`,
+              content: `\u2705 Successfully switched to ${pendingDisplayName} (${pendingProviderLabel})`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
@@ -2033,6 +2107,9 @@ Use /${data.name} to run it.`,
     const handleSessionRenameClose = (0, import_react.useCallback)(() => {
       setUi((prev) => ({ ...prev, activeOverlay: "none" }));
     }, [setUi]);
+    const currentLLMConfig = session.id ? agent.getCurrentLLMConfig(session.id) : agent.getCurrentLLMConfig();
+    const chatGPTFallbackTarget = (0, import_chatgpt_rate_limit.resolveChatGPTFallbackModel)(currentLLMConfig.model);
+    const chatGPTFallbackKeyStatus = (0, import_agent_management.getProviderKeyStatus)(chatGPTFallbackTarget.provider);
     const hideCliChrome = (0, import_overlayPresentation.shouldHideCliChrome)(ui.activeOverlay, approval);
     const overlayContent = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
       approval && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -2288,6 +2365,20 @@ Use /${data.name} to run it.`,
           onClose: handleClose
         }
       ) }),
+      ui.activeOverlay === "chatgpt-usage-cap" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_ChatGPTUsageCapOverlay.default,
+        {
+          ref: chatGPTUsageCapRef,
+          isVisible: true,
+          currentModelDisplayName: session.modelName,
+          fallbackModelDisplayName: chatGPTFallbackTarget.displayName,
+          usedDefaultFallback: chatGPTFallbackTarget.usedDefaultFallback,
+          apiKeyConfigured: chatGPTFallbackKeyStatus.hasApiKey,
+          status: ui.chatgptRateLimitStatus,
+          onConfirm: handleChatGPTUsageCapConfirm,
+          onClose: handleChatGPTUsageCapClose
+        }
+      ) }),
       ui.activeOverlay === "login" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_LoginOverlay.default,
         {

package/dist/containers/OverlayContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../src/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAG9F,OAAO,KAAK,EAAE,UAAU,EAAmD,MAAM,aAAa,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AAuIzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAsC3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGA6vF5B,CAAC"}
+{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../src/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAG9F,OAAO,KAAK,EAAE,UAAU,EAAmD,MAAM,aAAa,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AA4IzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAsC3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGAy2F5B,CAAC"}

package/dist/containers/OverlayContainer.js

@@ -30,6 +30,9 @@ import SessionSubcommandSelector from "../components/overlays/SessionSubcommandS
 import McpCustomTypeSelector from "../components/overlays/McpCustomTypeSelector.js";
 import McpCustomWizard from "../components/overlays/McpCustomWizard.js";
 import CustomModelWizard from "../components/overlays/CustomModelWizard.js";
+import ChatGPTUsageCapOverlay from "../components/overlays/ChatGPTUsageCapOverlay.js";
+import { getLLMProviderDisplayName } from "../utils/llm-provider-display.js";
+import { resolveChatGPTFallbackModel } from "../utils/chatgpt-rate-limit.js";
 import {
   getProviderKeyStatus,
   loadGlobalPreferences,
@@ -124,6 +127,7 @@ const OverlayContainer = forwardRef(
     const mcpCustomWizardRef = useRef(null);
     const customModelWizardRef = useRef(null);
     const sessionSubcommandSelectorRef = useRef(null);
+    const chatGPTUsageCapRef = useRef(null);
     const apiKeyInputRef = useRef(null);
     const loginOverlayRef = useRef(null);
     const logoutOverlayRef = useRef(null);
@@ -203,6 +207,8 @@ const OverlayContainer = forwardRef(
               return customModelWizardRef.current?.handleInput(inputStr, key) ?? false;
             case "session-subcommand-selector":
               return sessionSubcommandSelectorRef.current?.handleInput(inputStr, key) ?? false;
+            case "chatgpt-usage-cap":
+              return chatGPTUsageCapRef.current?.handleInput(inputStr, key) ?? false;
             case "api-key-input":
               return apiKeyInputRef.current?.handleInput(inputStr, key) ?? false;
             case "login":
@@ -323,12 +329,17 @@ const OverlayContainer = forwardRef(
       return null;
     };
     const persistRecentModel = useCallback(
-      async (provider, model) => {
+      async (provider, model, baseURL) => {
         try {
-          await recordRecentModel({ provider, model });
+          await recordRecentModel({
+            provider,
+            model,
+            ...baseURL ? { baseURL } : {}
+          });
         } catch (error) {
+          const modelKey = baseURL ? `${provider}/${model} (${baseURL})` : `${provider}/${model}`;
           agent.logger.debug(
-            `Failed to persist recent model (${provider}/${model}): ${error instanceof Error ? error.message : String(error)}`
+            `Failed to persist recent model (${modelKey}): ${error instanceof Error ? error.message : String(error)}`
           );
         }
       },
@@ -336,6 +347,7 @@ const OverlayContainer = forwardRef(
     );
     const handleModelSelect = useCallback(
       async (provider, model, displayName, baseURL, reasoningVariant) => {
+        const providerLabel = getLLMProviderDisplayName(provider, baseURL);
         if (provider === "dexto-nova") {
           try {
             const canUse = await canUseDextoProvider();
@@ -373,7 +385,7 @@ const OverlayContainer = forwardRef(
             {
               id: generateMessageId("system"),
               role: "system",
-              content: `\u{1F504} Switching to ${displayName || model} (${provider})...`,
+              content: `\u{1F504} Switching to ${displayName || model} (${providerLabel})...`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
@@ -386,20 +398,24 @@ const OverlayContainer = forwardRef(
             },
             session.id || void 0
           );
-          await persistRecentModel(provider, model);
+          await persistRecentModel(provider, model, baseURL);
           setSession((prev) => ({ ...prev, modelName: displayName || model }));
           setMessages((prev) => [
             ...prev,
             {
               id: generateMessageId("system"),
               role: "system",
-              content: `\u2705 Successfully switched to ${displayName || model} (${provider})`,
+              content: `\u2705 Successfully switched to ${displayName || model} (${providerLabel})`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
         } catch (error) {
           const missingProvider = isApiKeyMissingError(error);
           if (missingProvider) {
+            const missingProviderLabel = getLLMProviderDisplayName(
+              missingProvider,
+              missingProvider === provider ? baseURL : void 0
+            );
             setUi((prev) => ({
               ...prev,
               activeOverlay: "api-key-input",
@@ -416,7 +432,7 @@ const OverlayContainer = forwardRef(
               {
                 id: generateMessageId("system"),
                 role: "system",
-                content: `\u{1F511} API key required for ${provider}`,
+                content: `\u{1F511} API key required for ${missingProviderLabel}`,
                 timestamp: /* @__PURE__ */ new Date()
               }
             ]);
@@ -446,6 +462,7 @@ const OverlayContainer = forwardRef(
     );
     const handleSetDefaultModel = useCallback(
       async (provider, model, displayName, baseURL, reasoningVariant) => {
+        const providerLabel = getLLMProviderDisplayName(provider, baseURL);
         try {
           let providerEnvVar;
           try {
@@ -497,20 +514,24 @@ const OverlayContainer = forwardRef(
               },
               session.id || void 0
             );
-            await persistRecentModel(provider, model);
+            await persistRecentModel(provider, model, baseURL);
             setSession((prev) => ({ ...prev, modelName: displayName || model }));
             setMessages((prev) => [
               ...prev,
               {
                 id: generateMessageId("system"),
                 role: "system",
-                content: `\u2705 Default model set to ${displayName || model} (${provider})`,
+                content: `\u2705 Default model set to ${displayName || model} (${providerLabel})`,
                 timestamp: /* @__PURE__ */ new Date()
               }
             ]);
           } catch (error) {
             const missingProvider = isApiKeyMissingError(error);
             if (missingProvider) {
+              const missingProviderLabel = getLLMProviderDisplayName(
+                missingProvider,
+                missingProvider === provider ? baseURL : void 0
+              );
               setUi((prev) => ({
                 ...prev,
                 activeOverlay: "api-key-input",
@@ -527,7 +548,7 @@ const OverlayContainer = forwardRef(
                 {
                   id: generateMessageId("system"),
                   role: "system",
-                  content: `\u{1F511} API key required for ${provider}`,
+                  content: `\u{1F511} API key required for ${missingProviderLabel}`,
                   timestamp: /* @__PURE__ */ new Date()
                 }
               ]);
@@ -598,6 +619,51 @@ const OverlayContainer = forwardRef(
       },
       [setUi, setInput, setMessages, buffer, editingModel, handleModelSelect]
     );
+    const handleChatGPTUsageCapClose = useCallback(() => {
+      setUi((prev) => ({
+        ...prev,
+        activeOverlay: "none"
+      }));
+    }, [setUi]);
+    const handleChatGPTUsageCapConfirm = useCallback(async () => {
+      const currentLLMConfig2 = session.id ? agent.getCurrentLLMConfig(session.id) : agent.getCurrentLLMConfig();
+      const fallbackTarget = resolveChatGPTFallbackModel(currentLLMConfig2.model);
+      const providerKeyStatus = getProviderKeyStatus(fallbackTarget.provider);
+      const reasoningVariant = fallbackTarget.usedDefaultFallback ? void 0 : currentLLMConfig2.reasoning?.variant;
+      if (providerKeyStatus.hasApiKey) {
+        setUi((prev) => ({
+          ...prev,
+          activeOverlay: "none"
+        }));
+        await handleModelSelect(
+          fallbackTarget.provider,
+          fallbackTarget.model,
+          fallbackTarget.displayName,
+          void 0,
+          reasoningVariant
+        );
+        return;
+      }
+      setUi((prev) => ({
+        ...prev,
+        activeOverlay: "api-key-input",
+        pendingModelSwitch: {
+          provider: fallbackTarget.provider,
+          model: fallbackTarget.model,
+          displayName: fallbackTarget.displayName,
+          ...reasoningVariant !== void 0 ? { reasoningVariant } : {}
+        }
+      }));
+      setMessages((prev) => [
+        ...prev,
+        {
+          id: generateMessageId("system"),
+          role: "system",
+          content: "\u{1F511} ChatGPT Login hit its usage cap. Add an OpenAI API key to continue with the API provider.",
+          timestamp: /* @__PURE__ */ new Date()
+        }
+      ]);
+    }, [agent, handleModelSelect, session.id, setMessages, setUi]);
     const handleApiKeySaved = useCallback(
       async (meta) => {
         const pending = ui.pendingModelSwitch;
@@ -625,12 +691,16 @@ const OverlayContainer = forwardRef(
         ]);
         try {
           const pendingDisplayName = pending.displayName || pending.model;
+          const pendingProviderLabel = getLLMProviderDisplayName(
+            pending.provider,
+            pending.baseURL
+          );
           setMessages((prev) => [
             ...prev,
             {
               id: generateMessageId("system"),
               role: "system",
-              content: `\u{1F504} Retrying switch to ${pendingDisplayName} (${pending.provider})...`,
+              content: `\u{1F504} Retrying switch to ${pendingDisplayName} (${pendingProviderLabel})...`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
@@ -647,14 +717,18 @@ const OverlayContainer = forwardRef(
             },
             session.id || void 0
           );
-          await persistRecentModel(pending.provider, pending.model);
+          await persistRecentModel(
+            pending.provider,
+            pending.model,
+            pending.baseURL
+          );
           setSession((prev) => ({ ...prev, modelName: pendingDisplayName }));
           setMessages((prev) => [
             ...prev,
             {
               id: generateMessageId("system"),
               role: "system",
-              content: `\u2705 Successfully switched to ${pendingDisplayName} (${pending.provider})`,
+              content: `\u2705 Successfully switched to ${pendingDisplayName} (${pendingProviderLabel})`,
               timestamp: /* @__PURE__ */ new Date()
             }
           ]);
@@ -2019,6 +2093,9 @@ Use /${data.name} to run it.`,
     const handleSessionRenameClose = useCallback(() => {
       setUi((prev) => ({ ...prev, activeOverlay: "none" }));
     }, [setUi]);
+    const currentLLMConfig = session.id ? agent.getCurrentLLMConfig(session.id) : agent.getCurrentLLMConfig();
+    const chatGPTFallbackTarget = resolveChatGPTFallbackModel(currentLLMConfig.model);
+    const chatGPTFallbackKeyStatus = getProviderKeyStatus(chatGPTFallbackTarget.provider);
     const hideCliChrome = shouldHideCliChrome(ui.activeOverlay, approval);
     const overlayContent = /* @__PURE__ */ jsxs(Fragment, { children: [
       approval && /* @__PURE__ */ jsx(
@@ -2274,6 +2351,20 @@ Use /${data.name} to run it.`,
           onClose: handleClose
         }
       ) }),
+      ui.activeOverlay === "chatgpt-usage-cap" && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
+        ChatGPTUsageCapOverlay,
+        {
+          ref: chatGPTUsageCapRef,
+          isVisible: true,
+          currentModelDisplayName: session.modelName,
+          fallbackModelDisplayName: chatGPTFallbackTarget.displayName,
+          usedDefaultFallback: chatGPTFallbackTarget.usedDefaultFallback,
+          apiKeyConfigured: chatGPTFallbackKeyStatus.hasApiKey,
+          status: ui.chatgptRateLimitStatus,
+          onConfirm: handleChatGPTUsageCapConfirm,
+          onClose: handleChatGPTUsageCapClose
+        }
+      ) }),
       ui.activeOverlay === "login" && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
         LoginOverlay,
         {

package/dist/hooks/useAgentEvents.cjs

@@ -58,6 +58,28 @@ function useAgentEvents({
             )
           }));
         }
+        const nextIsChatGPTLogin = payload.newConfig?.provider === "openai-compatible" && (0, import_core.parseCodexBaseURL)(payload.newConfig?.baseURL)?.authMode === "chatgpt";
+        if (!nextIsChatGPTLogin) {
+          setUi((prev) => ({
+            ...prev,
+            chatgptRateLimitStatus: null,
+            ...prev.activeOverlay === "chatgpt-usage-cap" ? { activeOverlay: "none" } : {}
+          }));
+        }
+      },
+      { signal }
+    );
+    agent.on(
+      "llm:rate-limit-status",
+      (payload) => {
+        if (payload.sessionId !== currentSessionId) {
+          return;
+        }
+        setUi((prev) => ({
+          ...prev,
+          chatgptRateLimitStatus: payload.snapshot,
+          ...payload.snapshot.exceeded && prev.activeOverlay === "none" ? { activeOverlay: "chatgpt-usage-cap" } : {}
+        }));
       },
       { signal }
     );
@@ -142,7 +164,11 @@ function useAgentEvents({
         setApproval(null);
         setApprovalQueue([]);
         setQueuedMessages([]);
-        setUi((prev) => ({ ...prev, activeOverlay: "none" }));
+        setUi((prev) => ({
+          ...prev,
+          activeOverlay: "none",
+          chatgptRateLimitStatus: null
+        }));
       },
       { signal }
     );
@@ -181,6 +207,7 @@ function useAgentEvents({
           setUi((prev) => ({
             ...prev,
             activeOverlay: "none",
+            chatgptRateLimitStatus: null,
             historySearch: {
               isActive: false,
               query: "",
@@ -199,7 +226,11 @@ function useAgentEvents({
         setApproval(null);
         setApprovalQueue([]);
         setQueuedMessages([]);
-        setUi((prev) => ({ ...prev, activeOverlay: "none" }));
+        setUi((prev) => ({
+          ...prev,
+          activeOverlay: "none",
+          chatgptRateLimitStatus: null
+        }));
       },
       { signal }
     );

package/dist/hooks/useAgentEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../src/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAEH,KAAK,UAAU,EACf,KAAK,aAAa,EAErB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,UAAU,mBAAmB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CA6d5B"}
+{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../src/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAGH,KAAK,UAAU,EACf,KAAK,aAAa,EAErB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,UAAU,mBAAmB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAsgB5B"}

package/dist/hooks/useAgentEvents.js

@@ -1,7 +1,8 @@
 import { useEffect, useRef } from "react";
 import { setMaxListeners } from "events";
 import {
-  getModelDisplayName
+  getModelDisplayName,
+  parseCodexBaseURL
 } from "@dexto/core";
 import { generateMessageId } from "../utils/idGenerator.js";
 function extractTextContent(content) {
@@ -37,6 +38,28 @@ function useAgentEvents({
             )
           }));
         }
+        const nextIsChatGPTLogin = payload.newConfig?.provider === "openai-compatible" && parseCodexBaseURL(payload.newConfig?.baseURL)?.authMode === "chatgpt";
+        if (!nextIsChatGPTLogin) {
+          setUi((prev) => ({
+            ...prev,
+            chatgptRateLimitStatus: null,
+            ...prev.activeOverlay === "chatgpt-usage-cap" ? { activeOverlay: "none" } : {}
+          }));
+        }
+      },
+      { signal }
+    );
+    agent.on(
+      "llm:rate-limit-status",
+      (payload) => {
+        if (payload.sessionId !== currentSessionId) {
+          return;
+        }
+        setUi((prev) => ({
+          ...prev,
+          chatgptRateLimitStatus: payload.snapshot,
+          ...payload.snapshot.exceeded && prev.activeOverlay === "none" ? { activeOverlay: "chatgpt-usage-cap" } : {}
+        }));
       },
       { signal }
     );
@@ -121,7 +144,11 @@ function useAgentEvents({
         setApproval(null);
         setApprovalQueue([]);
         setQueuedMessages([]);
-        setUi((prev) => ({ ...prev, activeOverlay: "none" }));
+        setUi((prev) => ({
+          ...prev,
+          activeOverlay: "none",
+          chatgptRateLimitStatus: null
+        }));
       },
       { signal }
     );
@@ -160,6 +187,7 @@ function useAgentEvents({
           setUi((prev) => ({
             ...prev,
             activeOverlay: "none",
+            chatgptRateLimitStatus: null,
             historySearch: {
               isActive: false,
               query: "",
@@ -178,7 +206,11 @@ function useAgentEvents({
         setApproval(null);
         setApprovalQueue([]);
         setQueuedMessages([]);
-        setUi((prev) => ({ ...prev, activeOverlay: "none" }));
+        setUi((prev) => ({
+          ...prev,
+          activeOverlay: "none",
+          chatgptRateLimitStatus: null
+        }));
       },
       { signal }
     );