osagent 0.1.27 → 0.1.29

package/dist/cli.js

@@ -146180,7 +146180,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config, gcConfig, sessionId2, isInitialAuth) {
-  const version2 = "0.1.27";
+  const version2 = "0.1.29";
   const userAgent2 = `OSAgent/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -195824,7 +195824,27 @@ function getArchitectureString(arch3) {
       return void 0;
   }
 }
+function getRipgrepFromPackage() {
+  const platform15 = getPlatformString(process.platform);
+  const arch3 = getArchitectureString(process.arch);
+  if (!platform15 || !arch3) {
+    return null;
+  }
+  const packageName = `@osagent/ripgrep-${platform15}-${arch3}`;
+  try {
+    const pkg2 = __require(packageName);
+    if (pkg2 && typeof pkg2.getBinaryPath === "function") {
+      return pkg2.getBinaryPath();
+    }
+  } catch {
+  }
+  return null;
+}
 function getBuiltinRipgrep() {
+  const packagePath = getRipgrepFromPackage();
+  if (packagePath) {
+    return packagePath;
+  }
   const platform15 = getPlatformString(process.platform);
   const arch3 = getArchitectureString(process.arch);
   if (!platform15 || !arch3) {
@@ -195945,6 +195965,7 @@ var init_ripgrepUtils = __esm({
     __dirname3 = path39.dirname(__filename2);
     __name(getPlatformString, "getPlatformString");
     __name(getArchitectureString, "getArchitectureString");
+    __name(getRipgrepFromPackage, "getRipgrepFromPackage");
     __name(getBuiltinRipgrep, "getBuiltinRipgrep");
     __name(resolveRipgrep, "resolveRipgrep");
     __name(ensureRipgrepHealthy, "ensureRipgrepHealthy");
@@ -296088,6 +296109,17 @@ var SETTINGS_SCHEMA = {
             description: "Saved OpenAI credential profiles for quick switching via /openai-profile.",
             showInDialog: false,
             mergeStrategy: "shallow_merge" /* SHALLOW_MERGE */
+          },
+          // Provider-specific configurations
+          providers: {
+            type: "object",
+            label: "Provider Configurations",
+            category: "Security",
+            requiresRestart: false,
+            default: {},
+            description: "Provider-specific configuration for each AI provider (GROQ, Ollama, OpenAI, etc.).",
+            showInDialog: false,
+            mergeStrategy: "shallow_merge" /* SHALLOW_MERGE */
           }
         }
       }
@@ -309779,7 +309811,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.27";
+  return "0.1.29";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -313948,8 +313980,8 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "fbe9649";
-var CLI_VERSION2 = "0.1.27";
+var GIT_COMMIT_INFO2 = "481ebbe";
+var CLI_VERSION2 = "0.1.29";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -317774,6 +317806,10 @@ function getAvailableModelsForAuthType(authType) {
   }
 }
 __name(getAvailableModelsForAuthType, "getAvailableModelsForAuthType");
+function getAllAvailableModels() {
+  return [...AVAILABLE_MODELS_OSA, ...AVAILABLE_MODELS_GROQ, ...AVAILABLE_MODELS_OLLAMA_LOCAL];
+}
+__name(getAllAvailableModels, "getAllAvailableModels");
 function getDefaultVisionModel() {
   return MAINLINE_VLM;
 }
@@ -317784,6 +317820,19 @@ function isVisionModel(modelId) {
   );
 }
 __name(isVisionModel, "isVisionModel");
+function getModelContextWindow(modelId) {
+  const allModels = getAllAvailableModels();
+  const model = allModels.find((m) => m.id === modelId);
+  return model?.contextWindow ?? 131072;
+}
+__name(getModelContextWindow, "getModelContextWindow");
+function formatContextWindow(tokens) {
+  if (tokens >= 1e6) {
+    return `${Math.round(tokens / 1e6)}M`;
+  }
+  return `${Math.round(tokens / 1024)}K`;
+}
+__name(formatContextWindow, "formatContextWindow");
 
 // packages/cli/src/ui/commands/modelCommand.ts
 var modelCommand = {
@@ -317854,6 +317903,56 @@ var permissionsCommand = {
 
 // packages/cli/src/ui/commands/providerCommand.ts
 init_esbuild_shims();
+function getProviderApiKey(context2, providerKey, envVar) {
+  const { settings } = context2.services;
+  const providers = settings.merged.security?.auth?.providers;
+  const providerConfig = providers?.[providerKey];
+  if (providerConfig?.apiKey) {
+    return providerConfig.apiKey;
+  }
+  return process.env[envVar];
+}
+__name(getProviderApiKey, "getProviderApiKey");
+async function persistProviderSelection(context2, authType, apiKey, model) {
+  const { settings } = context2.services;
+  settings.setValue("User" /* User */, "security.auth.selectedType", authType);
+  if (apiKey) {
+    const providerKey = authType.replace(/-/g, "_");
+    const currentProviders = settings.merged.security?.auth?.providers || {};
+    const updatedProviders = {
+      ...currentProviders,
+      [providerKey]: {
+        ...currentProviders[providerKey],
+        apiKey,
+        model
+      }
+    };
+    settings.setValue(
+      "User" /* User */,
+      "security.auth.providers",
+      updatedProviders
+    );
+  }
+}
+__name(persistProviderSelection, "persistProviderSelection");
+function getProviderDisplayName(authType) {
+  if (!authType) return "Unknown";
+  switch (authType) {
+    case AuthType2.USE_GROQ:
+      return "GROQ";
+    case AuthType2.OLLAMA_LOCAL:
+      return "Ollama (Local)";
+    case AuthType2.OLLAMA_CLOUD:
+      return "Ollama (Cloud)";
+    case AuthType2.USE_OPENAI:
+      return "OpenAI Compatible";
+    case AuthType2.OSA_OAUTH:
+      return "OSAgent Cloud";
+    default:
+      return String(authType);
+  }
+}
+__name(getProviderDisplayName, "getProviderDisplayName");
 var providerCommand = {
   name: "provider",
   get description() {
@@ -317876,7 +317975,7 @@ var providerCommand = {
             content: t2("Configuration not available.")
           };
         }
-        const apiKey = process.env["GROQ_API_KEY"];
+        const apiKey = getProviderApiKey(context2, "groq", "GROQ_API_KEY");
         if (!apiKey) {
           return {
             type: "start_auth",
@@ -317884,7 +317983,17 @@ var providerCommand = {
           };
         }
         try {
+          process.env["GROQ_API_KEY"] = apiKey;
           await config.refreshAuth(AuthType2.USE_GROQ);
+          await persistProviderSelection(
+            context2,
+            AuthType2.USE_GROQ,
+            apiKey,
+            "moonshotai/kimi-k2-instruct-0905"
+          );
+          const contextWindow = getModelContextWindow(
+            "moonshotai/kimi-k2-instruct-0905"
+          );
           return {
             type: "message",
             messageType: "info",
@@ -317892,15 +318001,18 @@ var providerCommand = {
 
 Model: moonshotai/kimi-k2-instruct-0905
 Speed: ~200 tok/s
-Context: 256K tokens
+Context: ${formatContextWindow(contextWindow)} tokens
 
-Use /model to change models within GROQ.`)
+Use /model to change models within GROQ.
+Provider selection saved to settings.`)
           };
         } catch (error) {
           return {
             type: "message",
             messageType: "error",
-            content: t2(`Failed to switch to GROQ: ${error instanceof Error ? error.message : String(error)}`)
+            content: t2(
+              `Failed to switch to GROQ: ${error instanceof Error ? error.message : String(error)}`
+            )
           };
         }
       }, "action")
@@ -317922,19 +318034,23 @@ Use /model to change models within GROQ.`)
         }
         try {
           await config.refreshAuth(AuthType2.OLLAMA_LOCAL);
+          await persistProviderSelection(context2, AuthType2.OLLAMA_LOCAL);
           return {
             type: "message",
             messageType: "info",
             content: t2(`Switched to local Ollama provider.
 
 Make sure Ollama is running: ollama serve
-Use /model to select a local model.`)
+Use /model to select a local model.
+Provider selection saved to settings.`)
           };
         } catch (error) {
           return {
             type: "message",
             messageType: "error",
-            content: t2(`Failed to switch to Ollama: ${error instanceof Error ? error.message : String(error)}`)
+            content: t2(
+              `Failed to switch to Ollama: ${error instanceof Error ? error.message : String(error)}`
+            )
           };
         }
       }, "action")
@@ -317954,7 +318070,7 @@ Use /model to select a local model.`)
             content: t2("Configuration not available.")
           };
         }
