@runweave/server-linux-x64 0.1.11 → 0.1.13

package/manifest.json

@@ -6,8 +6,8 @@
     "protocolVersion": 1,
     "entry": "pty-host/index.cjs"
   },
-  "version": "0.1.11",
-  "sourceRevision": "7578c0782181a4db7b089ce1955082ecf8b53fcb",
+  "version": "0.1.13",
+  "sourceRevision": "da67d523de925abb4f2b958f949fd50a3ac2b5bb",
   "platform": "linux",
   "arch": "x64",
   "nodeModuleAbi": "127",
@@ -30,7 +30,7 @@
     {
       "path": "app-server/build-info.json",
       "size": 286,
-      "sha256": "bbb0b4273c1f90b6f3577e33ea7da89d6f91b9596f5a6e9aedd2c560f720dd0e"
+      "sha256": "9c7c169c3553261b2cc8b7d83bc7d2fb7f7e16d75e8d3ae8bd8b0fa0ffc28307"
     },
     {
       "path": "app-server/configuration-compatibility.json",
@@ -40,7 +40,7 @@
     {
       "path": "app-server/index.cjs",
       "size": 1991601,
-      "sha256": "51c5d8d6d0dcd308b4682ecb08ad681410bef9ff9d15f7cf1f26fb78ad1b0acc"
+      "sha256": "d99ba7fb4934b29a6cc499e8212fb1f098d01127b499b1b1d241b0ea20f28211"
     },
     {
       "path": "app-server/index.cjs.map",
@@ -55,7 +55,7 @@
     {
       "path": "backend/build-info.json",
       "size": 286,
-      "sha256": "42555f54ba0b0546c76b8bedb9edbc46a68dd816151deab1608e10310dd903a1"
+      "sha256": "bd960ff86288c8d4553d3d0444a66ae4dec7d3f902d34b53810f00f4be4f931b"
     },
     {
       "path": "backend/dev-resources/control.cjs",
@@ -69,8 +69,8 @@
     },
     {
       "path": "backend/index.cjs",
-      "size": 5746488,
-      "sha256": "37c4df8a5e14a0fe94d3572fb7f6ddfbd0635a88b017710471b0ee90b68e2256"
+      "size": 5753065,
+      "sha256": "55247579573e991db66d087db63c29a17a3147ea2fb43560c1ef61eed54f23e7"
     },
     {
       "path": "backend/ios-simulators/device_shutdown.py",
@@ -505,12 +505,12 @@
     {
       "path": "frontend/dist/build-info.json",
       "size": 286,
-      "sha256": "3bf893d05786880a4e9ee41f559595360ff1177a2f1714b7c4512814ed97322a"
+      "sha256": "77cffa6df1475be5a25363546a40125d700ae5736c04a33b80312ce440dbaca7"
     },
     {
       "path": "frontend/dist/companion.html",
       "size": 822,
-      "sha256": "ff5dd3f246e8a17291f12f00b563aed5041782edf9d025fbbe470220091f458c"
+      "sha256": "724bf62ecacd1f23e651185eb112ff0f1d6f180076a31c4c61cd6801b69f7ba1"
     },
     {
       "path": "frontend/dist/icons/apple-touch-icon.png",
@@ -535,7 +535,7 @@
     {
       "path": "frontend/dist/index.html",
       "size": 1028,
-      "sha256": "eedae45687039503548caa713d5e4f03dcb7457e5f59f34323c567aaed4a269d"
+      "sha256": "468e70be64ca45305732605cbc4f3c7e5338661a523783be8a705525c58a6c1c"
     },
     {
       "path": "frontend/dist/manifest.webmanifest",
@@ -1859,8 +1859,8 @@
     },
     {
       "path": "pty-host/index.cjs",
-      "size": 918397,
-      "sha256": "796bcb6e2b758c27db284ca11c5080a17f015ee1f880fca73aaf88e170c01bf5"
+      "size": 918936,
+      "sha256": "764642ecafe1b4e3f28ef9a84451e17d469257878e9730e73e6953eb060e2125"
     },
     {
       "path": "scripts/toolkit/codex-state.mjs",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runweave/server-linux-x64",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "license": "MIT",
   "repository": {
     "type": "git",

package/payload/app-server/build-info.json

@@ -1,8 +1,8 @@
 {
   "version": "0.1.0",
-  "buildId": "20261109T095851541Z-7578c078",
-  "sourceRevision": "7578c0782181a4db7b089ce1955082ecf8b53fcb",
+  "buildId": "20261109T123037865Z-da67d523",
+  "sourceRevision": "da67d523de925abb4f2b958f949fd50a3ac2b5bb",
   "sourceDirty": false,
-  "builtAt": "2026-11-09T09:58:51.541Z",
+  "builtAt": "2026-11-09T12:30:37.865Z",
   "contentSha256": "ee24c2adfe7a38b0f7698d68d8493b560042b699baba92c63e79961518d9a9af"
 }

package/payload/app-server/index.cjs

@@ -1,4 +1,4 @@
-/* runweave:build-info */var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T095851541Z-7578c078","sourceRevision":"7578c0782181a4db7b089ce1955082ecf8b53fcb","sourceDirty":false,"builtAt":"2026-11-09T09:58:51.541Z","contentSha256":"ee24c2adfe7a38b0f7698d68d8493b560042b699baba92c63e79961518d9a9af"};
+/* runweave:build-info */var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T123037865Z-da67d523","sourceRevision":"da67d523de925abb4f2b958f949fd50a3ac2b5bb","sourceDirty":false,"builtAt":"2026-11-09T12:30:37.865Z","contentSha256":"ee24c2adfe7a38b0f7698d68d8493b560042b699baba92c63e79961518d9a9af"};
 const __IMPORT_META_URL__ = require('url').pathToFileURL(__filename).href;
 "use strict";
 var __create = Object.create;

package/payload/backend/build-info.json

@@ -1,8 +1,8 @@
 {
   "version": "0.1.0",
-  "buildId": "20261109T095851036Z-7578c078",
-  "sourceRevision": "7578c0782181a4db7b089ce1955082ecf8b53fcb",
+  "buildId": "20261109T123037121Z-da67d523",
+  "sourceRevision": "da67d523de925abb4f2b958f949fd50a3ac2b5bb",
   "sourceDirty": false,
-  "builtAt": "2026-11-09T09:58:51.036Z",
-  "contentSha256": "594e17077399e80b4363f9e842cbedd629e811d5e8779f22aa6fc4b9aa4128f1"
+  "builtAt": "2026-11-09T12:30:37.121Z",
+  "contentSha256": "fd2cc32d5678e48707cff4a53f44897eb73eb0eff1b7584fc1da101e402cb2a2"
 }

package/payload/backend/index.cjs

@@ -1,4 +1,4 @@
-/* runweave:build-info */var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T095851036Z-7578c078","sourceRevision":"7578c0782181a4db7b089ce1955082ecf8b53fcb","sourceDirty":false,"builtAt":"2026-11-09T09:58:51.036Z","contentSha256":"594e17077399e80b4363f9e842cbedd629e811d5e8779f22aa6fc4b9aa4128f1"};
+/* runweave:build-info */var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T123037121Z-da67d523","sourceRevision":"da67d523de925abb4f2b958f949fd50a3ac2b5bb","sourceDirty":false,"builtAt":"2026-11-09T12:30:37.121Z","contentSha256":"fd2cc32d5678e48707cff4a53f44897eb73eb0eff1b7584fc1da101e402cb2a2"};
 const __IMPORT_META_URL__ = require('url').pathToFileURL(__filename).href;
 "use strict";
 var __create = Object.create;
@@ -71434,6 +71434,21 @@ function buildAgentResumeArgs(agent, thread) {
   return [resumeFlags[agent] ?? "resume", thread];
 }
 
+// packages/shared/src/terminal/shell.ts
+function terminalShellName(command) {
+  return (command.split(/[\\/]/).at(-1) ?? command).toLowerCase().replace(/\.exe$/, "");
+}
+function isInteractiveShellLaunch(launch) {
+  const name = terminalShellName(launch.command);
+  if (!["sh", "bash", "zsh", "dash", "ksh", "fish", "powershell", "pwsh", "cmd"].includes(name)) return false;
+  return !(launch.args ?? []).some((arg) => {
+    const value = arg.toLowerCase();
+    if (name === "cmd") return !/^\/(?:d|q|a|u|e:(?:on|off)|f:(?:on|off)|v:(?:on|off))$/.test(value);
+    if (name === "powershell" || name === "pwsh") return !["-nologo", "-noprofile", "-noexit", "-login", "-l"].includes(value);
+    return ["--help", "--version"].includes(value) || !value.startsWith("-") || value === "--" || /^-[^-]*[cs]/.test(value) || /^--(?:command|init-command)(?:=|$)/.test(value);
+  });
+}
+
 // backend/src/terminal/runtime/pi-editor.ts
 var import_node_crypto12 = require("node:crypto");
 var import_node_http = require("node:http");
@@ -71575,7 +71590,19 @@ function buildAgentResumeCommand(thread) {
       thread.sessionFile ?? thread.threadId
     )
   ];
-  return `${shellQuote(thread.executable ?? thread.provider)} ${args.map(shellQuote).join(" ")}
+  const configured = thread.provider === "codex" ? settingText("agents.codex.binary")?.trim() : ["trae", "traex", "traecli"].includes(thread.provider) ? settingText("agents.traex.binary")?.trim() : void 0;
+  const executable = thread.executable ?? configured ?? thread.provider;
+  const shell = terminalShellName(thread.shell ?? "sh");
+  if (["powershell", "pwsh", "cmd"].includes(shell)) {
+    const parts = [executable, ...args];
+    if (parts.some((part) => [...part].some((character) => character.charCodeAt(0) < 32 || character.charCodeAt(0) === 127)))
+      throw new Error("Agent resume arguments contain terminal control characters");
+    const command = `& ${parts.map((part) => `'${part.replaceAll("'", "''")}'`).join(" ")}`;
+    return shell === "cmd" ? `powershell.exe -NoProfile -EncodedCommand ${Buffer.from(command, "utf16le").toString("base64")}
+` : `${command}
+`;
+  }
+  return `${shellQuote(executable)} ${args.map(shellQuote).join(" ")}
 `;
 }
 function shellQuote(value) {
@@ -71878,21 +71905,6 @@ var aiDiagnosticLog = createAiDiagnosticLog({
   source: "backend"
 });
 
-// packages/shared/src/terminal/shell.ts
-function terminalShellName(command) {
-  return (command.split(/[\\/]/).at(-1) ?? command).toLowerCase().replace(/\.exe$/, "");
-}
-function isInteractiveShellLaunch(launch) {
-  const name = terminalShellName(launch.command);
-  if (!["sh", "bash", "zsh", "dash", "ksh", "fish", "powershell", "pwsh", "cmd"].includes(name)) return false;
-  return !(launch.args ?? []).some((arg) => {
-    const value = arg.toLowerCase();
-    if (name === "cmd") return !/^\/(?:d|q|a|u|e:(?:on|off)|f:(?:on|off)|v:(?:on|off))$/.test(value);
-    if (name === "powershell" || name === "pwsh") return !["-nologo", "-noprofile", "-noexit", "-login", "-l"].includes(value);
-    return ["--help", "--version"].includes(value) || !value.startsWith("-") || value === "--" || /^-[^-]*[cs]/.test(value) || /^--(?:command|init-command)(?:=|$)/.test(value);
-  });
-}
-
 // backend/src/terminal/runtime/pty-host-client.ts
 var import_node_crypto15 = require("node:crypto");
 
@@ -71985,10 +71997,7 @@ var PtyHostClient = class _PtyHostClient {
     });
     this.socket.on("close", () => {
       this.connected = false;
-      for (const request2 of this.pending.values()) {
-        clearTimeout(request2.timer);
-        request2.reject(new Error("HOST_CONNECTION_LOST"));
-      }
+      for (const request2 of this.pending.values()) request2.reject(new Error("HOST_CONNECTION_LOST"));
       this.pending.clear();
       for (const listener of this.disconnected) listener();
     });
@@ -71997,8 +72006,6 @@ var PtyHostClient = class _PtyHostClient {
       if (message2.requestId) {
         const request2 = this.pending.get(message2.requestId);
         if (!request2) return;
-        clearTimeout(request2.timer);
-        this.pending.delete(message2.requestId);
         if (message2.error) request2.reject(new Error(message2.error));
         else request2.resolve(message2.result);
       } else if (message2.type) for (const listener of this.events) listener(value);
@@ -72030,16 +72037,38 @@ var PtyHostClient = class _PtyHostClient {
       throw error2;
     }
   }
-  request(action, body2 = {}) {
+  /** Aborting only releases this caller's wait; it does not cancel or replay Host operations. */
+  request(action, body2 = {}, signal) {
+    if (signal?.aborted) return Promise.reject(new Error("HOST_REQUEST_ABORTED"));
     if (!this.connected) return Promise.reject(new Error("HOST_CONNECTION_LOST"));
     const requestId = (0, import_node_crypto14.randomUUID)();
     return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
+      const cleanup = () => {
+        clearTimeout(timer);
+        signal?.removeEventListener("abort", abort);
         this.pending.delete(requestId);
-        reject(new Error("HOST_REQUEST_UNCERTAIN"));
-      }, 15e3);
-      this.pending.set(requestId, { resolve: (value) => resolve(value), reject, timer });
-      sendJson(this.socket, { requestId, token: this.token, hostInstanceId: this.descriptor.hostInstanceId, action, body: body2 });
+      };
+      const request2 = {
+        resolve: (value) => {
+          cleanup();
+          resolve(value);
+        },
+        reject: (error2) => {
+          cleanup();
+          reject(error2);
+        }
+      };
+      const abort = () => request2.reject(new Error("HOST_REQUEST_ABORTED"));
+      const timer = setTimeout(() => request2.reject(new Error("HOST_REQUEST_UNCERTAIN")), 15e3);
+      this.pending.set(requestId, request2);
+      signal?.addEventListener("abort", abort, { once: true });
+      try {
+        if (!sendJson(this.socket, { requestId, token: this.token, hostInstanceId: this.descriptor.hostInstanceId, action, body: body2 })) {
+          request2.reject(new Error("HOST_CONNECTION_LOST"));
+        }
+      } catch (error2) {
+        request2.reject(error2);
+      }
     });
   }
   close() {
@@ -72052,27 +72081,37 @@ var ownerId = (0, import_node_crypto15.randomUUID)();
 var connection;
 var generation;
 var hostInstanceId;
+var upstreams;
 var stopped = false;
 function usesPtyHost() {
   return process.platform === "win32" && Boolean(process.env.RUNWEAVE_RUNTIME_RELEASE_ID);
 }
 async function getPtyHost() {
   if (stopped) throw new Error("HOST_CLIENT_STOPPED");
-  connection ??= PtyHostClient.connect(configuration().context, ownerId, generation, hostInstanceId).then((client) => {
+  connection ??= PtyHostClient.connect(configuration().context, ownerId, generation, hostInstanceId).then(async (client) => {
     generation = client.generation;
     hostInstanceId = client.descriptor.hostInstanceId;
     client.disconnected.add(() => {
       connection = void 0;
     });
-    return client;
+    try {
+      if (upstreams) await client.request("setUpstreams", upstreams);
+      return client;
+    } catch (error2) {
+      client.close();
+      throw error2;
+    }
   }).catch((error2) => {
     connection = void 0;
     throw error2;
   });
   return connection;
 }
-async function syncPtyHostUpstreams(upstreams) {
-  if (usesPtyHost()) await (await getPtyHost()).request("setUpstreams", upstreams);
+async function syncPtyHostUpstreams(value) {
+  if (usesPtyHost()) {
+    upstreams = { ...value };
+    await (await getPtyHost()).request("setUpstreams", value);
+  }
 }
 async function createHostedPty(options) {
   const client = await getPtyHost();
@@ -73169,63 +73208,139 @@ function createTerminalRuntimeRecorder(terminalSessionManager, terminalSessionId
   };
 }
 
+// backend/src/terminal/runtime/recovery-policy.ts
+var RebuildWindowMs = 6e4;
+var MaxRebuildAttempts = 3;
+var TerminalRebuildLimitError = class extends Error {
+  constructor(terminalSessionId, count, windowMs, maxAttempts, runtime = "terminal") {
+    super(`${runtime} session rebuild exceeded ${maxAttempts} attempts in ${windowMs} ms for ${terminalSessionId}`);
+    this.terminalSessionId = terminalSessionId;
+    this.count = count;
+    this.windowMs = windowMs;
+    this.maxAttempts = maxAttempts;
+    this.name = "TerminalRebuildLimitError";
+  }
+};
+function recordTerminalRebuildAttempt(history, terminalSessionId, now2 = Date.now()) {
+  const attempts = (history.get(terminalSessionId) ?? []).filter((timestamp3) => timestamp3 >= now2 - RebuildWindowMs);
+  history.set(terminalSessionId, attempts);
+  if (attempts.length >= MaxRebuildAttempts)
+    throw new TerminalRebuildLimitError(terminalSessionId, attempts.length + 1, RebuildWindowMs, MaxRebuildAttempts);
+  attempts.push(now2);
+  return { allowed: true, count: attempts.length, windowMs: RebuildWindowMs, maxAttempts: MaxRebuildAttempts };
+}
+function resolveAgentThreadToResume(session) {
+  const activeProvider = getAgentForCommand(session.activeCommand) ?? (session.terminalState?.state.startsWith("agent_") ? session.terminalState.agent : null);
+  if (!activeProvider) return null;
+  const currentThreadId = session.threadId?.trim();
+  const currentProvider = session.threadProvider ?? (currentThreadId ? "codex" : void 0);
+  if (currentThreadId && currentProvider === activeProvider)
+    return { provider: activeProvider, threadId: currentThreadId };
+  const recentThreadId = session.lastThreadId?.trim();
+  return recentThreadId && session.lastThreadProvider === activeProvider ? { provider: activeProvider, threadId: recentThreadId } : null;
+}
+
 // backend/src/terminal/runtime/pty-host-runtime.ts
 var launches = /* @__PURE__ */ new Map();
+var rebuildAttempts = /* @__PURE__ */ new Map();
 function ensureHostedTerminal(options) {
   const previous = launches.get(options.session.id);
   if (previous) return previous;
-  const launch = (async () => {
-    const { session, terminalSessionManager, runtimeRegistry } = options;
-    const existing = runtimeRegistry.getSessionRuntime(session.id);
-    if (existing) return existing;
-    let binding = session.ptyHost;
-    const creating = !binding;
-    if (!binding) {
-      binding = { hostInstanceId: (await getPtyHost()).descriptor.hostInstanceId, sessionInstanceId: (0, import_node_crypto16.randomUUID)() };
-      await terminalSessionManager.updateRuntimeMetadata(session.id, { runtimeKind: "pty", ptyHost: binding, recoverable: true });
-    }
-    const fallback = creating ? resolveTerminalFallbackLaunchConfig(session) : null;
-    const terminalEnv = buildTerminalRuntimeEnvironment({ terminalSessionId: session.id, projectId: session.projectId, source: session.source });
-    const runtime = await createHostedPty({
-      terminalSessionId: session.id,
-      binding,
-      onLaunch: async (launch2) => {
-        if (launch2.fallbackReason) logger.warn("terminal.pty-host.fallback.activated", { terminalSessionId: session.id, command: launch2.command, reason: launch2.fallbackReason });
-        await terminalSessionManager.updateSessionLaunch(session.id, { command: launch2.command, args: launch2.args });
-      },
-      create: creating ? {
-        sessionInstanceId: binding.sessionInstanceId,
-        terminalSessionId: session.id,
-        projectId: session.projectId,
-        command: session.command,
-        args: session.args,
-        cwd: session.cwd,
-        cols: 80,
-        rows: 24,
-        env: buildPtyEnv(process.env, terminalEnv, session.command),
-        ...fallback ? { fallback: { ...fallback, env: buildPtyEnv(process.env, terminalEnv, fallback.command) } } : {}
-      } : void 0
-    });
-    runtimeRegistry.createRuntime(session.id, runtime);
-    runtimeRegistry.ensureRecorder(session.id, createTerminalRuntimeRecorder(terminalSessionManager, session.id));
-    return runtime;
-  })().catch((error2) => {
-    if (error2 instanceof Error && error2.message === "HOST_SESSION_GONE") {
-      options.terminalSessionManager.markExited(options.session.id);
-    }
-    throw error2;
-  }).finally(() => {
+  const launch = attachOrRebuild(options).finally(() => {
     launches.delete(options.session.id);
   });
   launches.set(options.session.id, launch);
   return launch;
 }
+async function attachOrRebuild(options) {
+  const { session, terminalSessionManager, runtimeRegistry } = options;
+  const existing = runtimeRegistry.getSessionRuntime(session.id);
+  if (existing) return { runtime: existing };
+  let runtime;
+  let warning;
+  try {
+    runtime = await launchHostedTerminal(options, !session.ptyHost);
+  } catch (error2) {
+    if (!(error2 instanceof Error) || error2.message !== "HOST_SESSION_GONE" || session.status !== "running") throw error2;
+    ({ runtime, warning } = await rebuildHostedTerminal(options));
+  }
+  runtimeRegistry.createRuntime(session.id, runtime);
+  runtimeRegistry.ensureRecorder(session.id, createTerminalRuntimeRecorder(terminalSessionManager, session.id));
+  return { runtime, warning };
+}
+async function launchHostedTerminal(options, creating) {
+  const { session, terminalSessionManager } = options;
+  let binding = session.ptyHost;
+  if (creating) {
+    binding = { hostInstanceId: (await getPtyHost()).descriptor.hostInstanceId, sessionInstanceId: (0, import_node_crypto16.randomUUID)() };
+    await terminalSessionManager.updateRuntimeMetadata(session.id, { runtimeKind: "pty", ptyHost: binding, recoverable: true });
+  }
+  if (!binding) throw new Error("HOST_SESSION_GONE");
+  const fallback = creating ? resolveTerminalFallbackLaunchConfig(session) : null;
+  const terminalEnv = buildTerminalRuntimeEnvironment({ terminalSessionId: session.id, projectId: session.projectId, source: session.source });
+  return createHostedPty({
+    terminalSessionId: session.id,
+    binding,
+    onLaunch: async (launch) => {
+      if (launch.fallbackReason) logger.warn("terminal.pty-host.fallback.activated", { terminalSessionId: session.id, command: launch.command, reason: launch.fallbackReason });
+      await terminalSessionManager.updateSessionLaunch(session.id, { command: launch.command, args: launch.args });
+    },
+    create: creating ? {
+      sessionInstanceId: binding.sessionInstanceId,
+      terminalSessionId: session.id,
+      projectId: session.projectId,
+      command: session.command,
+      args: session.args,
+      cwd: session.cwd,
+      cols: 80,
+      rows: 24,
+      env: buildPtyEnv(process.env, terminalEnv, session.command),
+      ...fallback ? { fallback: { ...fallback, env: buildPtyEnv(process.env, terminalEnv, fallback.command) } } : {}
+    } : void 0
+  });
+}
+async function rebuildHostedTerminal(options) {
+  const { session, terminalSessionManager } = options;
+  const interactive = isInteractiveShellLaunch(session);
+  const thread = interactive ? resolveAgentThreadToResume(session) : null;
+  let warning = "Command exited; returned to a shell.";
+  if (interactive) {
+    try {
+      const attempt = recordTerminalRebuildAttempt(rebuildAttempts, session.id);
+      warning = thread ? `Original PTY Host session was lost; starting ${thread.provider} resume from saved threadId (${attempt.count}/${attempt.maxAttempts}).` : `Original PTY Host session was lost; created a fresh terminal session (${attempt.count}/${attempt.maxAttempts}).`;
+    } catch (error2) {
+      if (error2 instanceof TerminalRebuildLimitError) {
+        await terminalSessionManager.updateRuntimeMetadata(session.id, { runtimeKind: "pty", ptyHost: session.ptyHost, recoverable: false });
+        terminalSessionManager.markExited(session.id, 1);
+      }
+      throw error2;
+    }
+  } else {
+    await terminalSessionManager.updateSessionLaunch(session.id, resolveDefaultTerminalLaunchConfig());
+    await terminalSessionManager.updateSessionMetadata(session.id, { cwd: session.cwd, activeCommand: null });
+    terminalSessionManager.markRunning(session.id);
+  }
+  const sessionFile = thread ? await getAgentAdapter(thread.provider).resolveResumeTarget(thread.threadId, session.pi) : void 0;
+  const runtime = await launchHostedTerminal(options, true);
+  try {
+    if (thread) {
+      const command = buildAgentResumeCommand({ ...thread, sessionFile, shell: session.command });
+      await runtime.hosted.writeSteps([{ type: "text", data: command.replace(/\n$/, "") }, { type: "delay", ms: 200 }, { type: "text", data: "\r" }], `recovery:${session.ptyHost.sessionInstanceId}`);
+      await terminalSessionManager.updateSessionThreadId(session.id, thread.threadId, thread.provider);
+    }
+  } catch (error2) {
+    runtime.dispose();
+    throw error2;
+  }
+  logger.warn("terminal.pty-host.session-missing.rebuild", { terminalSessionId: session.id, warning });
+  return { runtime, warning };
+}
 async function reconcileHostedTerminals(manager, registry2) {
   if (!usesPtyHost()) return;
   for (const session of manager.listSessions()) {
     if (session.runtimeKind !== "pty" || session.status !== "running") continue;
     if (!session.ptyHost) {
-      if (session.status === "running") manager.markExited(session.id);
+      manager.markExited(session.id);
       continue;
     }
     try {
@@ -73279,8 +73394,6 @@ var import_node_fs16 = require("node:fs");
 var import_node_path25 = __toESM(require("node:path"), 1);
 var RUNWEAVE_TMUX_PREFIX = "runweave-";
 var TmuxCommandTimeoutMs = 5e3;
-var RebuildWindowMs = 6e4;
-var MaxRebuildAttempts = 3;
 var CaptureHistoryLines = 5e3;
 var InteractivePaneReadyMinWaitMs = 1e3;
 var InteractivePaneReadyStableMs = 200;
@@ -74033,28 +74146,13 @@ var TmuxSessionService = class extends TmuxProcess {
     return orphanedSessions;
   }
   recordRebuildAttempt(terminalSessionId) {
-    const now2 = this.now();
-    const windowStart = now2 - RebuildWindowMs;
-    const attempts = (this.rebuildAttempts.get(terminalSessionId) ?? []).filter(
-      (timestamp3) => timestamp3 >= windowStart
-    );
-    if (attempts.length >= MaxRebuildAttempts) {
-      this.rebuildAttempts.set(terminalSessionId, attempts);
-      throw new TmuxRebuildLimitError(
-        terminalSessionId,
-        attempts.length + 1,
-        RebuildWindowMs,
-        MaxRebuildAttempts
-      );
+    try {
+      return recordTerminalRebuildAttempt(this.rebuildAttempts, terminalSessionId, this.now());
+    } catch (error2) {
+      if (error2 instanceof TerminalRebuildLimitError)
+        throw new TmuxRebuildLimitError(error2.terminalSessionId, error2.count, error2.windowMs, error2.maxAttempts);
+      throw error2;
     }
-    attempts.push(now2);
-    this.rebuildAttempts.set(terminalSessionId, attempts);
-    return {
-      allowed: true,
-      count: attempts.length,
-      windowMs: RebuildWindowMs,
-      maxAttempts: MaxRebuildAttempts
-    };
   }
 };
 
@@ -74795,7 +74893,7 @@ async function ensureTerminalRuntime(options) {
       };
     });
   }
-  if (options.session.ptyHost || usesPtyHost()) return { runtime: await ensureHostedTerminal(options) };
+  if (options.session.ptyHost || usesPtyHost()) return ensureHostedTerminal(options);
   const runtime = options.ptyService.spawnSession({
     command: options.session.command,
     args: options.session.args,
@@ -74835,19 +74933,6 @@ async function ensureTerminalRuntime(options) {
 function isInteractiveShellLaunch2(command, args) {
   return isInteractiveShellLaunch({ command, args });
 }
-function resolveAgentThreadToResume(session) {
-  const activeProvider = getAgentForCommand(session.activeCommand);
-  if (!activeProvider) {
-    return null;
-  }
-  const currentThreadId = session.threadId?.trim();
-  const currentProvider = session.threadProvider ?? (currentThreadId ? "codex" : void 0);
-  if (currentThreadId && currentProvider === activeProvider) {
-    return { provider: activeProvider, threadId: currentThreadId };
-  }
-  const recentThreadId = session.lastThreadId?.trim();
-  return recentThreadId && session.lastThreadProvider === activeProvider ? { provider: activeProvider, threadId: recentThreadId } : null;
-}
 function createTmuxInputPacedRuntime(runtime) {
   const queuedInput = [];
   let holdInputUntil = 0;
@@ -112240,9 +112325,6 @@ function registerDesktopNetworkRoutes(app, requireAuth) {
     });
 }
 
-// backend/src/remote/routes.ts
-var import_node_crypto57 = require("node:crypto");
-
 // packages/shared/src/remote/index.ts
 function isRemoteBrowserProfileState(value) {
   if (!value || typeof value !== "object") return false;
@@ -112569,13 +112651,63 @@ function registerRemoteCapabilitiesRoute(app, requireTunnelAuth, requireAuth, br
   });
 }
 
-// backend/src/remote/routes.ts
-function matchesHookToken(value, expected) {
-  if (typeof value !== "string" || !expected) return false;
+// backend/src/remote/terminal-hook-auth.ts
+var import_node_crypto57 = require("node:crypto");
+function matchesToken2(value, expected) {
+  if (!expected) return false;
   const supplied = Buffer.from(value);
   const actual = Buffer.from(expected);
   return supplied.length === actual.length && (0, import_node_crypto57.timingSafeEqual)(supplied, actual);
 }
+async function authenticatesTerminal(value, terminalId, sessions, signal) {
+  signal.throwIfAborted();
+  if (typeof value !== "string" || !value) return false;
+  if (matchesToken2(value, process.env.RUNWEAVE_HOOK_TOKEN)) return true;
+  if (!usesPtyHost()) return false;
+  const session = sessions.getSession(terminalId);
+  const binding = session?.ptyHost;
+  if (!binding || session.status !== "running") return false;
+  const host = await getPtyHost();
+  signal.throwIfAborted();
+  if (host.descriptor.hostInstanceId !== binding.hostInstanceId) return false;
+  const hosted = (await host.request("listSessions", {}, signal)).find(
+    (item) => item.terminalSessionId === terminalId && item.hostInstanceId === binding.hostInstanceId && item.sessionInstanceId === binding.sessionInstanceId
+  );
+  return hosted?.status === "running" && matchesToken2(value, hosted.gatewayToken);
+}
+function createRequireTerminalHook(sessions) {
+  return async (req, res, next) => {
+    if (res.destroyed) return;
+    const controller = new AbortController();
+    const cancel = () => controller.abort();
+    const aborted2 = new Promise((_resolve, reject) => {
+      controller.signal.onabort = () => reject(new Error("Terminal authentication aborted"));
+    });
+    const timeout = setTimeout(cancel, 4e3);
+    res.once("close", cancel);
+    try {
+      const authenticated = await Promise.race([
+        authenticatesTerminal(req.headers["x-runweave-hook-token"], String(req.params.id), sessions, controller.signal),
+        aborted2
+      ]);
+      controller.signal.throwIfAborted();
+      if (res.destroyed) return;
+      if (!authenticated) {
+        res.sendStatus(401);
+        return;
+      }
+      next();
+    } catch {
+      if (!res.destroyed) res.status(503).json({ code: "DESKTOP_UNAVAILABLE", message: "Terminal runtime authentication is unavailable" });
+    } finally {
+      clearTimeout(timeout);
+      res.off("close", cancel);
+      controller.signal.onabort = null;
+    }
+  };
+}
+
+// backend/src/remote/routes.ts
 function sendError(res, error2) {
   if (error2 instanceof RemoteBrowserError) {
     res.status(error2.status).json({ code: error2.code, message: error2.message });
@@ -112586,14 +112718,11 @@ function sendError(res, error2) {
 function registerRemoteBrowserRoutes(app, auth, sessions, requireTunnelAuth, browserProfileDir, backendId) {
   const bindings = new DesktopBrowserBindings(sessions);
   const requireAuth = createRequireAuth(auth);
+  const requireTerminalHook = createRequireTerminalHook(sessions);
   registerDesktopNetworkRoutes(app, requireAuth);
   registerRemoteCapabilitiesRoute(app, requireTunnelAuth, requireAuth, browserProfileDir, backendId);
-  app.get("/api/terminal/session/:id/runtime-identity", (req, res) => {
-    if (!matchesHookToken(req.headers["x-runweave-hook-token"], process.env.RUNWEAVE_HOOK_TOKEN)) {
-      res.sendStatus(401);
-      return;
-    }
-    const session = sessions.getSession(req.params.id);
+  app.get("/api/terminal/session/:id/runtime-identity", requireTerminalHook, (req, res) => {
+    const session = sessions.getSession(String(req.params.id));
     if (!session) {
       res.status(404).json({ code: "terminal_session_not_found" });
       return;
@@ -112650,18 +112779,14 @@ function registerRemoteBrowserRoutes(app, auth, sessions, requireTunnelAuth, bro
       sendError(res, error2);
     }
   });
-  app.post("/api/terminal/session/:id/browser/capability", (req, res) => {
-    if (!matchesHookToken(req.headers["x-runweave-hook-token"], process.env.RUNWEAVE_HOOK_TOKEN)) {
-      res.sendStatus(401);
-      return;
-    }
+  app.post("/api/terminal/session/:id/browser/capability", requireTerminalHook, (req, res) => {
     const projectId = req.body?.projectId;
     if (typeof projectId !== "string") {
       res.sendStatus(400);
       return;
     }
     try {
-      res.json({ capability: bindings.issueCapability(req.params.id, projectId), expiresIn: 3600 });
+      res.json({ capability: bindings.issueCapability(String(req.params.id), projectId), expiresIn: 3600 });
     } catch (error2) {
       sendError(res, error2);
     }

package/payload/frontend/dist/build-info.json

@@ -1,8 +1,8 @@
 {
   "version": "0.1.0",
-  "buildId": "20261109T095850254Z-7578c078",
-  "sourceRevision": "7578c0782181a4db7b089ce1955082ecf8b53fcb",
+  "buildId": "20261109T123036078Z-da67d523",
+  "sourceRevision": "da67d523de925abb4f2b958f949fd50a3ac2b5bb",
   "sourceDirty": false,
-  "builtAt": "2026-11-09T09:58:50.254Z",
+  "builtAt": "2026-11-09T12:30:36.078Z",
   "contentSha256": "d88edba1ac622f799a43f96f04cacdfb2052f2b959dae733f3feb164b615427b"
 }

package/payload/frontend/dist/companion.html

@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="zh-CN">
-  <head><script data-runweave-build-info>var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T095850254Z-7578c078","sourceRevision":"7578c0782181a4db7b089ce1955082ecf8b53fcb","sourceDirty":false,"builtAt":"2026-11-09T09:58:50.254Z","contentSha256":"d88edba1ac622f799a43f96f04cacdfb2052f2b959dae733f3feb164b615427b"};</script>
+  <head><script data-runweave-build-info>var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T123036078Z-da67d523","sourceRevision":"da67d523de925abb4f2b958f949fd50a3ac2b5bb","sourceDirty":false,"builtAt":"2026-11-09T12:30:36.078Z","contentSha256":"d88edba1ac622f799a43f96f04cacdfb2052f2b959dae733f3feb164b615427b"};</script>
 
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />

package/payload/frontend/dist/index.html

@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="en">
-  <head><script data-runweave-build-info>var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T095850254Z-7578c078","sourceRevision":"7578c0782181a4db7b089ce1955082ecf8b53fcb","sourceDirty":false,"builtAt":"2026-11-09T09:58:50.254Z","contentSha256":"d88edba1ac622f799a43f96f04cacdfb2052f2b959dae733f3feb164b615427b"};</script>
+  <head><script data-runweave-build-info>var __RUNWEAVE_BUILD_INFO__={"version":"0.1.0","buildId":"20261109T123036078Z-da67d523","sourceRevision":"da67d523de925abb4f2b958f949fd50a3ac2b5bb","sourceDirty":false,"builtAt":"2026-11-09T12:30:36.078Z","contentSha256":"d88edba1ac622f799a43f96f04cacdfb2052f2b959dae733f3feb164b615427b"};</script>
 
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />

package/payload/pty-host/index.cjs

@@ -18953,6 +18953,7 @@ var NEVER = INVALID;
 // packages/pty-host/src/discovery.ts
 var import_node_crypto = require("node:crypto");
 var import_node_fs4 = require("node:fs");
+var import_promises = require("node:fs/promises");
 var import_node_path2 = __toESM(require("node:path"), 1);
 var import_node_os = __toESM(require("node:os"), 1);
 function hostPaths(scope) {
@@ -18982,10 +18983,27 @@ function prepareHostDirectory(scope) {
   readPrivateFile(paths.token, 256);
   return paths;
 }
-function writeHostJson(file, data) {
+async function writeHostJson(file, data) {
   const temporary = `${file}.${(0, import_node_crypto.randomUUID)()}.tmp`;
   (0, import_node_fs4.writeFileSync)(temporary, JSON.stringify(data) + "\n", { mode: 384, flag: "wx" });
-  (0, import_node_fs4.renameSync)(temporary, file);
+  const deadline = Date.now() + 5e3;
+  try {
+    for (; ; ) {
+      try {
+        await (0, import_promises.rename)(temporary, file);
+        return;
+      } catch (error) {
+        if (process.platform !== "win32" || !["EPERM", "EACCES", "EBUSY"].includes(error.code ?? "") || Date.now() >= deadline) throw error;
+        await new Promise((resolve) => setTimeout(resolve, 50));
+      }
+    }
+  } catch (error) {
+    try {
+      (0, import_node_fs4.rmSync)(temporary, { force: true });
+    } catch {
+    }
+    throw error;
+  }
 }
 
 // packages/pty-host/src/gateway.ts
@@ -20181,7 +20199,7 @@ async function startHost(scope, release) {
       gatewayUrl: gateway.url,
       release
     };
-    writeHostJson(paths.descriptor, descriptor);
+    await writeHostJson(paths.descriptor, descriptor);
     process.once("SIGTERM", () => {
       void shutdown();
     });