npm - @spencer-kit/coder-studio - Versions diffs - 0.4.2 → 0.4.4 - Mend

@spencer-kit/coder-studio 0.4.2 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/CHANGELOG.md +16 -0
package/dist/esm/bin.mjs +460 -91
package/dist/esm/bin.mjs.map +4 -4
package/dist/esm/server-runner.mjs +406 -67
package/dist/esm/server-runner.mjs.map +4 -4
package/dist/esm/update-worker.mjs +145 -6
package/dist/esm/update-worker.mjs.map +2 -2
package/dist/web/assets/components-C4SKshs2.js +110 -0
package/dist/web/assets/components-C4SKshs2.js.map +1 -0
package/dist/web/assets/{components-AKM1pxhf.css → components-CMahvybm.css} +1 -1
package/dist/web/assets/{main-D3dXqSaA.js → main-CZuF2VZA.js} +2 -2
package/dist/web/assets/{main-D3dXqSaA.js.map → main-CZuF2VZA.js.map} +1 -1
package/dist/web/assets/{ui-preview-BGZz053-.js → ui-preview-DCeC0YmD.js} +3 -3
package/dist/web/assets/{ui-preview-BGZz053-.js.map → ui-preview-DCeC0YmD.js.map} +1 -1
package/dist/web/index.html +3 -3
package/dist/web/ui-preview.html +3 -3
package/package.json +1 -1
package/src/pm2-control.test.ts +48 -6
package/src/pm2-control.ts +43 -2
package/src/update-worker.test.ts +113 -12
package/src/update-worker.ts +195 -7
package/dist/web/assets/components-omWbMLvf.js +0 -110
package/dist/web/assets/components-omWbMLvf.js.map +0 -1

package/dist/web/index.html CHANGED Viewed

@@ -6,14 +6,14 @@
     <meta name="description" content="Coder Studio - Agent-First Development Environment" />
     <title>Coder Studio</title>
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
-    <script type="module" crossorigin src="/assets/main-D3dXqSaA.js"></script>
+    <script type="module" crossorigin src="/assets/main-CZuF2VZA.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-CpWojdLp.js">
     <link rel="modulepreload" crossorigin href="/assets/monaco-editor-VTbRDH-J.js">
     <link rel="modulepreload" crossorigin href="/assets/xterm-BVlcrOZ1.js">
-    <link rel="modulepreload" crossorigin href="/assets/components-omWbMLvf.js">
+    <link rel="modulepreload" crossorigin href="/assets/components-C4SKshs2.js">
     <link rel="stylesheet" crossorigin href="/assets/monaco-editor-Br_kD0ds.css">
     <link rel="stylesheet" crossorigin href="/assets/xterm-BrP-ENHg.css">
-    <link rel="stylesheet" crossorigin href="/assets/components-AKM1pxhf.css">
+    <link rel="stylesheet" crossorigin href="/assets/components-CMahvybm.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/web/ui-preview.html CHANGED Viewed

@@ -4,14 +4,14 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Coder Studio UI Preview</title>
-    <script type="module" crossorigin src="/assets/ui-preview-BGZz053-.js"></script>
+    <script type="module" crossorigin src="/assets/ui-preview-DCeC0YmD.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-CpWojdLp.js">
     <link rel="modulepreload" crossorigin href="/assets/monaco-editor-VTbRDH-J.js">
     <link rel="modulepreload" crossorigin href="/assets/xterm-BVlcrOZ1.js">
-    <link rel="modulepreload" crossorigin href="/assets/components-omWbMLvf.js">
+    <link rel="modulepreload" crossorigin href="/assets/components-C4SKshs2.js">
     <link rel="stylesheet" crossorigin href="/assets/monaco-editor-Br_kD0ds.css">
     <link rel="stylesheet" crossorigin href="/assets/xterm-BrP-ENHg.css">
