@hienlh/ppm 0.9.94 → 0.9.95

package/src/server/index.ts

@@ -347,23 +347,46 @@ export async function startServer(options: {
       await ensureCloudflared();
     }
 
-    // Spawn supervisor process (manages server + tunnel children)
+    // ── Try starting via system service manager (crash recovery) ────────
+    // If autostart was previously enabled, start via systemd/launchd so the OS
+    // monitors the supervisor and restarts it on crash (Restart=always).
+    let startedViaService = false;
+    {
+      const { getAutoStartStatus } = await import("../services/autostart-register.ts");
+      const autoStatus = getAutoStartStatus();
+      if (autoStatus.enabled && !autoStatus.running) {
+        if (process.platform === "linux") {
+          // Update service file in case config changed (port, share, etc.)
+          const { enableAutoStart } = await import("../services/autostart-register.ts");
+          await enableAutoStart({ port, host, share: !!options.share, configPath: options.config, profile: options.profile });
+          startedViaService = true;
+        } else if (process.platform === "darwin") {
+          const { enableAutoStart } = await import("../services/autostart-register.ts");
+          await enableAutoStart({ port, host, share: !!options.share, configPath: options.config, profile: options.profile });
+          startedViaService = true;
+        }
+      }
+    }
+
+    // ── Spawn supervisor directly (fallback or first run) ────────────────
     const isCompiledBin = isCompiledBinary();
     const logFile = resolve(ppmDir, "ppm.log");
     const logFd = openSync(logFile, "a");
     const supervisorScript = resolve(import.meta.dir, "..", "services", "supervisor.ts");
 
-    const superviseArgs = [
-      "__supervise__", String(port), host,
-      options.config ?? "", options.profile ?? "",
-    ];
-    if (options.share) superviseArgs.push("--share");
-    // Strip trailing empty args (before --share flag)
-    while (superviseArgs.length > 1 && superviseArgs[superviseArgs.length - 1] === "") superviseArgs.pop();
-
     let supervisorPid: number;
 
-    if (process.platform === "win32") {
+    if (startedViaService) {
+      // Supervisor was started by systemd/launchd — read PID from status.json
+      supervisorPid = 0; // will be read from status.json below
+    } else if (process.platform === "win32") {
+      const superviseArgs = [
+        "__supervise__", String(port), host,
+        options.config ?? "", options.profile ?? "",
+      ];
+      if (options.share) superviseArgs.push("--share");
+      while (superviseArgs.length > 1 && superviseArgs[superviseArgs.length - 1] === "") superviseArgs.pop();
+
       const bunExe = process.execPath.replace(/\\/g, "\\\\");
       const logEscaped = logFile.replace(/\\/g, "\\\\");
       const errLog = logFile.replace(/\.log$/, ".err.log").replace(/\\/g, "\\\\");
@@ -388,6 +411,13 @@ export async function startServer(options: {
         process.exit(1);
       }
     } else {
+      const superviseArgs = [
+        "__supervise__", String(port), host,
+        options.config ?? "", options.profile ?? "",
+      ];
+      if (options.share) superviseArgs.push("--share");
+      while (superviseArgs.length > 1 && superviseArgs[superviseArgs.length - 1] === "") superviseArgs.pop();
+
       const cmd = isCompiledBin
         ? [process.execPath, ...superviseArgs]
         : [process.execPath, "run", supervisorScript, ...superviseArgs];
@@ -405,26 +435,30 @@ export async function startServer(options: {
     let serverPid: number | null = null;
     while (Date.now() - startWait < 10_000) {
       await Bun.sleep(500);
-      // Check supervisor is still alive
-      try { process.kill(supervisorPid, 0); } catch {
-        console.error("  ✗  Supervisor exited immediately after start.");
-        console.error("     Check logs: ppm logs");
-        process.exit(1);
-      }
       // Check if server PID appeared in status.json
       try {
         const data = JSON.parse(readFileSync(statusFile, "utf-8"));
         if (data.pid && data.supervisorPid) {
+          // Update supervisorPid if started via service (was 0 initially)
+          if (!supervisorPid) supervisorPid = data.supervisorPid;
           serverPid = data.pid;
           break;
         }
       } catch {}
+      // Check supervisor is still alive (skip if PID unknown from service start)
+      if (supervisorPid) {
+        try { process.kill(supervisorPid, 0); } catch {
+          console.error("  ✗  Supervisor exited immediately after start.");
+          console.error("     Check logs: ppm logs");
+          process.exit(1);
+        }
+      }
     }
 
     if (!serverPid) {
       console.error("  ✗  Server did not start within 10 seconds.");
       console.error("     Check logs: ppm logs");
-      try { process.kill(supervisorPid); } catch {}
+      if (supervisorPid) { try { process.kill(supervisorPid); } catch {} }
       process.exit(1);
     }
 
@@ -456,6 +490,23 @@ export async function startServer(options: {
       qr.generate(shareUrl, { small: true });
     }
 
+    // Auto-enable system service (systemd/launchd) for boot resilience
+    try {
+      const { getAutoStartStatus, enableAutoStart } = await import("../services/autostart-register.ts");
+      const status = getAutoStartStatus();
+      if (!status.enabled) {
+        const autoConfig = {
+          port, host,
+          share: !!options.share,
+          configPath: options.config,
+          profile: options.profile,
+        };
+        // skipStart: supervisor is already running from direct spawn above
+        await enableAutoStart(autoConfig, { skipStart: true });
+        console.log(`  ✓  Auto-restart enabled (${status.platform}). Disable: ppm autostart disable`);
+      }
+    } catch {}
+
     console.log(`  Commands:`);
     console.log(`    ppm restart   Reload config (keeps tunnel URL)`);
     console.log(`    ppm stop      Stop server & tunnel`);

package/src/services/autostart-generator.ts

@@ -132,7 +132,7 @@ Wants=network-online.target
 [Service]
 Type=simple
 ExecStart=${execStart}
-Restart=always
+Restart=on-failure
 RestartSec=5
 ${envPath}
 WorkingDirectory=${homedir()}/.ppm

package/src/services/autostart-register.ts

@@ -60,34 +60,37 @@ function removeMetadata(): void {
 
 // ─── macOS ──────────────────────────────────────────────────────────────
 
-async function enableMacOS(config: AutoStartConfig): Promise<string> {
+async function enableMacOS(config: AutoStartConfig, opts?: { skipStart?: boolean }): Promise<string> {
   const plistPath = getPlistPath();
   const plistDir = dirname(plistPath);
 
   if (!existsSync(plistDir)) mkdirSync(plistDir, { recursive: true });
   writeFileSync(plistPath, generatePlist(config));
 
-  // Unload first if already loaded (ignore errors)
-  Bun.spawnSync({
-    cmd: ["launchctl", "bootout", `gui/${process.getuid!()}`, plistPath],
-    stdout: "ignore", stderr: "ignore",
-  });
-
-  // Load the agent
-  const result = Bun.spawnSync({
-    cmd: ["launchctl", "bootstrap", `gui/${process.getuid!()}`, plistPath],
-    stdout: "pipe", stderr: "pipe",
-  });
+  // Skip loading if supervisor is already running from direct spawn
+  if (!opts?.skipStart) {
+    // Unload first if already loaded (ignore errors)
+    Bun.spawnSync({
+      cmd: ["launchctl", "bootout", `gui/${process.getuid!()}`, plistPath],
+      stdout: "ignore", stderr: "ignore",
+    });
 
-  if (result.exitCode !== 0) {
-    // Fallback to legacy syntax
-    const legacy = Bun.spawnSync({
-      cmd: ["launchctl", "load", plistPath],
+    // Load the agent
+    const result = Bun.spawnSync({
+      cmd: ["launchctl", "bootstrap", `gui/${process.getuid!()}`, plistPath],
       stdout: "pipe", stderr: "pipe",
     });
-    if (legacy.exitCode !== 0) {
-      const err = legacy.stderr.toString().trim();
-      throw new Error(`launchctl load failed: ${err}`);
+
+    if (result.exitCode !== 0) {
+      // Fallback to legacy syntax
+      const legacy = Bun.spawnSync({
+        cmd: ["launchctl", "load", plistPath],
+        stdout: "pipe", stderr: "pipe",
+      });
+      if (legacy.exitCode !== 0) {
+        const err = legacy.stderr.toString().trim();
+        throw new Error(`launchctl load failed: ${err}`);
+      }
     }
   }
 
@@ -146,7 +149,7 @@ function statusMacOS(): AutoStartStatus {
 
 // ─── Linux ──────────────────────────────────────────────────────────────
 
-async function enableLinux(config: AutoStartConfig): Promise<string> {
+async function enableLinux(config: AutoStartConfig, opts?: { skipStart?: boolean }): Promise<string> {
   const servicePath = getServicePath();
   const serviceDir = dirname(servicePath);
 
@@ -171,11 +174,13 @@ async function enableLinux(config: AutoStartConfig): Promise<string> {
     throw new Error(`systemctl enable failed: ${enable.stderr.toString().trim()}`);
   }
 
-  // Start
-  Bun.spawnSync({
-    cmd: ["systemctl", "--user", "start", "ppm.service"],
-    stdout: "ignore", stderr: "ignore",
-  });
+  // Start (skip if supervisor is already running from direct spawn)
+  if (!opts?.skipStart) {
+    Bun.spawnSync({
+      cmd: ["systemctl", "--user", "start", "ppm.service"],
+      stdout: "ignore", stderr: "ignore",
+    });
+  }
 
   // Enable lingering so service runs at boot without login
   Bun.spawnSync({
@@ -312,11 +317,11 @@ function statusWindows(): AutoStartStatus {
 
 // ─── Public API ─────────────────────────────────────────────────────────
 
-/** Enable auto-start for the current platform */
-export async function enableAutoStart(config: AutoStartConfig): Promise<string> {
+/** Enable auto-start for the current platform. skipStart=true registers without starting (when supervisor is already running). */
+export async function enableAutoStart(config: AutoStartConfig, opts?: { skipStart?: boolean }): Promise<string> {
   const platform = process.platform;
-  if (platform === "darwin") return enableMacOS(config);
-  if (platform === "linux") return enableLinux(config);
+  if (platform === "darwin") return enableMacOS(config, opts);
+  if (platform === "linux") return enableLinux(config, opts);
   if (platform === "win32") return enableWindows(config);
   throw new Error(`Auto-start not supported on ${platform}`);
 }

package/src/web/components/extensions/extension-webview.tsx

@@ -54,47 +54,33 @@ export function ExtensionWebview({ metadata }: ExtensionWebviewProps) {
   const rawHtml = panel?.html ?? "";
   const html = injectVscodeApiShim(rawHtml);
 
-  // On reload: resolve project path, then dispatch command with retry
-  // Retry needed because WS connection may not be ready on first attempt
+  // On reload: resolve project path and dispatch command once
+  // No retry — if it fails, user closes tab and reopens to retry
   useEffect(() => {
     if (panel || !viewType) return;
-    // Mark project as "dispatched" so project-sync effect doesn't double-dispatch
     if (projectName) prevProjectRef.current = projectName;
     const command = viewType.includes(".") ? viewType : `${viewType}.view`;
     let cancelled = false;
-    let resolvedArgs: unknown[] | null = null;
 
-    async function resolveArgs(): Promise<unknown[]> {
-      if (resolvedArgs) return resolvedArgs;
-      if (!projectName) return [];
-      try {
-        const res = await fetch("/api/projects");
-        const json = await res.json() as { ok: boolean; data?: { name: string; path: string }[] };
-        const match = json.data?.find((p) => p.name === projectName);
-        resolvedArgs = match ? [match.path] : [];
-      } catch {
-        resolvedArgs = [];
+    async function dispatch() {
+      let args: unknown[] = [];
+      if (projectName) {
+        try {
+          const res = await fetch("/api/projects");
+          const json = await res.json() as { ok: boolean; data?: { name: string; path: string }[] };
+          const match = json.data?.find((p) => p.name === projectName);
+          if (match) args = [match.path];
+        } catch {}
       }
-      return resolvedArgs;
-    }
-
-    async function attempt() {
-      const args = await resolveArgs();
       if (cancelled) return;
       window.dispatchEvent(new CustomEvent("ext:command:execute", {
         detail: { command, args },
       }));
     }
 
-    // First attempt after short delay (let WS connect), then retry every 2s
-    const initialTimer = setTimeout(() => {
-      if (!cancelled) attempt();
-    }, 500);
-    const retryTimer = setInterval(() => {
-      if (!cancelled) attempt();
-    }, 2_000);
-
-    return () => { cancelled = true; clearTimeout(initialTimer); clearInterval(retryTimer); };
+    // Short delay to let WS connect after page load
+    const timer = setTimeout(dispatch, 500);
+    return () => { cancelled = true; clearTimeout(timer); };
   }, [panel, viewType, projectName]);
 
   // When panel exists, ensure correct project is loaded.
@@ -168,10 +154,10 @@ export function ExtensionWebview({ metadata }: ExtensionWebviewProps) {
     };
   }, []);
 
-  // Timeout: if panel doesn't appear within 10s, show error
+  // Timeout: if panel doesn't appear within 5s, show error
   useEffect(() => {
     if (panel) { setTimedOut(false); return; }
-    const timer = setTimeout(() => setTimedOut(true), 10_000);
+    const timer = setTimeout(() => setTimedOut(true), 5_000);
     return () => clearTimeout(timer);
   }, [panel]);
 

package/dist/web/assets/extension-webview-gHGB2Nw2.js

@@ -1,3 +0,0 @@
-import{o as e}from"./rolldown-runtime-FhOqtrmT.js";import{b as t,x as n}from"./vendor-markdown-0Mxgxy0L.js";import{t as r}from"./tab-store-DZbiYk7y.js";import{t as i}from"./extension-store-3yZYn07W.js";import{A as a}from"./index-B4mGNywE.js";var o=e(n(),1),s=t(),c=`<script>
-function acquireVsCodeApi(){return{postMessage:function(m){window.parent.postMessage(m,"*")},getState:function(){try{return JSON.parse(sessionStorage.getItem("vscode-state")||"null")}catch{return null}},setState:function(s){sessionStorage.setItem("vscode-state",JSON.stringify(s));return s}}}
-<\/script>`;function l(e){if(!e)return e;let t=e.indexOf(`<head>`);return t===-1?c+e:e.slice(0,t+6)+c+e.slice(t+6)}function u({metadata:e}){let t=e?.panelId,n=e?.viewType,c=r(e=>e.currentProject)||e?.projectName||void 0,[u,d]=(0,o.useState)(!1),f=i(e=>{if(t&&e.webviewPanels[t])return e.webviewPanels[t];if(n){let t=n.includes(`.`)?n:`${n}.view`;return Object.values(e.webviewPanels).find(e=>e.viewType===n||e.viewType===t)}}),p=f?.id??t,m=(0,o.useRef)(null),h=f?.html??``,g=l(h);(0,o.useEffect)(()=>{if(f||!n)return;c&&(_.current=c);let e=n.includes(`.`)?n:`${n}.view`,t=!1,r=null;async function i(){if(r)return r;if(!c)return[];try{let e=(await(await fetch(`/api/projects`)).json()).data?.find(e=>e.name===c);r=e?[e.path]:[]}catch{r=[]}return r}async function a(){let n=await i();t||window.dispatchEvent(new CustomEvent(`ext:command:execute`,{detail:{command:e,args:n}}))}let o=setTimeout(()=>{t||a()},500),s=setInterval(()=>{t||a()},2e3);return()=>{t=!0,clearTimeout(o),clearInterval(s)}},[f,n,c]);let _=(0,o.useRef)(null);(0,o.useEffect)(()=>{if(!f||!n||!c||c===_.current)return;_.current=c;let e=n.includes(`.`)?n:`${n}.view`;(async()=>{try{let t=(await(await fetch(`/api/projects`)).json()).data?.find(e=>e.name===c);t&&window.dispatchEvent(new CustomEvent(`ext:command:execute`,{detail:{command:e,args:[t.path]}}))}catch{}})()},[f,n,c]);let v=e?.extensionId,y=i(e=>{if(v&&e.activationErrors[v])return e.activationErrors[v];if(n){for(let[t,r]of Object.entries(e.activationErrors))if(t===`ext-${n}`)return r}}),b=(0,o.useCallback)(()=>{if(d(!1),!n)return;let e=n.includes(`.`)?n:`${n}.view`;(async()=>{try{let t=(await(await fetch(`/api/projects`)).json()).data?.find(e=>e.name===c),n=t?[t.path]:[];window.dispatchEvent(new CustomEvent(`ext:command:execute`,{detail:{command:e,args:n}}))}catch{}})()},[n,c]),x=(0,o.useRef)(null);return(0,o.useEffect)(()=>{x.current=p??null},[p]),(0,o.useEffect)(()=>()=>{let e=x.current;e&&(i.getState().removeWebviewPanel(e),window.dispatchEvent(new CustomEvent(`ext:webview:close`,{detail:{panelId:e}})))},[]),(0,o.useEffect)(()=>{if(f){d(!1);return}let e=setTimeout(()=>d(!0),1e4);return()=>clearTimeout(e)},[f]),(0,o.useEffect)(()=>{if(!p)return;let e=e=>{m.current&&e.source===m.current.contentWindow&&window.dispatchEvent(new CustomEvent(`ext:webview:send`,{detail:{panelId:p,message:e.data}}))};return window.addEventListener(`message`,e),()=>window.removeEventListener(`message`,e)},[p]),(0,o.useEffect)(()=>{if(!p)return;let e=e=>{let{panelId:t,message:n}=e.detail;t===p&&m.current?.contentWindow?.postMessage(n,`*`)};return window.addEventListener(`ext:webview:message`,e),()=>window.removeEventListener(`ext:webview:message`,e)},[p]),!f||!h?(0,s.jsx)(`div`,{className:`flex flex-col items-center justify-center h-full gap-3 text-sm text-text-subtle`,children:u?(0,s.jsxs)(s.Fragment,{children:[(0,s.jsx)(`span`,{className:`text-destructive font-medium`,children:`Extension failed to load`}),y&&(0,s.jsx)(`span`,{className:`text-xs text-muted-foreground max-w-md text-center`,children:y}),(0,s.jsx)(`button`,{onClick:b,className:`text-xs text-primary hover:underline`,children:`Retry`})]}):(0,s.jsxs)(s.Fragment,{children:[(0,s.jsx)(a,{className:`size-5 animate-spin`}),(0,s.jsx)(`span`,{children:`Loading extension...`})]})}):(0,s.jsx)(`div`,{className:`h-full w-full relative`,children:(0,s.jsx)(`iframe`,{ref:m,srcDoc:g,sandbox:`allow-scripts`,className:`w-full h-full border-0 bg-white dark:bg-zinc-900`,title:f.title},p)})}export{u as ExtensionWebview};