-        const apiKey = process.env["OPENAI_API_KEY"];
+        const apiKey = getProviderApiKey(context2, "openai", "OPENAI_API_KEY");
         if (!apiKey) {
           return {
             type: "start_auth",
@@ -317962,20 +318078,64 @@ Use /model to select a local model.`)
           };
         }
         try {
+          process.env["OPENAI_API_KEY"] = apiKey;
           await config.refreshAuth(AuthType2.USE_OPENAI);
+          await persistProviderSelection(context2, AuthType2.USE_OPENAI, apiKey);
           return {
             type: "message",
             messageType: "info",
             content: t2(`Switched to OpenAI provider.
 
 Set OPENAI_BASE_URL for custom endpoints.
-Use /model to select a model.`)
+Use /model to select a model.
+Provider selection saved to settings.`)
+          };
+        } catch (error) {
+          return {
+            type: "message",
+            messageType: "error",
+            content: t2(
+              `Failed to switch to OpenAI: ${error instanceof Error ? error.message : String(error)}`
+            )
+          };
+        }
+      }, "action")
+    },
+    {
+      name: "osa",
+      altNames: ["osagent", "cloud"],
+      get description() {
+        return t2("Switch to OSAgent Cloud (default)");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      action: /* @__PURE__ */ __name(async (context2) => {
+        const { config } = context2.services;
+        if (!config) {
+          return {
+            type: "message",
+            messageType: "error",
+            content: t2("Configuration not available.")
+          };
+        }
+        try {
+          await config.refreshAuth(AuthType2.OSA_OAUTH);
+          await persistProviderSelection(context2, AuthType2.OSA_OAUTH);
+          return {
+            type: "message",
+            messageType: "info",
+            content: t2(`Switched to OSAgent Cloud provider.
+
+Model: qwen3-coder:480b-cloud
+Use /model to change models.
+Provider selection saved to settings.`)
           };
         } catch (error) {
           return {
             type: "message",
             messageType: "error",
-            content: t2(`Failed to switch to OpenAI: ${error instanceof Error ? error.message : String(error)}`)
+            content: t2(
+              `Failed to switch to OSAgent Cloud: ${error instanceof Error ? error.message : String(error)}`
+            )
           };
         }
       }, "action")
@@ -317987,7 +318147,7 @@ Use /model to select a model.`)
       },
       kind: "built-in" /* BUILT_IN */,
       action: /* @__PURE__ */ __name(async (context2) => {
-        const { config } = context2.services;
+        const { config, settings } = context2.services;
         if (!config) {
           return {
             type: "message",
@@ -317999,39 +318159,43 @@ Use /model to select a model.`)
         const contentGeneratorConfig = config.getContentGeneratorConfig();
         const model = contentGeneratorConfig?.model || "unknown";
         const baseUrl = contentGeneratorConfig?.baseUrl || "default";
-        let providerName = "Unknown";
-        switch (authType) {
-          case AuthType2.USE_GROQ:
-            providerName = "GROQ";
-            break;
-          case AuthType2.OLLAMA_LOCAL:
-            providerName = "Ollama (Local)";
-            break;
-          case AuthType2.OLLAMA_CLOUD:
-            providerName = "Ollama (Cloud)";
-            break;
-          case AuthType2.USE_OPENAI:
-            providerName = "OpenAI Compatible";
-            break;
-          case AuthType2.OSA_OAUTH:
-            providerName = "OSAgent Cloud";
-            break;
-          default:
-            providerName = String(authType);
+        const providerName = getProviderDisplayName(authType);
+        const contextWindow = getModelContextWindow(model);
+        const savedAuthType = settings.merged.security?.auth?.selectedType;
+        const providers = settings.merged.security?.auth?.providers;
+        const providerStatuses = [];
+        const providerList = [
+          { key: "groq", name: "GROQ", envVar: "GROQ_API_KEY" },
+          { key: "openai", name: "OpenAI", envVar: "OPENAI_API_KEY" },
+          { key: "ollama_local", name: "Ollama Local", envVar: null },
+          { key: "osa_oauth", name: "OSAgent Cloud", envVar: null }
+        ];
+        for (const p of providerList) {
+          const hasSettingsKey = !!providers?.[p.key]?.apiKey;
+          const hasEnvKey = p.envVar ? !!process.env[p.envVar] : true;
+          const configured = hasSettingsKey || hasEnvKey;
+          const status = configured ? "\u2713" : "\u25CB";
+          providerStatuses.push(`  ${status} ${p.name}`);
         }
         return {
           type: "message",
           messageType: "info",
           content: t2(`Provider Status
 \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
-Provider: ${providerName}
+Active: ${providerName}
 Model: ${model}
+Context: ${formatContextWindow(contextWindow)} tokens
 Base URL: ${baseUrl}
+Saved in Settings: ${savedAuthType ? "Yes" : "No"}
+
+Configured Providers:
+${providerStatuses.join("\n")}
 
 Commands:
   /provider groq    - Switch to GROQ (Kimi K2)
   /provider ollama  - Switch to local Ollama
   /provider openai  - Switch to OpenAI compatible
+  /provider osa     - Switch to OSAgent Cloud
   /model            - Change model within current provider`)
         };
       }, "action")
