@dev-anywhere/proxy 0.1.9 → 0.2.1

package/dist/serve.js

@@ -3,17 +3,15 @@ import {
   ContentBlockDeltaSchema,
   IGNORED_EVENT_TYPES,
   KnownContentBlockSchema,
-  SeqCounter,
-  StreamJsonEventSchema
-} from "./chunk-7XMJMVIL.js";
+  StreamJsonEventSchema,
+  disposeSeqCounter,
+  getSeqCounterFor
+} from "./chunk-4YQ2JUM7.js";
 import {
-  createFSM,
-  defineFSM,
+  decidePtySemanticTransition,
   extractOscSequences,
-  extractOscSignals,
-  shouldReleaseApprovalWait,
-  stateAfterApprovalRelease
-} from "./chunk-ORZTFYXR.js";
+  extractOscSignals
+} from "./chunk-OBYEKZWC.js";
 import {
   spawnScript
 } from "./chunk-ZUWAB67J.js";
@@ -21,47 +19,56 @@ import {
   CLAUDE_PROVIDER,
   CODEX_PROVIDER,
   detectAgentCliStatus
-} from "./chunk-6O6JTF24.js";
+} from "./chunk-WUBRUO3G.js";
 import {
+  ControlErrorCode,
+  MessageEnvelopeSchema,
+  RelayControlSchema,
+  SessionState,
+  buildMessage,
+  createFSM,
   createIpcReader,
   createWorkerReader,
+  defineFSM,
+  encodeBinaryFrame,
+  providerValues,
+  serializeControl,
   serializeIpc,
   serializeWorkerMsg
-} from "./chunk-U5T7ZYXT.js";
+} from "./chunk-NBRBO5GS.js";
 import {
   buildProviderEnv,
   loadConfig,
   saveAgentCliPath
-} from "./chunk-DCDXAM76.js";
+} from "./chunk-RIQ6OL7X.js";
+import {
+  atomicWriteFileSync
+} from "./chunk-NQDJ6QAM.js";
 import {
+  flushLogger,
   serviceLogger
-} from "./chunk-2JUB4LDU.js";
+} from "./chunk-7UOPAMX7.js";
 import {
-  ControlErrorCode,
   DATA_DIR,
   DEFAULT_PROXY_PROFILE,
   HOOK_REGISTRY_PATH,
-  MessageEnvelopeSchema,
   PID_PATH,
   PROFILE_NAME,
   PROXY_ID_PATH,
   SESSIONS_PATH,
   SOCK_PATH,
   STOPPED_PATH,
-  SessionState,
-  buildMessage,
   ensureProfileWorkspace,
   sessionPaths,
   tildify
-} from "./chunk-QFYI6AMN.js";
+} from "./chunk-PWG6K5QB.js";
 
 // src/serve.ts
 import { createServer as createServer2 } from "net";
-import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync5, chmodSync, rmSync as rmSync2 } from "fs";
+import { unlinkSync as unlinkSync4, writeFileSync as writeFileSync3, chmodSync, rmSync as rmSync2 } from "fs";
 
 // src/serve/session-manager.ts
