paseo-acp-agy 1.2.2 → 1.2.4

package/dist/asar.d.ts

@@ -4,6 +4,11 @@ export interface AsarNode {
     offset?: string;
     executable?: boolean;
     unpacked?: boolean;
+    link?: string;
+}
+export interface ExtractResult {
+    unpackedPaths: string[];
+    originalHeader: AsarNode;
 }
 /**
  * Reads and parses the ASAR archive header and returns the root node and base offset for data.
@@ -20,9 +25,13 @@ export declare function listPackage(archivePath: string): string[];
  * Pure TypeScript, zero-dependency ASAR archive extractor.
  * Compatible with all Node.js versions (Node 18, 20, 22, 24+) across Windows, macOS, and Linux.
  */
-export declare function extractAll(archivePath: string, destDir: string): void;
+export declare function extractAll(archivePath: string, destDir: string): ExtractResult;
+export interface CreatePackageOptions {
+    unpackedPaths?: string[];
+    originalHeader?: AsarNode;
+}
 /**
  * Pure TypeScript, zero-dependency ASAR archive builder.
  * Compatible with all Node.js versions (Node 18, 20, 22, 24+) across Windows, macOS, and Linux.
  */
-export declare function createPackage(srcDir: string, destFile: string): Promise<void>;
+export declare function createPackage(srcDir: string, destFile: string, options?: CreatePackageOptions): Promise<void>;

package/dist/asar.js

