paseo-acp-agy 1.2.5 → 1.2.6

package/dist/acp-server.js

@@ -444,16 +444,16 @@ export class ACPServer {
                             if (step.usage) {
                                 const inputTokens = step.usage.input_tokens ?? 0;
                                 const outputTokens = step.usage.output_tokens ?? 0;
-                                if (inputTokens > 0) {
-                                    latestStepContextTokens = inputTokens + outputTokens;
-                                }
-                                const turnCost = calculateUsageCostUsd(executingModel, inputTokens, outputTokens, step.usage.cache_read_tokens || 0);
                                 const cachedReadTokens = step.usage.cache_read_tokens ?? 0;
+                                if (inputTokens > 0 || cachedReadTokens > 0) {
+                                    latestStepContextTokens = inputTokens + cachedReadTokens + outputTokens;
+                                }
+                                const turnCost = calculateUsageCostUsd(executingModel, inputTokens, outputTokens, cachedReadTokens);
                                 const thoughtTokens = step.usage.thinking_tokens;
                                 const totalTokens = step.usage.total_tokens ?? (inputTokens + outputTokens);
                                 const totalCostUsd = roundUsageCostUsd(session.usage.totalCostUsd + turnCost);
                                 const contextWindowMaxTokens = getModelContextWindow(executingModel);
-                                const contextWindowUsedTokens = Math.min(inputTokens + outputTokens, contextWindowMaxTokens);
+                                const contextWindowUsedTokens = Math.min(latestStepContextTokens ?? (inputTokens + cachedReadTokens + outputTokens), contextWindowMaxTokens);
                                 this.sendNotification(ACP_METHODS.SESSION_UPDATE, {
                                     sessionId: session.id,
                                     update: {

package/dist/index.js

@@ -160,7 +160,7 @@ if (args.includes("doctor") || args.includes("--doctor")) {
             process.stdout.write("      Then launch Paseo again.\n");
         }
         else {
-            process.stdout.write("      Tip: Run 'paseo daemon restart' or close the Paseo app to reload.\n");
+            process.stdout.write("      Tip: Run 'paseo restart' or close the Paseo app/daemon to reload with updated patches.\n");
         }
     }
     else {

package/dist/paseo-patcher.js

@@ -1579,15 +1579,28 @@ export function isPaseoRunning() {
             return /paseo/i.test(out) && !out.includes("INFO:") && !out.includes("No tasks");
         }
         else {
-            const out = execFileSync("pgrep", ["-i", "-x", "paseo"], {
+            try {
+                const out = execFileSync("pgrep", ["-i", "-f", "paseo (daemon|supervisor)|/paseo$|@getpaseo/server"], {
+                    encoding: "utf-8",
+                    timeout: 2000,
+                });
+                const pids = out
+                    .split(/\r?\n/)
+                    .map((s) => parseInt(s.trim(), 10))
+                    .filter((p) => !isNaN(p) && p !== process.pid && p !== process.ppid);
+                if (pids.length > 0)
+                    return true;
+            }
+            catch { }
+            const out2 = execFileSync("pgrep", ["-i", "-x", "paseo"], {
                 encoding: "utf-8",
                 timeout: 2000,
             });
-            const pids = out
+            const pids2 = out2
                 .split(/\r?\n/)
                 .map((s) => parseInt(s.trim(), 10))
-                .filter((p) => !isNaN(p) && p !== process.pid);
-            return pids.length > 0;
+                .filter((p) => !isNaN(p) && p !== process.pid && p !== process.ppid);
+            return pids2.length > 0;
         }
     }
     catch {

package/dist/session.js

@@ -30,15 +30,22 @@ export class Session {
         this.createdAt = new Date();
         this.lastActivity = new Date();
         this.store = options.store || sessionStore;
-        this.usage = options.usage || {
-            inputTokens: 0,
-            outputTokens: 0,
-            cachedInputTokens: 0,
-            totalTokens: 0,
-            totalCostUsd: 0,
-            contextWindowUsedTokens: 0,
-            contextWindowMaxTokens: getModelContextWindow(this.model),
-        };
+        const maxTokens = getModelContextWindow(this.model);
+        this.usage = options.usage
+            ? { ...options.usage }
+            : {
+                inputTokens: 0,
+                outputTokens: 0,
+                cachedInputTokens: 0,
+                totalTokens: 0,
+                totalCostUsd: 0,
+                contextWindowUsedTokens: 0,
+                contextWindowMaxTokens: maxTokens,
+            };
+        this.usage.contextWindowMaxTokens = maxTokens;
+        if (this.usage.contextWindowUsedTokens > maxTokens) {
+            this.usage.contextWindowUsedTokens = Math.min(this.usage.contextWindowUsedTokens, maxTokens);
+        }
         const isSandbox = this.permission === "sandbox" || options.sandbox;
         const isBypass = this.permission === "bypass" || options.dangerouslySkipPermissions;
         const permissions = resolvePermissionSettings({
@@ -173,6 +180,9 @@ export class Session {
             if (rawTurnTokens > executingMaxTokens && numSteps > 1) {
                 activeContextTokens = Math.round(rawTurnTokens / numSteps);
             }
+            else if (rawTurnTokens > executingMaxTokens) {
+                activeContextTokens = Math.min(Math.round(rawTurnTokens / 10), executingMaxTokens);
+            }
             else {
                 activeContextTokens = rawTurnTokens;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo-acp-agy",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "ACP (Agent Client Protocol) provider for Google Antigravity in Paseo and Zed",
   "type": "module",
   "main": "dist/index.js",