@@ -318047,26 +318211,7 @@ Commands:
       };
     }
     const authType = config.getAuthType();
-    let providerName = "Unknown";
-    switch (authType) {
-      case AuthType2.USE_GROQ:
-        providerName = "GROQ";
-        break;
-      case AuthType2.OLLAMA_LOCAL:
-        providerName = "Ollama (Local)";
-        break;
-      case AuthType2.OLLAMA_CLOUD:
-        providerName = "Ollama (Cloud)";
-        break;
-      case AuthType2.USE_OPENAI:
-        providerName = "OpenAI Compatible";
-        break;
-      case AuthType2.OSA_OAUTH:
-        providerName = "OSAgent Cloud";
-        break;
-      default:
-        providerName = String(authType);
-    }
+    const providerName = getProviderDisplayName(authType);
     return {
       type: "message",
       messageType: "info",
@@ -318079,8 +318224,13 @@ Available Providers:
   /provider groq    - GROQ (Kimi K2, ~200 tok/s, 256K context)
   /provider ollama  - Local Ollama (qwen2.5-coder, etc.)
   /provider openai  - OpenAI compatible APIs
+  /provider osa     - OSAgent Cloud (default)
   /provider status  - Show detailed status
 
+Configuration:
+  API keys can be set via environment variables or saved in settings.
+  Use the provider commands to configure and save your preferences.
+
 Environment Variables:
   GROQ_API_KEY      - For GROQ provider
   OPENAI_API_KEY    - For OpenAI provider
@@ -363233,7 +363383,8 @@ ${queuedText}` : queuedText;
     refreshStatic();
   }, [historyManager, clearConsoleMessagesState, refreshStatic]);
   const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
-  const isInputActive = !initError && !isProcessing && (streamingState === "idle" /* Idle */ || streamingState === "responding" /* Responding */) && !proQuotaRequest;
+  const anyDialogOpen = showWelcomeBackDialog || showWorkspaceMigrationDialog || !!shellConfirmationRequest || !!confirmationRequest || confirmUpdateExtensionRequests.length > 0 || !!loopDetectionConfirmationRequest || !!quitConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isModelDialogOpen || isVisionSwitchDialogOpen || isPermissionsDialogOpen || isAuthDialogOpen || isAuthenticating || isEditorDialogOpen || isSubagentCreateDialogOpen || isAgentsManagerDialogOpen || isApprovalModeDialogOpen;
+  const isInputActive = !initError && !isProcessing && (streamingState === "idle" /* Idle */ || streamingState === "responding" /* Responding */) && !proQuotaRequest && !anyDialogOpen;
   const [controlsHeight, setControlsHeight] = (0, import_react139.useState)(0);
   (0, import_react139.useLayoutEffect)(() => {
     if (mainControlsRef.current) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osagent",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "OS Agent - AI-powered CLI for autonomous coding with Ollama Cloud and Qwen models",
   "author": "Roberto Luna",
   "license": "Apache-2.0",
@@ -23,7 +23,10 @@
   },
   "type": "module",
   "workspaces": [
-    "packages/*"
+    "packages/cli",
+    "packages/core",
+    "packages/test-utils",
+    "packages/vscode-ide-companion"
   ],
   "repository": {
     "type": "git",
@@ -140,7 +143,12 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "node-pty": "^1.0.0"
+    "node-pty": "^1.0.0",
+    "@osagent/ripgrep-darwin-arm64": "0.1.0",
+    "@osagent/ripgrep-darwin-x64": "0.1.0",
+    "@osagent/ripgrep-linux-arm64": "0.1.0",
+    "@osagent/ripgrep-linux-x64": "0.1.0",
+    "@osagent/ripgrep-win32-x64": "0.1.0"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [

package/dist/vendor/ripgrep/COPYING

@@ -1,3 +0,0 @@
-This project is dual-licensed under the Unlicense and MIT licenses.
-
-You may use this code under the terms of either license.