ponzu 1.61.1 → 1.63.0

package/dist/index.js

@@ -46860,7 +46860,7 @@ function remoteUpdater(endpoint, token) {
 // apps/cli/package.json
 var package_default = {
   name: "ponzu",
-  version: "1.61.1",
+  version: "1.63.0",
   description: "The open source canvas your agent draws on in HTML and CSS.",
   type: "module",
   license: "MIT",
@@ -46883,10 +46883,10 @@ var package_default = {
 
 // apps/cli/src/host.ts
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync2 } from "fs";
-import { chmod, mkdir as mkdir10, rm as rm4, writeFile as writeFile8 } from "fs/promises";
+import { existsSync as existsSync9, readFileSync as readFileSync2, statSync as statSync3 } from "fs";
+import { chmod, copyFile, mkdir as mkdir10, rename as rename8, rm as rm4, utimes as utimes3, writeFile as writeFile8 } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { dirname as dirname5, join as join13 } from "path";
+import { dirname as dirname5, join as join13, posix, win32 } from "path";
 var ponzuHome = () => process.env.PONZU_HOME ?? join13(homedir4(), ".ponzu");
 var hostFile = () => join13(ponzuHome(), "host.json");
 async function announceHost(url, opts = {}) {
@@ -46922,26 +46922,103 @@ async function runningHost() {
   }
 }
 var SERVER = "Contents/Resources/server/ponzu";
-function ownBundle() {
-  const app = /^(.*?\.app)\/Contents\/Resources\/server\/ponzu$/.exec(process.execPath)?.[1];
-  if (!app || app.startsWith("/Volumes/") || app.includes("/AppTranslocation/"))
+var pathFor = (os) => os === "win32" ? win32 : posix;
+var appImageServer = () => join13(ponzuHome(), "app/ponzu");
+var appImageRecord = () => join13(ponzuHome(), "app/appimage");
+function recordedAppImage() {
+  try {
+    const path = readFileSync2(appImageRecord(), "utf8").trim();
+    return path && existsSync9(path) ? path : null;
+  } catch {
     return null;
-  return app;
+  }
+}
+function isFolder(app) {
+  try {
+    return statSync3(app).isDirectory() && !app.endsWith(".app");
+  } catch {
+    return false;
+  }
+}
+function appServer(app, os = process.platform) {
+  if (os === "darwin")
+    return join13(app, SERVER);
+  const path = pathFor(os);
+  if (os === "linux" && !isFolder(app))
+    return appImageServer();
+  return path.join(app, "resources", "server", os === "win32" ? "ponzu.exe" : "ponzu");
+}
+function appLauncher(app, os = process.platform) {
+  if (app.endsWith(".app"))
+    return ["open", ["-n", "-g", "-a", app, "--args", "--background"]];
+  if (isFolder(app))
+    return [pathFor(os).join(app, os === "win32" ? "Ponzu.exe" : "ponzu"), ["--background"]];
+  return [app, ["--background"]];
+}
+function ownBundle(execPath = process.execPath, os = process.platform, env = process.env) {
+  if (os === "darwin") {
+    const app = /^(.*?\.app)\/Contents\/Resources\/server\/ponzu$/.exec(execPath)?.[1];
+    if (!app || app.startsWith("/Volumes/") || app.includes("/AppTranslocation/"))
+      return null;
+    return app;
+  }
+  if (os === "win32")
+    return /^(.*)\\resources\\server\\ponzu\.exe$/i.exec(execPath)?.[1] ?? null;
+  if (execPath === appImageServer())
+    return recordedAppImage();
+  const folder = /^(.*)\/resources\/server\/ponzu$/.exec(execPath)?.[1];
+  if (!folder)
+    return null;
+  if (env.APPIMAGE && (folder === env.APPDIR || folder.startsWith("/tmp/.mount_")))
+    return env.APPIMAGE;
+  return folder.startsWith("/tmp/.mount_") ? null : folder;
+}
+function installedApps(os = process.platform, env = process.env) {
+  if (os === "darwin")
+    return ["/Applications/Ponzu.app", join13(homedir4(), "Applications/Ponzu.app")];
+  if (os === "win32") {
+    return [
+      env.LOCALAPPDATA && win32.join(env.LOCALAPPDATA, "Programs", "ponzu"),
+      env.ProgramFiles && win32.join(env.ProgramFiles, "Ponzu")
+    ].filter((p) => Boolean(p));
+  }
+  return [recordedAppImage(), "/opt/Ponzu"].filter((p) => Boolean(p));
 }
-function findApp() {
-  const override = process.env.PONZU_APP;
+function isInstalled(app, os = process.platform) {
+  if (os === "linux" && !isFolder(app))
+    return existsSync9(app);
+  return existsSync9(appServer(app, os));
+}
+function findApp(os = process.platform, env = process.env, execPath = process.execPath) {
+  const override = env.PONZU_APP;
   if (override === "none")
     return null;
   if (override)
     return override;
-  if (process.platform !== "darwin")
+  const candidates = [ownBundle(execPath, os, env), ...installedApps(os, env)];
+  return candidates.find((c) => Boolean(c && isInstalled(c, os))) ?? null;
+}
+async function adoptAppImage(execPath = process.execPath, os = process.platform, env = process.env) {
+  if (os !== "linux")
     return null;
-  const candidates = [
-    ownBundle(),
-    "/Applications/Ponzu.app",
-    join13(homedir4(), "Applications/Ponzu.app")
-  ];
-  return candidates.find((c) => Boolean(c && existsSync9(join13(c, SERVER)))) ?? null;
+  const appimage = ownBundle(execPath, os, env);
+  if (!appimage || isFolder(appimage) || execPath === appImageServer())
+    return null;
+  const copy = appImageServer();
+  const from = statSync3(execPath);
+  const to = statSync3(copy, { throwIfNoEntry: false });
+  if (!to || to.size !== from.size || Math.trunc(to.mtimeMs) !== Math.trunc(from.mtimeMs)) {
+    await mkdir10(dirname5(copy), { recursive: true });
+    const temp = `${copy}.${process.pid}`;
+    await copyFile(execPath, temp);
+    await chmod(temp, 493);
+    await utimes3(temp, from.atime, from.mtime);
+    await rename8(temp, copy);
+  }
+  if (recordedAppImage() !== appimage)
+    await writeFile8(appImageRecord(), `${appimage}
+`);
+  return appimage;
 }
 async function launchApp(app, timeoutMs = 30000) {
   const deadline = Date.now() + timeoutMs;
@@ -46958,7 +47035,7 @@ async function launchApp(app, timeoutMs = 30000) {
 function startApp(app) {
   const env = { ...process.env };
   delete env.ELECTRON_RUN_AS_NODE;
-  const [cmd, args] = app.endsWith(".app") ? ["open", ["-n", "-g", "-a", app, "--args", "--background"]] : [app, ["--background"]];
+  const [cmd, args] = appLauncher(app);
   return new Promise((resolve) => {
     try {
       const child = spawn5(cmd, args, { detached: true, stdio: "ignore", env });
@@ -46989,11 +47066,31 @@ async function findHost(launch) {
     lastFailed = Date.now();
   return url;
 }
-var shimPath = () => join13(ponzuHome(), "bin/ponzu");
-async function writeShim(app) {
-  const path = shimPath();
+var shimPath = (os = process.platform) => join13(ponzuHome(), os === "win32" ? "bin/ponzu.cmd" : "bin/ponzu");
+function shimScript(app, os = process.platform) {
+  if (os === "win32") {
+    const candidates = [
+      appServer(app, os),
+      "%LOCALAPPDATA%\\Programs\\ponzu\\resources\\server\\ponzu.exe",
+      "%ProgramFiles%\\Ponzu\\resources\\server\\ponzu.exe"
+    ];
+    return `@echo off\r
+rem Written by Ponzu. Runs the server inside the installed Ponzu, so it updates with the app.\r
+setlocal\r
+${candidates.map((c) => `if exist "${c}" (\r
+  set "bin=${c}"\r
+  goto run\r
+)\r
+`).join("")}echo Ponzu isn't installed. Download it from https://ponzu.design 1>&2\r
+exit /b 1\r
+:run\r
+"%bin%" %*\r
+exit /b %ERRORLEVEL%\r
+`;
+  }
   const quote = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
-  const script = `#!/bin/sh
+  if (os === "darwin")
+    return `#!/bin/sh
 # Written by Ponzu. Runs the server inside the installed Ponzu.app, so it updates with the app.
 for app in ${quote(app)} /Applications/Ponzu.app "$HOME/Applications/Ponzu.app"; do
   bin="$app/${SERVER}"
@@ -47002,20 +47099,33 @@ done
 echo "Ponzu isn't installed. Download it from https://ponzu.design" >&2
 exit 1
 `;
+  const bins = new Set([appServer(app, os), "/opt/Ponzu/resources/server/ponzu", appImageServer()]);
+  return `#!/bin/sh
+# Written by Ponzu. Runs the server inside the installed Ponzu, so it updates with the app.
+for bin in ${[...bins].map(quote).join(" ")}; do
+  [ -x "$bin" ] && exec "$bin" "$@"
+done
+echo "Ponzu isn't installed. Download it from https://ponzu.design" >&2
+exit 1
+`;
+}
+async function writeShim(app) {
+  const path = shimPath();
   await mkdir10(dirname5(path), { recursive: true });
-  await writeFile8(path, script);
+  await writeFile8(path, shimScript(app));
   await chmod(path, 493);
   return path;
 }
 
 // apps/cli/src/install.ts
-import { spawnSync } from "child_process";
+import { spawnSync as spawnSync2 } from "child_process";
 import { existsSync as existsSync11, readFileSync as readFileSync4 } from "fs";
 import { mkdir as mkdir12, writeFile as writeFile10 } from "fs/promises";
 import { homedir as homedir6 } from "os";
 import { delimiter as delimiter2, dirname as dirname7, join as join15 } from "path";
 
 // apps/cli/src/command.ts
+import { spawnSync } from "child_process";
 import { accessSync, constants, existsSync as existsSync10, lstatSync, readFileSync as readFileSync3, realpathSync as realpathSync3 } from "fs";
 import { mkdir as mkdir11, symlink, writeFile as writeFile9 } from "fs/promises";
 import { homedir as homedir5 } from "os";
@@ -47029,8 +47139,11 @@ async function linkCommand(shim, opts) {
     if (!opts.auto)
       console.log(s);
   };
+  if (process.platform === "win32")
+    return addToUserPath(dirname6(shim), opts.auto, say);
   const found = Bun.which("ponzu", { PATH: opts.path.join(delimiter) });
-  if (found) {
+  const app = found && opensApp(found) ? found : null;
+  if (found && !app) {
     if (sameFile(found, shim))
       say(`The ponzu command is on your PATH: ${found}`);
     return;
@@ -47038,9 +47151,13 @@ async function linkCommand(shim, opts) {
   const state = readState();
   if (opts.auto && state.linked)
     return;
-  const dir = commandDirs(opts.home).find((d) => opts.path.includes(d) && canLink(d, opts.home));
+  const before = app ? opts.path.indexOf(dirname6(app)) : -1;
+  const dir = commandDirs(opts.home).find((d) => {
+    const at = opts.path.indexOf(d);
+    return at >= 0 && (before < 0 || at < before) && canLink(d, opts.home);
+  });
   if (!dir) {
-    say(`To run ponzu from a terminal, add ${dirname6(shim)} to your PATH, or choose Install Terminal Command in Ponzu's app menu.`);
+    say(process.platform === "darwin" ? `To run ponzu from a terminal, add ${dirname6(shim)} to your PATH, or choose Install Terminal Command in Ponzu's app menu.` : `To run ponzu from a terminal, add ${dirname6(shim)} to your PATH.`);
     return;
   }
   const link = join14(dir, "ponzu");
@@ -47056,6 +47173,45 @@ async function linkCommand(shim, opts) {
 `);
   say(`Linked ${link}, so ponzu runs from a terminal.`);
 }
+var USER_PATH = String.raw`
+$at = if ($env:PONZU_ENVIRONMENT_KEY) { $env:PONZU_ENVIRONMENT_KEY } else { 'HKCU:\Environment' }
+$key = Get-Item -LiteralPath $at
+$norm = { param($p) $p.Trim().TrimEnd('\', '/') }
+$entries = @(([string]$key.GetValue('Path', '', 'DoNotExpandEnvironmentNames')) -split ';' | Where-Object { $_.Trim() })
+if ($entries | Where-Object { (& $norm $_) -ieq (& $norm $env:PONZU_BIN) }) { exit 0 }
+if (-not $env:PONZU_ADD) { exit 3 }
+$kind = if ($key.GetValueNames() -contains 'Path') { $key.GetValueKind('Path') } else { 'ExpandString' }
+Set-ItemProperty -LiteralPath $at -Name Path -Value (($entries + $env:PONZU_BIN) -join ';') -Type $kind
+if (-not $env:PONZU_ENVIRONMENT_KEY) {
+  [Environment]::SetEnvironmentVariable('PONZU_PATH_CHANGED', '1', 'User')
+  [Environment]::SetEnvironmentVariable('PONZU_PATH_CHANGED', $null, 'User')
+}
+exit 2
+`;
+function userPath(dir, add, env = {}) {
+  const out = spawnSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", USER_PATH], {
+    stdio: "ignore",
+    timeout: 15000,
+    env: { ...process.env, ...env, PONZU_BIN: dir, ...add ? { PONZU_ADD: "1" } : {} },
+    windowsHide: true
+  });
+  return { 0: "on", 3: "off", 2: "added" }[out.status ?? -1] ?? "failed";
+}
+async function addToUserPath(dir, auto, say) {
+  const now = userPath(dir, false);
+  if (now === "on")
+    return say(`The ponzu command is on your PATH: ${dir}`);
+  if (now === "failed")
+    return say(`To run ponzu from a terminal, add ${dir} to your PATH.`);
+  if (auto && readState().linked)
+    return;
+  if (userPath(dir, true) !== "added")
+    return say(`Couldn't add ${dir} to your PATH. Add it yourself to run ponzu from a terminal.`);
+  await mkdir11(dirname6(stateFile()), { recursive: true });
+  await writeFile9(stateFile(), `${JSON.stringify({ linked: dir }, null, 2)}
+`);
+  say(`Added ${dir} to your PATH. Open a new terminal and run ponzu.`);
+}
 function readState() {
   try {
     return JSON.parse(readFileSync3(stateFile(), "utf8"));
@@ -47077,6 +47233,13 @@ function canLink(dir, home = homedir5()) {
     return false;
   }
 }
+function opensApp(file) {
+  try {
+    return existsSync10(join14(dirname6(realpathSync3(file)), "resources/server/ponzu"));
+  } catch {
+    return false;
+  }
+}
 function sameFile(a, b) {
   try {
     return realpathSync3(a) === realpathSync3(b);
@@ -47181,14 +47344,15 @@ async function installAgent(agent, opts) {
 Or launch \`ponzu mcp\` over stdio from any MCP client.`);
     process.exit(1);
   }
-  const entry = opts.url ? { url: opts.url } : await launchEntry();
+  const launch = opts.url ? { entry: { url: opts.url } } : await launchEntry();
+  const entry = launch?.entry;
   if (!entry) {
     if (!opts.auto)
       console.error("Move Ponzu to your Applications folder, then try again.");
     return;
   }
-  if ("command" in entry && entry.command === shimPath())
-    await linkCommand(entry.command, { auto: opts.auto, path: loginPath() });
+  if (launch.shim)
+    await linkCommand(launch.shim, { auto: opts.auto, path: loginPath() });
   const done = readDone();
   const targets = AGENTS.filter((a) => id ? a.id === id : a.detect());
   if (!targets.length && !opts.auto)
@@ -47234,16 +47398,21 @@ function codexConfigured() {
   }
 }
 async function launchEntry() {
+  await adoptAppImage().catch(() => null);
   const app = findApp();
-  if (app?.endsWith(".app"))
-    return { command: await writeShim(app), args: ["mcp"] };
+  const installed = process.platform === "darwin" ? app?.endsWith(".app") : app && app !== process.env.PONZU_APP;
+  if (app && installed) {
+    const shim = await writeShim(app);
+    const command = process.platform === "win32" ? appServer(app) : shim;
+    return { entry: { command, args: ["mcp"] }, shim };
+  }
   if (/\.app\/Contents\//.test(process.execPath))
     return null;
-  if (Bun.main.startsWith("/$bunfs/"))
-    return { command: process.execPath, args: ["mcp"] };
-  if (/\/bunx-[^/]+\//.test(Bun.main))
-    return { command: process.execPath, args: ["x", "ponzu", "mcp"] };
-  return { command: process.execPath, args: [Bun.main, "mcp"] };
+  if (Bun.main.startsWith("/$bunfs/") || Bun.main.startsWith("B:\\~BUN\\"))
+    return { entry: { command: process.execPath, args: ["mcp"] } };
+  if (/[\\/]bunx-[^\\/]+[\\/]/.test(Bun.main))
+    return { entry: { command: process.execPath, args: ["x", "ponzu", "mcp"] } };
+  return { entry: { command: process.execPath, args: [Bun.main, "mcp"] } };
 }
 function toEntry(raw) {
   if (raw?.command)
@@ -47312,7 +47481,7 @@ function loginPath() {
   shellPath = [];
   const shell = process.env.SHELL;
   if (shell) {
-    const login = spawnSync(shell, ["-ilc", 'printf %s "$PATH"'], {
+    const login = spawnSync2(shell, ["-ilc", 'printf %s "$PATH"'], {
       encoding: "utf8",
       timeout: 3000
     });
@@ -47329,7 +47498,7 @@ function capture2(cmd) {
   const bin = which(cmd[0]);
   if (!bin)
     return null;
-  const out = spawnSync(bin, cmd.slice(1), {
+  const out = spawnSync2(bin, cmd.slice(1), {
     encoding: "utf8",
     timeout: 15000,
     env: { ...process.env, PATH: agentPath() }
@@ -47340,7 +47509,7 @@ function run(cmd, quiet = false) {
   const bin = which(cmd[0]);
   if (!bin)
     return false;
-  const out = spawnSync(bin, cmd.slice(1), {
+  const out = spawnSync2(bin, cmd.slice(1), {
     stdio: quiet ? "ignore" : "inherit",
     timeout: 30000,
     env: { ...process.env, PATH: agentPath() }
@@ -47396,12 +47565,12 @@ function firstFree(ports, hostname) {
 // apps/cli/src/telemetry.ts
 import { createHash as createHash6, randomUUID } from "crypto";
 import { readFileSync as readFileSync5 } from "fs";
-import { mkdir as mkdir13, rename as rename8, writeFile as writeFile11 } from "fs/promises";
+import { mkdir as mkdir13, rename as rename9, writeFile as writeFile11 } from "fs/promises";
 import { arch, platform as platform2 } from "os";
 import { dirname as dirname10, join as join17 } from "path";
 
 // node_modules/.bun/posthog-node@5.56.2/node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname9, posix, sep as sep5 } from "path";
+import { dirname as dirname9, posix as posix2, sep as sep5 } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -47416,7 +47585,7 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? dirname9(proce
     if (!filename)
       return;
     const normalizedFilename = isWindows ? normalizeWindowsPath(filename) : filename;
-    let { dir, base: file, ext } = posix.parse(normalizedFilename);
+    let { dir, base: file, ext } = posix2.parse(normalizedFilename);
     if (ext === ".js" || ext === ".mjs" || ext === ".cjs")
       file = file.slice(0, -1 * ext.length);
     const decodedFile = decodeURIComponent(file);
@@ -56704,7 +56873,7 @@ async function writeSettings(settings) {
   const tmp = `${path}.${process.pid}.tmp`;
   await writeFile11(tmp, `${JSON.stringify(settings, null, 2)}
 `);
-  await rename8(tmp, path);
+  await rename9(tmp, path);
 }
 async function settings() {
   const current = readSettings();
@@ -56875,7 +57044,7 @@ async function telemetryCommand(arg = "status") {
 
 // apps/cli/src/wake.ts
 import { dlopen, FFIType, ptr } from "bun:ffi";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
 import { fstatSync, readFileSync as readFileSync6 } from "fs";
 import { mkdir as mkdir14, rm as rm5, writeFile as writeFile12 } from "fs/promises";
 import { homedir as homedir7 } from "os";
@@ -56918,7 +57087,7 @@ function wakePlist(program, port = WAKE_PORT) {
 </plist>
 `;
 }
-var launchctl = (args) => spawnSync2("/bin/launchctl", args, { stdio: "ignore" }).status === 0;
+var launchctl = (args) => spawnSync3("/bin/launchctl", args, { stdio: "ignore" }).status === 0;
 var domain = () => `gui/${process.getuid?.() ?? 501}`;
 async function installWake(program, run = launchctl) {
   const path = wakePlistPath();
@@ -57079,7 +57248,7 @@ function sockaddrIp(addr) {
   return null;
 }
 function lsofPeer() {
-  const out = spawnSync2("/usr/sbin/lsof", ["-nP", "-a", "-p", String(process.pid), "-d", "0", "-Fn"], {
+  const out = spawnSync3("/usr/sbin/lsof", ["-nP", "-a", "-p", String(process.pid), "-d", "0", "-Fn"], {
     encoding: "utf8"
   }).stdout;
   const remote = /->(.+):\d+$/m.exec(out ?? "")?.[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponzu",
-  "version": "1.61.1",
+  "version": "1.63.0",
   "description": "The open source canvas your agent draws on in HTML and CSS.",
   "license": "MIT",
   "type": "module",