paseo-acp-agy 1.3.1 → 1.3.3

package/dist/acp-server.js

@@ -418,6 +418,7 @@ export class ACPServer extends EventEmitter {
                             }
                         }
                         if (!isNotification) {
+                            this.publishUsageUpdate(session);
                             this.sendSuccess(id, await this.sessionState(session));
                             this.publishCommands(session.id);
                             this.publishUsageUpdate(session);
@@ -465,6 +466,7 @@ export class ACPServer extends EventEmitter {
                             catch { }
                         }
                         if (!isNotification) {
+                            this.publishUsageUpdate(session);
                             this.sendSuccess(id, await this.sessionState(session));
                             this.publishCommands(session.id);
                             this.publishUsageUpdate(session);
@@ -679,8 +681,8 @@ export class ACPServer extends EventEmitter {
                                             toolCall: {
                                                 toolCallId: toolCall.toolCallId,
                                                 title: toolCall.title,
-                                                kind: "question",
-                                                content: [{ type: "text", text: promptText }],
+                                                kind: "other",
+                                                content: [{ type: "content", content: { type: "text", text: promptText } }],
                                                 rawInput: toolCall.rawInput,
                                             },
                                             options,

package/dist/paseo-patcher.js

@@ -119,14 +119,12 @@ export function findPaseoServerInstallations() {
         }
     }
     else {
-        // POSIX locations (Linux / macOS)
+        // POSIX locations (Linux / standalone CLI — never inside signed macOS .app bundles)
         const posixLocations = [
             "/usr/lib/node_modules/@getpaseo/cli/node_modules/@getpaseo/server",
             "/usr/lib/node_modules/@getpaseo/server",
             "/usr/local/lib/node_modules/@getpaseo/cli/node_modules/@getpaseo/server",
             "/usr/local/lib/node_modules/@getpaseo/server",
-            "/Applications/Paseo.app/Contents/Resources/app.asar.unpacked/node_modules/@getpaseo/server",
-            "/Applications/Paseo.app/Contents/Resources/app/node_modules/@getpaseo/server",
         ];
         if (home) {
             posixLocations.push(path.join(home, ".local", "lib", "node_modules", "@getpaseo", "cli", "node_modules", "@getpaseo", "server"), path.join(home, ".local", "lib", "node_modules", "@getpaseo", "server"), path.join(home, ".local", "share", "pnpm", "global", "5", "node_modules", "@getpaseo", "cli", "node_modules", "@getpaseo", "server"), path.join(home, ".bun", "install", "global", "node_modules", "@getpaseo", "cli", "node_modules", "@getpaseo", "server"));
@@ -199,6 +197,11 @@ export function findPaseoServerInstallations() {
         if (seen.has(key))
             continue;
         seen.add(key);
+        if (process.platform === "darwin" &&
+            dir.includes(".app/Contents/") &&
+            process.env.PASEO_SERVER_PATH !== dir) {
+            continue;
+        }
         if (fs.existsSync(path.join(dir, "dist")) || fs.existsSync(path.join(dir, "package.json"))) {
             verified.push(dir);
         }
@@ -711,10 +714,18 @@ function toneFromUsedPct(usedPct) {
 
 function isStandaloneTelemetryPluginEnabled() {
     try {
-        const paseoHome = process.env.PASEO_HOME || path.join(os.homedir(), ".paseo");
+        let paseoHome = process.env.PASEO_HOME;
+        if (!paseoHome && Array.isArray(process.argv)) {
+            const homeIdx = process.argv.indexOf("--home");
+            if (homeIdx !== -1 && process.argv[homeIdx + 1]) {
+                paseoHome = process.argv[homeIdx + 1];
+            }
+        }
+        paseoHome = paseoHome || path.join(os.homedir(), ".paseo");
         const cfgPath = path.join(paseoHome, "config.json");
         if (!fs.existsSync(cfgPath)) return false;
         const cfg = JSON.parse(fs.readFileSync(cfgPath, "utf-8"));
+        if (cfg && cfg.pluginsEnabled === false) return false;
         const entry = cfg && cfg.plugins && cfg.plugins["antigravity-telemetry"];
         return Boolean(entry && entry.enabled !== false);
     } catch {
@@ -1262,6 +1273,28 @@ ${braceIndent}}`;
                     acpModified = true;
                 }
             }
+            // Patch handlePromptResponse so response.usage merges defined fields instead of wiping
+            // totalCostUsd / contextWindowMaxTokens / contextWindowUsedTokens from this.currentTurnUsage
+            const promptRespAssignRegex = /([ \t]*)this\.currentTurnUsage\s*=\s*mapACPUsage\(response\.usage\)\s*\?\?\s*this\.currentTurnUsage;/;
+            if (promptRespAssignRegex.test(acpCode) && !acpCode.includes("_mappedRespUsage")) {
+                acpCode = acpCode.replace(promptRespAssignRegex, (_m, ind) => `${ind}const _mappedRespUsage = mapACPUsage(response.usage);\n` +
+                    `${ind}if (_mappedRespUsage) {\n` +
+                    `${ind}    this.currentTurnUsage = {\n` +
+                    `${ind}        ...this.currentTurnUsage,\n` +
+                    `${ind}        ...Object.fromEntries(Object.entries(_mappedRespUsage).filter(([, v]) => v !== undefined)),\n` +
+                    `${ind}    };\n` +
+                    `${ind}}`);
+                acpModified = true;
+            }
+            // Patch subscribe(callback) so any usage_update received during newSession/loadSession
+            // (before subscribers attach, including history resumes) is replayed immediately
+            const subscribeMethodMatch = acpCode.match(/subscribe\s*\([^)]*\)\s*\{[\s\S]*?\n\s*\}/);
+            if (subscribeMethodMatch &&
+                acpCode.includes('type: "thread_started"') &&
+                !subscribeMethodMatch[0].includes("usage_updated")) {
+                acpCode = acpCode.replace(/(\bcallback\(\{\s*type:\s*"thread_started"[\s\S]*?\}\);\s*\})/, `$1\n        if (this.currentTurnUsage) {\n            callback({\n                type: "usage_updated",\n                provider: this.provider,\n                usage: this.currentTurnUsage,\n            });\n        }`);
+                acpModified = true;
+            }
             // Patch mapPermissionRequest for native QuestionFormCard support in Paseo UI
             if (!acpCode.includes("snapshot?.kind === \"question\" || params?.kind === \"question\"")) {
                 const oldMapPermRegex = /function\s+mapPermissionRequest\s*\([^)]*\)\s*\{[\s\S]*?const\s+kind\s*=\s*snapshot\.kind\s*===\s*"switch_mode"\s*\?\s*"mode"\s*:\s*"tool";/m;
@@ -1968,6 +2001,10 @@ export function isPaseoServerPatched(serverDir) {
             if (pluginDir && (!content.includes("usageSession()") || content.includes("!this.usageProvider"))) {
                 return false;
             }
+            if (content.includes("mapACPUsage(response.usage) ?? this.currentTurnUsage") &&
+                !content.includes("_mappedRespUsage")) {
+                return false;
+            }
         }
         return true;
     }

package/dist/protocol.d.ts

@@ -135,7 +135,7 @@ export interface SessionInfo {
     updatedAt?: string | null;
     _meta?: Record<string, unknown> | null;
 }
-export type ToolKind = "read" | "edit" | "execute" | "fetch" | "search" | "question" | "other";
+export type ToolKind = "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "switch_mode" | "other";
 export declare function mapToolNameToKind(toolName: string): ToolKind;
 export declare function extractPromptText(promptInput: unknown): string;
 export interface ModelDefinition {

package/dist/tool-formatter.d.ts

@@ -18,6 +18,7 @@ export interface NormalizedToolResult {
 }
 export interface PlanEntry {
     content: string;
+    priority: "high" | "medium" | "low";
     status: "pending" | "in_progress" | "completed";
 }
 /**

package/dist/tool-formatter.js

@@ -102,7 +102,7 @@ export function normalizeToolCall(toolName, rawParams = {}, stepIndex) {
         return {
             toolCallId,
             title: "❓ Pergunta do Assistente",
-            kind: "question",
+            kind: "other",
             rawInput: normalizedParams,
             questionCard: questionCard || undefined,
         };
@@ -149,8 +149,11 @@ export function normalizeToolResult(toolName, rawParams = {}, output, error) {
     else if (name === "read_file" || name === "view_file") {
         if (outputStr.trim()) {
             content.push({
-                type: "text",
-                text: outputStr,
+                type: "content",
+                content: {
+                    type: "text",
+                    text: outputStr,
+                },
             });
         }
     }
@@ -180,7 +183,7 @@ export function extractPlanEntries(text) {
             else if (mark === "/" || mark === "-") {
                 status = "in_progress";
             }
-            entries.push({ content, status });
+            entries.push({ content, priority: "medium", status });
         }
     }
     return entries.length >= 2 ? entries : null;

package/dist/transcript.d.ts

@@ -8,6 +8,7 @@ export interface ReplayItem {
     rawInput?: Record<string, unknown>;
     rawOutput?: string;
     status?: "completed" | "failed";
+    compacted?: boolean;
 }
 /**
  * Strips XML-like tags injected by harness or system prompts (e.g., <USER_REQUEST>, <ADDITIONAL_METADATA>)

package/dist/transcript.js

@@ -85,11 +85,13 @@ export function loadConversationTranscript(conversationId) {
             const stepType = String(step.type || "");
             if (stepType === "USER_INPUT") {
                 const rawContent = typeof step.content === "string" ? step.content : "";
+                const isCompacted = rawContent.includes("<CONTEXT_SUMMARY>");
                 const cleanPrompt = extractCleanUserPrompt(rawContent);
                 if (cleanPrompt) {
                     replayItems.push({
                         type: "user_message",
                         text: cleanPrompt,
+                        ...(isCompacted ? { compacted: true } : {}),
                     });
                 }
             }
@@ -163,6 +165,9 @@ export function estimateReplayContextTokens(items) {
         return 0;
     let totalChars = 0;
     for (const item of items) {
+        if (item.compacted) {
+            totalChars = 0;
+        }
         if (item.text) {
             totalChars += item.text.length;
         }

package/package.json

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

package/paseo-plugin/client/format.ts

@@ -41,6 +41,8 @@ export function toneColor(tone: UsageTone, theme: PluginTheme): string {
 export function buildPillLabel(session: SessionTelemetry, quota: QuotaReport): string {
   const parts: string[] = [];
 
+  parts.push(`${Math.round(session.contextPct)}% ctx`);
+
   if (session.totalCostUsd > 0) {
     parts.push(fmtCost(session.totalCostUsd));
   } else if (session.totalTokens > 0) {
@@ -49,8 +51,6 @@ export function buildPillLabel(session: SessionTelemetry, quota: QuotaReport): s
     parts.push("$0.00");
   }
 
-  parts.push(`ctx ${Math.round(session.contextPct)}%`);
-
   const primaryFiveHour =
     quota.windows.find((w) => w.id === "session") ?? quota.windows[0] ?? null;
   if (primaryFiveHour) {

package/paseo-plugin/client/pill.tsx

@@ -5,13 +5,22 @@ import type {
   PluginClientContext,
 } from "@getpaseo/plugin/client";
 import { Icon, ScrollView } from "@getpaseo/plugin/client/react-native";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { Text, View } from "react-native";
 import { isAntigravityProvider } from "../shared/telemetry.ts";
 import { useAntigravityTelemetry } from "./data.ts";
 import { TelemetryBody } from "./ui.tsx";
 import { buildPillLabel } from "./ui-helpers.ts";
 
+function sanitizeButtonId(agentId: string): string {
+  const cleaned = agentId
+    .toLowerCase()
+    .replace(/[^a-z0-9-]+/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-|-$/g, "");
+  return `agy-telemetry-${cleaned || "agent"}`;
+}
+
 interface PopoverProps {
   theme: PluginTheme;
   layout: { compact: boolean };
@@ -62,21 +71,35 @@ export function contributeAntigravityPills(client: PluginClientContext): () => P
 
     function TelemetryPillIcon(props: PluginButtonIconProps) {
       const { data, error } = useAntigravityTelemetry(agentId);
+      const lastLabelRef = useRef<string>("AGY …");
+
       useEffect(() => {
         if (!handle) return;
-        const nextLabel = error
+        const computed = error
           ? "AGY"
           : data
             ? buildPillLabel(data.session, data.quota)
             : "AGY …";
-        handle.update({ label: nextLabel });
+        const nextLabel = computed.trim() || "AGY";
+        if (lastLabelRef.current !== nextLabel) {
+          lastLabelRef.current = nextLabel;
+          handle.update({ label: nextLabel });
+        }
       }, [data, error]);
 
+      const pct = data?.session.contextPct ?? 0;
+      const iconColor =
+        pct >= 90
+          ? "#ef4444"
+          : pct >= 75
+            ? "#f59e0b"
+            : props.color;
+
       return (
         <Icon
           name={data?.session.activeTurn ? "Activity" : "Gauge"}
           size={props.size}
-          color={props.color}
+          color={iconColor}
         />
       );
     }
@@ -123,7 +146,7 @@ export function contributeAntigravityPills(client: PluginClientContext): () => P
     }
 
     handle = client.addComposerPill({
-      id: `agy-telemetry-${agentId}`,
+      id: sanitizeButtonId(agentId),
       workspaceId,
       agentId,
       button: {

package/paseo-plugin/index.client.tsx

@@ -30,14 +30,19 @@ export default function contribute(client: PluginClientContext) {
   ).addSlashCommand;
 
   if (typeof maybeAddSlashCommand === "function") {
-    maybeAddSlashCommand.call(client, {
-      name: "agy-telemetry",
-      description: "Open Antigravity session usage, context wheel & quota panel",
-      context: "agent",
-      async onSubmit({ openPanel }) {
-        openPanel("telemetry");
-      },
-    });
+    try {
+      maybeAddSlashCommand.call(client, {
+        name: "agy-telemetry",
+        description: "Open Antigravity session usage, context wheel & quota panel",
+        argumentHint: "[panel]",
+        context: "agent",
+        async onSubmit({ openPanel }) {
+          openPanel("telemetry");
+        },
+      });
+    } catch (err) {
+      console.warn("[antigravity-telemetry] Slash command registration skipped:", err);
+    }
   }
 
   return contributeAntigravityPills(client);

package/paseo-plugin/server/agy-usage.ts

@@ -475,6 +475,43 @@ export interface AgentSnapshotInfo {
   } | null;
 }
 
+function estimateConversationContextTokens(conversationId: string | null | undefined, maxTokens: number): number | null {
+  if (!conversationId) return null;
+  const home = os.homedir();
+  const candidates = [
+    process.env.AGY_BRAIN_DIR ? path.join(process.env.AGY_BRAIN_DIR, conversationId) : "",
+    home ? path.join(home, ".gemini", "antigravity-cli", "brain", conversationId) : "",
+    home ? path.join(home, ".antigravity", "brain", conversationId) : "",
+  ].filter(Boolean);
+
+  for (const brainDir of candidates) {
+    const transcriptPath = path.join(brainDir, ".system_generated", "logs", "transcript.jsonl");
+    if (!fs.existsSync(transcriptPath)) continue;
+    try {
+      const content = fs.readFileSync(transcriptPath, "utf-8");
+      const lines = content.split(/\r?\n/).filter(Boolean);
+      let activeChars = 0;
+      for (const line of lines) {
+        try {
+          const step = JSON.parse(line) as Record<string, unknown>;
+          const rawContent = typeof step.content === "string" ? step.content : "";
+          if (step.type === "USER_INPUT" && rawContent.includes("<CONTEXT_SUMMARY>")) {
+            activeChars = 0;
+          }
+          activeChars += rawContent.length;
+          if (typeof step.thinking === "string") activeChars += step.thinking.length;
+          if (Array.isArray(step.tool_calls)) activeChars += JSON.stringify(step.tool_calls).length;
+        } catch {}
+      }
+      if (activeChars <= 0) return null;
+      return Math.min(maxTokens, 4_000 + Math.ceil(activeChars / 4));
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+
 export function resolveSessionTelemetry(
   agentId: string,
   snapshot: AgentSnapshotInfo | null | undefined
@@ -496,10 +533,22 @@ export function resolveSessionTelemetry(
         : defaultMax;
     // Prefer live streaming contextWindowUsedTokens from snapshot if higher/fresher mid-turn
     const liveUsed = snapshot?.lastUsage?.contextWindowUsedTokens;
-    const rawUsed =
+    let rawUsed =
       snapshot?.activeTurn && typeof liveUsed === "number" && liveUsed > 0
         ? liveUsed
         : (u.contextWindowUsedTokens ?? liveUsed ?? 0);
+    // Repair legacy pre-v1.3.0 sessions where cumulative inputTokens was clamped to maxTokens
+    if (
+      rawUsed >= maxTokens &&
+      inputTokens > maxTokens &&
+      (!liveUsed || liveUsed >= maxTokens) &&
+      persisted.conversationId
+    ) {
+      const estimated = estimateConversationContextTokens(persisted.conversationId, maxTokens);
+      if (estimated !== null && estimated > 0 && estimated < maxTokens) {
+        rawUsed = estimated;
+      }
+    }
     const usedTokens = Math.min(Math.max(0, rawUsed), maxTokens);
     const totalCostUsd =
       typeof u.totalCostUsd === "number"
@@ -545,9 +594,9 @@ export function resolveSessionTelemetry(
     return {
       agentId,
       sessionId,
-      conversationId: null,
+      conversationId: persisted?.conversationId ?? null,
       model,
-      effort: null,
+      effort: persisted?.effort ?? null,
       activeTurn: Boolean(snapshot.activeTurn),
       inputTokens,
       outputTokens,
@@ -562,6 +611,28 @@ export function resolveSessionTelemetry(
     };
   }
 
+  if (persisted?.conversationId) {
+    const estimated = estimateConversationContextTokens(persisted.conversationId, defaultMax) ?? 0;
+    return {
+      agentId,
+      sessionId,
+      conversationId: persisted.conversationId,
+      model,
+      effort: persisted.effort ?? null,
+      activeTurn: Boolean(snapshot?.activeTurn),
+      inputTokens: 0,
+      outputTokens: 0,
+      cachedInputTokens: 0,
+      totalTokens: 0,
+      totalCostUsd: 0,
+      contextWindowUsedTokens: estimated,
+      contextWindowMaxTokens: defaultMax,
+      contextPct: defaultMax > 0 ? Math.min(100, Math.round((estimated / defaultMax) * 1000) / 10) : 0,
+      updatedAt: persisted.updatedAt ?? snapshot?.updatedAt ?? null,
+      source: "acp_store",
+    };
+  }
+
   return {
     agentId,
     sessionId,