open-agents-ai 0.103.15 → 0.103.16

package/dist/index.js

@@ -26223,6 +26223,13 @@ function cleanForwardHeaders(raw, targetHost) {
   out.host = targetHost;
   return out;
 }
+function fmtTokens(n) {
+  if (n < 1e3)
+    return String(n);
+  if (n < 1e6)
+    return `${(n / 1e3).toFixed(1)}K`;
+  return `${(n / 1e6).toFixed(1)}M`;
+}
 function readExposeState(stateDir) {
   try {
     const path = join35(stateDir, STATE_FILE_NAME);
@@ -26347,7 +26354,11 @@ var init_expose = __esm({
         totalRequests: 0,
         activeConnections: 0,
         errors: 0,
-        modelUsage: /* @__PURE__ */ new Map()
+        totalTokensIn: 0,
+        totalTokensOut: 0,
+        startedAt: Date.now(),
+        modelUsage: /* @__PURE__ */ new Map(),
+        users: /* @__PURE__ */ new Map()
       };
       get tunnelUrl() {
         return this._tunnelUrl;
@@ -26509,7 +26520,20 @@ var init_expose = __esm({
                 totalRequests: this._stats.totalRequests,
                 activeConnections: this._stats.activeConnections,
                 errors: this._stats.errors,
-                modelUsage: Object.fromEntries(this._stats.modelUsage)
+                totalTokensIn: this._stats.totalTokensIn,
+                totalTokensOut: this._stats.totalTokensOut,
+                uptimeSeconds: Math.floor((Date.now() - this._stats.startedAt) / 1e3),
+                modelUsage: Object.fromEntries(this._stats.modelUsage),
+                users: Array.from(this._stats.users.values()).map((u) => ({
+                  ip: u.ip,
+                  requests: u.requests,
+                  tokensIn: u.tokensIn,
+                  tokensOut: u.tokensOut,
+                  activeRequests: u.activeRequests,
+                  firstSeen: new Date(u.firstSeen).toISOString(),
+                  lastSeen: new Date(u.lastSeen).toISOString(),
+                  models: Object.fromEntries(Array.from(u.models.entries()).map(([m, v]) => [m, { requests: v.requests, tokensIn: v.tokensIn, tokensOut: v.tokensOut }]))
+                }))
               };
               res.writeHead(200, { "Content-Type": "application/json" });
               res.end(JSON.stringify({ ...metrics, gateway: gatewayStats }));
@@ -26519,8 +26543,26 @@ var init_expose = __esm({
             });
             return;
           }
+          const userIp = req.headers["cf-connecting-ip"] ?? req.headers["x-forwarded-for"]?.split(",")[0]?.trim() ?? req.socket.remoteAddress ?? "unknown";
+          let user = this._stats.users.get(userIp);
+          if (!user) {
+            user = {
+              ip: userIp,
+              firstSeen: Date.now(),
+              lastSeen: Date.now(),
+              requests: 0,
+              tokensIn: 0,
+              tokensOut: 0,
+              activeRequests: 0,
+              models: /* @__PURE__ */ new Map()
+            };
+            this._stats.users.set(userIp, user);
+          }
           this._stats.totalRequests++;
           this._stats.activeConnections++;
+          user.requests++;
+          user.activeRequests++;
+          user.lastSeen = Date.now();
           this.emitStats();
           url.searchParams.delete("key");
           const forwardPath = url.pathname + url.search;
@@ -26529,14 +26571,22 @@ var init_expose = __esm({
           req.on("end", () => {
             const body = Buffer.concat(bodyChunks);
             let isStreaming = false;
+            let requestModel = "";
             if (req.method === "POST" && body.length > 0) {
               try {
                 const text = body.toString("utf8", 0, Math.min(body.length, 1024));
                 const modelMatch = text.match(/"model"\s*:\s*"([^"]+)"/);
                 if (modelMatch) {
-                  const model = modelMatch[1];
-                  const count = this._stats.modelUsage.get(model) ?? 0;
-                  this._stats.modelUsage.set(model, count + 1);
+                  requestModel = modelMatch[1];
+                  const count = this._stats.modelUsage.get(requestModel) ?? 0;
+                  this._stats.modelUsage.set(requestModel, count + 1);
+                  let mm = user.models.get(requestModel);
+                  if (!mm) {
+                    mm = { requests: 0, tokensIn: 0, tokensOut: 0, lastUsed: Date.now() };
+                    user.models.set(requestModel, mm);
+                  }
+                  mm.requests++;
+                  mm.lastUsed = Date.now();
                 }
                 isStreaming = /"stream"\s*:\s*true/.test(text);
               } catch {
@@ -26567,6 +26617,50 @@ var init_expose = __esm({
                 heartbeatTimer = null;
               }
             };
+            let responseTail = "";
+            const finalizeRequest = () => {
+              user.activeRequests = Math.max(0, user.activeRequests - 1);
+              this._stats.activeConnections = Math.max(0, this._stats.activeConnections - 1);
+              try {
+                const promptEval = responseTail.match(/"prompt_eval_count"\s*:\s*(\d+)/);
+                const evalCount = responseTail.match(/"eval_count"\s*:\s*(\d+)/);
+                if (promptEval || evalCount) {
+                  const tIn = parseInt(promptEval?.[1] ?? "0", 10);
+                  const tOut = parseInt(evalCount?.[1] ?? "0", 10);
+                  this._stats.totalTokensIn += tIn;
+                  this._stats.totalTokensOut += tOut;
+                  user.tokensIn += tIn;
+                  user.tokensOut += tOut;
+                  if (requestModel) {
+                    const mm = user.models.get(requestModel);
+                    if (mm) {
+                      mm.tokensIn += tIn;
+                      mm.tokensOut += tOut;
+                    }
+                  }
+                } else {
+                  const promptTokens = responseTail.match(/"prompt_tokens"\s*:\s*(\d+)/);
+                  const completionTokens = responseTail.match(/"completion_tokens"\s*:\s*(\d+)/);
+                  if (promptTokens || completionTokens) {
+                    const tIn = parseInt(promptTokens?.[1] ?? "0", 10);
+                    const tOut = parseInt(completionTokens?.[1] ?? "0", 10);
+                    this._stats.totalTokensIn += tIn;
+                    this._stats.totalTokensOut += tOut;
+                    user.tokensIn += tIn;
+                    user.tokensOut += tOut;
+                    if (requestModel) {
+                      const mm = user.models.get(requestModel);
+                      if (mm) {
+                        mm.tokensIn += tIn;
+                        mm.tokensOut += tOut;
+                      }
+                    }
+                  }
+                }
+              } catch {
+              }
+              this.emitStats();
+            };
             const proxyReq = httpRequest({
               hostname: target.hostname,
               port: target.port || (target.protocol === "https:" ? 443 : 80),
@@ -26576,8 +26670,14 @@ var init_expose = __esm({
             }, (proxyRes) => {
               cleanupHeartbeat();
               proxyRes.on("error", () => {
-                this._stats.activeConnections = Math.max(0, this._stats.activeConnections - 1);
-                this.emitStats();
+                finalizeRequest();
+              });
+              proxyRes.on("data", (chunk) => {
+                const text = chunk.toString();
+                responseTail += text;
+                if (responseTail.length > 2048) {
+                  responseTail = responseTail.slice(-2048);
+                }
               });
               if (isStreaming) {
                 if (proxyRes.statusCode !== 200) {
@@ -26597,8 +26697,7 @@ var init_expose = __esm({
                     } catch {
                     }
                     this._stats.errors++;
-                    this._stats.activeConnections = Math.max(0, this._stats.activeConnections - 1);
-                    this.emitStats();
+                    finalizeRequest();
                   });
                   return;
                 }
@@ -26608,14 +26707,12 @@ var init_expose = __esm({
                 proxyRes.pipe(res);
               }
               proxyRes.on("end", () => {
-                this._stats.activeConnections = Math.max(0, this._stats.activeConnections - 1);
-                this.emitStats();
+                finalizeRequest();
               });
             });
             proxyReq.on("error", (err) => {
               cleanupHeartbeat();
               this._stats.errors++;
-              this._stats.activeConnections = Math.max(0, this._stats.activeConnections - 1);
               if (!res.headersSent) {
                 res.writeHead(502, { "Content-Type": "application/json" });
                 res.end(JSON.stringify({ error: `Backend unreachable: ${err.message}` }));
@@ -26631,7 +26728,7 @@ var init_expose = __esm({
                 } catch {
                 }
               }
-              this.emitStats();
+              finalizeRequest();
             });
             if (body.length > 0) {
               proxyReq.write(body);
@@ -26639,6 +26736,7 @@ var init_expose = __esm({
             proxyReq.end();
           });
           req.on("error", () => {
+            user.activeRequests = Math.max(0, user.activeRequests - 1);
             this._stats.activeConnections = Math.max(0, this._stats.activeConnections - 1);
             this.emitStats();
           });
@@ -26669,8 +26767,12 @@ var init_expose = __esm({
           });
           this._cloudflaredPid = this.cloudflaredProcess.pid ?? null;
           let urlFound = false;
+          let stderrOutput = "";
           const handleOutput = (data) => {
             const text = data.toString();
+            stderrOutput += text;
+            if (stderrOutput.length > 4096)
+              stderrOutput = stderrOutput.slice(-4096);
             const urlMatch = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
             if (urlMatch && !urlFound) {
               urlFound = true;
@@ -26690,7 +26792,8 @@ var init_expose = __esm({
           this.cloudflaredProcess.on("close", (code) => {
             if (!urlFound) {
               clearTimeout(timeout);
-              reject(new Error(`Cloudflared exited with code ${code} before providing URL`));
+              const hint = stderrOutput.trim().split("\n").slice(-3).join(" | ");
+              reject(new Error(`Cloudflared exited with code ${code}. ${hint ? "Output: " + hint : ""}`));
             }
             if (this._stats.status === "active") {
               this.options.onInfo?.("Cloudflared tunnel died \u2014 restarting...");
@@ -26769,7 +26872,11 @@ ${this.formatConnectionInfo()}`);
         });
       }
       emitStats() {
-        this.emit("stats", { ...this._stats, modelUsage: new Map(this._stats.modelUsage) });
+        this.emit("stats", {
+          ...this._stats,
+          modelUsage: new Map(this._stats.modelUsage),
+          users: new Map(this._stats.users)
+        });
       }
       /** Format connection info for display */
       formatConnectionInfo() {
@@ -26795,15 +26902,50 @@ ${this.formatConnectionInfo()}`);
       formatStats() {
         const s = this._stats;
         const lines = [];
+        const uptimeSec = Math.floor((Date.now() - s.startedAt) / 1e3);
+        const uptimeStr = uptimeSec < 60 ? `${uptimeSec}s` : uptimeSec < 3600 ? `${Math.floor(uptimeSec / 60)}m ${uptimeSec % 60}s` : `${Math.floor(uptimeSec / 3600)}h ${Math.floor(uptimeSec % 3600 / 60)}m`;
         lines.push(`  ${c2.bold("Expose Gateway Stats")}`);
-        lines.push(`  ${c2.cyan("Status".padEnd(16))} ${s.status === "active" ? c2.green("active") : s.status === "error" ? c2.red("error") : c2.yellow("standby")}`);
-        lines.push(`  ${c2.cyan("Total requests".padEnd(16))} ${s.totalRequests}`);
-        lines.push(`  ${c2.cyan("Active conns".padEnd(16))} ${s.activeConnections}`);
-        lines.push(`  ${c2.cyan("Errors".padEnd(16))} ${s.errors}`);
+        lines.push(`  ${c2.cyan("Status".padEnd(18))} ${s.status === "active" ? c2.green("active") : s.status === "error" ? c2.red("error") : c2.yellow("standby")}`);
+        lines.push(`  ${c2.cyan("Uptime".padEnd(18))} ${uptimeStr}`);
+        lines.push(`  ${c2.cyan("Total requests".padEnd(18))} ${s.totalRequests}`);
+        lines.push(`  ${c2.cyan("Active conns".padEnd(18))} ${s.activeConnections}`);
+        lines.push(`  ${c2.cyan("Errors".padEnd(18))} ${s.errors}`);
+        lines.push(`  ${c2.cyan("Tokens in".padEnd(18))} ${fmtTokens(s.totalTokensIn)}`);
+        lines.push(`  ${c2.cyan("Tokens out".padEnd(18))} ${fmtTokens(s.totalTokensOut)}`);
         if (s.modelUsage.size > 0) {
-          lines.push(`  ${c2.cyan("Models used:")}`);
+          lines.push("");
+          lines.push(`  ${c2.bold("Models")}`);
           for (const [model, count] of s.modelUsage) {
-            lines.push(`    ${model}: ${count} requests`);
+            let mIn = 0, mOut = 0;
+            for (const user of s.users.values()) {
+              const mm = user.models.get(model);
+              if (mm) {
+                mIn += mm.tokensIn;
+                mOut += mm.tokensOut;
+              }
+            }
+            lines.push(`  ${c2.cyan(model.padEnd(30))} ${count} reqs  ${c2.dim(`in:${fmtTokens(mIn)} out:${fmtTokens(mOut)}`)}`);
+          }
+        }
+        if (s.users.size > 0) {
+          lines.push("");
+          lines.push(`  ${c2.bold("Active Users")} (${s.users.size})`);
+          for (const user of s.users.values()) {
+            const ageSec = Math.floor((Date.now() - user.firstSeen) / 1e3);
+            const ageStr = ageSec < 60 ? `${ageSec}s` : ageSec < 3600 ? `${Math.floor(ageSec / 60)}m` : `${Math.floor(ageSec / 3600)}h ${Math.floor(ageSec % 3600 / 60)}m`;
+            const lastSec = Math.floor((Date.now() - user.lastSeen) / 1e3);
+            const lastStr = lastSec < 5 ? "now" : lastSec < 60 ? `${lastSec}s ago` : `${Math.floor(lastSec / 60)}m ago`;
+            const activeTag = user.activeRequests > 0 ? c2.green(` [${user.activeRequests} active]`) : "";
+            lines.push(`  ${c2.bold(user.ip)}${activeTag}`);
+            lines.push(`    ${c2.dim("Session:")} ${ageStr}  ${c2.dim("Last seen:")} ${lastStr}  ${c2.dim("Requests:")} ${user.requests}`);
+            lines.push(`    ${c2.dim("Tokens:")} in:${fmtTokens(user.tokensIn)} out:${fmtTokens(user.tokensOut)}  ${c2.dim("Total:")} ${fmtTokens(user.tokensIn + user.tokensOut)}`);
+            if (user.models.size > 0) {
+              const modelParts = [];
+              for (const [m, mm] of user.models) {
+                modelParts.push(`${m} (${mm.requests} reqs, ${fmtTokens(mm.tokensIn + mm.tokensOut)} tokens)`);
+              }
+              lines.push(`    ${c2.dim("Models:")} ${modelParts.join(", ")}`);
+            }
           }
         }
         return lines.join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.103.15",
+  "version": "0.103.16",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",