Fix CLI arg routing and desktop install links

packages/desktop/src/integrations/cli-install-path.test.ts

@@ -0,0 +1,47 @@
+import { describe, expect, it } from "vitest";
+import { resolveCliInstallSourcePath } from "./cli-install-path";
+
+describe("cli-install-path", () => {
+  it("uses the packaged executable on supported unix platforms", () => {
+    expect(
+      resolveCliInstallSourcePath({
+        platform: "darwin",
+        isPackaged: true,
+        executablePath: "/Applications/Paseo.app/Contents/MacOS/Paseo",
+        shimPath: "/Applications/Paseo.app/Contents/Resources/bin/paseo",
+      }),
+    ).toBe("/Applications/Paseo.app/Contents/MacOS/Paseo");
+  });
+
+  it("prefers the original AppImage path on linux", () => {
+    expect(
+      resolveCliInstallSourcePath({
+        platform: "linux",
+        isPackaged: true,
+        executablePath: "/tmp/.mount_paseo123/paseo",
+        shimPath: "/tmp/.mount_paseo123/resources/bin/paseo",
+        appImagePath: "/home/user/Applications/Paseo.AppImage",
+      }),
+    ).toBe("/home/user/Applications/Paseo.AppImage");
+  });
+
+  it("falls back to the shim on windows and in development", () => {
+    expect(
+      resolveCliInstallSourcePath({
+        platform: "win32",
+        isPackaged: true,
+        executablePath: "C:\\Users\\user\\AppData\\Local\\Programs\\Paseo\\Paseo.exe",
+        shimPath: "C:\\Users\\user\\AppData\\Local\\Programs\\Paseo\\resources\\bin\\paseo.cmd",
+      }),
+    ).toBe("C:\\Users\\user\\AppData\\Local\\Programs\\Paseo\\resources\\bin\\paseo.cmd");
+
+    expect(
+      resolveCliInstallSourcePath({
+        platform: "linux",
+        isPackaged: false,
+        executablePath: "/opt/Paseo/paseo",
+        shimPath: "/opt/Paseo/resources/bin/paseo",
+      }),
+    ).toBe("/opt/Paseo/resources/bin/paseo");
+  });
+});

packages/desktop/src/integrations/cli-install-path.ts

@@ -0,0 +1,24 @@
+export function resolveCliInstallSourcePath(input: {
+  platform: NodeJS.Platform;
+  isPackaged: boolean;
+  executablePath: string;
+  shimPath: string;
+  appImagePath?: string | null;
+}): string {
+  if (input.platform === "win32") {
+    return input.shimPath;
+  }
+
+  if (!input.isPackaged) {
+    return input.shimPath;
+  }
+
+  if (input.platform === "linux") {
+    const appImagePath = input.appImagePath?.trim();
+    if (appImagePath) {
+      return appImagePath;
+    }
+  }
+
+  return input.executablePath;
+}

packages/desktop/src/integrations/integrations-manager.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 import os from "node:os";
 import { app } from "electron";
 import log from "electron-log/main";
+import { resolveCliInstallSourcePath } from "./cli-install-path.js";
 
 // ---------------------------------------------------------------------------
 // Types
@@ -184,6 +185,13 @@ async function ensurePathInShellRc(): Promise<{ shellUpdated: boolean }> {
 export async function installCli(): Promise<InstallStatus> {
   const targetPath = getCliTargetPath();
   const shimPath = getBundledCliShimPath();
+  const installSourcePath = resolveCliInstallSourcePath({
+    platform: process.platform,
+    isPackaged: app.isPackaged,
+    executablePath: app.getPath("exe"),
+    shimPath,
+    appImagePath: process.env.APPIMAGE,
+  });
   const binDir = getLocalBinDir();
 
   await fs.mkdir(binDir, { recursive: true });
@@ -192,12 +200,12 @@ export async function installCli(): Promise<InstallStatus> {
     if (await pathOrSymlinkExists(targetPath)) {
       await fs.unlink(targetPath);
     }
-    await fs.copyFile(shimPath, targetPath);
+    await fs.copyFile(installSourcePath, targetPath);
   } else {
     if (await pathOrSymlinkExists(targetPath)) {
       await fs.unlink(targetPath);
     }
-    await fs.symlink(shimPath, targetPath);
+    await fs.symlink(installSourcePath, targetPath);
   }
 
   const { shellUpdated } = await ensurePathInShellRc();