@astra-cli/cli 1.2.8 → 1.3.0

package/dist/astra.js

@@ -204,6 +204,7 @@ var ConfigSchema = z2.object({
     }).optional()
   }),
   apiBase: z2.string().default("https://agents.astranova.live"),
+  savedKeys: z2.record(z2.string()).optional(),
   preferences: z2.object({
     theme: z2.enum(["dark", "light"]).default("dark")
   }).default({}),
@@ -1356,9 +1357,14 @@ function pluginTagline(pluginName, tagline) {
   const capitalized = pluginName.charAt(0).toUpperCase() + pluginName.slice(1);
   return `${GREEN}Welcome to ${capitalized} \xB7 ${tagline}${RESET}`;
 }
-var __dirname = dirname(fileURLToPath(import.meta.url));
-var pkg = JSON.parse(readFileSync(resolve(__dirname, "..", "package.json"), "utf-8"));
-var VERSION = `${GREEN}v${pkg.version}${RESET}`;
+var version = "0.0.0";
+try {
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  const pkg = JSON.parse(readFileSync(resolve(__dirname, "..", "package.json"), "utf-8"));
+  version = pkg.version;
+} catch {
+}
+var VERSION = `${GREEN}v${version}${RESET}`;
 
 // src/onboarding/index.ts
 async function runOnboarding() {
@@ -4245,7 +4251,7 @@ function extractNarrativeContent(skillMd) {
 function buildManifestFromMeta(meta) {
   const rawName = typeof meta.name === "string" ? meta.name.trim() : void 0;
   const name = rawName && /^[a-z0-9_-]+$/.test(rawName) ? rawName : void 0;
-  const version = typeof meta.version === "string" ? meta.version.trim() : "0.0.0";
+  const version2 = typeof meta.version === "string" ? meta.version.trim() : "0.0.0";
   const description = typeof meta.description === "string" ? meta.description.trim() : name ?? "Unknown";
   const apiBase = typeof meta.apiBase === "string" ? meta.apiBase.trim().replace(/\/$/, "") : void 0;
   let allowedPaths;
@@ -4254,7 +4260,7 @@ function buildManifestFromMeta(meta) {
   } else if (typeof meta.allowedPaths === "string") {
     allowedPaths = [meta.allowedPaths];
   }
-  return { name, version, description, apiBase, allowedPaths };
+  return { name, version: version2, description, apiBase, allowedPaths };
 }
 async function fetchWithLimit(url, maxBytes, timeoutMs) {
   const controller = new AbortController();
@@ -5125,7 +5131,7 @@ import { useState as useState3, useEffect as useEffect2 } from "react";
 import { Text as Text9 } from "ink";
 import { jsxs as jsxs9 } from "react/jsx-runtime";
 var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var INTERVAL_MS = 120;
+var INTERVAL_MS = 80;
 function Spinner({ label }) {
   const [frame, setFrame] = useState3(0);
   useEffect2(() => {
@@ -5179,27 +5185,9 @@ function App({
     isLoadingRef.current = isLoading;
   }, [isLoading]);
   const [toolName, setToolName] = useState4(void 0);
-  const streamBufferRef = useRef2("");
-  const streamFlushTimerRef = useRef2(null);
-  const flushStreamBuffer = useCallback2(() => {
-    streamFlushTimerRef.current = null;
-    setStreamingText((prev) => (prev ?? "") + streamBufferRef.current);
-    streamBufferRef.current = "";
-  }, []);
-  const appendStreamChunk = useCallback2((chunk) => {
-    streamBufferRef.current += chunk;
-    if (!streamFlushTimerRef.current) {
-      streamFlushTimerRef.current = setTimeout(flushStreamBuffer, 50);
-    }
-  }, [flushStreamBuffer]);
-  const clearStream = useCallback2(() => {
-    if (streamFlushTimerRef.current) {
-      clearTimeout(streamFlushTimerRef.current);
-      streamFlushTimerRef.current = null;
-    }
-    streamBufferRef.current = "";
-    clearStream();
-  }, []);
+  const [awaitingApiKey, setAwaitingApiKey] = useState4(null);
+  const [validatingKey, setValidatingKey] = useState4(false);
+  const oauthVerifierRef = useRef2(null);
   const [autopilotMode, setAutopilotMode] = useState4(initialAutopilotConfig?.mode ?? "off");
   const [autopilotIntervalMs, setAutopilotIntervalMs] = useState4(initialAutopilotConfig?.intervalMs ?? 3e5);
   const epochCallCountRef = useRef2(0);
@@ -5269,7 +5257,7 @@ function App({
           { ...profile, autopilotMode },
           {
             onTextChunk: displayMode === "chat" ? (chunk) => {
-              appendStreamChunk(chunk);
+              setStreamingText((prev) => (prev ?? "") + chunk);
             } : () => {
             },
             onToolCallStart: displayMode === "chat" ? (name) => {
@@ -5289,7 +5277,7 @@ function App({
         setCoreMessages(updatedCore);
         const responseText = result.text.trim();
         if (displayMode === "chat") {
-          clearStream();
+          setStreamingText(void 0);
           setChatMessages((prev) => [
             ...prev,
             { role: "assistant", content: responseText || "Market checked \u2014 holding." }
@@ -5310,7 +5298,7 @@ function App({
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
         if (displayMode === "chat") {
-          clearStream();
+          setStreamingText(void 0);
           setChatMessages((prev) => [...prev, { role: "assistant", content: `Autopilot error: ${message}` }]);
         } else {
           addLogEntry("error", message);
@@ -5320,7 +5308,7 @@ function App({
         if (displayMode === "chat") setToolName(void 0);
       }
     },
-    [skillContext, tradingContext, walletContext, rewardsContext, onboardingContext, apiContext, profile, autopilotMode, agentName, sessionId, memoryContent, addLogEntry, appendStreamChunk, clearStream, pluginMap]
+    [skillContext, tradingContext, walletContext, rewardsContext, onboardingContext, apiContext, profile, autopilotMode, agentName, sessionId, memoryContent, addLogEntry, pluginMap]
   );
   useEffect3(() => {
     if (!hasAutopilot || autopilotMode === "off") return;
@@ -5346,6 +5334,103 @@ function App({
   const sendMessage = useCallback2(
     async (userText, displayRole = "user") => {
       let skipChatDisplay = false;
+      if (awaitingApiKey) {
+        if (userText.startsWith("/model")) {
+          setAwaitingApiKey(null);
+          oauthVerifierRef.current = null;
+        } else if (awaitingApiKey.startsWith("oauth-paste:")) {
+          const expectedState = awaitingApiKey.slice("oauth-paste:".length);
+          const trimmed = userText.trim();
+          if (!trimmed) return;
+          const parsed = parseCallbackUrl(trimmed, expectedState);
+          if ("error" in parsed) {
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "user", content: trimmed.slice(0, 40) + "..." },
+              { role: "assistant", content: `${parsed.error}
+
+Paste the full redirect URL, or type \`/model\` to cancel.` }
+            ]);
+            return;
+          }
+          const verifier = oauthVerifierRef.current;
+          if (!verifier) {
+            setAwaitingApiKey(null);
+            setChatMessages((prev) => [...prev, { role: "assistant", content: "OAuth session expired. Try `/model codex` again." }]);
+            return;
+          }
+          setValidatingKey(true);
+          setChatMessages((prev) => [...prev, { role: "user", content: trimmed.slice(0, 40) + "..." }]);
+          try {
+            const tokens = await exchangeCodeForTokens({ code: parsed.code, codeVerifier: verifier });
+            oauthVerifierRef.current = null;
+            setValidatingKey(false);
+            const cfg = loadConfig();
+            if (cfg.auth.type === "api-key" && cfg.auth.apiKey) {
+              cfg.savedKeys = { ...cfg.savedKeys, [cfg.provider]: cfg.auth.apiKey };
+            }
+            cfg.provider = "openai-oauth";
+            cfg.model = DEFAULT_MODELS["openai-oauth"] ?? "gpt-5.3-codex";
+            cfg.auth = {
+              type: "oauth",
+              oauth: { accessToken: tokens.accessToken, refreshToken: tokens.refreshToken, expiresAt: tokens.expiresAt, clientId: tokens.clientId }
+            };
+            saveConfig(cfg);
+            providerRef.current = "openai-oauth";
+            setAwaitingApiKey(null);
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "assistant", content: `Switched to **Codex** (${DEFAULT_MODELS["openai-oauth"]})` }
+            ]);
+          } catch (error) {
+            setValidatingKey(false);
+            const msg = error instanceof Error ? error.message : "Unknown error";
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "assistant", content: `OAuth token exchange failed: ${msg}
+
+Try \`/model codex\` again.` }
+            ]);
+            setAwaitingApiKey(null);
+            oauthVerifierRef.current = null;
+          }
+          return;
+        } else {
+          const trimmedKey = userText.trim();
+          if (!trimmedKey) return;
+          setValidatingKey(true);
+          setChatMessages((prev) => [...prev, { role: "user", content: "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022" }]);
+          const result = await validateApiKey(awaitingApiKey, trimmedKey);
+          setValidatingKey(false);
+          if (!result.ok) {
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "assistant", content: `Key validation failed: ${result.error}
+
+Paste a valid key to retry, or type \`/model\` to cancel.` }
+            ]);
+            return;
+          }
+          const targetProvider = awaitingApiKey;
+          const config = loadConfig();
+          if (config.auth.type === "api-key" && config.auth.apiKey) {
+            config.savedKeys = { ...config.savedKeys, [config.provider]: config.auth.apiKey };
+          }
+          config.provider = targetProvider;
+          config.model = DEFAULT_MODELS[targetProvider] ?? "";
+          config.auth = { type: "api-key", apiKey: trimmedKey };
+          config.savedKeys = { ...config.savedKeys, [targetProvider]: trimmedKey };
+          saveConfig(config);
+          providerRef.current = targetProvider;
+          setAwaitingApiKey(null);
+          const modelName = DEFAULT_MODELS[targetProvider] ?? targetProvider;
+          setChatMessages((prev) => [
+            ...prev,
+            { role: "assistant", content: `Switched to **${providerLabel(targetProvider)}** (${modelName})` }
+          ]);
+          return;
+        }
+      }
       if (userText.startsWith("/")) {
         const parts = userText.trim().split(/\s+/);
         const cmd = parts[0].toLowerCase();
@@ -5375,6 +5460,140 @@ function App({
           setTimeout(() => exit(), 800);
           return;
         }
+        if (cmd === "/model") {
+          const arg = parts[1]?.toLowerCase();
+          const config = loadConfig();
+          const currentProvider = config.provider;
+          const currentModel = config.model;
+          if (!arg) {
+            const available = ["claude", "openai", "gemini", "codex"].filter(
+              (p) => p !== providerAlias(currentProvider)
+            );
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "user", content: userText },
+              {
+                role: "assistant",
+                content: `**Current provider:** ${providerLabel(currentProvider)} (${currentModel})
+
+**Switch to:** ${available.map((p) => `\`/model ${p}\``).join(" \xB7 ")}`
+              }
+            ]);
+            return;
+          }
+          const providerAliases = {
+            claude: "claude",
+            anthropic: "claude",
+            openai: "openai",
+            gpt: "openai",
+            gemini: "google",
+            google: "google",
+            codex: "openai-oauth",
+            chatgpt: "openai-oauth"
+          };
+          const targetProvider = providerAliases[arg];
+          if (!targetProvider) {
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "user", content: userText },
+              { role: "assistant", content: `Unknown provider: \`${arg}\`. Available: \`claude\` \xB7 \`openai\` \xB7 \`gemini\` \xB7 \`codex\`` }
+            ]);
+            return;
+          }
+          if (targetProvider === currentProvider) {
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "user", content: userText },
+              { role: "assistant", content: `Already using **${providerLabel(targetProvider)}** (${currentModel})` }
+            ]);
+            return;
+          }
+          if (targetProvider === "openai-oauth") {
+            const { verifier, challenge } = generatePkce();
+            const oauthState = generateState();
+            const authorizeUrl = buildAuthorizeUrl({ state: oauthState, challenge });
+            oauthVerifierRef.current = verifier;
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "user", content: userText },
+              { role: "assistant", content: "Opening browser for ChatGPT login..." }
+            ]);
+            setValidatingKey(true);
+            openBrowser(authorizeUrl);
+            try {
+              const result = await waitForCallback({
+                redirectUri: REDIRECT_URI,
+                expectedState: oauthState
+              });
+              const tokens = await exchangeCodeForTokens({ code: result.code, codeVerifier: verifier });
+              oauthVerifierRef.current = null;
+              setValidatingKey(false);
+              const cfg = loadConfig();
+              if (cfg.auth.type === "api-key" && cfg.auth.apiKey) {
+                cfg.savedKeys = { ...cfg.savedKeys, [cfg.provider]: cfg.auth.apiKey };
+              }
+              cfg.provider = "openai-oauth";
+              cfg.model = DEFAULT_MODELS["openai-oauth"] ?? "gpt-5.3-codex";
+              cfg.auth = {
+                type: "oauth",
+                oauth: {
+                  accessToken: tokens.accessToken,
+                  refreshToken: tokens.refreshToken,
+                  expiresAt: tokens.expiresAt,
+                  clientId: tokens.clientId
+                }
+              };
+              saveConfig(cfg);
+              providerRef.current = "openai-oauth";
+              setChatMessages((prev) => [
+                ...prev,
+                { role: "assistant", content: `Switched to **Codex** (${DEFAULT_MODELS["openai-oauth"]})` }
+              ]);
+            } catch {
+              setValidatingKey(false);
+              setAwaitingApiKey("oauth-paste:" + oauthState);
+              setChatMessages((prev) => [
+                ...prev,
+                { role: "assistant", content: `Couldn't detect the callback automatically.
+
+Paste the redirect URL from your browser here, or type \`/model\` to cancel.
+
+${authorizeUrl}` }
+              ]);
+            }
+            return;
+          }
+          const savedKey = config.savedKeys?.[targetProvider];
+          if (savedKey) {
+            if (config.auth.type === "api-key" && config.auth.apiKey) {
+              config.savedKeys = { ...config.savedKeys, [config.provider]: config.auth.apiKey };
+            }
+            config.provider = targetProvider;
+            config.model = DEFAULT_MODELS[targetProvider] ?? "";
+            config.auth = { type: "api-key", apiKey: savedKey };
+            saveConfig(config);
+            providerRef.current = targetProvider;
+            const modelName = DEFAULT_MODELS[targetProvider] ?? targetProvider;
+            setChatMessages((prev) => [
+              ...prev,
+              { role: "user", content: userText },
+              { role: "assistant", content: `Switched to **${providerLabel(targetProvider)}** (${modelName})` }
+            ]);
+            return;
+          }
+          const keyLabels = {
+            claude: "Anthropic API key",
+            openai: "OpenAI API key",
+            google: "Google AI API key"
+          };
+          setAwaitingApiKey(targetProvider);
+          setChatMessages((prev) => [
+            ...prev,
+            { role: "user", content: userText },
+            { role: "assistant", content: `Enter your ${keyLabels[targetProvider] ?? "API key"}. Your key is stored locally and never shared with the AI model.` }
+          ]);
+          return;
+        }
         if (hasAutopilot && cmd === "/auto") {
           const sub = parts[1]?.toLowerCase();
           if (!sub || sub === "status") {
@@ -5559,6 +5778,7 @@ Let's go through it and improve or replace it.` : "I want to create a trading st
           helpLines.push(
             "**System**",
             "",
+            "  `/model`     \u2014 Show or switch LLM provider",
             "  `/plugins`   \u2014 Browse and switch plugins",
             "  `/help`      \u2014 Show this help",
             "  `/exit`      \u2014 Exit (also `/quit`, `/q`)",
@@ -5618,7 +5838,7 @@ Let's go through it and improve or replace it.` : "I want to create a trading st
           { ...profile, autopilotMode },
           {
             onTextChunk: (chunk) => {
-              appendStreamChunk(chunk);
+              setStreamingText((prev) => (prev ?? "") + chunk);
             },
             onToolCallStart: (name) => {
               setToolName(name);
@@ -5651,7 +5871,7 @@ Let's go through it and improve or replace it.` : "I want to create a trading st
         }
         setChatMessages(updatedChat);
         setCoreMessages(updatedCore);
-        clearStream();
+        setStreamingText(void 0);
         saveSession({
           agentName,
           provider: providerRef.current,
@@ -5677,13 +5897,13 @@ ${stack}
           { role: "assistant", content: `Error: ${message}${debugInfo}` }
         ]);
         setCoreMessages(newCoreMessages);
-        clearStream();
+        setStreamingText(void 0);
       } finally {
         setIsLoading(false);
         setToolName(void 0);
       }
     },
-    [coreMessages, chatMessages, skillContext, tradingContext, walletContext, rewardsContext, onboardingContext, apiContext, profile, autopilotMode, agentName, sessionId, memoryContent, addLogEntry, pluginMap, hasAutopilot, hasJourneyStages, exit, debug, appendStreamChunk, clearStream, runAutopilotTurn]
+    [coreMessages, chatMessages, skillContext, tradingContext, walletContext, rewardsContext, onboardingContext, apiContext, profile, autopilotMode, agentName, sessionId, memoryContent, addLogEntry, pluginMap, hasAutopilot, hasJourneyStages, exit, debug, runAutopilotTurn, awaitingApiKey]
   );
   useEffect3(() => {
     sendMessageRef.current = sendMessage;
@@ -5695,10 +5915,13 @@ ${stack}
     [sendMessage]
   );
   return /* @__PURE__ */ jsxs10(Box9, { flexDirection: "column", width: "100%", height: "100%", children: [
-    /* @__PURE__ */ jsx9(Box9, { flexDirection: "column", flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ jsx9(ChatView, { messages: chatMessages, streamingText }) }),
-    isLoading && toolName && /* @__PURE__ */ jsx9(Spinner, { label: `Calling ${toolName}...` }),
-    isLoading && !toolName && /* @__PURE__ */ jsx9(Spinner, { label: streamingText ? "Thinking..." : void 0 }),
-    /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, width: "100%", children: /* @__PURE__ */ jsx9(Input, { isActive: !isLoading, onSubmit: handleSubmit }) }),
+    /* @__PURE__ */ jsxs10(Box9, { flexDirection: "column", flexGrow: 1, flexShrink: 1, children: [
+      /* @__PURE__ */ jsx9(ChatView, { messages: chatMessages, streamingText }),
+      validatingKey && /* @__PURE__ */ jsx9(Spinner, { label: "Validating API key..." }),
+      isLoading && toolName && /* @__PURE__ */ jsx9(Spinner, { label: `Calling ${toolName}...` }),
+      isLoading && !toolName && /* @__PURE__ */ jsx9(Spinner, { label: streamingText ? "Thinking..." : void 0 })
+    ] }),
+    /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, width: "100%", children: /* @__PURE__ */ jsx9(Input, { isActive: !isLoading && !validatingKey, onSubmit: handleSubmit }) }),
     /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, width: "100%", children: /* @__PURE__ */ jsx9(
       StatusBar_default,
       {
@@ -5712,8 +5935,8 @@ ${stack}
         pluginMap
       }
     ) }),
-    /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, width: "100%", paddingX: 2, marginTop: 1, justifyContent: "space-between", children: hasJourneyStages ? /* @__PURE__ */ jsxs10(Fragment3, { children: [
-      /* @__PURE__ */ jsx9(Text10, { dimColor: true, children: "/help \xB7 /portfolio \xB7 /market \xB7 /strategy \xB7 /exit" }),
+    /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, width: "100%", paddingX: 2, marginTop: 1, marginBottom: 1, justifyContent: "space-between", children: hasJourneyStages ? /* @__PURE__ */ jsxs10(Fragment3, { children: [
+      /* @__PURE__ */ jsx9(Text10, { dimColor: true, children: "/help \xB7 /portfolio \xB7 /market \xB7 /model \xB7 /exit" }),
       /* @__PURE__ */ jsx9(Text10, { dimColor: true, children: "/auto on\xB7off\xB7set \xB7 Ctrl+C quit" })
     ] }) : /* @__PURE__ */ jsxs10(Fragment3, { children: [
       /* @__PURE__ */ jsx9(Text10, { dimColor: true, children: (pluginMap?.commands?.map((c) => c.command).join(" \xB7 ") ?? "/help") + " \xB7 /exit" }),
@@ -5724,6 +5947,25 @@ ${stack}
 function formatTime(d) {
   return `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
 }
+function providerLabel(provider) {
+  const labels = {
+    claude: "Claude",
+    openai: "OpenAI GPT",
+    google: "Gemini",
+    "openai-oauth": "Codex",
+    ollama: "Ollama"
+  };
+  return labels[provider] ?? provider;
+}
+function providerAlias(provider) {
+  const aliases = {
+    claude: "claude",
+    openai: "openai",
+    google: "gemini",
+    "openai-oauth": "codex"
+  };
+  return aliases[provider] ?? provider;
+}
 
 // src/bin/astra.ts
 function detectJourneyStage(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astra-cli/cli",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "description": "The terminal for autonomous agents. Powered by AstraNova.",
   "type": "module",
   "bin": {
@@ -33,7 +33,11 @@
     "test:e2e": "vitest run src/__tests__/e2e/",
     "test:all": "vitest run",
     "test:coverage": "vitest run --exclude 'src/__tests__/integration/**' --exclude 'src/__tests__/e2e/**' --coverage",
-    "prepublishOnly": "pnpm build"
+    "prepublishOnly": "pnpm build",
+    "desktop:dev": "pnpm build && pnpm --filter @astra-cli/desktop dev",
+    "desktop:bundle": "npx tsup --config tsup.desktop.ts",
+    "desktop:build": "pnpm desktop:bundle && pnpm --filter @astra-cli/desktop build",
+    "desktop:package": "pnpm desktop:bundle && pnpm --filter @astra-cli/desktop package"
   },
   "author": "fermartz",
   "repository": {