-    <link rel="stylesheet" crossorigin href="/assets/components-AKM1pxhf.css">
+    <link rel="stylesheet" crossorigin href="/assets/components-CMahvybm.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@spencer-kit/coder-studio",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "type": "module",
   "description": "Deploy once, code everywhere. Browser-based AI coding workspace for Claude Code and Codex.",
   "main": "./dist/esm/index.mjs",

package/src/pm2-control.test.ts CHANGED Viewed

@@ -148,14 +148,15 @@ describe("pm2-control", () => {
   });
   it("waits for the previous PM2 app to disappear before starting a replacement", async () => {
+    const previousPid = 999_990;
     describeProcess
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
-          callback(null, [{ pid: 111, pm2_env: { status: "online", restart_time: 0 } }])
+          callback(null, [{ pid: previousPid, pm2_env: { status: "online", restart_time: 0 } }])
       )
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
-          callback(null, [{ pid: 111, pm2_env: { status: "stopping", restart_time: 0 } }])
+          callback(null, [{ pid: previousPid, pm2_env: { status: "stopping", restart_time: 0 } }])
       )
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
@@ -180,14 +181,15 @@ describe("pm2-control", () => {
   });
   it("reuses one pm2 session while polling deletion during startup", async () => {
+    const previousPid = 999_992;
     describeProcess
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
-          callback(null, [{ pid: 111, pm2_env: { status: "online", restart_time: 0 } }])
+          callback(null, [{ pid: previousPid, pm2_env: { status: "online", restart_time: 0 } }])
       )
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
-          callback(null, [{ pid: 111, pm2_env: { status: "stopping", restart_time: 0 } }])
+          callback(null, [{ pid: previousPid, pm2_env: { status: "stopping", restart_time: 0 } }])
       )
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
@@ -204,15 +206,55 @@ describe("pm2-control", () => {
     expect(disconnect).toHaveBeenCalledTimes(1);
   });
