paseo-acp-agy 1.2.13 → 1.2.14

package/dist/index.js

@@ -4,7 +4,7 @@ import { execFileSync } from "node:child_process";
 import { ACPServer } from "./acp-server.js";
 import { logger } from "./logger.js";
 import { formatDiagnosticVersion, resolveBuildMetadata } from "./version.js";
-import { ensurePaseoIntegration, findPaseoServerInstallations, findPaseoAsarPaths, isPaseoServerPatched, isPaseoAsarPatched, isPaseoRunning, } from "./paseo-patcher.js";
+import { ensurePaseoIntegration, restorePaseoIntegration, findPaseoServerInstallations, findPaseoAsarPaths, isPaseoServerPatched, isPaseoAsarPatched, isPaseoRunning, } from "./paseo-patcher.js";
 import { resolveDefaultAgyBinary, isWindowsBatchScript } from "./antigravity-process.js";
 import { parseAgyQuotaOutput } from "./protocol.js";
 const args = process.argv.slice(2);
@@ -30,11 +30,14 @@ Usage:
 Commands:
   setup, patch   Configure and integrate Antigravity telemetry with Paseo
   doctor         Diagnose Antigravity binary, quota provider, and Paseo status
+  restore        Restore original Paseo files from backup (.bak)
 
 Options:
   --acp             Start ACP server over stdio (default)
   --setup           Integrate Antigravity with local Paseo server installation
   --doctor          Run environment, binary, and telemetry diagnostics
+  --restore         Restore original Paseo files from backup
+  --force-macos-app Force patching inside macOS .app bundle (re-signs with ad-hoc)
   --skip-naration   Drop leading narration-only assistant chunks (e.g. 'I will...')
   --skip-narration  Alias for --skip-naration
   -v, --version     Show version
@@ -212,6 +215,28 @@ if (args.includes("doctor") || args.includes("--doctor")) {
     }
     process.exit(0);
 }
