@ashx-j/lunr 0.1.1 → 0.1.2

package/dist/modes/interactive/interactive-mode.js

@@ -16,6 +16,7 @@ import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, }
 import { formatCatalogRefreshSummary } from "../../core/catalog-merge.js";
 import { computeContextBreakdown } from "../../core/context-breakdown.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
+import { hasGrokCliXaiAuth } from "../../core/grok-cli-auth.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { detectInjectedPrompt } from "../../core/injected-prompt.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
@@ -37,7 +38,7 @@ import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { buildSwarmPrompt } from "../../core/swarm.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { collectUsageHistory } from "../../core/usage-history.js";
-import { getPlanUsage } from "../../core/usage-service.js";
+import { getPlanUsageResult } from "../../core/usage-service.js";
 import { modelToUserEntry } from "../../core/user-models.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
@@ -4654,6 +4655,28 @@ export class InteractiveMode {
             }
         }
         if (providerOption.authType === "oauth") {
+            if (providerOption.id === "xai" && hasGrokCliXaiAuth()) {
+                const choice = await this.showExtensionSelector("xAI SuperGrok is already signed in via Grok CLI.", [
+                    "Use existing Grok CLI login",
+                    "Sign in again",
+                ]);
+                if (choice === undefined)
+                    return;
+                if (choice === "Use existing Grok CLI login") {
+                    try {
+                        const imported = await this.session.modelRuntime.importGrokCliXaiAuth();
+                        if (!imported) {
+                            this.showError("Could not read the Grok CLI SuperGrok session. Run /login xai again.");
+                            return;
+                        }
+                        await this.completeProviderAuthentication(providerOption.id, providerOption.name, "oauth", this.session.model, { actionLabel: "Imported Grok CLI login", savedNote: "Using ~/.grok/auth.json" });
+                    }
+                    catch (error) {
+                        this.showError(`Failed to import Grok CLI login: ${error instanceof Error ? error.message : String(error)}`);
+                    }
+                    return;
+                }
+            }
             await this.showLoginDialog(providerOption.id, providerOption.name);
         }
         else if (providerOption.method?.login) {
@@ -5867,11 +5890,13 @@ export class InteractiveMode {
             : undefined;
         const context = this.session.getContextUsage();
         const provider = this.session.model?.provider;
-        const plan = provider ? await getPlanUsage(provider, this.session.modelRuntime) : undefined;
+        const planResult = provider ? await getPlanUsageResult(provider, this.session.modelRuntime) : {};
         const history = this.collectUsageHistorySafe();
-        const lines = renderUsageBox({ sessionTotals, context, plan, history }, this.ui.terminal.columns);
+        const lines = renderUsageBox({ sessionTotals, context, plan: planResult.usage, history }, this.ui.terminal.columns);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(lines.join("\n"), 1, 0));
+        if (planResult.error)
+            this.showStatus(planResult.error);
         this.ui.requestRender();
     }
     // lunr: /token-usage — per-model token breakdown for the current session and