-import { mkdirSync, readFileSync, renameSync, writeFileSync, existsSync } from "fs";
-import { dirname } from "path";
+import { readFileSync, existsSync } from "fs";
 import { nanoid } from "nanoid";
 var PTY_TRANSITIONS = {
   [SessionState.IDLE]: [
@@ -278,8 +285,6 @@ var SessionManager = class {
     }
   }
   save() {
-    const dir = dirname(this.persistPath);
-    mkdirSync(dir, { recursive: true });
     const persisted = Array.from(this.sessions.values()).map((s) => ({
       id: s.id,
       mode: s.mode,
@@ -292,9 +297,7 @@ var SessionManager = class {
       ...s.claudeSessionId !== void 0 ? { claudeSessionId: s.claudeSessionId } : {}
     }));
     const data = JSON.stringify(persisted, null, 2);
-    const tmpPath = this.persistPath + ".tmp";
-    writeFileSync(tmpPath, data, "utf-8");
-    renameSync(tmpPath, this.persistPath);
+    atomicWriteFileSync(this.persistPath, data, { ensureDir: true });
   }
   load() {
     if (!existsSync(this.persistPath)) {
@@ -305,22 +308,28 @@ var SessionManager = class {
     try {
       parsed = JSON.parse(raw);
     } catch (err) {
-      throw new Error(`Failed to parse session persistence file at ${this.persistPath}`, {
-        cause: err
-      });
+      serviceLogger.warn(
+        { path: this.persistPath, error: String(err) },
+        "Session persistence file unparseable, starting with empty state"
+      );
+      return;
     }
     if (!Array.isArray(parsed)) {
-      throw new Error(
-        `Session persistence file has invalid format at ${this.persistPath}: expected array`
+      serviceLogger.warn(
+        { path: this.persistPath },
+        "Session persistence file has unexpected format (not array), starting with empty state"
       );
+      return;
     }
     for (const item of parsed) {
       if (item && typeof item === "object" && "state" in item) {
-        throw new Error(
-          `Session persistence file has invalid persisted state for session ${String(
-            item.id
-          )}`
+        const sessionId = String(item.id);
+        serviceLogger.warn(
+          { sessionId },
+          "Session persistence record has unexpected state field, skipping"
         );
+        this.onSessionRemoved?.(sessionId);
+        continue;
       }
       const info = item;
       if (!isProviderId(info.provider)) {
@@ -366,9 +375,9 @@ var SessionManager = class {
 
 // src/serve/relay-connection.ts
 import WebSocket from "ws";
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
 import { homedir } from "os";
-import { dirname as dirname2, join } from "path";
+import { join } from "path";
 import { nanoid as nanoid2 } from "nanoid";
 import { EventEmitter } from "events";
 
@@ -400,6 +409,7 @@ var DEFAULT_PROXY_ID_PATH = join(homedir(), ".dev-anywhere", "proxy-id");
 var MAX_BACKOFF_MS = 3e4;
 var BASE_BACKOFF_MS = 1e3;
 var MAX_QUEUE_SIZE = 1e4;
+var MAX_JSON_MESSAGE_SIZE = 1 * 1024 * 1024;
 var RelayConnectionState = {
   DISCONNECTED: "disconnected",
   CONNECTING: "connecting",
@@ -467,11 +477,7 @@ var RelayConnection = class extends EventEmitter {
       }
     }
     const id = nanoid2(21);
-    const dir = dirname2(idPath);
-    if (!existsSync2(dir)) {
-      mkdirSync2(dir, { recursive: true });
-    }
-    writeFileSync2(idPath, id, "utf-8");
+    atomicWriteFileSync(idPath, id, { ensureDir: true });
     return id;
   }
   // 连接到 relay server
@@ -492,7 +498,7 @@ var RelayConnection = class extends EventEmitter {
           "Connected to relay server"
         );
         this.ws.send(
-          JSON.stringify({
+          serializeControl({
             type: "proxy_register",
             proxyId: this.proxyId,
             ...this.name ? { name: this.name } : {}
@@ -500,7 +506,15 @@ var RelayConnection = class extends EventEmitter {
         );
       });
       this.ws.on("message", (data) => {
-        const raw = data.toString();
+        const buf = data;
+        if (buf.length > MAX_JSON_MESSAGE_SIZE) {
+          serviceLogger.warn(
+            { size: buf.length },
+            "JSON message from relay rejected: exceeds max size"
+          );
+          return;
+        }
+        const raw = buf.toString();
         let msg;
         try {
           msg = JSON.parse(raw);
@@ -518,15 +532,16 @@ var RelayConnection = class extends EventEmitter {
         }
         this.emit("message", msg);
       });
-      this.ws.on("close", () => {
+      this.ws.on("close", (code, reason) => {
         this.ws = null;
+        const closeMeta = { code, reason: reason.toString() || void 0 };
         if (this.fsm.current() !== RelayConnectionState.CLOSED) {
           this.fsm.tryTransitionTo(RelayConnectionState.WAITING_RECONNECT);
-          serviceLogger.info("Relay connection closed unexpectedly");
+          serviceLogger.info(closeMeta, "Relay connection closed unexpectedly");
           this.emit("disconnected");
           this.scheduleReconnect();
         } else {
-          serviceLogger.info("Relay connection closed");
+          serviceLogger.info(closeMeta, "Relay connection closed");
         }
       });
       this.ws.on("error", (err) => {
@@ -565,6 +580,8 @@ var RelayConnection = class extends EventEmitter {
     this.sendRaw(raw);
   }
   // 发送 binary PTY 帧到 relay，断线时直接丢弃不入队
+  // 接受 Uint8Array 而非强制 Buffer：encodeBinaryFrame 在 shared 包返回 Uint8Array，
+  // ws.send 在底层同样支持 Uint8Array，无需额外 Buffer.from 拷贝。
   sendBinary(data) {
     if (this.fsm.current() === RelayConnectionState.SYNCED && this.ws?.readyState === WebSocket.OPEN) {
       this.ws.send(data);
@@ -599,7 +616,7 @@ var RelayConnection = class extends EventEmitter {
     }
     if (this.ws) {
       if (this.ws.readyState === WebSocket.OPEN) {
-        this.ws.send(JSON.stringify({ type: "proxy_disconnect", proxyId: this.proxyId }));
+        this.ws.send(serializeControl({ type: "proxy_disconnect", proxyId: this.proxyId }));
       }
       this.ws.close();
       this.ws = null;
@@ -744,7 +761,9 @@ function decodeHistoryCursor(cursor, fileSize) {
   if (!Number.isInteger(parsed) || parsed < 0) return fileSize;
   return Math.min(parsed, fileSize);
 }
+var SAFE_SESSION_ID_PATTERN = /^[A-Za-z0-9_-]+$/;
 async function findClaudeSessionFile(claudeSessionId) {
+  if (!SAFE_SESSION_ID_PATTERN.test(claudeSessionId)) return null;
   let projectDirs;
   try {
     projectDirs = await readdir(claudeProjectsDir());
@@ -1270,7 +1289,7 @@ function createControlMessageHandlers(send, sessionManager) {
       try {
         const commands = await discoverCommands(workDir);
         send(
-          JSON.stringify({
+          serializeControl({
             type: "command_list_push",
             commands
           })
@@ -1285,7 +1304,7 @@ function createControlMessageHandlers(send, sessionManager) {
     async handleDirListRequest(msg) {
       if (!isPathSafe(msg.path)) {
         send(
-          JSON.stringify({
+          serializeControl({
             type: "dir_list_response",
             requestId: msg.requestId,
             path: msg.path,
@@ -1300,7 +1319,7 @@ function createControlMessageHandlers(send, sessionManager) {
       try {
         const entries = await scanDir(msg.path);
         send(
-          JSON.stringify({
+          serializeControl({
             type: "dir_list_response",
             requestId: msg.requestId,
             path: msg.path,
@@ -1310,7 +1329,7 @@ function createControlMessageHandlers(send, sessionManager) {
         serviceLogger.debug({ path: msg.path, count: entries.length }, "Dir list response sent");
       } catch (err) {
         send(
-          JSON.stringify({
+          serializeControl({
             type: "dir_list_response",
             requestId: msg.requestId,
             path: msg.path,
@@ -1325,7 +1344,7 @@ function createControlMessageHandlers(send, sessionManager) {
     async handleDirCreateRequest(msg) {
       if (!isPathSafe(msg.path)) {
         send(
-          JSON.stringify({
+          serializeControl({
             type: "dir_create_response",
             requestId: msg.requestId,
             path: msg.path,
@@ -1340,7 +1359,7 @@ function createControlMessageHandlers(send, sessionManager) {
       try {
         await mkdir(msg.path, { recursive: true });
         send(
-          JSON.stringify({
+          serializeControl({
             type: "dir_create_response",
             requestId: msg.requestId,
             path: msg.path,
@@ -1350,7 +1369,7 @@ function createControlMessageHandlers(send, sessionManager) {
         serviceLogger.info({ path: msg.path }, "Directory created");
       } catch (err) {
         send(
-          JSON.stringify({
+          serializeControl({
             type: "dir_create_response",
             requestId: msg.requestId,
             path: msg.path,
@@ -1366,7 +1385,7 @@ function createControlMessageHandlers(send, sessionManager) {
       try {
         const sessions = await scanSessionHistory();
         send(
-          JSON.stringify({
+          serializeControl({
             type: "session_history_response",
             requestId: msg.requestId,
             sessions
@@ -1375,7 +1394,7 @@ function createControlMessageHandlers(send, sessionManager) {
         serviceLogger.debug({ count: sessions.length }, "Session history response sent");
       } catch (err) {
         send(
-          JSON.stringify({
+          serializeControl({
             type: "session_history_response",
             requestId: msg.requestId,
             sessions: []
@@ -1395,7 +1414,7 @@ function createControlMessageHandlers(send, sessionManager) {
       const groups = groupsResult.status === "fulfilled" ? groupsResult.value : [];
       const failedReason = commandsResult.status === "rejected" ? commandsResult.reason : groupsResult.status === "rejected" ? groupsResult.reason : void 0;
       send(
-        JSON.stringify({
+        serializeControl({
           type: "session_resources_response",
           requestId: msg.requestId,
           sessionId: msg.sessionId,
@@ -1416,7 +1435,7 @@ function createControlMessageHandlers(send, sessionManager) {
       try {
         const commands = await discoverCommands(workDir);
         send(
-          JSON.stringify({
+          serializeControl({
             type: "command_list_push",
             commands
           })
@@ -1433,7 +1452,7 @@ function createControlMessageHandlers(send, sessionManager) {
       try {
         const groups = await getFileTree(workDir);
         send(
-          JSON.stringify({
+          serializeControl({
             type: "file_tree_push",
             groups
           })
@@ -1451,7 +1470,7 @@ function createControlMessageHandlers(send, sessionManager) {
       const activeSessions = sessionManager.listSessions().filter((s) => s.state !== "terminated");
       if (activeSessions.length > 0) {
         send(
-          JSON.stringify({
+          serializeControl({
             type: "session_sync",
             sessions: activeSessions.map((s) => ({
               id: s.id,
@@ -1471,14 +1490,14 @@ function createControlMessageHandlers(send, sessionManager) {
           try {
             const commands = await discoverCommands(workDir);
             send(
-              JSON.stringify({
+              serializeControl({
                 type: "command_list_push",
                 commands
               })
             );
             const groups = await getFileTree(workDir);
             send(
-              JSON.stringify({
+              serializeControl({
                 type: "file_tree_push",
                 groups
               })
@@ -1585,7 +1604,16 @@ var WorkerRegistry = class {
       const sock = connect(sockPath);
       sock.on("connect", () => {
         this.sockets.set(sessionId, sock);
-        createWorkerReader(sock, (msg) => this.handleWorkerMessage(sessionId, msg));
+        createWorkerReader(
+          sock,
+          (msg) => this.handleWorkerMessage(sessionId, msg),
+          (err, line) => {
+            serviceLogger.warn(
+              { sessionId, err: err.message, lineLen: line.length },
+              "Worker IPC message dropped (parse/schema error)"
+            );
+          }
+        );
         sock.on("close", () => this.onDisconnect(sessionId));
         sock.on("error", () => this.onDisconnect(sessionId));
         resolve3(sock);
@@ -1690,6 +1718,9 @@ var WorkerRegistry = class {
   onDisconnect(sessionId) {
     this.sockets.delete(sessionId);
     this.deps.permissionBroker.cleanupSession(sessionId, "Worker disconnected");
+    if (this.deps.sessionManager.getSession(sessionId)) {
+      this.deps.jsonObserver.onChannelBroken(sessionId);
+    }
   }
   // 对齐 Claude CLI stream-json 输出，按 type 分发：
   //   stream_event.content_block_delta → 增量 text/thinking envelope（仅 streamDelta 会话产生）
@@ -1802,7 +1833,7 @@ var WorkerRegistry = class {
     if (ev.type === "result") {
       const resultText = typeof ev.result === "string" ? ev.result : void 0;
       relay.sendRaw(
-        JSON.stringify({
+        serializeControl({
           type: "turn_result",
           sessionId,
           success: ev.subtype === "success",
@@ -1820,7 +1851,7 @@ var WorkerRegistry = class {
     );
     this.deps.jsonObserver.onApprovalRequested(sessionId);
     try {
-      const approvalSeq = this.deps.nextSeq?.(sessionId) ?? new SeqCounter(sessionId).next();
+      const approvalSeq = this.deps.nextSeq?.(sessionId) ?? getSeqCounterFor(sessionId).next();
       const envelope = buildMessage(
         "tool_use_request",
         sessionId,
@@ -1887,6 +1918,7 @@ function terminateSessionByOwnership(deps, sessionId) {
     });
     deps.controlHandlers.cleanup(sessionId);
     deps.agentStatusRegistry.delete(sessionId);
+    deps.broadcastSessionList();
     serviceLogger.info(
       { sessionId, success: result.success },
       "Local terminal session detached from remote view"
@@ -1904,6 +1936,7 @@ function terminateSessionByOwnership(deps, sessionId) {
     const result = deps.sessionManager.terminateSession(sessionId);
     deps.controlHandlers.cleanup(sessionId);
     deps.agentStatusRegistry.delete(sessionId);
+    deps.broadcastSessionList();
     serviceLogger.info({ sessionId, success: result.success }, "JSON worker session terminated");
     return { success: result.success, action: "terminate_json_worker" };
   }
@@ -1915,7 +1948,7 @@ function terminateSessionByOwnership(deps, sessionId) {
 }
 
 // src/serve/clipboard-image-upload.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync4, statSync, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync4, statSync, writeFileSync } from "fs";
 import { isAbsolute as isAbsolute2, join as join5, relative, resolve } from "path";
 import { nanoid as nanoid3 } from "nanoid";
 var MAX_CLIPBOARD_IMAGE_BYTES = 10 * 1024 * 1024;
@@ -1971,7 +2004,7 @@ function ensureProjectClipboardIgnored(cwd) {
     const alreadyIgnored = current.split(/\r?\n/).some((line) => normalizeGitignoreLine(line) === ".dev-anywhere");
     if (alreadyIgnored) return;
     const separator = current.length > 0 && !current.endsWith("\n") ? "\n" : "";
-    writeFileSync3(gitignorePath, `${current}${separator}.dev-anywhere/
+    writeFileSync(gitignorePath, `${current}${separator}.dev-anywhere/
 `);
   } catch {
   }
@@ -1984,11 +2017,15 @@ function trySaveProjectClipboardImage(options) {
     const clipboardRoot = resolve(cwd, ".dev-anywhere", "clipboard");
     const uploadDir = resolveChildDir(clipboardRoot, options.sessionId);
     const path = join5(uploadDir, options.fileName);
-    mkdirSync3(uploadDir, { recursive: true });
-    writeFileSync3(path, options.buffer, { mode: 384 });
+    mkdirSync(uploadDir, { recursive: true });
+    writeFileSync(path, options.buffer, { mode: 384 });
     ensureProjectClipboardIgnored(cwd);
     return { success: true, path: relative(cwd, path) };
-  } catch {
+  } catch (err) {
+    serviceLogger.warn(
+      { sessionId: options.sessionId, cwd: options.cwd, error: String(err) },
+      "Project clipboard image write failed; falling back to data dir"
+    );
     return null;
   }
 }
@@ -2017,8 +2054,8 @@ function saveClipboardImageUpload(request, options = {}) {
     const dataDir = options.dataDir ?? DATA_DIR;
     const uploadDir = resolveSessionClipboardDir(dataDir, request.sessionId);
     const path = join5(uploadDir, fileName);
-    mkdirSync3(uploadDir, { recursive: true });
-    writeFileSync3(path, buffer, { mode: 384 });
+    mkdirSync(uploadDir, { recursive: true });
+    writeFileSync(path, buffer, { mode: 384 });
     return { success: true, path };
   } catch (err) {
     return {
@@ -2144,17 +2181,15 @@ var RelayInputHandlers = class {
   }
   deps;
   onUserInput(msg) {
-    const sessionId = msg.sessionId;
+    const { sessionId } = msg;
     if (!sessionId) return;
     const session = this.deps.sessionManager.getSession(sessionId);
     if (!session) {
       serviceLogger.warn({ sessionId }, "Remote input dropped: session not found");
       return;
     }
-    const payload = msg.payload;
-    const text = payload?.text ?? "";
+    const text = msg.payload.text;
     if (session.mode === "json") {
-      this.deps.jsonObserver.onTurnStart(sessionId);
       const sent = this.deps.workerRegistry.send(sessionId, {
         type: "worker_input",
         content: text
@@ -2163,18 +2198,16 @@ var RelayInputHandlers = class {
         serviceLogger.warn({ sessionId }, "Remote input dropped: JSON worker socket not available");
         return;
       }
-      const timestamp = typeof msg.timestamp === "number" && Number.isFinite(msg.timestamp) ? msg.timestamp : Date.now();
-      const seq = typeof msg.seq === "number" && Number.isInteger(msg.seq) && msg.seq >= 0 ? msg.seq : 0;
-      const version = typeof msg.version === "string" ? msg.version : "1";
-      const messageId = typeof payload?.messageId === "string" && payload.messageId.length > 0 ? payload.messageId : `${sessionId}-user-${timestamp}`;
+      this.deps.jsonObserver.onTurnStart(sessionId);
+      const messageId = msg.payload.messageId && msg.payload.messageId.length > 0 ? msg.payload.messageId : `${sessionId}-user-${msg.timestamp}`;
       this.deps.relayConnection.sendEnvelope(
         MessageEnvelopeSchema.parse({
           type: "user_input",
           sessionId,
-          seq,
-          timestamp,
+          seq: msg.seq,
+          timestamp: msg.timestamp,
           source: "proxy",
-          version,
+          version: msg.version,
           payload: { text, messageId }
         })
       );
@@ -2187,8 +2220,7 @@ var RelayInputHandlers = class {
     );
   }
   onRemoteInputRaw(msg) {
-    const sessionId = msg.sessionId;
-    const data = msg.data;
+    const { sessionId, data } = msg;
     if (!sessionId || data === void 0) return;
     const ts = this.deps.terminalSockets.get(sessionId);
     if (!ts?.writable && this.deps.hostedPtyRegistry.write(sessionId, data)) {
@@ -2206,13 +2238,12 @@ var RelayInputHandlers = class {
     serviceLogger.info({ sessionId, bytes: data.length }, "Raw PTY input forwarded");
   }
   onClipboardImageUpload(msg) {
-    const sessionId = msg.sessionId;
-    const requestId = msg.requestId;
+    const { sessionId, requestId } = msg;
     if (!sessionId) return;
     const session = this.deps.sessionManager.getSession(sessionId);
     if (!session) {
       this.deps.relayConnection.sendRaw(
-        JSON.stringify({
+        serializeControl({
           type: "clipboard_image_upload_response",
           requestId,
           sessionId,
@@ -2228,16 +2259,16 @@ var RelayInputHandlers = class {
     const result = saveClipboardImageUpload(
       {
         sessionId,
-        mimeType: typeof msg.mimeType === "string" ? msg.mimeType : "",
-        dataBase64: typeof msg.dataBase64 === "string" ? msg.dataBase64 : "",
-        fileName: typeof msg.fileName === "string" ? msg.fileName : void 0
+        mimeType: msg.mimeType,
+        dataBase64: msg.dataBase64,
+        fileName: msg.fileName
       },
       {
         cwd: session.cwd
       }
     );
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "clipboard_image_upload_response",
         requestId,
         sessionId,
@@ -2247,14 +2278,12 @@ var RelayInputHandlers = class {
     serviceLogger.info({ sessionId, success: result.success }, "Clipboard image upload handled");
   }
   onImagePreviewRequest(msg) {
-    const sessionId = msg.sessionId;
-    const requestId = msg.requestId;
-    const path = msg.path;
+    const { sessionId, requestId, path } = msg;
     if (!sessionId || !path) return;
     const session = this.deps.sessionManager.getSession(sessionId);
     if (!session) {
       this.deps.relayConnection.sendRaw(
-        JSON.stringify({
+        serializeControl({
           type: "image_preview_response",
           requestId,
           sessionId,
@@ -2275,7 +2304,7 @@ var RelayInputHandlers = class {
       }
     );
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "image_preview_response",
         requestId,
         ...result
@@ -2292,16 +2321,13 @@ var RelayHistoryHandlers = class {
   }
   deps;
   onSessionMessagesRequest(msg) {
-    const sid = msg.sessionId;
+    const { sessionId: sid, requestId, before, limit } = msg;
     if (!sid) return;
-    const requestId = msg.requestId;
-    const before = msg.before;
-    const limit = msg.limit;
     const session = this.deps.sessionManager.getSession(sid);
     if (session?.claudeSessionId) {
       readSessionMessagesPage(session.claudeSessionId, { before, limit }).then((page) => {
         this.deps.relaySend(
-          JSON.stringify({
+          serializeControl({
             type: "session_history_messages",
             requestId,
             sessionId: sid,
@@ -2327,7 +2353,7 @@ var RelayHistoryHandlers = class {
           "Failed to read session history page on request"
         );
         this.deps.relaySend(
-          JSON.stringify({
+          serializeControl({
             type: "session_history_messages",
             requestId,
             sessionId: sid,
@@ -2339,7 +2365,7 @@ var RelayHistoryHandlers = class {
       });
     } else {
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_history_messages",
           requestId,
           sessionId: sid,
@@ -2355,7 +2381,7 @@ var RelayHistoryHandlers = class {
       input: approval.input
     }));
     this.deps.relaySend(
-      JSON.stringify({ type: "pending_approvals_push", sessionId: sid, approvals })
+      serializeControl({ type: "pending_approvals_push", sessionId: sid, approvals })
     );
     serviceLogger.info({ sessionId: sid, count: approvals.length }, "Pending approvals pushed");
   }
@@ -2368,8 +2394,7 @@ var RelayPermissionHandlers = class {
   }
   deps;
   onToolApprove(msg) {
-    const sessionId = msg.sessionId;
-    const payload = msg.payload;
+    const { sessionId, payload } = msg;
     if (!sessionId || !payload?.toolId) return;
     const pending = this.deps.permissionBroker.get(payload.toolId);
     if (!pending) {
@@ -2421,8 +2446,7 @@ var RelayPermissionHandlers = class {
     );
   }
   onToolDeny(msg) {
-    const sessionId = msg.sessionId;
-    const payload = msg.payload;
+    const { sessionId, payload } = msg;
     if (!sessionId || !payload?.toolId) return;
     const reason = payload.reason ?? "Denied by remote user";
     const pending = this.deps.permissionBroker.get(payload.toolId);
@@ -2460,15 +2484,14 @@ var RelayPermissionHandlers = class {
     serviceLogger.info({ sessionId, toolId: payload.toolId }, "Tool denied via relay");
   }
   onPermissionRequestDelivered(msg) {
-    const sid = msg.sessionId;
-    const requestId = msg.requestId;
+    const { sessionId: sid, requestId } = msg;
     if (!sid || !requestId) return;
     const marked = this.deps.permissionBroker.markDelivered(requestId);
     serviceLogger.info({ sessionId: sid, requestId, marked }, "Permission request delivered");
   }
   pushPermissionDecisionResult(sessionId, requestId, outcome, delivered, message) {
     this.deps.relaySend(
-      JSON.stringify({
+      serializeControl({
         type: "permission_decision_result",
         sessionId,
         requestId,
@@ -2501,7 +2524,7 @@ var RelayResourceHandlers = class {
   deps;
   onProxyInfoRequest(msg) {
     this.deps.relaySend(
-      JSON.stringify({
+      serializeControl({
         type: "proxy_info",
         requestId: msg.requestId,
         homePath: homedir4() || "/",
@@ -2512,12 +2535,11 @@ var RelayResourceHandlers = class {
     );
   }
   onAgentCliConfigUpdate(msg) {
-    const requestId = msg.requestId;
-    const provider = msg.provider;
+    const { requestId, provider } = msg;
     const rawPath = msg.path;
     if (provider !== "claude" && provider !== "codex") {
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "agent_cli_config_update_response",
           requestId,
           provider: "claude",
@@ -2535,7 +2557,7 @@ var RelayResourceHandlers = class {
         suggestions: this.deps.getAgentCliSuggestions()
       });
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "agent_cli_config_update_response",
           requestId,
           provider,
@@ -2546,7 +2568,7 @@ var RelayResourceHandlers = class {
     } catch (err) {
       const error = errorMessage(err);
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "agent_cli_config_update_response",
           requestId,
           provider,
@@ -2576,7 +2598,7 @@ var RelayResourceHandlers = class {
     if (!session?.cwd) {
       serviceLogger.warn({ sessionId: sid }, "Session resources request: no cwd available");
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_resources_response",
           requestId: msg.requestId,
           sessionId: sid,
@@ -2712,7 +2734,7 @@ var HostedPtyRegistry = class {
     hosted.child.resize(cols, rows);
     hosted.terminal.resize(cols, rows);
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({ type: "terminal_resize", sessionId, cols, rows })
+      serializeControl({ type: "terminal_resize", sessionId, cols, rows })
     );
     serviceLogger.info({ sessionId, cols, rows }, "Hosted PTY resized");
     return true;
@@ -2722,14 +2744,14 @@ var HostedPtyRegistry = class {
     if (!hosted) return false;
     const data = hosted.serializeAddon.serialize();
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "session_snapshot",
         sessionId,
         cols: hosted.terminal.cols,
         rows: hosted.terminal.rows,
         data,
         outputSeq: hosted.outputSeq,
-        requestId
+        ...requestId !== void 0 ? { requestId } : {}
       })
     );
     serviceLogger.info(
@@ -2770,46 +2792,15 @@ var HostedPtyRegistry = class {
     if (signal?.title) {
       this.sendTerminalTitle(sessionId, signal.title);
     }
-    if (signal?.state === "approval_wait") {
-      hosted.currentState = "approval_wait";
-      this.deps.changeSessionState(sessionId, SessionState.WAITING_APPROVAL);
-      this.sendPtyState(sessionId, "approval_wait", { title: signal?.title, tool: signal?.tool });
-      return;
-    }
-    if (shouldReleaseApprovalWait({
+    const decision = decidePtySemanticTransition({
       currentState: hosted.currentState,
-      signalState: signal?.state
-    })) {
-      const nextState = stateAfterApprovalRelease(signal?.state);
-      hosted.currentState = nextState;
-      if (nextState === "turn_complete") {
-        this.deps.onTurnComplete(sessionId);
-        this.deps.changeSessionState(sessionId, SessionState.IDLE);
-      } else {
-        this.deps.changeSessionState(sessionId, SessionState.WORKING);
-      }
-      this.sendPtyState(sessionId, nextState, { title: signal?.title, tool: signal?.tool });
-      return;
-    }
-    if ((session?.state === SessionState.WAITING_APPROVAL || hosted.currentState === "approval_wait") && signal?.state !== "turn_complete") {
-      hosted.currentState = "approval_wait";
-      this.sendPtyState(sessionId, "approval_wait", { title: signal?.title, tool: signal?.tool });
-      return;
-    }
-    if (signal && signal.state !== "working") {
-      hosted.currentState = signal.state;
-      if (signal.state === "turn_complete") {
-        this.deps.onTurnComplete(sessionId);
-        this.deps.changeSessionState(sessionId, SessionState.IDLE);
-      }
-      this.sendPtyState(sessionId, signal.state, { title: signal.title, tool: signal.tool });
-      return;
-    }
-    if (hosted.currentState !== "working") {
-      hosted.currentState = "working";
-      this.deps.changeSessionState(sessionId, SessionState.WORKING);
-      this.sendPtyState(sessionId, "working");
-    }
+      signal: signal ?? null,
+      sessionStateIsWaitingApproval: session?.state === SessionState.WAITING_APPROVAL
+    });
+    hosted.currentState = decision.nextState;
+    if (!decision.emit) return;
+    this.sendPtyState(sessionId, decision.nextState, decision.meta);
+    this.deps.applyPtyStateToSession(sessionId, decision.nextState);
   }
   checkIdle(sessionId) {
     const hosted = this.sessions.get(sessionId);
@@ -2820,9 +2811,8 @@ var HostedPtyRegistry = class {
     hosted.lastOutputTime = 0;
     if (hosted.currentState !== "working") return;
     hosted.currentState = "turn_complete";
-    this.deps.onTurnComplete(sessionId);
-    this.deps.changeSessionState(sessionId, SessionState.IDLE);
     this.sendPtyState(sessionId, "turn_complete");
+    this.deps.applyPtyStateToSession(sessionId, "turn_complete");
   }
   sendPtyState(sessionId, state, meta) {
     const payload = {
@@ -2831,7 +2821,7 @@ var HostedPtyRegistry = class {
       ...meta?.tool !== void 0 ? { tool: meta.tool } : {}
     };
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "pty_state",
         sessionId,
         payload
@@ -2846,7 +2836,7 @@ var HostedPtyRegistry = class {
   }
   sendTerminalTitle(sessionId, title) {
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "terminal_title",
         sessionId,
         title
@@ -2854,13 +2844,7 @@ var HostedPtyRegistry = class {
     );
   }
   sendBinary(sessionId, data, outputSeq) {
-    const sessionIdBuf = Buffer.from(sessionId, "utf-8");
-    const frame = Buffer.alloc(1 + sessionIdBuf.length + 4 + data.length);
-    frame[0] = sessionIdBuf.length;
-    sessionIdBuf.copy(frame, 1);
-    frame.writeUInt32LE(outputSeq, 1 + sessionIdBuf.length);
-    data.copy(frame, 1 + sessionIdBuf.length + 4);
-    this.deps.relayConnection.sendBinary(frame);
+    this.deps.relayConnection.sendBinary(encodeBinaryFrame(sessionId, outputSeq, data));
   }
   close(sessionId, options) {
     const hosted = this.sessions.get(sessionId);
@@ -2907,16 +2891,25 @@ var RelaySessionCreateHandler = class {
     this.deps = deps;
   }
   deps;
+  // 跟踪每个 pendingId 当前挂起的 retry timer。SIGTERM 抵达时 destroy() 会 clear
+  // 这些 timer 并执行 cleanupPendingJsonSession，否则 worker 子进程在窗口期内可能成为孤儿
+  // （setTimeout 回调命中时 workerRegistry 已经 destroyAll，但 worker 进程并未被 kill）。
+  pendingTimers = /* @__PURE__ */ new Map();
+  destroy() {
+    for (const [pendingId, timer] of this.pendingTimers) {
+      clearTimeout(timer);
+      this.cleanupPendingJsonSession(pendingId);
+    }
+    this.pendingTimers.clear();
+  }
   onSessionCreate(msg) {
-    const requestId = msg.requestId;
-    const cwd = msg.cwd;
+    const { requestId, cwd } = msg;
     const cwdError = validateSessionCwd(cwd);
     if (cwdError) {
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_create_response",
           requestId,
-          sessionId: "",
           error: cwdError.message,
           errorCode: cwdError.code
         })
@@ -2934,10 +2927,9 @@ var RelaySessionCreateHandler = class {
     }
     if (provider !== "claude") {
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_create_response",
           requestId,
-          sessionId: "",
           errorCode: ControlErrorCode.PROVIDER_UNSUPPORTED,
           error: provider === "codex" ? "Codex chat sessions are not supported yet; start a Codex terminal session instead." : "Unsupported provider for JSON session."
         })
@@ -2946,7 +2938,7 @@ var RelaySessionCreateHandler = class {
       return;
     }
     const resumeSessionId = msg.resumeSessionId;
-    const streamDelta = msg.streamDelta === true;
+    const streamDelta = false;
     const name = tildify(sessionCwd);
     const pendingId = nanoid4();
     const hook = this.deps.createHookContext(pendingId, provider);
@@ -2960,7 +2952,12 @@ var RelaySessionCreateHandler = class {
     const paths = sessionPaths(pendingId);
     let attempt = 0;
     const maxRetries = 20;
+    const scheduleAttempt = (delayMs) => {
+      const timer = setTimeout(tryConnect, delayMs);
+      this.pendingTimers.set(pendingId, timer);
+    };
     const tryConnect = () => {
+      this.pendingTimers.delete(pendingId);
       attempt++;
       this.deps.workerRegistry.connect(pendingId, paths.workerSock).then((sock) => {
         if (sock) {
@@ -2976,7 +2973,11 @@ var RelaySessionCreateHandler = class {
             this.deps.sessionManager.setClaudeSessionId(session.id, resumeSessionId);
           }
           this.deps.relaySend(
-            JSON.stringify({ type: "session_create_response", requestId, sessionId: session.id })
+            serializeControl({
+              type: "session_create_response",
+              requestId,
+              sessionId: session.id
+            })
           );
           if (resumeSessionId) {
             this.pushHistoryMessages(session.id, resumeSessionId);
@@ -2989,11 +2990,11 @@ var RelaySessionCreateHandler = class {
           this.deps.broadcastSessionSync(session);
           this.deps.broadcastSessionList();
         } else if (attempt < maxRetries) {
-          setTimeout(tryConnect, Math.min(100 * attempt, 2e3));
+          scheduleAttempt(Math.min(100 * attempt, 2e3));
         } else {
           this.cleanupPendingJsonSession(pendingId);
           this.deps.relaySend(
-            JSON.stringify({
+            serializeControl({
               type: "session_create_response",
               requestId,
               sessionId: pendingId,
@@ -3005,7 +3006,7 @@ var RelaySessionCreateHandler = class {
         }
       });
     };
-    setTimeout(tryConnect, 100);
+    scheduleAttempt(100);
   }
   cleanupPendingJsonSession(sessionId) {
     const killed = this.deps.workerRegistry.terminateProcess(sessionId);
@@ -3022,10 +3023,9 @@ var RelaySessionCreateHandler = class {
   createHostedPtySession(msg, cwd, provider, permissionMode) {
     if (provider !== "claude" && provider !== "codex") {
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_create_response",
           requestId: msg.requestId,
-          sessionId: "",
           errorCode: ControlErrorCode.PROVIDER_UNSUPPORTED,
           error: "Unsupported provider for PTY session."
         })
@@ -3058,7 +3058,7 @@ var RelaySessionCreateHandler = class {
         this.deps.sessionManager.setClaudeSessionId(session.id, resumeSessionId);
       }
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_create_response",
           requestId: msg.requestId,
           sessionId: session.id,
@@ -3075,10 +3075,9 @@ var RelaySessionCreateHandler = class {
     } catch (err) {
       const error = err instanceof Error ? err.message : String(err);
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_create_response",
           requestId: msg.requestId,
-          sessionId: "",
           errorCode: ControlErrorCode.PROCESS_START_FAILED,
           error
         })
@@ -3101,7 +3100,7 @@ var RelaySessionCreateHandler = class {
     readSessionMessagesPage(resumeSessionId).then((page) => {
       if (page.messages.length === 0) return;
       this.deps.relaySend(
-        JSON.stringify({
+        serializeControl({
           type: "session_history_messages",
           sessionId,
           messages: page.messages,
@@ -3180,56 +3179,120 @@ var RelayRouter = class {
   permissionHandlers;
   resourceHandlers;
   sessionCreateHandler;
-  handle(parsed) {
-    const type = parsed.type;
-    if (!type) {
-      serviceLogger.warn("Relay message without type discriminator");
+  // shutdown 链路上提供单一 destroy 入口：把 sessionCreateHandler 内部 pending retry timer 清掉
+  // 并 cleanup 已 spawn 但未 connect 的 worker 子进程，避免在 SIGTERM 之后变成孤儿。
+  destroy() {
+    this.sessionCreateHandler.destroy();
+  }
+  // 入站消息统一入口：proxy 收两类消息——relay control 与 envelope（user_input 这一种）。
+  // 先按 envelope 试解析（discriminated union），失败再按 control 解析；各 handler 拿到
+  // 强类型窄化后的消息，不再需要 `as string | undefined` / `as { ... }` 裸 cast。
+  handle(rawMsg) {
+    const asEnvelope = MessageEnvelopeSchema.safeParse(rawMsg);
+    if (asEnvelope.success && asEnvelope.data.type === "user_input") {
+      try {
+        this.inputHandlers.onUserInput(asEnvelope.data);
+      } catch (err) {
+        serviceLogger.warn({ type: "user_input", error: String(err) }, "Relay handler threw");
+      }
       return;
     }
-    const handler = this.handlers[type];
-    if (!handler) {
-      serviceLogger.warn({ type }, "Unhandled relay message type");
+    const asControl = RelayControlSchema.safeParse(rawMsg);
+    if (!asControl.success) {
+      serviceLogger.warn(
+        {
+          type: typeof rawMsg.type === "string" ? rawMsg.type : "<missing>",
+          controlIssues: asControl.error.issues.slice(0, 3)
+        },
+        "Relay message rejected by both envelope and control schemas"
+      );
       return;
     }
+    const msg = asControl.data;
     try {
-      handler.call(this, parsed);
+      this.dispatch(msg);
     } catch (err) {
-      serviceLogger.warn({ type, error: String(err) }, "Relay handler threw");
-    }
-  }
-  handlers = {
-    user_input: (msg) => this.inputHandlers.onUserInput(msg),
-    remote_input_raw: (msg) => this.inputHandlers.onRemoteInputRaw(msg),
-    clipboard_image_upload: (msg) => this.inputHandlers.onClipboardImageUpload(msg),
-    image_preview_request: (msg) => this.inputHandlers.onImagePreviewRequest(msg),
-    tool_approve: (msg) => this.permissionHandlers.onToolApprove(msg),
-    tool_deny: (msg) => this.permissionHandlers.onToolDeny(msg),
-    proxy_info_request: (msg) => this.resourceHandlers.onProxyInfoRequest(msg),
-    agent_cli_config_update: (msg) => this.resourceHandlers.onAgentCliConfigUpdate(msg),
-    dir_list_request: (msg) => this.resourceHandlers.onDirListRequest(msg),
-    dir_create_request: (msg) => this.resourceHandlers.onDirCreateRequest(msg),
-    session_create: (msg) => this.sessionCreateHandler.onSessionCreate(msg),
-    session_messages_request: (msg) => this.historyHandlers.onSessionMessagesRequest(msg),
-    session_resources_request: (msg) => this.resourceHandlers.onSessionResourcesRequest(msg),
-    agent_status_request: (msg) => this.onAgentStatusRequest(msg),
-    permission_request_delivered: (msg) => this.permissionHandlers.onPermissionRequestDelivered(msg),
-    session_terminate: (msg) => this.onSessionTerminate(msg),
-    session_worker_abort: (msg) => this.onSessionWorkerAbort(msg),
-    session_history_request: (msg) => this.deps.controlHandlers.handleSessionHistoryRequest({
-      requestId: msg.requestId
-    }),
-    session_list: () => this.onSessionList(),
-    permission_mode_change: (msg) => this.onPermissionModeChange(msg),
-    session_subscribe: (msg) => this.onSessionSubscribe(msg),
-    terminal_resize_request: (msg) => this.onTerminalResizeRequest(msg)
-  };
+      serviceLogger.warn({ type: msg.type, error: String(err) }, "Relay handler threw");
+    }
+  }
+  dispatch(msg) {
+    switch (msg.type) {
+      case "remote_input_raw":
+        this.inputHandlers.onRemoteInputRaw(msg);
+        return;
+      case "clipboard_image_upload":
+        this.inputHandlers.onClipboardImageUpload(msg);
+        return;
+      case "image_preview_request":
+        this.inputHandlers.onImagePreviewRequest(msg);
+        return;
+      case "tool_approve":
+        this.permissionHandlers.onToolApprove(msg);
+        return;
+      case "tool_deny":
+        this.permissionHandlers.onToolDeny(msg);
+        return;
+      case "proxy_info_request":
+        this.resourceHandlers.onProxyInfoRequest(msg);
+        return;
+      case "agent_cli_config_update":
+        this.resourceHandlers.onAgentCliConfigUpdate(msg);
+        return;
+      case "dir_list_request":
+        this.resourceHandlers.onDirListRequest(msg);
+        return;
+      case "dir_create_request":
+        this.resourceHandlers.onDirCreateRequest(msg);
+        return;
+      case "session_create":
+        this.sessionCreateHandler.onSessionCreate(msg);
+        return;
+      case "session_messages_request":
+        this.historyHandlers.onSessionMessagesRequest(msg);
+        return;
+      case "session_resources_request":
+        this.resourceHandlers.onSessionResourcesRequest(msg);
+        return;
+      case "agent_status_request":
+        this.onAgentStatusRequest(msg);
+        return;
+      case "permission_request_delivered":
+        this.permissionHandlers.onPermissionRequestDelivered(msg);
+        return;
+      case "session_terminate":
+        this.onSessionTerminate(msg);
+        return;
+      case "session_worker_abort":
+        this.onSessionWorkerAbort(msg);
+        return;
+      case "session_history_request":
+        this.deps.controlHandlers.handleSessionHistoryRequest({ requestId: msg.requestId });
+        return;
+      case "session_list":
+        this.onSessionList();
+        return;
+      case "permission_mode_change":
+        this.onPermissionModeChange(msg);
+        return;
+      case "session_subscribe":
+        this.onSessionSubscribe(msg);
+        return;
+      case "terminal_resize_request":
+        this.onTerminalResizeRequest(msg);
+        return;
+      default:
+        return;
+    }
+  }
   onAgentStatusRequest(msg) {
     const sid = msg.sessionId;
     const requestId = msg.requestId;
     if (sid) {
       const status = this.deps.agentStatusRegistry.get(sid);
       const statuses2 = status && this.deps.sessionManager.getSession(sid) ? [{ sessionId: sid, payload: status }] : [];
-      this.deps.relaySend(JSON.stringify({ type: "agent_status_response", requestId, statuses: statuses2 }));
+      this.deps.relaySend(
+        serializeControl({ type: "agent_status_response", requestId, statuses: statuses2 })
+      );
       serviceLogger.info({ sessionId: sid, count: statuses2.length }, "Agent status snapshot sent");
       return;
     }
@@ -3238,7 +3301,9 @@ var RelayRouter = class {
       if (!this.deps.sessionManager.getSession(sessionId)) continue;
       statuses.push({ sessionId, payload: status });
     }
-    this.deps.relaySend(JSON.stringify({ type: "agent_status_response", requestId, statuses }));
+    this.deps.relaySend(
+      serializeControl({ type: "agent_status_response", requestId, statuses })
+    );
     serviceLogger.info({ count: statuses.length }, "Agent status snapshot sent");
   }
   onSessionTerminate(msg) {
@@ -3249,7 +3314,6 @@ var RelayRouter = class {
       { sessionId: sid, success: result.success, action: result.action },
       "Session termination handled via relay"
     );
-    if (result.action !== "terminate_hosted_pty") this.deps.broadcastSessionList();
   }
   onSessionWorkerAbort(msg) {
     const sid = msg.sessionId;
@@ -3382,15 +3446,27 @@ var JsonObserver = class {
 };
 
 // src/serve/permission-broker.ts
+var DUPLICATE_DECISION = {
+  behavior: "deny",
+  message: "Duplicate permission request id."
+};
+function snapshot(pending) {
+  return {
+    requestId: pending.requestId,
+    sessionId: pending.sessionId,
+    provider: pending.provider,
+    source: pending.source,
+    toolName: pending.toolName,
+    input: pending.input,
+    createdAt: pending.createdAt,
+    ...pending.deliveredAt !== void 0 ? { deliveredAt: pending.deliveredAt } : {}
+  };
+}
 var PermissionBroker = class {
   pending = /* @__PURE__ */ new Map();
   request(request) {
-    const existing = this.pending.get(request.requestId);
-    if (existing) {
-      return Promise.resolve({
-        behavior: "deny",
-        message: "Duplicate permission request id."
-      });
+    if (this.pending.has(request.requestId)) {
+      return Promise.resolve(DUPLICATE_DECISION);
     }
     return new Promise((resolve3) => {
       this.pending.set(request.requestId, {
@@ -3402,12 +3478,8 @@ var PermissionBroker = class {
     });
   }
   registerWorkerRequest(request, onDecision) {
-    const existing = this.pending.get(request.requestId);
-    if (existing) {
-      onDecision({
-        behavior: "deny",
-        message: "Duplicate permission request id."
-      });
+    if (this.pending.has(request.requestId)) {
+      onDecision(DUPLICATE_DECISION);
       return false;
     }
     this.pending.set(request.requestId, {
@@ -3433,17 +3505,7 @@ var PermissionBroker = class {
   }
   get(requestId) {
     const pending = this.pending.get(requestId);
-    if (!pending) return null;
-    return {
-      requestId: pending.requestId,
-      sessionId: pending.sessionId,
-      provider: pending.provider,
-      source: pending.source,
-      toolName: pending.toolName,
-      input: pending.input,
-      createdAt: pending.createdAt,
-      ...pending.deliveredAt !== void 0 ? { deliveredAt: pending.deliveredAt } : {}
-    };
+    return pending ? snapshot(pending) : null;
   }
   cleanupSession(sessionId, reason) {
     for (const [requestId, pending] of this.pending) {
@@ -3457,31 +3519,27 @@ var PermissionBroker = class {
     const out = [];
     for (const pending of this.pending.values()) {
       if (pending.sessionId !== sessionId) continue;
-      out.push({
-        requestId: pending.requestId,
-        sessionId: pending.sessionId,
-        provider: pending.provider,
-        source: pending.source,
-        toolName: pending.toolName,
-        input: pending.input,
-        createdAt: pending.createdAt,
-        ...pending.deliveredAt !== void 0 ? { deliveredAt: pending.deliveredAt } : {}
-      });
+      out.push(snapshot(pending));
     }
     return out;
   }
 };
 
-// src/serve/hook-event-router.ts
-function hookPayloadRecord(value) {
+// src/serve/hook-payload-helpers.ts
+function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
+function asProvider(value) {
+  return providerValues.includes(value) ? value : null;
+}
 function toolNameFromPayload(payload) {
   return typeof payload.toolName === "string" ? payload.toolName : typeof payload.tool_name === "string" ? payload.tool_name : "unknown";
 }
 function toolInputFromPayload(payload) {
-  return hookPayloadRecord(payload.input ?? payload.tool_input);
+  return asRecord(payload.input ?? payload.tool_input);
 }
+
+// src/serve/hook-event-router.ts
 var HookEventRouter = class {
   constructor(deps) {
     this.deps = deps;
@@ -3521,9 +3579,13 @@ var HookEventRouter = class {
     }
   }
   onPermissionResolved(sessionId, provider, requestId, outcome, context) {
-    this.deps.changeSessionState(sessionId, SessionState.WORKING);
     if (outcome === "deny") {
       this.deps.changeSessionState(sessionId, SessionState.IDLE);
+    } else {
+      const mode = this.deps.getSessionMode?.(sessionId);
+      if (mode === "pty") {
+        this.deps.changeSessionState(sessionId, SessionState.WORKING);
+      }
     }
     this.forwardAgentStatus(
       {
@@ -3556,7 +3618,7 @@ var HookEventRouter = class {
         input
       }
     });
-    const seq = this.deps.nextSeq?.(event.sessionId) ?? new SeqCounter(event.sessionId).next();
+    const seq = this.deps.nextSeq?.(event.sessionId) ?? getSeqCounterFor(event.sessionId).next();
     const envelope = buildMessage(
       "tool_use_request",
       event.sessionId,
@@ -3588,7 +3650,7 @@ var HookEventRouter = class {
     };
     this.deps.agentStatusRegistry.set(event.sessionId, payload);
     this.deps.relayConnection.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "agent_status",
         sessionId: event.sessionId,
         payload
@@ -3596,7 +3658,7 @@ var HookEventRouter = class {
     );
   }
   nextSeq(sessionId) {
-    return this.deps.nextSeq?.(sessionId) ?? new SeqCounter(sessionId).next();
+    return this.deps.nextSeq?.(sessionId) ?? getSeqCounterFor(sessionId).next();
   }
 };
 
@@ -3619,6 +3681,52 @@ var AgentStatusRegistry = class {
   }
 };
 
+// src/serve/pty-state-guard.ts
+function shouldPromotePtyActivityToWorking(session, pendingApprovalCount) {
+  if (!session || session.mode !== "pty") return false;
+  if (pendingApprovalCount > 0) return false;
+  return session.state === SessionState.IDLE || session.state === SessionState.WAITING_APPROVAL;
+}
+
+// src/serve/pty-semantic-lifecycle.ts
+function resolvePtySemanticSessionTransitions(currentState, semanticState) {
+  if (semanticState !== "turn_complete") return [];
+  if (currentState === SessionState.WAITING_APPROVAL) {
+    return [SessionState.IDLE];
+  }
+  if (currentState === SessionState.WORKING) {
+    return [SessionState.IDLE];
+  }
+  return [];
+}
+
+// src/serve/pty-session-bridge.ts
+function applyPtyStateToSession(deps, sessionId, ptyState) {
+  const session = deps.getSession(sessionId);
+  if (!session || session.state === SessionState.TERMINATED) return;
+  switch (ptyState) {
+    case "approval_wait":
+      deps.changeSessionState(sessionId, SessionState.WAITING_APPROVAL);
+      break;
+    case "working": {
+      const pending = deps.getPendingApprovalCount(sessionId);
+      if (shouldPromotePtyActivityToWorking(session, pending)) {
+        deps.changeSessionState(sessionId, SessionState.WORKING);
+      }
+      break;
+    }
+    case "turn_complete": {
+      deps.resolveInterruptedApprovals(sessionId);
+      const transitions = resolvePtySemanticSessionTransitions(session.state, ptyState);
+      for (const next of transitions) {
+        deps.changeSessionState(sessionId, next);
+      }
+      deps.emitAgentStatus(sessionId, "idle");
+      break;
+    }
+  }
+}
+
 // src/serve/session-broadcast.ts
 var ACTIVITY_STATUS_PUSH_INTERVAL_MS = 15e3;
 function toSessionListPayload(s) {
@@ -3649,21 +3757,18 @@ function pushSessionStatus(relay, sessionManager, sessionId) {
   }
 }
 function broadcastSessionList(relay, sessionManager) {
-  relay.sendRaw(
-    JSON.stringify({
-      type: "session_list",
-      sessionId: "",
-      seq: 0,
-      timestamp: Date.now(),
-      source: "proxy",
-      version: "1",
-      payload: { sessions: sessionManager.listSessions().map(toSessionListPayload) }
-    })
+  const envelope = buildMessage(
+    "session_list",
+    null,
+    0,
+    { sessions: sessionManager.listSessions().map(toSessionListPayload) },
+    "proxy"
   );
+  relay.sendEnvelope(envelope);
 }
 function broadcastSessionSync(relay, session) {
   relay.sendRaw(
-    JSON.stringify({
+    serializeControl({
       type: "session_sync",
       sessions: [
         {
@@ -3689,6 +3794,37 @@ function touchSessionActivity(sessionManager, relay, sessionId, now = Date.now()
   return touched;
 }
 
+// src/serve/event-bridge.ts
+function createEventBridge(deps) {
+  const changeState = (sessionId, next) => changeSessionState(deps.sessionManager, deps.relayConnection, sessionId, next);
+  const touchActivity = (sessionId) => touchSessionActivity(deps.sessionManager, deps.relayConnection, sessionId);
+  const emitAgentStatus = (sessionId, phase) => {
+    const session = deps.sessionManager.getSession(sessionId);
+    if (!session) return;
+    const payload = {
+      provider: session.provider,
+      phase,
+      seq: getSeqCounterFor(sessionId).next(),
+      updatedAt: Date.now()
+    };
+    deps.agentStatusRegistry.set(sessionId, payload);
+    deps.relayConnection.sendRaw(serializeControl({ type: "agent_status", sessionId, payload }));
+  };
+  const cleanupSessionResources = (sessionId) => {
+    deps.controlHandlers.cleanup(sessionId);
+    deps.agentStatusRegistry.delete(sessionId);
+    disposeSeqCounter(sessionId);
+    deps.permissionBroker.cleanupSession(sessionId, "Session closed");
+    broadcastSessionList(deps.relayConnection, deps.sessionManager);
+  };
+  return {
+    changeSessionState: changeState,
+    touchSessionActivity: touchActivity,
+    emitAgentStatus,
+    cleanupSessionResources
+  };
+}
+
 // src/serve/service-files.ts
 import { execSync } from "child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync6, unlinkSync as unlinkSync2 } from "fs";
@@ -3717,6 +3853,7 @@ async function cleanupStaleResources() {
       const msg = `Another service is already running on ${SOCK_PATH}`;
       serviceLogger.error(msg);
       console.error(msg);
+      await flushLogger(serviceLogger);
       process.exit(1);
     }
     unlinkSync2(SOCK_PATH);
@@ -3729,6 +3866,7 @@ async function cleanupStaleResources() {
       const msg = `Another service is already running with PID ${pid}`;
       serviceLogger.error(msg);
       console.error(msg);
+      await flushLogger(serviceLogger);
       process.exit(1);
     }
     unlinkSync2(PID_PATH);
@@ -3751,25 +3889,6 @@ function getComputerName() {
   }
 }
 
-// src/serve/pty-state-guard.ts
-function shouldPromotePtyActivityToWorking(session, pendingApprovalCount) {
-  if (!session || session.mode !== "pty") return false;
-  if (pendingApprovalCount > 0) return false;
-  return session.state === SessionState.IDLE || session.state === SessionState.WAITING_APPROVAL;
-}
-
-// src/serve/pty-semantic-lifecycle.ts
-function resolvePtySemanticSessionTransitions(currentState, semanticState) {
-  if (semanticState !== "turn_complete") return [];
-  if (currentState === SessionState.WAITING_APPROVAL) {
-    return [SessionState.IDLE];
-  }
-  if (currentState === SessionState.WORKING) {
-    return [SessionState.IDLE];
-  }
-  return [];
-}
-
 // src/serve/terminal-ipc.ts
 function handleTerminalConnection(socket, deps) {
   const {
@@ -3784,8 +3903,16 @@ function handleTerminalConnection(socket, deps) {
     createHookContext,
     emitAgentStatus,
     resolveInterruptedApprovals: resolveInterruptedApprovals2,
+    cleanupSessionResources,
     config
   } = deps;
+  const bridgeDeps = {
+    changeSessionState: (sessionId, next) => changeSessionState(sessionManager, relayConnection, sessionId, next),
+    getSession: (sessionId) => sessionManager.getSession(sessionId),
+    getPendingApprovalCount: (sessionId) => permissionBroker.listSession(sessionId).length,
+    resolveInterruptedApprovals: resolveInterruptedApprovals2,
+    emitAgentStatus
+  };
   createIpcReader(
     socket,
     (msg) => {
@@ -3852,7 +3979,7 @@ function handleTerminalConnection(socket, deps) {
         case "pty_title_change": {
           if (!sessionManager.getSession(msg.sessionId)) break;
           relayConnection.sendRaw(
-            JSON.stringify({
+            serializeControl({
               type: "terminal_title",
               sessionId: msg.sessionId,
               title: msg.title
@@ -3873,45 +4000,9 @@ function handleTerminalConnection(socket, deps) {
           } else {
             serviceLogger.debug(logPayload, "PTY semantic event received");
           }
-          if (msg.state === "approval_wait") {
-            changeSessionState(
-              sessionManager,
-              relayConnection,
-              msg.sessionId,
-              SessionState.WAITING_APPROVAL
-            );
-          } else if (msg.state === "working" || msg.state === "mid_pause") {
-            const session = sessionManager.getSession(msg.sessionId);
-            const pendingApprovals = permissionBroker.listSession(msg.sessionId);
-            if (shouldPromotePtyActivityToWorking(session, pendingApprovals.length)) {
-              changeSessionState(
-                sessionManager,
-                relayConnection,
-                msg.sessionId,
-                SessionState.WORKING
-              );
-            } else if (session?.state === SessionState.WAITING_APPROVAL) {
-              serviceLogger.debug(
-                {
-                  sessionId: msg.sessionId,
-                  ptyState: msg.state,
-                  pendingApprovals: pendingApprovals.length
-                },
-                "PTY working signal ignored while permission approval is pending"
-              );
-            }
-          }
-          if (msg.state === "turn_complete") {
-            resolveInterruptedApprovals2(msg.sessionId);
-            const session = sessionManager.getSession(msg.sessionId);
-            const transitions = resolvePtySemanticSessionTransitions(session?.state, msg.state);
-            for (const next of transitions) {
-              changeSessionState(sessionManager, relayConnection, msg.sessionId, next);
-            }
-            emitAgentStatus(msg.sessionId, "idle");
-          }
+          applyPtyStateToSession(bridgeDeps, msg.sessionId, msg.state);
           relayConnection.sendRaw(
-            JSON.stringify({
+            serializeControl({
               type: "pty_state",
               sessionId: msg.sessionId,
               payload: {
@@ -3926,7 +4017,7 @@ function handleTerminalConnection(socket, deps) {
         case "pty_resize": {
           if (!sessionManager.getSession(msg.sessionId)) break;
           relayConnection.sendRaw(
-            JSON.stringify({
+            serializeControl({
               type: "terminal_resize",
               sessionId: msg.sessionId,
               cols: msg.cols,
@@ -3943,7 +4034,8 @@ function handleTerminalConnection(socket, deps) {
               controlHandlers,
               terminalSockets,
               hostedPtyRegistry,
-              agentStatusRegistry
+              agentStatusRegistry,
+              broadcastSessionList: () => broadcastSessionList(relayConnection, sessionManager)
             },
             msg.sessionId
           );
@@ -3986,7 +4078,7 @@ function handleTerminalConnection(socket, deps) {
         }
         case "pty_deregister": {
           relayConnection.sendRaw(
-            JSON.stringify({
+            serializeControl({
               type: "pty_state",
               sessionId: msg.sessionId,
               payload: { state: "turn_complete" }
@@ -3994,9 +4086,7 @@ function handleTerminalConnection(socket, deps) {
           );
           sessionManager.terminateSession(msg.sessionId);
           terminalSockets.delete(msg.sessionId);
-          controlHandlers.cleanup(msg.sessionId);
-          agentStatusRegistry.delete(msg.sessionId);
-          broadcastSessionList(relayConnection, sessionManager);
+          cleanupSessionResources(msg.sessionId);
           serviceLogger.info({ sessionId: msg.sessionId }, "PTY session deregistered");
           break;
         }
@@ -4024,14 +4114,14 @@ function handleTerminalConnection(socket, deps) {
         case "pty_snapshot": {
           if (!sessionManager.getSession(msg.sessionId)) break;
           relayConnection.sendRaw(
-            JSON.stringify({
+            serializeControl({
               type: "session_snapshot",
               sessionId: msg.sessionId,
               cols: msg.cols,
               rows: msg.rows,
               data: msg.data,
               outputSeq: msg.outputSeq,
-              requestId: msg.requestId
+              ...msg.requestId !== void 0 ? { requestId: msg.requestId } : {}
             })
           );
           serviceLogger.info(
@@ -4048,13 +4138,13 @@ function handleTerminalConnection(socket, deps) {
     (sessionId, data, outputSeq) => {
       if (!sessionManager.getSession(sessionId)) return;
       touchSessionActivity(sessionManager, relayConnection, sessionId);
-      const sessionIdBuf = Buffer.from(sessionId, "utf-8");
-      const wsFrame = Buffer.alloc(1 + sessionIdBuf.length + 4 + data.length);
-      wsFrame[0] = sessionIdBuf.length;
-      sessionIdBuf.copy(wsFrame, 1);
-      wsFrame.writeUInt32LE(outputSeq, 1 + sessionIdBuf.length);
-      data.copy(wsFrame, 1 + sessionIdBuf.length + 4);
-      relayConnection.sendBinary(wsFrame);
+      relayConnection.sendBinary(encodeBinaryFrame(sessionId, outputSeq, data));
+    },
+    (err, line) => {
+      serviceLogger.warn(
+        { err: err.message, lineLen: line.length },
+        "Terminal IPC message dropped (parse/schema error)"
+      );
     }
   );
   socket.on("close", () => {
@@ -4074,16 +4164,14 @@ function handleTerminalConnection(socket, deps) {
           continue;
         }
         relayConnection.sendRaw(
-          JSON.stringify({
+          serializeControl({
             type: "pty_state",
             sessionId,
             payload: { state: "turn_complete" }
           })
         );
         sessionManager.terminateSession(sessionId);
-        controlHandlers.cleanup(sessionId);
-        agentStatusRegistry.delete(sessionId);
-        broadcastSessionList(relayConnection, sessionManager);
+        cleanupSessionResources(sessionId);
         serviceLogger.info(
           { sessionId },
           "PTY session cleaned up on socket close (crash fallback)"
@@ -4098,8 +4186,8 @@ function handleTerminalConnection(socket, deps) {
 
 // src/serve/hook-registry.ts
 import { createHash, randomBytes } from "crypto";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
-import { dirname as dirname3 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync7, renameSync, writeFileSync as writeFileSync2 } from "fs";
+import { dirname } from "path";
 import { z } from "zod";
 var PersistedHookSessionBindingSchema = z.object({
   sessionId: z.string(),
@@ -4178,9 +4266,9 @@ var HookRegistry = class {
   save() {
     if (!this.persistPath) return;
     try {
-      mkdirSync4(dirname3(this.persistPath), { recursive: true });
+      mkdirSync2(dirname(this.persistPath), { recursive: true });
       const tmpPath = `${this.persistPath}.${process.pid}.${Date.now()}.tmp`;
-      writeFileSync4(
+      writeFileSync2(
         tmpPath,
         JSON.stringify(
           {
@@ -4191,7 +4279,7 @@ var HookRegistry = class {
           2
         )
       );
-      renameSync2(tmpPath, this.persistPath);
+      renameSync(tmpPath, this.persistPath);
     } catch (err) {
       serviceLogger.warn(
         { path: this.persistPath, error: String(err) },
@@ -4208,12 +4296,6 @@ function getBearerToken(req) {
   if (!header?.startsWith("Bearer ")) return null;
   return header.slice("Bearer ".length).trim() || null;
 }
-function asProvider(value) {
-  return value === "claude" || value === "codex" ? value : null;
-}
-function asRecord(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
 var HookServer = class {
   constructor(options) {
     this.options = options;
@@ -4313,7 +4395,7 @@ var HookServer = class {
   }
   async handlePermissionRequest(event, res) {
     const requestId = event.requestId ?? (typeof event.payload.tool_use_id === "string" ? event.payload.tool_use_id : void 0) ?? `${event.sessionId}:${Date.now()}`;
-    const toolName = typeof event.payload.toolName === "string" ? event.payload.toolName : typeof event.payload.tool_name === "string" ? event.payload.tool_name : "unknown";
+    const toolName = toolNameFromPayload(event.payload);
     const input = asRecord(event.payload.input ?? event.payload.tool_input);
     this.options.onEvent?.({ ...event, requestId });
     const decision = await this.options.permissionBroker.request({
@@ -4396,7 +4478,8 @@ async function createProviderHookRuntime(options) {
   const hookEventRouter = new HookEventRouter({
     relayConnection: options.relayConnection,
     agentStatusRegistry: options.agentStatusRegistry,
-    changeSessionState: options.changeSessionState
+    changeSessionState: options.changeSessionState,
+    getSessionMode: (sessionId) => options.sessionManager.getSession(sessionId)?.mode
   });
   const port = options.hookPort ?? 17654;
   const hookServer = new HookServer({
@@ -4423,6 +4506,7 @@ async function createProviderHookRuntime(options) {
     const msg = `Failed to start hook server on 127.0.0.1:${port}: ${String(err)}`;
     serviceLogger.error(msg);
     console.error(msg);
+    await flushLogger(serviceLogger);
     process.exit(1);
   }
   const hookUrl = `http://127.0.0.1:${hookServer.getListeningPort() ?? port}/hook`;
@@ -4444,6 +4528,35 @@ async function createProviderHookRuntime(options) {
   };
 }
 
+// src/serve/shutdown.ts
+import { unlinkSync as unlinkSync3 } from "fs";
+function createServeShutdown(deps) {
+  const exit = deps.exit ?? ((code) => process.exit(code));
+  let shuttingDown = false;
+  return async () => {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    deps.logger.info("Shutting down service");
+    deps.sessionManagerStopReaper();
+    deps.relayRouterDestroy();
+    await deps.hookServerClose();
+    deps.relayConnectionClose();
+    deps.workerRegistryDestroyAll();
+    deps.hostedPtyRegistryDestroyAll();
+    deps.ipcServerClose();
+    try {
+      unlinkSync3(deps.sockPath);
+    } catch {
+    }
+    try {
+      unlinkSync3(deps.pidPath);
+    } catch {
+    }
+    await flushLogger(deps.logger);
+    exit(0);
+  };
+}
+
 // src/serve.ts
 function resolveInterruptedApprovals(permissionBroker, hookEventRouter, relay, sessionId) {
   const approvals = permissionBroker.listSession(sessionId);
@@ -4459,7 +4572,7 @@ function resolveInterruptedApprovals(permissionBroker, hookEventRouter, relay, s
       { toolName: approval.toolName, toolInput: approval.input }
     );
     relay.sendRaw(
-      JSON.stringify({
+      serializeControl({
         type: "permission_decision_result",
         sessionId: approval.sessionId,
         requestId: approval.requestId,
@@ -4499,7 +4612,7 @@ async function startService(options) {
   ensureProfileWorkspace();
   await cleanupStaleResources();
   try {
-    unlinkSync3(STOPPED_PATH);
+    unlinkSync4(STOPPED_PATH);
   } catch {
   }
   const permissionBroker = new PermissionBroker();
@@ -4560,6 +4673,7 @@ async function startService(options) {
     const msg = `Relay URL is required. Set relays.${proxyConfig.relayName}.url in ~/.dev-anywhere/config.json or pass --relay <name>.`;
     serviceLogger.error(msg);
     console.error(msg);
+    await flushLogger(serviceLogger);
     process.exit(1);
   }
   const relayConnection = new RelayConnection(relayUrl, {
@@ -4569,23 +4683,16 @@ async function startService(options) {
   });
   const relaySend = (data) => relayConnection.sendRaw(data);
   const controlHandlers = createControlMessageHandlers(relaySend, sessionManager);
-  const observerChangeState = (sessionId, next) => changeSessionState(sessionManager, relayConnection, sessionId, next);
-  const observerTouchActivity = (sessionId) => touchSessionActivity(sessionManager, relayConnection, sessionId);
-  const emitAgentStatus = (sessionId, phase) => {
-    const session = sessionManager.getSession(sessionId);
-    if (!session) return;
-    const payload = {
-      provider: session.provider,
-      phase,
-      seq: new SeqCounter(sessionId).next(),
-      updatedAt: Date.now()
-    };
-    agentStatusRegistry.set(sessionId, payload);
-    relayConnection.sendRaw(JSON.stringify({ type: "agent_status", sessionId, payload }));
-  };
+  const eventBridge = createEventBridge({
+    sessionManager,
+    relayConnection,
+    agentStatusRegistry,
+    controlHandlers,
+    permissionBroker
+  });
   const jsonObserver = new JsonObserver({
-    changeSessionState: observerChangeState,
-    emitAgentStatus
+    changeSessionState: eventBridge.changeSessionState,
+    emitAgentStatus: eventBridge.emitAgentStatus
   });
   const hookRuntime = await createProviderHookRuntime({
     hookPort: proxyConfig.hookPort,
@@ -4593,7 +4700,7 @@ async function startService(options) {
     sessionManager,
     relayConnection,
     agentStatusRegistry,
-    changeSessionState: observerChangeState
+    changeSessionState: eventBridge.changeSessionState
   });
   unregisterHookSession = (sessionId) => hookRuntime.hookRegistry.unregisterSession(sessionId);
   const workerRegistry = new WorkerRegistry({
@@ -4601,29 +4708,28 @@ async function startService(options) {
     permissionBroker,
     relayConnection,
     jsonObserver,
-    touchSessionActivity: observerTouchActivity,
+    touchSessionActivity: eventBridge.touchSessionActivity,
     getProviderEnv
   });
+  const ptyBridgeDeps = {
+    changeSessionState: eventBridge.changeSessionState,
+    getSession: (sessionId) => sessionManager.getSession(sessionId),
+    getPendingApprovalCount: (sessionId) => permissionBroker.listSession(sessionId).length,
+    resolveInterruptedApprovals: (sessionId) => resolveInterruptedApprovals(
+      permissionBroker,
+      hookRuntime.hookEventRouter,
+      relayConnection,
+      sessionId
+    ),
+    emitAgentStatus: eventBridge.emitAgentStatus
+  };
   const hostedPtyRegistry = new HostedPtyRegistry({
     sessionManager,
     relayConnection,
     getProviderEnv,
-    changeSessionState: observerChangeState,
-    touchSessionActivity: observerTouchActivity,
-    onTurnComplete: (sessionId) => {
-      resolveInterruptedApprovals(
-        permissionBroker,
-        hookRuntime.hookEventRouter,
-        relayConnection,
-        sessionId
-      );
-      emitAgentStatus(sessionId, "idle");
-    },
-    onSessionClosed: (sessionId) => {
-      controlHandlers.cleanup(sessionId);
-      agentStatusRegistry.delete(sessionId);
-      broadcastSessionList(relayConnection, sessionManager);
-    }
+    touchSessionActivity: eventBridge.touchSessionActivity,
+    applyPtyStateToSession: (sessionId, ptyState) => applyPtyStateToSession(ptyBridgeDeps, sessionId, ptyState),
+    onSessionClosed: eventBridge.cleanupSessionResources
   });
   relayConnection.connect();
   serviceLogger.info(
@@ -4660,7 +4766,12 @@ async function startService(options) {
   });
   relayConnection.on("message", (msg) => relayRouter.handle(msg));
   relayConnection.on("connected", () => {
-    controlHandlers.reinitializeOnReconnect();
+    void controlHandlers.reinitializeOnReconnect().catch((err) => {
+      serviceLogger.error(
+        { error: err instanceof Error ? err.message : String(err), stack: err instanceof Error ? err.stack : void 0 },
+        "reinitializeOnReconnect failed: client may see stale state until next manual sync"
+      );
+    });
     broadcastBridgeStatus(true);
   });
   relayConnection.on("disconnected", () => {
@@ -4685,7 +4796,8 @@ async function startService(options) {
       permissionBroker,
       hookEventRouter: hookRuntime.hookEventRouter,
       createHookContext: hookRuntime.createHookContext,
-      emitAgentStatus,
+      emitAgentStatus: eventBridge.emitAgentStatus,
+      cleanupSessionResources: eventBridge.cleanupSessionResources,
       config: statusConfig,
       resolveInterruptedApprovals: (sessionId) => resolveInterruptedApprovals(
         permissionBroker,
@@ -4696,41 +4808,36 @@ async function startService(options) {
     });
   });
   server.listen(SOCK_PATH, () => {
-    writeFileSync5(PID_PATH, String(process.pid));
+    writeFileSync3(PID_PATH, String(process.pid));
     chmodSync(SOCK_PATH, 384);
     serviceLogger.info({ pid: process.pid, sock: SOCK_PATH }, "Service started");
   });
-  async function shutdown() {
-    serviceLogger.info("Shutting down service");
-    sessionManager.stopReaper();
-    await hookRuntime.hookServer.close();
-    relayConnection.close();
-    workerRegistry.destroyAll();
-    hostedPtyRegistry.destroyAll();
-    server.close();
-    try {
-      unlinkSync3(SOCK_PATH);
-    } catch {
-    }
-    try {
-      unlinkSync3(PID_PATH);
-    } catch {
-    }
-    process.exit(0);
-  }
+  const shutdown = createServeShutdown({
+    logger: serviceLogger,
+    sessionManagerStopReaper: () => sessionManager.stopReaper(),
+    relayRouterDestroy: () => relayRouter.destroy(),
+    hookServerClose: () => hookRuntime.hookServer.close(),
+    relayConnectionClose: () => relayConnection.close(),
+    workerRegistryDestroyAll: () => workerRegistry.destroyAll(),
+    hostedPtyRegistryDestroyAll: () => hostedPtyRegistry.destroyAll(),
+    ipcServerClose: () => server.close(),
+    sockPath: SOCK_PATH,
+    pidPath: PID_PATH
+  });
   process.on("SIGTERM", () => {
-    shutdown();
+    void shutdown();
   });
   process.on("SIGINT", () => {
-    shutdown();
+    void shutdown();
   });
 }
 var isMainModule = process.argv[1] && (process.argv[1].endsWith("serve.js") || process.argv[1].endsWith("serve.ts"));
 if (isMainModule) {
-  startService(parseServiceOptions(process.argv.slice(2))).catch((err) => {
+  startService(parseServiceOptions(process.argv.slice(2))).catch(async (err) => {
     const message = err instanceof Error ? err.message : String(err);
     serviceLogger.error({ err: message }, "Service failed to start");
     console.error(message);
+    await flushLogger(serviceLogger);
     process.exit(1);
   });
 }