osagent 0.1.18 → 0.1.20

package/dist/cli.js

@@ -142611,14 +142611,14 @@ var init_ollama = __esm({
        */
       static isOllamaProvider(config) {
         const baseUrl = config.baseUrl?.toLowerCase() || "";
-        return baseUrl.includes("osa.dev") || baseUrl.includes("ollama.com") || baseUrl.includes("localhost:11434") || baseUrl.includes("127.0.0.1:11434");
+        return baseUrl.includes("ollama.com") || baseUrl.includes("localhost:11434") || baseUrl.includes("127.0.0.1:11434");
       }
       /**
        * Check if this is OS Agent Cloud (vs Local)
        */
       isCloud() {
         const baseUrl = this.contentGeneratorConfig.baseUrl?.toLowerCase() || "";
-        return baseUrl.includes("osa.dev") || baseUrl.includes("ollama.com");
+        return baseUrl.includes("ollama.com");
       }
       buildHeaders() {
         const version2 = this.cliConfig.getCliVersion() || "unknown";
@@ -146088,7 +146088,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
     return {
       ...newContentGeneratorConfig,
       model: newContentGeneratorConfig?.model || DEFAULT_OLLAMA_CODER_MODEL,
-      baseUrl: newContentGeneratorConfig?.baseUrl || "https://osa.dev",
+      baseUrl: newContentGeneratorConfig?.baseUrl || "https://api.ollama.com",
       // API key from OLLAMA_API_KEY env var or settings
       apiKey: newContentGeneratorConfig?.apiKey || process.env["OLLAMA_API_KEY"]
     };
@@ -146108,7 +146108,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config, gcConfig, sessionId2, isInitialAuth) {
-  const version2 = "0.1.18";
+  const version2 = "0.1.20";
   const userAgent2 = `OSAgent/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -303788,7 +303788,7 @@ function validateAuthMethod(authMethod, mergedSettings) {
   if (authMethod === AuthType2.OLLAMA_CLOUD) {
     const hasApiKey = process.env["OLLAMA_API_KEY"] || settings.merged.security?.auth?.apiKey;
     if (!hasApiKey) {
-      return "OLLAMA_API_KEY environment variable not found. Get your API key at https://osa.dev";
+      return "OLLAMA_API_KEY environment variable not found. Get your API key at https://ollama.com/settings/keys";
     }
     return null;
   }
@@ -309699,7 +309699,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.18";
+  return "0.1.20";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -314633,6 +314633,81 @@ Use /consult for help.`)
   }, "action")
 };
 
+// packages/cli/src/ui/commands/contextCommand.ts
+init_esbuild_shims();
+var formatTokens = /* @__PURE__ */ __name((count) => {
+  if (count >= 1e6) {
+    return `${(count / 1e6).toFixed(1)}M`;
+  }
+  if (count >= 1e3) {
+    return `${Math.round(count / 1e3)}K`;
+  }
+  return String(count);
+}, "formatTokens");
+var generateProgressBar = /* @__PURE__ */ __name((percentage, width) => {
+  const filled = Math.round(percentage * width);
+  const empty = width - filled;
+  return "\u2588".repeat(filled) + "\u2591".repeat(empty);
+}, "generateProgressBar");
+var contextCommand = {
+  name: "context",
+  altNames: ["ctx", "tokens"],
+  get description() {
+    return t2("Show current context window usage and token statistics");
+  },
+  kind: "built-in" /* BUILT_IN */,
+  action: /* @__PURE__ */ __name((context2) => {
+    const { metrics: metrics2, lastPromptTokenCount } = context2.session.stats;
+    const model = context2.services.config?.getModel() || "unknown";
+    const limit2 = tokenLimit(model);
+    const percentage = lastPromptTokenCount / limit2;
+    const percentUsed = (percentage * 100).toFixed(1);
+    let totalPromptTokens = 0;
+    let totalCandidateTokens = 0;
+    let totalCachedTokens = 0;
+    let totalThoughtTokens = 0;
+    let totalToolTokens = 0;
+    let totalRequests = 0;
+    let totalLatency = 0;
+    for (const modelMetrics of Object.values(metrics2.models)) {
+      totalPromptTokens += modelMetrics.tokens.prompt;
+      totalCandidateTokens += modelMetrics.tokens.candidates;
+      totalCachedTokens += modelMetrics.tokens.cached;
+      totalThoughtTokens += modelMetrics.tokens.thoughts;
+      totalToolTokens += modelMetrics.tokens.tool;
+      totalRequests += modelMetrics.api.totalRequests;
+      totalLatency += modelMetrics.api.totalLatencyMs;
+    }
+    const avgLatency = totalRequests > 0 ? Math.round(totalLatency / totalRequests) : 0;
+    const cacheRate = totalPromptTokens > 0 ? (totalCachedTokens / totalPromptTokens * 100).toFixed(1) : "0";
+    const barWidth = 20;
+    const progressBar = generateProgressBar(percentage, barWidth);
+    const lines = [
+      `\u250C\u2500 Context Window \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510`,
+      `\u2502 Model: ${model.padEnd(38)}\u2502`,
+      `\u2502 Usage: [${progressBar}] ${percentUsed.padStart(5)}%  \u2502`,
+      `\u2502 Tokens: ${formatTokens(lastPromptTokenCount).padStart(6)} / ${formatTokens(limit2).padEnd(26)}\u2502`,
+      `\u251C\u2500 Session Statistics \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524`,
+      `\u2502 Total Prompt Tokens:    ${formatTokens(totalPromptTokens).padStart(20)}\u2502`,
+      `\u2502 Total Response Tokens:  ${formatTokens(totalCandidateTokens).padStart(20)}\u2502`,
+      `\u2502 Cached Tokens:          ${formatTokens(totalCachedTokens).padStart(17)} (${cacheRate}%)\u2502`,
+      `\u2502 Thinking Tokens:        ${formatTokens(totalThoughtTokens).padStart(20)}\u2502`,
+      `\u2502 Tool Tokens:            ${formatTokens(totalToolTokens).padStart(20)}\u2502`,
+      `\u251C\u2500 API Statistics \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524`,
+      `\u2502 Total Requests:         ${String(totalRequests).padStart(20)}\u2502`,
+      `\u2502 Avg Latency:            ${String(avgLatency).padStart(17)} ms\u2502`,
+      `\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518`
+    ];
+    context2.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: lines.join("\n")
+      },
+      Date.now()
+    );
+  }, "action")
+};
+
 // packages/cli/src/ui/commands/continueCommand.ts
 init_esbuild_shims();
 import * as fs72 from "node:fs/promises";