+  it("waits for the previous process pid to exit before starting a replacement", async () => {
+    const previousPid = 999_991;
+    const killSpy = vi.spyOn(process, "kill");
+    killSpy
+      .mockImplementationOnce(() => true)
+      .mockImplementationOnce(() => true)
+      .mockImplementationOnce(() => {
+        const error = new Error("process not found") as NodeJS.ErrnoException;
+        error.code = "ESRCH";
+        throw error;
+      });
+    describeProcess
+      .mockImplementationOnce(
+        (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
+          callback(null, [{ pid: previousPid, pm2_env: { status: "online", restart_time: 0 } }])
+      )
+      .mockImplementationOnce(
+        (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
+          callback(null, [])
+      );
+    const pendingStart = startManagedServer({
+      script: "/cli/dist/esm/server-runner.js",
+      cwd: "/repo",
+      waitMs: 10,
+    });
+    await expect(
+      Promise.race([
+        pendingStart.then(() => "started"),
+        new Promise((resolve) => setTimeout(() => resolve("waiting"), 20)),
+      ])
+    ).resolves.toBe("waiting");
+    expect(start).not.toHaveBeenCalled();
+    await pendingStart;
+    expect(killSpy).toHaveBeenCalledWith(previousPid, 0);
+  });
   it("keeps waiting during startup when delete reports missing but the old app still lingers", async () => {
+    const previousPid = 999_993;
     describeProcess
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
-          callback(null, [{ pid: 111, pm2_env: { status: "online", restart_time: 0 } }])
+          callback(null, [{ pid: previousPid, pm2_env: { status: "online", restart_time: 0 } }])
       )
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>
-          callback(null, [{ pid: 111, pm2_env: { status: "stopping", restart_time: 0 } }])
+          callback(null, [{ pid: previousPid, pm2_env: { status: "stopping", restart_time: 0 } }])
       )
       .mockImplementationOnce(
         (_name: string, callback: (error: Error | null, result: unknown[]) => void) =>

package/src/pm2-control.ts CHANGED Viewed

@@ -265,6 +265,39 @@ const waitForManagedServerDeletion = async (pm2: Pm2Module, waitMs: number): Pro
   throw new Error(`Timed out waiting for the managed server to stop after ${waitMs}ms.`);
 };
+const isMissingProcessError = (error: unknown): boolean =>
+  Boolean(
+    error &&
+      typeof error === "object" &&
+      "code" in error &&
+      (error as NodeJS.ErrnoException).code === "ESRCH"
+  );
+const waitForProcessExit = async (pid: number, waitMs: number): Promise<void> => {
+  const deadline = Date.now() + waitMs;
+  while (Date.now() <= deadline) {
+    try {
+      process.kill(pid, 0);
+    } catch (error) {
+      if (isMissingProcessError(error)) {
+        return;
+      }
+      throw error;
+    }
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) {
+      break;
+    }
+    await sleep(Math.min(STARTUP_POLL_INTERVAL_MS, remainingMs));
+  }
+  throw new Error(`Timed out waiting for the managed server pid ${pid} to exit after ${waitMs}ms.`);
+};
 const deleteManagedServerInSession = async (
   pm2: Pm2Module,
   {
@@ -277,19 +310,27 @@ const deleteManagedServerInSession = async (
   if (processes.length === 0) {
     return false;
   }
+  const previousPid = processes[0]?.pid;
+  const deadline = Date.now() + PM2_DELETE_WAIT_MS;
   try {
     await removeManagedServer(pm2);
   } catch (error) {
     if (ignoreMissing && isMissingManagedServerError(error)) {
-      await waitForManagedServerDeletion(pm2, PM2_DELETE_WAIT_MS);
+      await waitForManagedServerDeletion(pm2, Math.max(0, deadline - Date.now()));
+      if (typeof previousPid === "number" && previousPid > 0) {
+        await waitForProcessExit(previousPid, Math.max(0, deadline - Date.now()));
+      }
       return false;
     }
     throw error;
   }
-  await waitForManagedServerDeletion(pm2, PM2_DELETE_WAIT_MS);
+  await waitForManagedServerDeletion(pm2, Math.max(0, deadline - Date.now()));
+  if (typeof previousPid === "number" && previousPid > 0) {
+    await waitForProcessExit(previousPid, Math.max(0, deadline - Date.now()));
+  }
   return true;
 };

package/src/update-worker.test.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { runUpdateWorker } from "./update-worker.js";
+import { runRestartHandoff, runUpdateWorker } from "./update-worker.js";
 describe("update-worker", () => {
   const tempDirs: string[] = [];
@@ -29,13 +29,16 @@ describe("update-worker", () => {
     };
   }
-  it("writes restarting state after install success and restart handoff", async () => {
+  it("writes restarting state and spawns a detached restart handoff after install success", async () => {
     const env = createEnv();
     const runCommand = vi.fn(async () => {});
+    const spawnDetachedProcess = vi.fn(async () => {});
     await runUpdateWorker(env, {
       runCommand,
       now: () => 1000,
+      processId: 4242,
+      spawnDetachedProcess,
     });
     const state = JSON.parse(readFileSync(env.stateFilePath, "utf-8")) as { updateStatus: string };
@@ -46,11 +49,13 @@ describe("update-worker", () => {
       ["install", "-g", "@spencer-kit/coder-studio@0.5.0"],
       expect.any(Object)
     );
-    expect(runCommand).toHaveBeenNthCalledWith(
-      2,
-      "coder-studio",
-      ["serve", "--restart"],
-      expect.any(Object)
+    expect(spawnDetachedProcess).toHaveBeenCalledWith(
+      process.execPath,
+      expect.any(Array),
+      expect.objectContaining({
+        CODER_STUDIO_UPDATE_WORKER_MODE: "restart-handoff",
+        CODER_STUDIO_UPDATE_PARENT_PID: "4242",
+      })
     );
   });
@@ -77,14 +82,14 @@ describe("update-worker", () => {
   it("marks restart failures with manual restart guidance", async () => {
     const env = createEnv();
-    const runCommand = vi
-      .fn()
-      .mockResolvedValueOnce(undefined)
-      .mockRejectedValueOnce(new Error("pm2 restart failed"));
+    const runCommand = vi.fn().mockRejectedValueOnce(new Error("pm2 restart failed"));
+    const waitForProcessExit = vi.fn(async () => {});
-    await runUpdateWorker(env, {
+    await runRestartHandoff(env, {
       runCommand,
       now: () => 1000,
+      waitForProcessExit,
+      restartParentPid: 999,
     });
     const state = JSON.parse(readFileSync(env.stateFilePath, "utf-8")) as {
@@ -95,5 +100,101 @@ describe("update-worker", () => {
     expect(state.updateStatus).toBe("failed");
     expect(state.manualCommand).toBe("coder-studio serve --restart");
     expect(state.errorSummary).toContain("restart failed");
+    expect(waitForProcessExit).toHaveBeenCalledWith(999);
+  });
+  it("sanitizes pm2 and runtime override env before invoking install and restart commands", async () => {
+    const env = createEnv();
+    const runCommand = vi.fn(async () => {});
+    const spawnDetachedProcess = vi.fn(async () => {});
+    const originalEnv = {
+      PM2_HOME: process.env.PM2_HOME,
+      PM2_PROGRAMMATIC: process.env.PM2_PROGRAMMATIC,
+      PM2_JSON_PROCESSING: process.env.PM2_JSON_PROCESSING,
+      PM2_INTERACTOR_PROCESSING: process.env.PM2_INTERACTOR_PROCESSING,
+      NODE_APP_INSTANCE: process.env.NODE_APP_INSTANCE,
+      NODE_CHANNEL_FD: process.env.NODE_CHANNEL_FD,
+      NODE_CHANNEL_SERIALIZATION_MODE: process.env.NODE_CHANNEL_SERIALIZATION_MODE,
+      CODER_STUDIO_RUNTIME_JSON_PATH: process.env.CODER_STUDIO_RUNTIME_JSON_PATH,
+      CODER_STUDIO_SESSION_ID: process.env.CODER_STUDIO_SESSION_ID,
+      CODER_STUDIO_UPDATE_STATE_PATH: process.env.CODER_STUDIO_UPDATE_STATE_PATH,
+      pm_id: process.env.pm_id,
+    };
+    process.env.PM2_HOME = "/tmp/custom-pm2-home";
+    process.env.PM2_PROGRAMMATIC = "true";
+    process.env.PM2_JSON_PROCESSING = "true";
+    process.env.PM2_INTERACTOR_PROCESSING = "true";
+    process.env.NODE_APP_INSTANCE = "0";
+    process.env.NODE_CHANNEL_FD = "3";
+    process.env.NODE_CHANNEL_SERIALIZATION_MODE = "json";
+    process.env.CODER_STUDIO_RUNTIME_JSON_PATH = "/tmp/runtime.json";
+    process.env.CODER_STUDIO_SESSION_ID = "sess_test";
+    process.env.CODER_STUDIO_UPDATE_STATE_PATH = "/tmp/update-state.json";
+    process.env.pm_id = "0";
+    try {
+      await runUpdateWorker(env, {
+        runCommand,
+        now: () => 1000,
+        processId: 4242,
+        spawnDetachedProcess,
+      });
+    } finally {
+      for (const [key, value] of Object.entries(originalEnv)) {
+        if (value === undefined) {
+          delete process.env[key];
+        } else {
+          process.env[key] = value;
+        }
+      }
+    }
+    for (const call of runCommand.mock.calls) {
+      const options = call[2] as { env?: NodeJS.ProcessEnv };
+      expect(options.env?.PM2_HOME).toBe("/tmp/custom-pm2-home");
+      expect(options.env?.PM2_PROGRAMMATIC).toBeUndefined();
+      expect(options.env?.PM2_JSON_PROCESSING).toBeUndefined();
+      expect(options.env?.PM2_INTERACTOR_PROCESSING).toBeUndefined();
+      expect(options.env?.NODE_APP_INSTANCE).toBeUndefined();
+      expect(options.env?.NODE_CHANNEL_FD).toBeUndefined();
+      expect(options.env?.NODE_CHANNEL_SERIALIZATION_MODE).toBeUndefined();
+      expect(options.env?.CODER_STUDIO_RUNTIME_JSON_PATH).toBeUndefined();
+      expect(options.env?.CODER_STUDIO_SESSION_ID).toBeUndefined();
+      expect(options.env?.CODER_STUDIO_UPDATE_STATE_PATH).toBeUndefined();
+      expect(options.env?.pm_id).toBeUndefined();
+    }
+    const handoffEnv = spawnDetachedProcess.mock.calls[0]?.[2] as NodeJS.ProcessEnv | undefined;
+    expect(handoffEnv?.PM2_HOME).toBe("/tmp/custom-pm2-home");
+    expect(handoffEnv?.PM2_PROGRAMMATIC).toBeUndefined();
+    expect(handoffEnv?.PM2_JSON_PROCESSING).toBeUndefined();
+    expect(handoffEnv?.PM2_INTERACTOR_PROCESSING).toBeUndefined();
+    expect(handoffEnv?.NODE_APP_INSTANCE).toBeUndefined();
+    expect(handoffEnv?.NODE_CHANNEL_FD).toBeUndefined();
+    expect(handoffEnv?.NODE_CHANNEL_SERIALIZATION_MODE).toBeUndefined();
+    expect(handoffEnv?.CODER_STUDIO_RUNTIME_JSON_PATH).toBeUndefined();
+    expect(handoffEnv?.CODER_STUDIO_SESSION_ID).toBeUndefined();
+    expect(handoffEnv?.pm_id).toBeUndefined();
+  });
+  it("waits for the install worker to exit before running the restart command", async () => {
+    const env = createEnv();
+    const waitForProcessExit = vi.fn(async () => {});
+    const runCommand = vi.fn(async () => {});
+    await runRestartHandoff(env, {
+      runCommand,
+      now: () => 1000,
+      waitForProcessExit,
+      restartParentPid: 777,
+    });
+    expect(waitForProcessExit).toHaveBeenCalledWith(777);
+    expect(runCommand).toHaveBeenCalledWith(
+      "coder-studio",
+      ["serve", "--restart"],
+      expect.any(Object)
+    );
   });
 });

package/src/update-worker.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { spawn } from "node:child_process";
 import { createWriteStream } from "node:fs";
 import { mkdir } from "node:fs/promises";
 import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 interface UpdateStateSnapshot {
   version: 1;
@@ -37,6 +38,13 @@ interface WorkerEnv {
   installArgsPrefix: string[];
 }
+type WorkerMode = "install" | "restart-handoff";
+const RESTART_HANDOFF_MODE: WorkerMode = "restart-handoff";
+const DEFAULT_MODE: WorkerMode = "install";
+const RESTART_HANDOFF_WAIT_MS = 5_000;
+const WORKER_ENTRY_PATH = fileURLToPath(import.meta.url);
 async function writeState(filePath: string, value: UpdateStateSnapshot): Promise<void> {
   await mkdir(dirname(filePath), { recursive: true });
   await import("node:fs/promises").then(({ writeFile }) =>
@@ -44,6 +52,16 @@ async function writeState(filePath: string, value: UpdateStateSnapshot): Promise
   );
 }
+function closeLogStream(stream: NodeJS.WritableStream): Promise<void> {
+  return new Promise((resolve, reject) => {
+    stream.once("error", reject);
+    stream.end(() => {
+      stream.off("error", reject);
+      resolve();
+    });
+  });
+}
 function parseJsonArray(value: string | undefined, fallback: string[]): string[] {
   if (!value) {
     return fallback;
@@ -97,15 +115,128 @@ function buildManualCommand(input: WorkerEnv): string {
   ].join("\n");
 }
+function readWorkerMode(env = process.env): WorkerMode {
+  return env.CODER_STUDIO_UPDATE_WORKER_MODE === RESTART_HANDOFF_MODE
+    ? RESTART_HANDOFF_MODE
+    : DEFAULT_MODE;
+}
+function readRestartParentPid(env = process.env): number | null {
+  const raw = env.CODER_STUDIO_UPDATE_PARENT_PID;
+  if (!raw) {
+    return null;
+  }
+  const pid = Number.parseInt(raw, 10);
+  return Number.isInteger(pid) && pid > 0 ? pid : null;
+}
+const INTERNAL_ENV_KEYS = new Set([
+  "CODER_STUDIO_RUNTIME_JSON_PATH",
+  "CODER_STUDIO_SESSION_ID",
+  "NODE_APP_INSTANCE",
+  "NODE_CHANNEL_FD",
+  "NODE_CHANNEL_SERIALIZATION_MODE",
+  "PM2_INTERACTOR_PROCESSING",
+  "PM2_JSON_PROCESSING",
+  "PM2_PROGRAMMATIC",
+]);
+function buildChildProcessEnv(env = process.env): NodeJS.ProcessEnv {
+  const nextEnv: NodeJS.ProcessEnv = { ...env };
+  for (const key of Object.keys(nextEnv)) {
+    if (INTERNAL_ENV_KEYS.has(key)) {
+      delete nextEnv[key];
+      continue;
+    }
+    if (key.startsWith("CODER_STUDIO_UPDATE_") || key.startsWith("pm_")) {
+      delete nextEnv[key];
+    }
+  }
+  return nextEnv;
+}
+function buildWorkerEnv(input: WorkerEnv): NodeJS.ProcessEnv {
+  return {
+    CODER_STUDIO_UPDATE_STATE_PATH: input.stateFilePath,
+    CODER_STUDIO_UPDATE_LOG_PATH: input.logFilePath,
+    CODER_STUDIO_UPDATE_PACKAGE_NAME: input.packageName,
+    CODER_STUDIO_UPDATE_TARGET_VERSION: input.targetVersion,
+    CODER_STUDIO_UPDATE_CLI_COMMAND: input.cliCommand,
+    CODER_STUDIO_UPDATE_CURRENT_VERSION: input.currentVersion,
+    CODER_STUDIO_UPDATE_NPM_COMMAND: input.npmCommand,
+    CODER_STUDIO_UPDATE_RESTART_ARGS: JSON.stringify(input.restartArgs),
+    CODER_STUDIO_UPDATE_INSTALL_ARGS_PREFIX: JSON.stringify(input.installArgsPrefix),
+  };
+}
+function spawnDetachedProcess(
+  command: string,
+  args: string[],
+  env: NodeJS.ProcessEnv
+): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      detached: true,
+      stdio: "ignore",
+      env,
+    });
+    child.on("error", reject);
+    child.unref();
+    resolve();
+  });
+}
+const isMissingProcessError = (error: unknown): boolean =>
+  Boolean(
+    error &&
+      typeof error === "object" &&
+      "code" in error &&
+      (error as NodeJS.ErrnoException).code === "ESRCH"
+  );
+async function waitForProcessExit(pid: number, waitMs = RESTART_HANDOFF_WAIT_MS): Promise<void> {
+  const deadline = Date.now() + waitMs;
+  while (Date.now() <= deadline) {
+    try {
+      process.kill(pid, 0);
+    } catch (error) {
+      if (isMissingProcessError(error)) {
+        return;
+      }
+      throw error;
+    }
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) {
+      break;
+    }
+    await new Promise((resolve) => {
+      setTimeout(resolve, Math.min(100, remainingMs));
+    });
+  }
+}
 function runCommand(
   command: string,
   args: string[],
-  options?: { stdio?: "ignore" | "pipe"; logStream?: NodeJS.WritableStream }
+  options?: {
+    stdio?: "ignore" | "pipe";
+    logStream?: NodeJS.WritableStream;
+    env?: NodeJS.ProcessEnv;
+  }
 ): Promise<void> {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       stdio: options?.stdio === "ignore" ? "ignore" : "pipe",
-      env: process.env,
+      env: options?.env ?? process.env,
     });
     if (options?.logStream && child.stdout) {
@@ -131,18 +262,23 @@ export async function runUpdateWorker(
   deps?: {
     runCommand?: typeof runCommand;
     now?: () => number;
+    processId?: number;
+    spawnDetachedProcess?: typeof spawnDetachedProcess;
   }
 ): Promise<void> {
   const now = deps?.now ?? Date.now;
   await mkdir(dirname(input.logFilePath), { recursive: true });
   const logStream = createWriteStream(input.logFilePath, { flags: "a" });
   const execute = deps?.runCommand ?? runCommand;
+  const childEnv = buildChildProcessEnv(process.env);
+  const processId = deps?.processId ?? process.pid;
+  const spawnRestartHandoff = deps?.spawnDetachedProcess ?? spawnDetachedProcess;
   try {
     await execute(
       input.npmCommand,
       [...input.installArgsPrefix, `${input.packageName}@${input.targetVersion}`],
-      { logStream }
+      { logStream, env: childEnv }
     );
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -163,7 +299,7 @@ export async function runUpdateWorker(
       manualCommand: permissionRelated ? buildManualCommand(input) : null,
       errorSummary: message,
     });
-    logStream.end();
+    await closeLogStream(logStream);
     return;
   }
@@ -183,7 +319,56 @@ export async function runUpdateWorker(
   });
   try {
-    await execute(input.cliCommand, input.restartArgs, { logStream });
+    await spawnRestartHandoff(process.execPath, [WORKER_ENTRY_PATH], {
+      ...childEnv,
+      ...buildWorkerEnv(input),
+      CODER_STUDIO_UPDATE_WORKER_MODE: RESTART_HANDOFF_MODE,
+      CODER_STUDIO_UPDATE_PARENT_PID: String(processId),
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    await writeState(input.stateFilePath, {
+      version: 1,
+      currentVersion: input.currentVersion,
+      latestVersion: input.targetVersion,
+      availability: "update_available",
+      updateStatus: "failed",
+      lastCheckedAt: now(),
+      targetVersion: input.targetVersion,
+      startedAt: now(),
+      finishedAt: now(),
+      requiresManualStep: true,
+      manualCommand: `${input.cliCommand} ${input.restartArgs.join(" ")}`,
+      errorSummary: `new version installed but service restart failed: ${message}`,
+    });
+  } finally {
+    await closeLogStream(logStream);
+  }
+}
+export async function runRestartHandoff(
+  input = readEnv(),
+  deps?: {
+    runCommand?: typeof runCommand;
+    now?: () => number;
+    waitForProcessExit?: typeof waitForProcessExit;
+    restartParentPid?: number | null;
+  }
+): Promise<void> {
+  const now = deps?.now ?? Date.now;
+  await mkdir(dirname(input.logFilePath), { recursive: true });
+  const logStream = createWriteStream(input.logFilePath, { flags: "a" });
+  const execute = deps?.runCommand ?? runCommand;
+  const waitForParentExit = deps?.waitForProcessExit ?? waitForProcessExit;
+  const childEnv = buildChildProcessEnv(process.env);
+  const restartParentPid = deps?.restartParentPid ?? readRestartParentPid(process.env);
+  try {
+    if (restartParentPid !== null) {
+      await waitForParentExit(restartParentPid);
+    }
+    await execute(input.cliCommand, input.restartArgs, { logStream, env: childEnv });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     await writeState(input.stateFilePath, {
@@ -201,12 +386,15 @@ export async function runUpdateWorker(
       errorSummary: `new version installed but service restart failed: ${message}`,
     });
   } finally {
-    logStream.end();
+    await closeLogStream(logStream);
   }
 }
 if (process.env.CODER_STUDIO_UPDATE_STATE_PATH) {
-  void runUpdateWorker().catch((error) => {
+  const run =
+    readWorkerMode(process.env) === RESTART_HANDOFF_MODE ? runRestartHandoff : runUpdateWorker;
+  void run().catch((error) => {
     console.error("[update-worker]", error);
     process.exitCode = 1;
   });