@quantish/agent 0.1.23 → 0.1.25

package/dist/index.js

@@ -2348,9 +2348,13 @@ function calculateCostWithPricing(pricing, inputTokens, outputTokens, cacheCreat
 }
 function formatCost(cost) {
   if (cost < 0.01) {
-    return `$${(cost * 100).toFixed(3)}\xA2`;
+    const cents = cost * 100;
+    return `${cents.toFixed(3)}\xA2`;
   }
-  return `$${cost.toFixed(4)}`;
+  if (cost < 1) {
+    return `$${cost.toFixed(4)}`;
+  }
+  return `$${cost.toFixed(2)}`;
 }
 function listModels() {
   return Object.values(MODELS);
@@ -2834,17 +2838,33 @@ var OpenRouterClient = class {
   }
 };
 function calculateOpenRouterCost(modelId, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0) {
-  const config = getOpenRouterModelConfig(modelId);
+  let config = getOpenRouterModelConfig(modelId);
+  if (!config) {
+    config = getOpenRouterModelConfig(modelId.toLowerCase());
+  }
+  if (!config) {
+    const lower = modelId.toLowerCase();
+    for (const [key, model] of Object.entries(OPENROUTER_MODELS2)) {
+      if (key.toLowerCase() === lower || model.name.toLowerCase() === lower) {
+        config = model;
+        break;
+      }
+    }
+    if (!config && OPENROUTER_ALIASES[lower]) {
+      config = OPENROUTER_MODELS2[OPENROUTER_ALIASES[lower]];
+    }
+  }
   const pricing = config?.pricing ?? {
-    inputPerMTok: 1,
-    outputPerMTok: 3,
-    cacheReadPerMTok: 0.1,
-    cacheWritePerMTok: 1.25
+    inputPerMTok: 0.4,
+    // GLM 4.7 pricing as fallback
+    outputPerMTok: 1.5,
+    cacheReadPerMTok: 0,
+    cacheWritePerMTok: 0
   };
   const inputCost = inputTokens / 1e6 * pricing.inputPerMTok;
   const outputCost = outputTokens / 1e6 * pricing.outputPerMTok;
-  const cacheReadCost = cacheReadTokens / 1e6 * (pricing.cacheReadPerMTok ?? pricing.inputPerMTok * 0.1);
-  const cacheWriteCost = cacheWriteTokens / 1e6 * (pricing.cacheWritePerMTok ?? pricing.inputPerMTok * 1.25);
+  const cacheReadCost = cacheReadTokens / 1e6 * (pricing.cacheReadPerMTok ?? 0);
+  const cacheWriteCost = cacheWriteTokens / 1e6 * (pricing.cacheWritePerMTok ?? 0);
   return {
     inputCost,
     outputCost,
@@ -3613,7 +3633,7 @@ ${userMessage}`;
         output_tokens: response.usage.outputTokens,
         cache_creation_input_tokens: response.usage.cacheCreationTokens,
         cache_read_input_tokens: response.usage.cacheReadTokens
-      });
+      }, response.cost);
       const responseContent = [];
       if (response.text) {
         responseContent.push({ type: "text", text: response.text });
@@ -3950,15 +3970,17 @@ ${userMessage}`;
   }
   /**
    * Update cumulative token usage from API response
+   * @param usage - Token counts from the API response
+   * @param preCalculatedCost - Optional pre-calculated cost (from OpenRouter provider)
    */
-  updateTokenUsage(usage) {
+  updateTokenUsage(usage, preCalculatedCost) {
     const model = this.config.model ?? DEFAULT_MODEL;
     this.cumulativeTokenUsage.inputTokens = usage.input_tokens;
     this.cumulativeTokenUsage.outputTokens += usage.output_tokens;
     this.cumulativeTokenUsage.cacheCreationInputTokens = usage.cache_creation_input_tokens || 0;
     this.cumulativeTokenUsage.cacheReadInputTokens = usage.cache_read_input_tokens || 0;
     this.cumulativeTokenUsage.totalTokens = this.cumulativeTokenUsage.inputTokens + this.cumulativeTokenUsage.outputTokens;
-    const callCost = calculateCost(
+    const callCost = preCalculatedCost ?? calculateCost(
       model,
       usage.input_tokens,
       usage.output_tokens,
@@ -5047,16 +5069,22 @@ Use /load <id> to load a session.`
       setIsProcessing(false);
       setThinkingText(null);
       abortController.current = null;
-      if (hasQueuedMessage && queuedInput) {
-        const nextMessage = queuedInput;
-        setQueuedInput("");
-        setHasQueuedMessage(false);
-        setTimeout(() => {
-          handleSubmit(nextMessage);
-        }, 100);
-      }
     }
-  }, [agent, isProcessing, isInterrupted, exit, onExit, handleSlashCommand, hasQueuedMessage, queuedInput]);
+  }, [agent, isProcessing, isInterrupted, exit, onExit, handleSlashCommand]);
+  useEffect(() => {
+    if (!isProcessing && hasQueuedMessage && queuedInput) {
+      const nextMessage = queuedInput;
+      setQueuedInput("");
+      setHasQueuedMessage(false);
+      setMessages((prev) => prev.filter(
+        (m) => !(m.role === "system" && m.content.startsWith("\u{1F4E5} Queued:"))
+      ));
+      const timer = setTimeout(() => {
+        handleSubmit(nextMessage);
+      }, 150);
+      return () => clearTimeout(timer);
+    }
+  }, [isProcessing, hasQueuedMessage, queuedInput, handleSubmit]);
   useEffect(() => {
     const originalConfig = agent.config;
     agent.config = {
@@ -5111,6 +5139,14 @@ Stopped ${count} background process${count > 1 ? "es" : ""}.`);
       onExit?.();
       exit();
     }
+    if (key.backspace && input === "" && hasQueuedMessage && queuedInput) {
+      setInput(queuedInput);
+      setQueuedInput("");
+      setHasQueuedMessage(false);
+      setMessages((prev) => prev.filter(
+        (m) => !(m.role === "system" && m.content.startsWith("\u{1F4E5} Queued:"))
+      ));
+    }
     if (key.escape && isProcessing) {
       setIsInterrupted(true);
       abortController.current?.abort();
@@ -5187,9 +5223,10 @@ Stopped ${count} background process${count > 1 ? "es" : ""}.`);
       "\u274C Error: ",
       error2
     ] }) }),
-    isProcessing && !streamingText && currentToolCalls.length === 0 && /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+    isProcessing && /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
       /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-      " Thinking..."
+      " ",
+      currentToolCalls.length > 0 ? `Working... (${currentToolCalls.filter((tc) => tc.pending).length} tool${currentToolCalls.filter((tc) => tc.pending).length !== 1 ? "s" : ""} running)` : streamingText ? "Generating..." : "Thinking..."
     ] }) }),
     input.startsWith("/") && !isProcessing && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 2, children: [
       /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "Commands:" }),
@@ -5251,7 +5288,7 @@ Stopped ${count} background process${count > 1 ? "es" : ""}.`);
 }
 
 // src/index.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.25";
 function cleanup() {
   if (processManager.hasRunning()) {
     const count = processManager.runningCount();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantish/agent",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "AI-powered agent for building trading bots on Polymarket",
   "type": "module",
   "bin": {