@@ -319191,6 +319266,7 @@ var BuiltinCommandLoader = class {
       clearCommand,
       compressCommand,
       consultCommand,
+      contextCommand,
       continueCommand,
       openaiProfileCommand,
       copyCommand,
@@ -350392,7 +350468,7 @@ var DialogManager = /* @__PURE__ */ __name(({
           onSubmit: (apiKey, baseUrl, model) => {
             uiActions.handleAuthSelect(AuthType2.OLLAMA_CLOUD, "User" /* User */, {
               apiKey,
-              baseUrl: baseUrl || "https://osa.dev",
+              baseUrl: baseUrl || "https://api.ollama.com",
               model: model || "qwen3-coder:480b-cloud"
             });
           },
@@ -350401,10 +350477,10 @@ var DialogManager = /* @__PURE__ */ __name(({
             uiActions.setAuthState("updating" /* Updating */);
           },
           defaultApiKey: fromSettings?.apiKey || process34.env["OLLAMA_API_KEY"] || "",
-          defaultBaseUrl: fromSettings?.baseUrl || "https://osa.dev",
+          defaultBaseUrl: fromSettings?.baseUrl || "https://api.ollama.com",
           defaultModel: modelSettings?.name || "qwen3-coder:480b-cloud",
           providerName: "Ollama Cloud",
-          apiKeyUrl: "https://osa.dev/settings/keys"
+          apiKeyUrl: "https://ollama.com/settings/keys"
         }
       );
     }
@@ -352885,7 +352961,7 @@ var MemoryUsageDisplay = /* @__PURE__ */ __name(() => {
 // packages/cli/src/ui/components/ContextUsageDisplay.tsx
 init_esbuild_shims();
 var import_jsx_runtime98 = __toESM(require_jsx_runtime(), 1);
-var formatTokens = /* @__PURE__ */ __name((count) => {
+var formatTokens2 = /* @__PURE__ */ __name((count) => {
   if (count >= 1e6) {
     return `${(count / 1e6).toFixed(1)}M`;
   }
@@ -352894,7 +352970,7 @@ var formatTokens = /* @__PURE__ */ __name((count) => {
   }
   return String(count);
 }, "formatTokens");
-var generateProgressBar = /* @__PURE__ */ __name((percentage, width) => {
+var generateProgressBar2 = /* @__PURE__ */ __name((percentage, width) => {
   const filled = Math.round(percentage * width);
   const empty = width - filled;
   return "\u2588".repeat(filled) + "\u2591".repeat(empty);
@@ -352929,15 +353005,15 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
       /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: theme.text.secondary, children: [
         " ",
         "(",
-        formatTokens(promptTokenCount),
+        formatTokens2(promptTokenCount),
         "/",
-        formatTokens(limit2),
+        formatTokens2(limit2),
         ")"
       ] })
     ] });
   }
   const barWidth = 10;
-  const progressBar = generateProgressBar(percentage, barWidth);
+  const progressBar = generateProgressBar2(percentage, barWidth);
   return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: usageColor, children: [
       "[",
@@ -352946,9 +353022,9 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text3, { color: theme.text.secondary, children: [
       " ",
-      formatTokens(promptTokenCount),
+      formatTokens2(promptTokenCount),
       "/",
-      formatTokens(limit2)
+      formatTokens2(limit2)
     ] })
   ] });
 }, "ContextUsageDisplay");
@@ -353750,7 +353826,7 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config, addItem) => {
         if (credentials) {
           config.updateCredentials({
             apiKey: credentials.apiKey,
-            baseUrl: credentials.baseUrl || "https://osa.dev",
+            baseUrl: credentials.baseUrl || "https://api.ollama.com",
             model: credentials.model || "qwen3-coder:480b-cloud"
           });
           await performAuth(authType, scope, credentials);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osagent",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "OS Agent - AI-powered CLI for autonomous coding with Ollama Cloud and Qwen models",
   "author": "Roberto Luna",
   "license": "Apache-2.0",