+if (args.includes("restore") ||
+    args.includes("unpatch") ||
+    args.includes("--restore") ||
+    args.includes("--unpatch")) {
+    process.stdout.write("Restoring original Paseo files from backup...\n");
+    try {
+        const res = await restorePaseoIntegration();
+        if (res.restored.length > 0) {
+            process.stdout.write(`Successfully restored original files:\n${res.restored.map((r) => `  - ${r}`).join("\n")}\n\n`);
+        }
+        else {
+            process.stdout.write("No backup archives (.bak) found to restore.\n\n");
+        }
+        if (res.errors.length > 0) {
+            process.stderr.write(`Errors during restore:\n${res.errors.map((e) => `  - ${e}`).join("\n")}\n`);
+        }
+    }
+    catch (err) {
+        process.stderr.write(`Restore encountered an issue: ${err instanceof Error ? err.message : String(err)}\n`);
+    }
+    process.exit(0);
+}
 if (args.includes("setup") ||
     args.includes("patch") ||
     args.includes("--setup") ||
@@ -221,22 +246,35 @@ if (args.includes("setup") ||
     }
     process.stdout.write("Checking Paseo installation and configuring Antigravity telemetry...\n");
     try {
-        const res = await ensurePaseoIntegration({ verbose: true });
+        const forceMacosApp = args.includes("--force-macos-app");
+        const res = await ensurePaseoIntegration({ verbose: true, forceMacosApp });
         if (!res.found) {
             process.stdout.write("Notice: No active @getpaseo/server installation or app.asar found in standard paths.\n" +
                 "If Paseo is installed in a custom directory, set PASEO_SERVER_PATH or PASEO_ASAR_PATH and run setup again.\n");
         }
         else {
-            const totalFound = res.serverPaths.length + (res.asarPaths?.length || 0);
-            process.stdout.write(`Found ${totalFound} Paseo installation target(s) (${res.serverPaths.length} server dir(s), ${res.asarPaths?.length || 0} asar package(s)).\n`);
+            const totalFound = res.serverPaths.length + (res.asarPaths?.length || 0) + (res.skippedPaths?.length || 0);
+            process.stdout.write(`Found ${totalFound} Paseo installation target(s) (${res.serverPaths.length} server dir(s), ${res.asarPaths?.length || 0} asar package(s)` +
+                (res.skippedPaths && res.skippedPaths.length > 0 ? `, ${res.skippedPaths.length} protected macOS app bundle(s)` : "") +
+                `).\n`);
             const allPatched = [...res.patchedPaths, ...(res.patchedAsarPaths || [])];
             if (allPatched.length > 0) {
                 process.stdout.write(`Successfully integrated with: \n${allPatched.map((p) => `  - ${p}`).join("\n")}\n\n` +
                     `Antigravity quota provider and context-window telemetry are now enabled!\n`);
             }
+            else if (res.skippedPaths && res.skippedPaths.length > 0) {
+                process.stdout.write("Paseo server is ready. macOS .app bundle signature was preserved.\n");
+            }
             else {
                 process.stdout.write("Paseo is already up-to-date and configured for Antigravity telemetry.\n");
             }
+            if (res.skippedPaths && res.skippedPaths.length > 0) {
+                process.stdout.write(`\n🛡️  Preserved macOS Code Signature:\n` +
+                    `   Skipped ${res.skippedPaths.length} target(s) inside macOS .app bundle to protect official Apple Developer ID signature\n` +
+                    `   and prevent Gatekeeper "damaged app" warnings.\n` +
+                    `   (Antigravity ACP runs standalone and does not require modifying Paseo.app).\n` +
+                    `   If you specifically wish to patch the .app bundle, run with: paseo-acp-agy patch --force-macos-app\n\n`);
+            }
             if (isPaseoRunning()) {
                 const isWin = process.platform === "win32";
                 process.stdout.write(`\n⚠️  IMPORTANT: Paseo is currently running in the background!\n` +

package/dist/paseo-patcher.d.ts

@@ -4,6 +4,7 @@ export interface PatchResult {
     patchedPaths: string[];
     asarPaths?: string[];
     patchedAsarPaths?: string[];
+    skippedPaths?: string[];
     errors: string[];
 }
 /**
@@ -54,7 +55,15 @@ export declare function ensurePaseoIntegration(options?: {
     verbose?: boolean;
     targetPaths?: string[];
     targetAsarPaths?: string[];
+    forceMacosApp?: boolean;
 }): Promise<PatchResult>;
+/**
+ * Restores original unpatched Paseo files from backup (.bak) archives.
+ */
+export declare function restorePaseoIntegration(): Promise<{
+    restored: string[];
+    errors: string[];
+}>;
 /**
  * Checks whether a @getpaseo/server installation directory is already patched
  * for Antigravity quota and telemetry support.

package/dist/paseo-patcher.js

@@ -1461,6 +1461,14 @@ export async function patchPaseoAsar(asarPath) {
                     timeout: 15000,
                 });
                 changes.push(`Re-signed macOS bundle at ${appBundlePath}`);
+                try {
+                    execFileSync("xattr", ["-cr", appBundlePath], {
+                        stdio: "ignore",
+                        timeout: 10000,
+                    });
+                    changes.push(`Cleared quarantine extended attributes at ${appBundlePath}`);
+                }
+                catch { }
             }
             catch (signErr) {
                 logger.warn(`Could not re-sign ${appBundlePath}`, { error: String(signErr) });
@@ -1491,11 +1499,34 @@ export async function patchPaseoAsar(asarPath) {
  * Discovers and patches all accessible Paseo installations (both directory and app.asar).
  */
 export async function ensurePaseoIntegration(options) {
-    const serverPaths = options?.targetPaths || findPaseoServerInstallations();
-    const asarPaths = options?.targetAsarPaths || findPaseoAsarPaths();
+    const rawServerPaths = options?.targetPaths || findPaseoServerInstallations();
+    const rawAsarPaths = options?.targetAsarPaths || findPaseoAsarPaths();
+    const serverPaths = [];
+    const asarPaths = [];
+    const skippedPaths = [];
     const patchedPaths = [];
     const patchedAsarPaths = [];
     const errors = [];
+    for (const sPath of rawServerPaths) {
+        if (process.platform === "darwin" && sPath.includes(".app") && !options?.forceMacosApp) {
+            skippedPaths.push(sPath);
+            if (options?.verbose) {
+                logger.info(`[macOS] Skipping server path inside .app bundle to preserve Apple signature: ${sPath}`);
+            }
+            continue;
+        }
+        serverPaths.push(sPath);
+    }
+    for (const aPath of rawAsarPaths) {
+        if (process.platform === "darwin" && aPath.includes(".app") && !options?.forceMacosApp) {
+            skippedPaths.push(aPath);
+            if (options?.verbose) {
+                logger.info(`[macOS] Skipping app.asar inside .app bundle to preserve Apple signature: ${aPath}`);
+            }
+            continue;
+        }
+        asarPaths.push(aPath);
+    }
     for (const sPath of serverPaths) {
         const res = patchPaseoServer(sPath);
         if (res.success) {
@@ -1525,14 +1556,52 @@ export async function ensurePaseoIntegration(options) {
         }
     }
     return {
-        found: serverPaths.length > 0 || asarPaths.length > 0,
+        found: serverPaths.length > 0 || asarPaths.length > 0 || skippedPaths.length > 0,
         serverPaths,
         patchedPaths,
         asarPaths,
         patchedAsarPaths,
+        skippedPaths,
         errors,
     };
 }
+/**
+ * Restores original unpatched Paseo files from backup (.bak) archives.
+ */
+export async function restorePaseoIntegration() {
+    const restored = [];
+    const errors = [];
+    const home = os.homedir();
+    const macBackup = path.join(home, ".paseo", "backups", "app.asar.bak");
+    const asarCandidates = findPaseoAsarPaths();
+    for (const asarPath of asarCandidates) {
+        let backupFile = null;
+        if (process.platform === "darwin" && asarPath.includes(".app") && fs.existsSync(macBackup)) {
+            backupFile = macBackup;
+        }
+        else if (fs.existsSync(`${asarPath}.bak`)) {
+            backupFile = `${asarPath}.bak`;
+        }
+        if (backupFile) {
+            try {
+                fs.copyFileSync(backupFile, asarPath);
+                restored.push(asarPath);
+                if (process.platform === "darwin" && asarPath.includes(".app")) {
+                    const appIndex = asarPath.indexOf(".app");
+                    const appBundlePath = asarPath.slice(0, appIndex + 4);
+                    try {
+                        execFileSync("xattr", ["-cr", appBundlePath], { stdio: "ignore" });
+                    }
+                    catch { }
+                }
+            }
+            catch (err) {
+                errors.push(`Failed restoring ${asarPath}: ${err?.message || err}`);
+            }
+        }
+    }
+    return { restored, errors };
+}
 /**
  * Checks whether a @getpaseo/server installation directory is already patched
  * for Antigravity quota and telemetry support.

package/package.json

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