@@ -61,6 +61,7 @@ export function listPackage(archivePath) {
 export function extractAll(archivePath, destDir) {
     const { header, dataBaseOffset } = readArchiveHeader(archivePath);
     const fd = fs.openSync(archivePath, "r");
+    const unpackedPaths = [];
     try {
         function extractNode(node, currentPath, relParts = []) {
             if (node.files) {
@@ -69,6 +70,20 @@ export function extractAll(archivePath, destDir) {
                     extractNode(child, path.join(currentPath, name), [...relParts, name]);
                 }
             }
+            else if (node.link) {
+                fs.mkdirSync(path.dirname(currentPath), { recursive: true });
+                try {
+                    fs.unlinkSync(currentPath);
+                }
+                catch { }
+                fs.symlinkSync(node.link, currentPath);
+            }
+            else if (node.unpacked) {
+                // Unpacked files belong in archive.unpacked and must NOT be copied into destDir,
+                // so that re-packing does not duplicate external binaries into the asar payload.
+                const relPath = relParts.join("/");
+                unpackedPaths.push(relPath);
+            }
             else if (node.size !== undefined && node.offset !== undefined) {
                 const fileOffset = dataBaseOffset + parseInt(node.offset, 10);
                 const fileBuf = Buffer.alloc(node.size);
@@ -80,15 +95,9 @@ export function extractAll(archivePath, destDir) {
                     mode: node.executable ? 0o755 : 0o644,
                 });
             }
-            else if (node.unpacked) {
-                const unpackedSrc = path.join(archivePath + ".unpacked", ...relParts);
-                if (fs.existsSync(unpackedSrc)) {
-                    fs.mkdirSync(path.dirname(currentPath), { recursive: true });
-                    fs.copyFileSync(unpackedSrc, currentPath);
-                }
-            }
         }
         extractNode(header, destDir);
+        return { unpackedPaths, originalHeader: header };
     }
     finally {
         fs.closeSync(fd);
@@ -98,7 +107,7 @@ export function extractAll(archivePath, destDir) {
  * Pure TypeScript, zero-dependency ASAR archive builder.
  * Compatible with all Node.js versions (Node 18, 20, 22, 24+) across Windows, macOS, and Linux.
  */
-export async function createPackage(srcDir, destFile) {
+export async function createPackage(srcDir, destFile, options) {
     const files = [];
     function walk(dir, rel = "") {
         const entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -106,16 +115,25 @@ export async function createPackage(srcDir, destFile) {
         for (const e of entries) {
             const entryRel = rel ? `${rel}/${e.name}` : e.name;
             const full = path.join(dir, e.name);
-            if (e.isDirectory()) {
+            const lstat = fs.lstatSync(full);
+            if (lstat.isSymbolicLink()) {
+                files.push({
+                    relPath: entryRel,
+                    fullPath: full,
+                    size: 0,
+                    isLink: true,
+                    linkTarget: fs.readlinkSync(full),
+                });
+            }
+            else if (lstat.isDirectory()) {
                 walk(full, entryRel);
             }
-            else if (e.isFile()) {
-                const stat = fs.statSync(full);
-                const executable = Boolean(stat.mode & 0o111);
+            else if (lstat.isFile()) {
+                const executable = Boolean(lstat.mode & 0o111);
                 files.push({
                     relPath: entryRel,
                     fullPath: full,
-                    size: stat.size,
+                    size: lstat.size,
                     executable: executable || undefined,
                 });
             }
@@ -134,12 +152,39 @@ export async function createPackage(srcDir, destFile) {
             curr = curr[parts[i]].files;
         }
         const leaf = parts[parts.length - 1];
-        curr[leaf] = {
-            size: f.size,
-            offset: String(currentOffset),
-            executable: f.executable,
-        };
-        currentOffset += f.size;
+        if (f.isLink) {
+            curr[leaf] = { link: f.linkTarget };
+        }
+        else {
+            curr[leaf] = {
+                size: f.size,
+                offset: String(currentOffset),
+                executable: f.executable,
+            };
+            currentOffset += f.size;
+        }
+    }
+    // Restore unpacked file references from original archive if provided
+    if (options?.unpackedPaths && options?.originalHeader) {
+        for (const relPath of options.unpackedPaths) {
+            const parts = relPath.split("/");
+            let origNode = options.originalHeader;
+            for (const p of parts) {
+                origNode = origNode?.files?.[p];
+            }
+            let curr = header.files;
+            for (let i = 0; i < parts.length - 1; i++) {
+                if (!curr[parts[i]]) {
+                    curr[parts[i]] = { files: {} };
+                }
+                curr = curr[parts[i]].files;
+            }
+            const leaf = parts[parts.length - 1];
+            curr[leaf] = {
+                size: origNode?.size ?? 0,
+                unpacked: true,
+            };
+        }
     }
     const jsonBuf = Buffer.from(JSON.stringify(header), "utf8");
     const alignedJsonLen = (jsonBuf.length + 3) & ~3;
@@ -159,7 +204,7 @@ export async function createPackage(srcDir, destFile) {
         fs.writeSync(fd, sizePickle);
         fs.writeSync(fd, headerPickle);
         for (const f of files) {
-            if (f.size > 0) {
+            if (!f.isLink && f.size > 0) {
                 const content = fs.readFileSync(f.fullPath);
                 fs.writeSync(fd, content);
             }

package/dist/paseo-patcher.js

@@ -129,7 +129,7 @@ export function findPaseoServerInstallations() {
             "/Applications/Paseo.app/Contents/Resources/app/node_modules/@getpaseo/server",
         ];
         if (home) {
-            posixLocations.push(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"));
+            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"));
             // Check nvm paths if available
             const nvmDir = path.join(home, ".nvm", "versions", "node");
             if (fs.existsSync(nvmDir)) {
@@ -146,6 +146,38 @@ export function findPaseoServerInstallations() {
             if (fs.existsSync(loc))
                 candidates.add(path.resolve(loc));
         }
+        // Inspect which paseo on POSIX
+        try {
+            const whichOut = execFileSync("which", ["paseo"], {
+                encoding: "utf-8",
+                timeout: 3000,
+            }).trim();
+            for (const line of whichOut.split(/\r?\n/).map((l) => l.trim()).filter(Boolean)) {
+                let realLine = line;
+                try {
+                    realLine = fs.realpathSync(line);
+                }
+                catch { }
+                const dirs = [path.dirname(line), path.dirname(realLine)];
+                for (const dir of dirs) {
+                    const checks = [
+                        path.join(dir, "node_modules", "@getpaseo", "cli", "node_modules", "@getpaseo", "server"),
+                        path.join(dir, "node_modules", "@getpaseo", "server"),
+                        path.join(path.dirname(dir), "node_modules", "@getpaseo", "cli", "node_modules", "@getpaseo", "server"),
+                        path.join(path.dirname(dir), "node_modules", "@getpaseo", "server"),
+                        path.join(path.dirname(path.dirname(dir)), "node_modules", "@getpaseo", "cli", "node_modules", "@getpaseo", "server"),
+                        path.join(path.dirname(path.dirname(dir)), "node_modules", "@getpaseo", "server"),
+                        path.join(dir, "resources", "app.asar.unpacked", "node_modules", "@getpaseo", "server"),
+                        path.join(path.dirname(dir), "resources", "app.asar.unpacked", "node_modules", "@getpaseo", "server"),
+                    ];
+                    for (const c of checks) {
+                        if (fs.existsSync(c))
+                            candidates.add(path.resolve(c));
+                    }
+                }
+            }
+        }
+        catch { }
         try {
             const npmRoot = execFileSync("npm", ["root", "-g"], { encoding: "utf-8", timeout: 2000 }).trim();
             if (npmRoot && fs.existsSync(npmRoot)) {
@@ -618,39 +650,43 @@ export function patchPaseoServer(serverDir) {
                 }
             }
             // Patch handleUsageUpdate
-            if (acpCode.includes("handleUsageUpdate") && (!acpCode.includes("this.deliverTranslatedEvents") || acpCode.includes("this.notifySubscribers"))) {
-                const startIdx = acpCode.search(/\bhandleUsageUpdate\s*\(/);
-                if (startIdx !== -1) {
-                    const openBrace = acpCode.indexOf("{", startIdx);
-                    if (openBrace !== -1) {
-                        let depth = 1;
-                        let i = openBrace + 1;
-                        while (i < acpCode.length && depth > 0) {
-                            if (acpCode[i] === "{")
-                                depth++;
-                            else if (acpCode[i] === "}")
-                                depth--;
-                            i++;
-                        }
-                        if (depth === 0) {
-                            const newHandler = `handleUsageUpdate(update) {
-        if (!update) return;
-        const usage = mapACPUsage(update);
-        if (usage) {
-            this.currentTurnUsage = { ...this.currentTurnUsage, ...usage };
-            const event = {
-                type: "usage_updated",
-                provider: this.provider,
-                usage: this.currentTurnUsage,
-                ...(this.activeForegroundTurnId ? { turnId: this.activeForegroundTurnId } : {}),
-            };
-            if (typeof this.deliverTranslatedEvents === "function") {
-                this.deliverTranslatedEvents([event]);
-            } else if (typeof this.pushEvent === "function") {
-                this.pushEvent(event);
-            }
-        }
-    }`;
+            const methodMatch = acpCode.match(/(?:^|\n)([ \t]*)handleUsageUpdate\s*\([^)]*\)\s*\{/);
+            if (methodMatch && methodMatch.index !== undefined) {
+                const startIdx = methodMatch.index + (methodMatch[0].startsWith("\n") ? 1 : 0);
+                const openBrace = acpCode.indexOf("{", startIdx);
+                if (openBrace !== -1) {
+                    let depth = 1;
+                    let i = openBrace + 1;
+                    while (i < acpCode.length && depth > 0) {
+                        if (acpCode[i] === "{")
+                            depth++;
+                        else if (acpCode[i] === "}")
+                            depth--;
+                        i++;
+                    }
+                    if (depth === 0) {
+                        const currentMethodBody = acpCode.slice(startIdx, i);
+                        const needsPatch = !currentMethodBody.includes('type: "usage_updated"') || currentMethodBody.includes("this.notifySubscribers");
+                        if (needsPatch) {
+                            const indent = methodMatch[1] || "    ";
+                            const newHandler = `${indent}handleUsageUpdate(update) {
+${indent}    if (!update) return;
+${indent}    const usage = mapACPUsage(update);
+${indent}    if (usage) {
+${indent}        this.currentTurnUsage = { ...this.currentTurnUsage, ...usage };
+${indent}        const event = {
+${indent}            type: "usage_updated",
+${indent}            provider: this.provider,
+${indent}            usage: this.currentTurnUsage,
+${indent}            ...(this.activeForegroundTurnId ? { turnId: this.activeForegroundTurnId } : {}),
+${indent}        };
+${indent}        if (typeof this.pushEvent === "function") {
+${indent}            this.pushEvent(event);
+${indent}        } else if (typeof this.deliverTranslatedEvents === "function") {
+${indent}            this.deliverTranslatedEvents([event]);
+${indent}        }
+${indent}    }
+${indent}}`;
                             acpCode = acpCode.slice(0, startIdx) + newHandler + acpCode.slice(i);
                             acpModified = true;
                         }
@@ -762,7 +798,7 @@ export async function patchPaseoAsar(asarPath) {
             return { success: false, changes: [], error: `Asar archive not found: ${asarPath}` };
         }
         tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "paseo-asar-extract-"));
-        extractAll(asarPath, tempDir);
+        const { unpackedPaths, originalHeader } = extractAll(asarPath, tempDir);
         // Look for server directory in extracted files
         const serverCandidates = [
             path.join(tempDir, "node_modules", "@getpaseo", "server"),
@@ -805,8 +841,27 @@ export async function patchPaseoAsar(asarPath) {
             return { success: true, changes: [] };
         }
         changes.push(...patchResult.changes);
-        // Create backup if not already present
-        const backupPath = `${asarPath}.bak`;
+        // Create backup if not already present.
+        // On macOS, never write backup inside .app bundle (e.g. app.asar.bak) because it breaks code signing seals.
+        let backupPath;
+        if (process.platform === "darwin" && asarPath.includes(".app")) {
+            const backupDir = path.join(os.homedir(), ".paseo", "backups");
+            if (!fs.existsSync(backupDir)) {
+                fs.mkdirSync(backupDir, { recursive: true });
+            }
+            backupPath = path.join(backupDir, "app.asar.bak");
+            // Clean up any orphan backup inside the .app bundle from previous runs
+            const orphanBak = `${asarPath}.bak`;
+            if (fs.existsSync(orphanBak)) {
+                try {
+                    fs.unlinkSync(orphanBak);
+                }
+                catch { }
+            }
+        }
+        else {
+            backupPath = `${asarPath}.bak`;
+        }
         if (!fs.existsSync(backupPath)) {
             try {
                 fs.copyFileSync(asarPath, backupPath);
@@ -817,7 +872,7 @@ export async function patchPaseoAsar(asarPath) {
             }
         }
         tempAsar = path.join(os.tmpdir(), `app-${Date.now()}.asar`);
-        await createPackage(tempDir, tempAsar);
+        await createPackage(tempDir, tempAsar, { unpackedPaths, originalHeader });
         // Replace original archive with locked file handling for Windows
         try {
             fs.copyFileSync(tempAsar, asarPath);
@@ -839,6 +894,21 @@ export async function patchPaseoAsar(asarPath) {
                 throw copyErr;
             }
         }
+        // On macOS, re-sign application bundle if inside an .app directory to satisfy Gatekeeper
+        if (process.platform === "darwin" && asarPath.includes(".app")) {
+            const appIndex = asarPath.indexOf(".app");
+            const appBundlePath = asarPath.slice(0, appIndex + 4);
+            try {
+                execFileSync("codesign", ["--force", "--deep", "--sign", "-", appBundlePath], {
+                    stdio: "ignore",
+                    timeout: 15000,
+                });
+                changes.push(`Re-signed macOS bundle at ${appBundlePath}`);
+            }
+            catch (signErr) {
+                logger.warn(`Could not re-sign ${appBundlePath}`, { error: String(signErr) });
+            }
+        }
         return { success: true, changes };
     }
     catch (err) {
@@ -914,6 +984,7 @@ export function isPaseoServerPatched(serverDir) {
     try {
         if (!fs.existsSync(serverDir))
             return false;
+        // 1. Antigravity quota provider file
         const antigravityJsCandidates = [
             path.join(serverDir, "dist", "server", "services", "quota-fetcher", "providers", "antigravity.js"),
             path.join(serverDir, "dist", "services", "quota-fetcher", "providers", "antigravity.js"),
@@ -940,20 +1011,80 @@ export function isPaseoServerPatched(serverDir) {
             };
             hasProvider = checkRecursive(path.join(serverDir, "dist"));
         }
-        if (hasProvider)
-            return true;
+        if (!hasProvider)
+            return false;
+        // 2. Manifest check
         const manifestCandidates = [
             path.join(serverDir, "dist", "server", "services", "quota-fetcher", "manifest.js"),
             path.join(serverDir, "dist", "services", "quota-fetcher", "manifest.js"),
         ];
-        for (const cand of manifestCandidates) {
-            if (fs.existsSync(cand)) {
-                const content = fs.readFileSync(cand, "utf-8");
-                if (content.includes('providerId: "antigravity"'))
-                    return true;
+        let manifestFile = manifestCandidates.find((f) => fs.existsSync(f));
+        if (!manifestFile && fs.existsSync(path.join(serverDir, "dist"))) {
+            const findManifest = (dir, depth = 0) => {
+                if (depth > 5)
+                    return null;
+                try {
+                    const entries = fs.readdirSync(dir, { withFileTypes: true });
+                    for (const e of entries) {
+                        const full = path.join(dir, e.name);
+                        if (e.isDirectory() && e.name !== "node_modules") {
+                            const found = findManifest(full, depth + 1);
+                            if (found)
+                                return found;
+                        }
+                        else if (e.isFile() && e.name === "manifest.js" && dir.replace(/\\/g, "/").includes("quota-fetcher")) {
+                            return full;
+                        }
+                    }
+                }
+                catch { }
+                return null;
+            };
+            manifestFile = findManifest(path.join(serverDir, "dist")) || undefined;
+        }
+        if (manifestFile) {
+            const content = fs.readFileSync(manifestFile, "utf-8");
+            if (!content.includes('providerId: "antigravity"')) {
+                return false;
+            }
+        }
+        // 3. ACP Agent check (context window telemetry & usage updates)
+        const acpCandidates = [
+            path.join(serverDir, "dist", "server", "server", "agent", "providers", "acp-agent.js"),
+            path.join(serverDir, "dist", "server", "agent", "providers", "acp-agent.js"),
+            path.join(serverDir, "dist", "agent", "providers", "acp-agent.js"),
+        ];
+        let acpFile = acpCandidates.find((f) => fs.existsSync(f));
+        if (!acpFile && fs.existsSync(path.join(serverDir, "dist"))) {
+            const findAcp = (dir, depth = 0) => {
+                if (depth > 5)
+                    return null;
+                try {
+                    const entries = fs.readdirSync(dir, { withFileTypes: true });
+                    for (const e of entries) {
+                        const full = path.join(dir, e.name);
+                        if (e.isDirectory() && e.name !== "node_modules") {
+                            const found = findAcp(full, depth + 1);
+                            if (found)
+                                return found;
+                        }
+                        else if (e.isFile() && e.name === "acp-agent.js") {
+                            return full;
+                        }
+                    }
+                }
+                catch { }
+                return null;
+            };
+            acpFile = findAcp(path.join(serverDir, "dist")) || undefined;
+        }
+        if (acpFile) {
+            const content = fs.readFileSync(acpFile, "utf-8");
+            if (!content.includes('type: "usage_updated"') || !content.includes("contextWindowMaxTokens")) {
+                return false;
             }
         }
-        return false;
+        return true;
     }
     catch {
         return false;

package/package.json

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