@karlorz/codexhost-cli-linux-x64 0.14.0-0 → 0.14.0-2

package/app/host-runtime.mjs

@@ -23314,7 +23314,7 @@ function retainRendererHostResponses(client, hostId2, target) {
   if (typeof client.addRequestLifecycleListener !== "function" || typeof target.addEventListener !== "function" || typeof target.removeEventListener !== "function")
     return () => {
     };
-  const isRecord21 = (value2) => typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+  const isRecord22 = (value2) => typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
   const pending = /* @__PURE__ */ new Set();
   let retired = false;
   let unsubscribe = () => {
@@ -23330,15 +23330,15 @@ function retainRendererHostResponses(client, hostId2, target) {
     const ownOrigin = target.location?.origin;
     if (source === target && ownOrigin && ownOrigin !== "null" && origin !== ownOrigin)
       return;
-    if (!isRecord21(data) || data.type !== "mcp-response" || data.hostId !== hostId2)
+    if (!isRecord22(data) || data.type !== "mcp-response" || data.hostId !== hostId2)
       return;
     const message2 = data.message;
-    if (!isRecord21(message2))
+    if (!isRecord22(message2))
       return;
     const id2 = message2.id;
     if (typeof id2 !== "string" && typeof id2 !== "number" || !pending.has(id2))
       return;
-    const hasError = isRecord21(message2.error);
+    const hasError = isRecord22(message2.error);
     if (!hasError && !Object.prototype.hasOwnProperty.call(message2, "result"))
       return;
     queueMicrotask(() => {
@@ -23352,7 +23352,7 @@ function retainRendererHostResponses(client, hostId2, target) {
   };
   target.addEventListener("message", receive);
   unsubscribe = client.addRequestLifecycleListener((event) => {
-    if (!isRecord21(event) || event.hostId !== hostId2)
+    if (!isRecord22(event) || event.hostId !== hostId2)
       return;
     const id2 = event.id;
     if (typeof id2 !== "string" && typeof id2 !== "number")
@@ -23382,13 +23382,13 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
   let selectedModel = null;
   let prewarmGeneration = 0;
   const externalPrewarms = /* @__PURE__ */ new Set();
-  const isRecord21 = (value2) => typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+  const isRecord22 = (value2) => typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
   const isUnsupportedPosixBridgeSpawn = (value2) => {
     const marker = "AbsolutePathBuf deserialized without a base path";
     if (typeof value2 === "string") {
       return value2.startsWith("Invalid request:") && value2.includes(marker);
     }
-    if (!isRecord21(value2))
+    if (!isRecord22(value2))
       return false;
     if (typeof value2.message === "string" && value2.message.includes(marker)) {
       if (value2.code === -32600 || value2.message.startsWith("Invalid request:"))
@@ -23481,7 +23481,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     bridgeState = "idle";
   };
   const rememberExternalThread = (value2) => {
-    if (!isRecord21(value2) || typeof value2.id !== "string")
+    if (!isRecord22(value2) || typeof value2.id !== "string")
       return;
     if (value2.modelProvider === "codexhost" || value2.cliVersion === "codexhost") {
       knownExternalThreadIds.add(value2.id);
@@ -23489,7 +23489,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     }
   };
   const observeBridgeResult = (request, result) => {
-    if (!request || !isRecord21(result))
+    if (!request || !isRecord22(result))
       return;
     if (request.method === "thread/list" && Array.isArray(result.data)) {
       for (const thread of result.data)
@@ -23500,7 +23500,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
       rememberExternalThread(result.thread);
       return;
     }
-    if (request.method === "codexhost/thread/inspect" && isRecord21(request.parameters) && typeof request.parameters.threadId === "string") {
+    if (request.method === "codexhost/thread/inspect" && isRecord22(request.parameters) && typeof request.parameters.threadId === "string") {
       if (result.owner === "external") {
         knownExternalThreadIds.add(request.parameters.threadId);
         knownOfficialThreadIds.delete(request.parameters.threadId);
@@ -23510,18 +23510,18 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
       }
       return;
     }
-    if (request.method === "thread/delete" && isRecord21(request.parameters) && typeof request.parameters.threadId === "string") {
+    if (request.method === "thread/delete" && isRecord22(request.parameters) && typeof request.parameters.threadId === "string") {
       knownExternalThreadIds.delete(request.parameters.threadId);
       knownOfficialThreadIds.delete(request.parameters.threadId);
     }
   };
   const handleBridgeFrame = (value2) => {
-    if (!isRecord21(value2)) {
+    if (!isRecord22(value2)) {
       failBridge("received a non-object app-server frame");
       return;
     }
     if (value2.method === bridgeReadyMethod && value2.id === void 0) {
-      if (isRecord21(value2.params) && value2.params.protocolVersion === 1) {
+      if (isRecord22(value2.params) && value2.params.protocolVersion === 1) {
         bridgeState = "ready";
         if (bridgeReadyTimeout !== null)
           globalThis.clearTimeout(bridgeReadyTimeout);
@@ -23535,7 +23535,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
       return;
     }
     if (typeof value2.method === "string" && value2.id === void 0) {
-      if (value2.method === "thread/started" && isRecord21(value2.params)) {
+      if (value2.method === "thread/started" && isRecord22(value2.params)) {
         rememberExternalThread(value2.params.thread);
       }
       originalOnNotification.call(manager, value2.method, value2.params);
@@ -23586,13 +23586,13 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     }
   };
   const handleOuterNotification = (method, parameters) => {
-    if (method === "process/exited" && isRecord21(parameters) && parameters.processHandle === bridgeProcessHandle) {
+    if (method === "process/exited" && isRecord22(parameters) && parameters.processHandle === bridgeProcessHandle) {
       const exitCode = typeof parameters.exitCode === "number" ? parameters.exitCode : "unknown";
       const stderr = typeof parameters.stderr === "string" ? parameters.stderr.trim() : "";
       failBridge(`process exited unexpectedly with code ${exitCode}${stderr ? `: ${stderr}` : ""}`, false);
       return true;
     }
-    if (method !== "process/outputDelta" || !isRecord21(parameters) || parameters.processHandle !== bridgeProcessHandle || parameters.stream !== "stdout" && parameters.stream !== "stderr" || typeof parameters.deltaBase64 !== "string") {
+    if (method !== "process/outputDelta" || !isRecord22(parameters) || parameters.processHandle !== bridgeProcessHandle || parameters.stream !== "stdout" && parameters.stream !== "stderr" || typeof parameters.deltaBase64 !== "string") {
       return false;
     }
     if (parameters.capReached === true) {
@@ -23696,7 +23696,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     return bridgeInitialization;
   };
   const threadIdFromParameters = (parameters) => {
-    if (!isRecord21(parameters))
+    if (!isRecord22(parameters))
       return null;
     const value2 = parameters.threadId ?? parameters.conversationId;
     return typeof value2 === "string" ? value2 : null;
@@ -23713,9 +23713,9 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     const resolution = initializeBridge().then(() => enqueueBridgeRequest("codexhost/thread/ownership/list", {
       threadIds: [threadId2]
     })).then((value2) => {
-      const ownerships = isRecord21(value2) && Array.isArray(value2.threads) ? value2.threads : null;
+      const ownerships = isRecord22(value2) && Array.isArray(value2.threads) ? value2.threads : null;
       const ownership = ownerships?.[0];
-      if (!ownerships || !isRecord21(ownership) || ownerships.length !== 1 || ownership.threadId !== threadId2 || ownership.owner !== "external" && ownership.owner !== "codex") {
+      if (!ownerships || !isRecord22(ownership) || ownerships.length !== 1 || ownership.threadId !== threadId2 || ownership.owner !== "external" && ownership.owner !== "codex") {
         throw transportError("Thread ownership lookup returned an invalid result");
       }
       if (ownership.owner === "external") {
@@ -23754,7 +23754,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     if (method === "thread/list")
       return true;
     if (method === "thread/start") {
-      return isRecord21(parameters) && typeof parameters.model === "string" && parameters.model.startsWith("codexhost/");
+      return isRecord22(parameters) && typeof parameters.model === "string" && parameters.model.startsWith("codexhost/");
     }
     const threadId2 = threadIdFromParameters(parameters);
     if (threadId2 && knownExternalThreadIds.has(threadId2))
@@ -23764,7 +23764,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     return selectedModel !== null && (method.startsWith("thread/") || method.startsWith("turn/") || method.startsWith("review/"));
   };
   const routeThreadStart = (parameters) => {
-    if (!isRecord21(parameters) || parameters.ephemeral === true) {
+    if (!isRecord22(parameters) || parameters.ephemeral === true) {
       return parameters;
     }
     return {
@@ -23797,12 +23797,12 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
     return shouldUseBridge(method, routedParameters) ? sendBridged() : sendDirect();
   };
   const publishDraftWorkspace = (parameters) => {
-    if (!isRecord21(parameters) || parameters.ephemeral === true)
+    if (!isRecord22(parameters) || parameters.ephemeral === true)
       return;
     const cwd = parameters.cwd;
     if (typeof cwd !== "string" || cwd.length === 0)
       return;
-    const drafts = isRecord21(target.__codexhostDraftWorkspacesV1) ? target.__codexhostDraftWorkspacesV1 : {};
+    const drafts = isRecord22(target.__codexhostDraftWorkspacesV1) ? target.__codexhostDraftWorkspacesV1 : {};
     drafts[hostId2] = cwd;
     Object.defineProperty(target, "__codexhostDraftWorkspacesV1", {
       configurable: true,
@@ -23825,16 +23825,16 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
   };
   const routedPrewarm = (parameters, options2) => {
     const routed = routeThreadStart(parameters);
-    const external = isRecord21(routed) && routed.ephemeral !== true && typeof routed.model === "string" && routed.model.startsWith("codexhost/");
+    const external = isRecord22(routed) && routed.ephemeral !== true && typeof routed.model === "string" && routed.model.startsWith("codexhost/");
     const routedParameters = external ? { ...routed, codexhostPrewarm: true } : routed;
     const generation = prewarmGeneration;
     publishDraftWorkspace(routedParameters);
     const pending = shouldUseBridge("thread/start", routedParameters) ? routedSend("thread/start", routedParameters, options2) : options2 === void 0 ? originalPrewarm.call(bridge, routedParameters) : originalPrewarm.call(bridge, routedParameters, options2);
-    if (isRecord21(parameters) && parameters.ephemeral === true || typeof pending !== "object" && typeof pending !== "function" || pending === null || typeof Reflect.get(pending, "then") !== "function") {
+    if (isRecord22(parameters) && parameters.ephemeral === true || typeof pending !== "object" && typeof pending !== "function" || pending === null || typeof Reflect.get(pending, "then") !== "function") {
       return pending;
     }
     return Promise.resolve(pending).then((result) => {
-      const threadId2 = external && isRecord21(result) && isRecord21(result.thread) && typeof result.thread.id === "string" ? result.thread.id : null;
+      const threadId2 = external && isRecord22(result) && isRecord22(result.thread) && typeof result.thread.id === "string" ? result.thread.id : null;
       if (disposed || generation !== prewarmGeneration) {
         if (threadId2)
           discardExternalPrewarm(threadId2);
@@ -23850,7 +23850,7 @@ function createDraftPrewarmPolicyBridge(manager, bridge, hostId2, target, prewar
   bridge.prewarmThreadStart = routedPrewarm;
   const routedWindowMessage = (event) => {
     const message2 = event.data;
-    if (!isRecord21(message2) || message2.type !== "mcp-notification" || message2.hostId !== hostId2 || typeof message2.method !== "string") {
+    if (!isRecord22(message2) || message2.type !== "mcp-notification" || message2.hostId !== hostId2 || typeof message2.method !== "string") {
       return;
     }
     handleOuterNotification(message2.method, message2.params);
@@ -32428,7 +32428,7 @@ var HarnessAccountInspectionCache = class {
 };
 
 // packages/host-runtime/src/app-server-host.ts
-import { createHash as createHash9, randomUUID as randomUUID18 } from "node:crypto";
+import { createHash as createHash9, randomUUID as randomUUID19 } from "node:crypto";
 import os9 from "node:os";
 import path28 from "node:path";
 
@@ -40063,13 +40063,106 @@ async function moveThreadSection(input) {
 // packages/host-runtime/src/external-thread-official-defaults.ts
 var EMPTY_RESULTS = /* @__PURE__ */ new Map([
   ["thread/attachment/list", () => ({ data: [], nextCursor: null })],
-  ["thread/queue/list", () => ({ data: [], nextCursor: null })],
   ["thread/settings/update", () => ({})]
 ]);
 function externalThreadEmptyOfficialResult(method) {
   return EMPTY_RESULTS.get(method)?.();
 }
 
+// packages/host-runtime/src/external-thread-follow-up-queue.ts
+import { randomUUID as randomUUID18 } from "node:crypto";
+function isRecord20(value2) {
+  return value2 !== null && typeof value2 === "object" && !Array.isArray(value2);
+}
+function queuedSubmissionText(input) {
+  return input.filter(isRecord20).map((item) => item.text).filter((value2) => typeof value2 === "string" && value2.length > 0).join("\n");
+}
+function queuedSubmissionInput(input) {
+  return input.map((entry) => {
+    if (!isRecord20(entry) || typeof entry.text !== "string" || entry.text.length === 0) {
+      return entry;
+    }
+    if (entry.type === "input_text") {
+      return {
+        type: "text",
+        text: entry.text,
+        text_elements: Array.isArray(entry.text_elements) ? entry.text_elements : []
+      };
+    }
+    if (entry.type !== "text" || Array.isArray(entry.text_elements)) return entry;
+    return { ...entry, text_elements: [] };
+  });
+}
+var ExternalThreadFollowUpQueue = class {
+  #threads = /* @__PURE__ */ new Map();
+  list(threadId2) {
+    return { data: [...this.#threads.get(threadId2) ?? []], nextCursor: null };
+  }
+  add(threadId2, input, clientUserMessageId) {
+    const item = {
+      id: randomUUID18(),
+      clientUserMessageId: clientUserMessageId?.trim() || randomUUID18(),
+      input: queuedSubmissionInput(input)
+    };
+    const items = this.#threads.get(threadId2) ?? [];
+    items.push(item);
+    this.#threads.set(threadId2, items);
+    return item;
+  }
+  update(threadId2, id2, input) {
+    const item = this.#threads.get(threadId2)?.find((entry) => entry.id === id2);
+    if (!item) return void 0;
+    item.input = queuedSubmissionInput(input);
+    return item;
+  }
+  delete(threadId2, id2) {
+    const items = this.#threads.get(threadId2);
+    if (!items) return false;
+    const next = items.filter((entry) => entry.id !== id2);
+    if (next.length === items.length) return false;
+    if (next.length === 0) this.#threads.delete(threadId2);
+    else this.#threads.set(threadId2, next);
+    return true;
+  }
+  reorder(threadId2, ids) {
+    const items = this.#threads.get(threadId2);
+    if (!items) return false;
+    const remaining = new Map(items.map((entry) => [entry.id, entry]));
+    const next = [];
+    for (const id2 of ids) {
+      const item = remaining.get(id2);
+      if (!item) return false;
+      next.push(item);
+      remaining.delete(id2);
+    }
+    next.push(...remaining.values());
+    this.#threads.set(threadId2, next);
+    return true;
+  }
+  peek(threadId2, id2) {
+    const items = this.#threads.get(threadId2);
+    if (!items?.length) return void 0;
+    return id2 ? items.find((entry) => this.#matches(entry, id2)) : items[0];
+  }
+  take(threadId2, id2) {
+    const items = this.#threads.get(threadId2);
+    if (!items?.length) return void 0;
+    const index = id2 ? items.findIndex((entry) => this.#matches(entry, id2)) : 0;
+    if (index < 0) return void 0;
+    const [item] = items.splice(index, 1);
+    if (items.length === 0) this.#threads.delete(threadId2);
+    return item;
+  }
+  restore(threadId2, item) {
+    const items = this.#threads.get(threadId2) ?? [];
+    items.unshift(item);
+    this.#threads.set(threadId2, items);
+  }
+  #matches(entry, id2) {
+    return entry.id === id2 || entry.clientUserMessageId === id2;
+  }
+};
+
 // packages/host-runtime/src/observed-session-usage.ts
 var ObservedSessionUsage = class {
   constructor(providers, prices, diagnose) {
@@ -40229,14 +40322,14 @@ var THREAD_USAGE_UPDATED_METHOD = "codexhost/thread/usage/updated";
 function delay5(milliseconds) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
-function isRecord20(value2) {
+function isRecord21(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function officialThreadBusy(thread) {
-  if (thread && isRecord20(thread.status) && thread.status.type === "active") return true;
+  if (thread && isRecord21(thread.status) && thread.status.type === "active") return true;
   const turns = thread && Array.isArray(thread.turns) ? thread.turns : [];
   const latestTurn = turns.at(-1);
-  return isRecord20(latestTurn) && (latestTurn.status === "inProgress" || latestTurn.status === "running");
+  return isRecord21(latestTurn) && (latestTurn.status === "inProgress" || latestTurn.status === "running");
 }
 function errorMessage4(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
@@ -40343,15 +40436,15 @@ function classifyCreateRequestRoute(request) {
   };
 }
 function routingParams(request) {
-  return isRecord20(request.params) ? request.params : {};
+  return isRecord21(request.params) ? request.params : {};
 }
 function requestObject(request) {
-  if (!isRecord20(request.params)) throw new Error(`${request.method} params must be an object`);
+  if (!isRecord21(request.params)) throw new Error(`${request.method} params must be an object`);
   return request.params;
 }
 function requestText(params) {
   if (!Array.isArray(params.input)) throw new Error("turn/start input must be an array");
-  const text = params.input.filter((item) => isRecord20(item) && item.type === "text").map((item) => item.text).filter((value2) => typeof value2 === "string").join("\n");
+  const text = queuedSubmissionText(params.input);
   if (!text) throw new Error("turn/start must contain text input");
   return text;
 }
@@ -40404,6 +40497,7 @@ var AppServerHost = class {
   #executionHosts = /* @__PURE__ */ new WeakMap();
   #externalPrewarms = new ExternalThreadPrewarms();
   #externalSteering = new ExternalTurnSteering();
+  #followUps = new ExternalThreadFollowUpQueue();
   #nativeVoiceGateway;
   #externalVoice;
   #externalVoiceResults = new ExternalVoiceResults(
@@ -40435,7 +40529,7 @@ var AppServerHost = class {
   #sectionMoves = Promise.resolve();
   #writer;
   /** Console requests share Desktop handling; their replies return to the console. */
-  #consoleRequestPrefix = `codexhost-console:${randomUUID18()}:`;
+  #consoleRequestPrefix = `codexhost-console:${randomUUID19()}:`;
   #consoleReplies = /* @__PURE__ */ new Map();
   #nextConsoleRequest = 0;
   #subagentThreadStatuses = /* @__PURE__ */ new Map();
@@ -40793,19 +40887,19 @@ var AppServerHost = class {
     for (const resolve of waiters) resolve();
   }
   #observeOfficialTurnStartResponse(value2) {
-    if (!isRecord20(value2) || !("id" in value2)) return;
+    if (!isRecord21(value2) || !("id" in value2)) return;
     const threadId2 = this.#pendingOfficialTurnStarts.get(value2.id);
     if (!threadId2) return;
     this.#pendingOfficialTurnStarts.delete(value2.id);
-    const result = isRecord20(value2.result) ? value2.result : null;
-    const turn = result && isRecord20(result.turn) ? result.turn : null;
+    const result = isRecord21(value2.result) ? value2.result : null;
+    const turn = result && isRecord21(result.turn) ? result.turn : null;
     if (turn && typeof turn.id === "string") {
       this.#activeOfficialTurns.set(threadId2, turn.id);
     }
     this.#signalActiveWorkChanged();
   }
   #takeConsoleReply(value2) {
-    if (!isRecord20(value2) || typeof value2.id !== "string") return false;
+    if (!isRecord21(value2) || typeof value2.id !== "string") return false;
     const reply2 = this.#consoleReplies.get(value2.id);
     if (!reply2) return false;
     this.#consoleReplies.delete(value2.id);
@@ -40851,10 +40945,10 @@ var AppServerHost = class {
     );
     try {
       const message2 = await reply2;
-      if (isRecord20(message2) && "result" in message2) {
+      if (isRecord21(message2) && "result" in message2) {
         return { result: message2.result ?? null };
       }
-      const error51 = isRecord20(message2) && isRecord20(message2.error) ? message2.error : void 0;
+      const error51 = isRecord21(message2) && isRecord21(message2.error) ? message2.error : void 0;
       return {
         error: {
           code: typeof error51?.code === "number" ? error51.code : -32603,
@@ -40880,7 +40974,7 @@ var AppServerHost = class {
         this.#diagnose(error51);
         continue;
       }
-      if (isRecord20(parsed2) && parsed2.method === "initialized" && !("id" in parsed2)) {
+      if (isRecord21(parsed2) && parsed2.method === "initialized" && !("id" in parsed2)) {
         continue;
       }
       if (await this.#handleDesktopApprovalResponse(parsed2)) continue;
@@ -40902,7 +40996,7 @@ var AppServerHost = class {
           const options2 = this.#observedSessionUsage.requestOptions("initialize", params);
           const nativeParams = options2 ? { ...params, ...options2 } : params;
           const response = await this.#officialRuntime.initializeProtocol(nativeParams);
-          if (!isRecord20(response.error)) this.#observedSessionUsage.initialized(nativeParams);
+          if (!isRecord21(response.error)) this.#observedSessionUsage.initialized(nativeParams);
           await this.#writer.json({ ...response, id: request.id });
           this.#nativeAccountObserver?.initialized(nativeGeneration);
         } catch (error51) {
@@ -40910,7 +41004,7 @@ var AppServerHost = class {
         }
         continue;
       }
-      const threadId2 = isRecord20(request.params) && typeof request.params.threadId === "string" ? request.params.threadId : void 0;
+      const threadId2 = isRecord21(request.params) && typeof request.params.threadId === "string" ? request.params.threadId : void 0;
       this.#dispatchDesktopRequest(
         () => this.#desktopRequests.run(
           threadId2,
@@ -40958,7 +41052,7 @@ var AppServerHost = class {
     for (const guard of this.#replyGuards.get(id2) ?? []) guard.answered = true;
   }
   #noteDesktopReply(value2) {
-    if (isRecord20(value2) && "id" in value2 && !("method" in value2)) {
+    if (isRecord21(value2) && "id" in value2 && !("method" in value2)) {
       this.#markDesktopRequestAnswered(value2.id);
     }
   }
@@ -41537,7 +41631,7 @@ var AppServerHost = class {
       return;
     }
     if (request.method === "thread/fork") {
-      const params = isRecord20(request.params) ? request.params : {};
+      const params = isRecord21(request.params) ? request.params : {};
       const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
       if (resolution.kind === "error") {
         await this.#writer.json(rpcError(request, resolution.error.code, resolution.error.message));
@@ -41558,7 +41652,7 @@ var AppServerHost = class {
       }
     }
     if (request.method === "thread/revert") {
-      const params = isRecord20(request.params) ? request.params : {};
+      const params = isRecord21(request.params) ? request.params : {};
       const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
       if (resolution.kind === "error") {
         await this.#writer.json(rpcError(request, resolution.error.code, resolution.error.message));
@@ -41579,7 +41673,7 @@ var AppServerHost = class {
       }
     }
     if (request.method === "thread/rollback") {
-      const params = isRecord20(request.params) ? request.params : {};
+      const params = isRecord21(request.params) ? request.params : {};
       const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
       if (resolution.kind === "error") {
         await this.#writer.json(rpcError(request, resolution.error.code, resolution.error.message));
@@ -41638,6 +41732,24 @@ var AppServerHost = class {
         this.#pendingOfficialTurnStarts.set(request.id, threadId2);
       }
     }
+    if (request.method.startsWith("thread/queue/")) {
+      const params = routingParams(request);
+      const threadId2 = params.threadId;
+      const resolution = typeof threadId2 === "string" ? await this.#resolveExternalThread(threadId2) : { kind: "official" };
+      if (await this.#writeResolutionError(request, resolution)) return;
+      if (resolution.kind === "external") {
+        if (request.method === "thread/queue/start") {
+          this.#dispatchDesktopReply(
+            request,
+            () => this.#startExternalQueuedTurn(request, resolution.thread),
+            resolution.thread.id
+          );
+          return;
+        }
+        await this.#handleExternalQueueMutation(request, resolution.thread);
+        return;
+      }
+    }
     if (request.method === "turn/steer") {
       const params = routingParams(request);
       const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
@@ -41737,7 +41849,7 @@ var AppServerHost = class {
         return;
       }
     }
-    if (request.method === "thread/backgroundTerminals/clean" && isRecord20(request.params) && typeof request.params.threadId === "string") {
+    if (request.method === "thread/backgroundTerminals/clean" && isRecord21(request.params) && typeof request.params.threadId === "string") {
       const location = await this.#locateExternalThread(request.params.threadId);
       if (await this.#writeResolutionError(request, location)) return;
       if (location.kind === "external") {
@@ -41745,7 +41857,7 @@ var AppServerHost = class {
         return;
       }
     }
-    if (request.method.startsWith("thread/realtime/") && isRecord20(request.params) && typeof request.params.threadId === "string") {
+    if (request.method.startsWith("thread/realtime/") && isRecord21(request.params) && typeof request.params.threadId === "string") {
       const resolution = await this.#resolveExternalThread(request.params.threadId);
       if (await this.#writeResolutionError(request, resolution)) return;
       if (resolution.kind === "external") {
@@ -41757,7 +41869,7 @@ var AppServerHost = class {
         return;
       }
     }
-    if (request.method.startsWith("thread/") && !EXPLICIT_EXTERNAL_THREAD_METHODS.has(request.method) && isRecord20(request.params) && typeof request.params.threadId === "string") {
+    if (request.method.startsWith("thread/") && !EXPLICIT_EXTERNAL_THREAD_METHODS.has(request.method) && isRecord21(request.params) && typeof request.params.threadId === "string") {
       const location = await this.#locateExternalThread(request.params.threadId);
       if (await this.#writeResolutionError(request, location)) return;
       if (location.kind === "external") {
@@ -41776,10 +41888,10 @@ var AppServerHost = class {
   /** Native Codex Turns: turn `#` delegation chips into an explicit Skill-backed request. */
   async #rewriteOfficialDelegationMentions(request, frame) {
     if (request.method !== "turn/start" && request.method !== "turn/steer") return frame;
-    if (!isRecord20(request.params) || !Array.isArray(request.params.input)) return frame;
+    if (!isRecord21(request.params) || !Array.isArray(request.params.input)) return frame;
     const input = request.params.input;
     if (!input.some(
-      (item) => isRecord20(item) && typeof item.text === "string" && item.text.includes(DELEGATION_MENTION_PATH_PREFIX)
+      (item) => isRecord21(item) && typeof item.text === "string" && item.text.includes(DELEGATION_MENTION_PATH_PREFIX)
     )) {
       return frame;
     }
@@ -41792,7 +41904,7 @@ var AppServerHost = class {
   }
   async #forwardOfficialNonRequest(value2, frame) {
     if (this.#options.externalOnly) return;
-    const response = isRecord20(value2) ? value2 : null;
+    const response = isRecord21(value2) ? value2 : null;
     const request = response && (typeof response.id === "string" || typeof response.id === "number") ? this.#officialServerRequests.get(response.id) : null;
     if (request !== void 0 && response) {
       this.#officialServerRequests.delete(response.id);
@@ -41812,13 +41924,13 @@ var AppServerHost = class {
       return;
     }
     try {
-      const options2 = isRecord20(request.params) ? this.#observedSessionUsage.requestOptions(request.method, request.params) : null;
+      const options2 = isRecord21(request.params) ? this.#observedSessionUsage.requestOptions(request.method, request.params) : null;
       if (options2) {
         const original = parseJsonFrame(frame);
-        if (isRecord20(original))
+        if (isRecord21(original))
           frame = encodeJsonFrame({
             ...original,
-            params: { ...isRecord20(original.params) ? original.params : {}, ...options2 }
+            params: { ...isRecord21(original.params) ? original.params : {}, ...options2 }
           });
       }
       await this.#officialRuntime.sendFrame(frame);
@@ -41842,7 +41954,7 @@ var AppServerHost = class {
     const observedAtMs = Date.now();
     this.#observeOfficialTurnStartResponse(parsed2);
     let forwarded = parsed2;
-    if (isRecord20(parsed2) && typeof parsed2.method === "string" && "id" in parsed2) {
+    if (isRecord21(parsed2) && typeof parsed2.method === "string" && "id" in parsed2) {
       const originalId = parsed2.id;
       if (typeof originalId === "string" || typeof originalId === "number") {
         const forwardedId = `codexhost:official:${++this.#nextOfficialServerRequestId}`;
@@ -41850,7 +41962,7 @@ var AppServerHost = class {
         forwarded = { ...parsed2, id: forwardedId };
       }
     }
-    const accountScopedNotification = isRecord20(parsed2) && typeof parsed2.method === "string" && (parsed2.method === "account/updated" || parsed2.method.startsWith("account/rateLimits/"));
+    const accountScopedNotification = isRecord21(parsed2) && typeof parsed2.method === "string" && (parsed2.method === "account/updated" || parsed2.method.startsWith("account/rateLimits/"));
     if (accountScopedNotification) {
       if (parsed2.method === "account/updated") this.#officialRateLimits.reset(input.accountId);
     }
@@ -41862,7 +41974,7 @@ var AppServerHost = class {
       this.#diagnose(error51);
     }
     this.#routeObservationTracker.bindOfficialResponse(parsed2);
-    const privateTelemetry = isRecord20(parsed2) && typeof parsed2.method === "string" && !("id" in parsed2) && !this.#observedSessionUsage.shouldForwardNotification(parsed2);
+    const privateTelemetry = isRecord21(parsed2) && typeof parsed2.method === "string" && !("id" in parsed2) && !this.#observedSessionUsage.shouldForwardNotification(parsed2);
     if (!privateTelemetry) {
       if (forwarded === parsed2) await this.#writer.frame(input.frame);
       else await this.#writer.json(forwarded);
@@ -41928,10 +42040,10 @@ var AppServerHost = class {
     }
   }
   async #observeOfficialTurnLifecycle(value2) {
-    if (!isRecord20(value2) || !isRecord20(value2.params)) return;
+    if (!isRecord21(value2) || !isRecord21(value2.params)) return;
     const params = value2.params;
     if (value2.method === "turn/started" && typeof params.threadId === "string") {
-      const turn = isRecord20(params.turn) ? params.turn : null;
+      const turn = isRecord21(params.turn) ? params.turn : null;
       if (turn && typeof turn.id === "string") {
         this.#forgetPendingOfficialTurnStarts(params.threadId);
         this.#activeOfficialTurns.set(params.threadId, turn.id);
@@ -41944,7 +42056,7 @@ var AppServerHost = class {
       const delegation = await this.#repository.getDelegationByChild(
         hostThreadIdSchema.parse(params.threadId)
       );
-      const turn = isRecord20(params.turn) ? params.turn : null;
+      const turn = isRecord21(params.turn) ? params.turn : null;
       const status2 = turn?.status === "failed" ? "failed" : turn?.status === "interrupted" || turn?.status === "cancelled" ? "interrupted" : "completed";
       if (this.#pendingOfficialDelegationThreads.has(params.threadId)) {
         this.#pendingOfficialTerminalStatuses.set(params.threadId, status2);
@@ -41977,9 +42089,9 @@ var AppServerHost = class {
   }
   async #readOfficialThreadMetadata(threadId2) {
     const response = await this.#requestOfficial("thread/read", { threadId: threadId2, includeTurns: false });
-    if (isRecord20(response.error)) return {};
-    const result = isRecord20(response.result) ? response.result : null;
-    const thread = result && isRecord20(result.thread) ? result.thread : null;
+    if (isRecord21(response.error)) return {};
+    const result = isRecord21(response.result) ? response.result : null;
+    const thread = result && isRecord21(result.thread) ? result.thread : null;
     if (!thread) return {};
     const title = typeof thread.name === "string" && thread.name.trim() ? thread.name : thread.preview;
     return {
@@ -41989,21 +42101,21 @@ var AppServerHost = class {
   }
   async #inspectOfficialDelegationTarget(input) {
     const response = await this.#requestOfficial("model/list", {});
-    if (isRecord20(response.error)) {
+    if (isRecord21(response.error)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         typeof response.error.message === "string" ? response.error.message : "Official Model catalog could not be read"
       );
     }
-    const result = isRecord20(response.result) ? response.result : null;
+    const result = isRecord21(response.result) ? response.result : null;
     const data = result && Array.isArray(result.data) ? result.data : [];
     const thinkingById = /* @__PURE__ */ new Map();
     const models = data.flatMap((candidate) => {
-      if (!isRecord20(candidate) || typeof candidate.model !== "string" || !candidate.model.trim()) {
+      if (!isRecord21(candidate) || typeof candidate.model !== "string" || !candidate.model.trim()) {
         return [];
       }
       const supportedThinkingOptionIds = Array.isArray(candidate.supportedReasoningEfforts) ? candidate.supportedReasoningEfforts.flatMap((option) => {
-        if (!isRecord20(option) || typeof option.reasoningEffort !== "string" || !option.reasoningEffort.trim()) {
+        if (!isRecord21(option) || typeof option.reasoningEffort !== "string" || !option.reasoningEffort.trim()) {
           return [];
         }
         const id2 = harnessThinkingOptionIdSchema.safeParse(option.reasoningEffort);
@@ -42023,9 +42135,9 @@ var AppServerHost = class {
       ];
     });
     const defaultEntry = data.find(
-      (candidate) => isRecord20(candidate) && candidate.isDefault === true
+      (candidate) => isRecord21(candidate) && candidate.isDefault === true
     );
-    const defaultModel = isRecord20(defaultEntry) && typeof defaultEntry.model === "string" ? encodeOfficialCodexModelRef(defaultEntry.model) : void 0;
+    const defaultModel = isRecord21(defaultEntry) && typeof defaultEntry.model === "string" ? encodeOfficialCodexModelRef(defaultEntry.model) : void 0;
     return {
       harnessId: input.harnessId,
       inspection: {
@@ -42131,8 +42243,8 @@ var AppServerHost = class {
       ephemeral: false,
       historyMode: "paginated"
     });
-    const startedResult = isRecord20(started.result) ? started.result : null;
-    const thread = startedResult && isRecord20(startedResult.thread) ? startedResult.thread : null;
+    const startedResult = isRecord21(started.result) ? started.result : null;
+    const thread = startedResult && isRecord21(startedResult.thread) ? startedResult.thread : null;
     const threadId2 = thread && typeof thread.id === "string" ? thread.id : null;
     if (!threadId2) throw new Error("Official thread/start returned no Thread identity");
     this.#pendingOfficialDelegationThreads.add(threadId2);
@@ -42147,8 +42259,8 @@ var AppServerHost = class {
         ...nativeModelId ? { model: nativeModelId } : {},
         ...input.thinkingOptionId ? { effort: input.thinkingOptionId } : {}
       });
-      const turnResult = isRecord20(turn.result) ? turn.result : null;
-      const turnValue = turnResult && isRecord20(turnResult.turn) ? turnResult.turn : null;
+      const turnResult = isRecord21(turn.result) ? turn.result : null;
+      const turnValue = turnResult && isRecord21(turnResult.turn) ? turnResult.turn : null;
       const parsedTurnId = turnValue && typeof turnValue.id === "string" ? turnValue.id : null;
       if (!parsedTurnId) throw new Error("Official turn/start returned no Turn identity");
       turnId = parsedTurnId;
@@ -42159,7 +42271,7 @@ var AppServerHost = class {
       throw error51;
     }
     this.#activeOfficialTurns.set(threadId2, turnId);
-    const delegationId = hostThreadIdSchema.parse(randomUUID18());
+    const delegationId = hostThreadIdSchema.parse(randomUUID19());
     try {
       const source = await this.#repository.find(input.parentThreadId);
       const pendingTerminal = this.#pendingOfficialTerminalStatuses.get(threadId2);
@@ -42218,11 +42330,11 @@ var AppServerHost = class {
       threadId: input.threadId,
       includeTurns: true
     });
-    if (isRecord20(current.error)) throw officialThreadReadError(current.error);
-    if (!isRecord20(current.result)) {
+    if (isRecord21(current.error)) throw officialThreadReadError(current.error);
+    if (!isRecord21(current.result)) {
       throw new DelegationControlError("INTERNAL_ERROR", "Official Thread read returned no result");
     }
-    const currentThread = isRecord20(current.result.thread) ? current.result.thread : null;
+    const currentThread = isRecord21(current.result.thread) ? current.result.thread : null;
     if (officialThreadBusy(currentThread)) {
       throw new DelegationControlError("THREAD_BUSY", "Thread already has an active Turn");
     }
@@ -42230,14 +42342,14 @@ var AppServerHost = class {
       threadId: input.threadId,
       excludeTurns: true
     });
-    if (isRecord20(resumed.error) || !isRecord20(resumed.result)) {
+    if (isRecord21(resumed.error) || !isRecord21(resumed.result)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
-        isRecord20(resumed.error) && typeof resumed.error.message === "string" ? resumed.error.message : "Official Thread resume failed",
+        isRecord21(resumed.error) && typeof resumed.error.message === "string" ? resumed.error.message : "Official Thread resume failed",
         { notStarted: true }
       );
     }
-    const resumedThread = isRecord20(resumed.result.thread) ? resumed.result.thread : null;
+    const resumedThread = isRecord21(resumed.result.thread) ? resumed.result.thread : null;
     if (!resumedThread || resumedThread.id !== input.threadId) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
@@ -42248,7 +42360,7 @@ var AppServerHost = class {
     if (officialThreadBusy(resumedThread)) {
       throw new DelegationControlError("THREAD_BUSY", "Thread already has an active Turn");
     }
-    if (!isRecord20(resumedThread.status) || resumedThread.status.type !== "idle") {
+    if (!isRecord21(resumedThread.status) || resumedThread.status.type !== "idle") {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         "Official Thread is not idle after resume",
@@ -42259,15 +42371,15 @@ var AppServerHost = class {
       threadId: input.threadId,
       input: [{ type: "text", text: input.message }]
     });
-    if (isRecord20(response.error)) {
+    if (isRecord21(response.error)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         typeof response.error.message === "string" ? response.error.message : "Turn start failed",
         { notStarted: true }
       );
     }
-    const result = isRecord20(response.result) ? response.result : null;
-    const turn = result && isRecord20(result.turn) ? result.turn : null;
+    const result = isRecord21(response.result) ? response.result : null;
+    const turn = result && isRecord21(result.turn) ? result.turn : null;
     const turnId = turn && typeof turn.id === "string" ? turn.id : null;
     if (!turnId) throw new Error("Official turn/start returned no Turn identity");
     this.#activeOfficialTurns.set(input.threadId, turnId);
@@ -42289,13 +42401,13 @@ var AppServerHost = class {
         threadId: input.threadId,
         includeTurns: true
       });
-      if (isRecord20(current.error) || !isRecord20(current.result)) {
+      if (isRecord21(current.error) || !isRecord21(current.result)) {
         throw new DelegationControlError("THREAD_NOT_FOUND", "Official Thread was not found");
       }
-      const currentThread = isRecord20(current.result.thread) ? current.result.thread : null;
+      const currentThread = isRecord21(current.result.thread) ? current.result.thread : null;
       const currentTurns = currentThread && Array.isArray(currentThread.turns) ? currentThread.turns : [];
       const latestTurn = currentTurns.at(-1);
-      if (isRecord20(latestTurn) && typeof latestTurn.id === "string" && (latestTurn.status === "inProgress" || latestTurn.status === "running")) {
+      if (isRecord21(latestTurn) && typeof latestTurn.id === "string" && (latestTurn.status === "inProgress" || latestTurn.status === "running")) {
         turnId = latestTurn.id;
         this.#activeOfficialTurns.set(input.threadId, turnId);
       } else {
@@ -42306,7 +42418,7 @@ var AppServerHost = class {
       threadId: input.threadId,
       turnId
     });
-    if (isRecord20(response.error)) {
+    if (isRecord21(response.error)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         typeof response.error.message === "string" ? response.error.message : "Turn cancel failed"
@@ -42319,13 +42431,13 @@ var AppServerHost = class {
       threadId: input.threadId,
       includeTurns: true
     });
-    if (isRecord20(response.error)) throw officialThreadReadError(response.error);
-    const result = isRecord20(response.result) ? response.result : null;
-    const thread = result && isRecord20(result.thread) ? result.thread : null;
+    if (isRecord21(response.error)) throw officialThreadReadError(response.error);
+    const result = isRecord21(response.result) ? response.result : null;
+    const thread = result && isRecord21(result.thread) ? result.thread : null;
     if (!thread)
       throw new DelegationControlError("INTERNAL_ERROR", "Official Thread read returned no Thread");
-    const turns = Array.isArray(thread.turns) ? thread.turns.filter((turn) => isRecord20(turn)) : [];
-    const running = this.#activeOfficialTurns.has(input.threadId) || isRecord20(thread.status) && thread.status.type === "active";
+    const turns = Array.isArray(thread.turns) ? thread.turns.filter((turn) => isRecord21(turn)) : [];
+    const running = this.#activeOfficialTurns.has(input.threadId) || isRecord21(thread.status) && thread.status.type === "active";
     const snapshot2 = projectDelegationThreadSnapshot({
       threadId: input.threadId,
       harnessId: "codex",
@@ -42347,7 +42459,7 @@ var AppServerHost = class {
   async #listDelegationThreads(input) {
     const [sortKey, sortDirection2] = input.sort.split("-");
     const request = {
-      id: `codexhost:delegation-list:${randomUUID18()}`,
+      id: `codexhost:delegation-list:${randomUUID19()}`,
       method: "thread/list",
       params: {
         cwd: input.cwd ? [input.cwd] : null,
@@ -42373,7 +42485,7 @@ var AppServerHost = class {
       threads: result.data.flatMap((entry) => {
         if (typeof entry.id !== "string") return [];
         const record4 = records.find((candidate) => candidate.hostThreadId === entry.id);
-        const status2 = isRecord20(entry.status) && entry.status.type === "active" ? "running" : "completed";
+        const status2 = isRecord21(entry.status) && entry.status.type === "active" ? "running" : "completed";
         return [
           {
             threadId: entry.id,
@@ -42540,7 +42652,7 @@ var AppServerHost = class {
       const exists2 = await this.#requestOfficial("project/read", {
         projectId: update.projectId
       }).then(
-        (response) => !isRecord20(response.error) && isRecord20(response.result) && isRecord20(response.result.project) && response.result.project.id === update.projectId,
+        (response) => !isRecord21(response.error) && isRecord21(response.result) && isRecord21(response.result.project) && response.result.project.id === update.projectId,
         () => false
       );
       if (!exists2) {
@@ -43075,7 +43187,7 @@ var AppServerHost = class {
     if (thread.running || thread.activeTurnId) {
       throw new ExternalCommandError(-32072, "External Thread already has an active operation");
     }
-    const turnId = requestedTurnId ?? hostTurnIdSchema.parse(randomUUID18());
+    const turnId = requestedTurnId ?? hostTurnIdSchema.parse(randomUUID19());
     const projection = {
       projector: new CodexTurnProjector({
         threadId: thread.id,
@@ -43791,10 +43903,10 @@ var AppServerHost = class {
     if (thread.record.subagent)
       result.reasoningEffort = thread.record.subagentConfiguration?.reasoningEffort ?? null;
     try {
-      if (params.initialTurnsPage !== void 0 && params.initialTurnsPage !== null && !isRecord20(params.initialTurnsPage)) {
+      if (params.initialTurnsPage !== void 0 && params.initialTurnsPage !== null && !isRecord21(params.initialTurnsPage)) {
         throw new ExternalHistoryRequestError("initialTurnsPage must be an object");
       }
-      const initialPageParams = isRecord20(params.initialTurnsPage) ? params.initialTurnsPage : null;
+      const initialPageParams = isRecord21(params.initialTurnsPage) ? params.initialTurnsPage : null;
       const initialTurnsPage = initialPageParams ? listExternalTurns(turns, initialPageParams) : null;
       const paginated = thread.record.historyMode === "paginated";
       const turnsBackwardsCursor = paginated ? listExternalTurns(turns, { limit: 1, itemsView: "notLoaded" }).backwardsCursor : null;
@@ -43935,6 +44047,117 @@ var AppServerHost = class {
       (signal) => this.#externalVoiceResults.watch(threadId2, turnId, signal)
     );
   }
+  async #notifyFollowUpQueueChanged(threadId2) {
+    await this.#writer.json({
+      method: "thread/queue/changed",
+      params: { threadId: threadId2 }
+    });
+  }
+  async #handleExternalQueueMutation(request, thread) {
+    const params = requestObject(request);
+    try {
+      if (request.method === "thread/queue/list") {
+        await this.#writer.json(rpcEnvelope(request, { result: this.#followUps.list(thread.id) }));
+        return;
+      }
+      if (request.method === "thread/queue/add") {
+        if (!Array.isArray(params.input))
+          throw new Error("thread/queue/add input must be an array");
+        const text = queuedSubmissionText(params.input);
+        if (!text) throw new Error("thread/queue/add must contain text input");
+        const queuedSubmission = this.#followUps.add(
+          thread.id,
+          params.input,
+          typeof params.clientUserMessageId === "string" ? params.clientUserMessageId : void 0
+        );
+        await this.#writer.json(rpcEnvelope(request, { result: { queuedSubmission } }));
+        await this.#notifyFollowUpQueueChanged(thread.id);
+        return;
+      }
+      if (request.method === "thread/queue/update") {
+        if (typeof params.queuedSubmissionId !== "string" || !Array.isArray(params.input)) {
+          throw new Error("thread/queue/update requires queuedSubmissionId and input");
+        }
+        const queuedSubmission = this.#followUps.update(
+          thread.id,
+          params.queuedSubmissionId,
+          params.input
+        );
+        if (!queuedSubmission) throw new Error("Queued follow-up was not found");
+        await this.#writer.json(rpcEnvelope(request, { result: { queuedSubmission } }));
+        await this.#notifyFollowUpQueueChanged(thread.id);
+        return;
+      }
+      if (request.method === "thread/queue/delete") {
+        if (typeof params.queuedSubmissionId !== "string") {
+          throw new Error("thread/queue/delete requires queuedSubmissionId");
+        }
+        const deleted = this.#followUps.delete(thread.id, params.queuedSubmissionId);
+        await this.#writer.json(rpcEnvelope(request, { result: { deleted } }));
+        if (deleted) await this.#notifyFollowUpQueueChanged(thread.id);
+        return;
+      }
+      if (request.method === "thread/queue/reorder") {
+        if (!Array.isArray(params.queuedSubmissionIds) || params.queuedSubmissionIds.some((id2) => typeof id2 !== "string")) {
+          throw new Error("thread/queue/reorder requires queuedSubmissionIds");
+        }
+        if (!this.#followUps.reorder(thread.id, params.queuedSubmissionIds)) {
+          throw new Error("Queued follow-up order could not be applied");
+        }
+        await this.#writer.json(rpcEnvelope(request, { result: {} }));
+        await this.#notifyFollowUpQueueChanged(thread.id);
+        return;
+      }
+      await this.#writer.json(
+        rpcError(request, -32076, `External Thread does not support ${request.method}`)
+      );
+    } catch (error51) {
+      await this.#writer.json(rpcError(request, -32602, errorMessage4(error51)));
+    }
+  }
+  async #startExternalFromFollowUp(request, thread, queued, sourceHostId) {
+    const text = queuedSubmissionText(queued.input);
+    if (!text) {
+      this.#followUps.restore(thread.id, queued);
+      await this.#writer.json(rpcError(request, -32602, "Queued follow-up was not found"));
+      return;
+    }
+    await this.#notifyFollowUpQueueChanged(thread.id);
+    try {
+      const started = await this.#beginExternalInputTurn(
+        thread,
+        text,
+        void 0,
+        queued.clientUserMessageId,
+        sourceHostId
+      );
+      try {
+        await this.#writer.json(rpcEnvelope(request, { result: { turn: started.turn } }));
+      } finally {
+        started.gate.resolve();
+      }
+    } catch (error51) {
+      this.#followUps.restore(thread.id, queued);
+      await this.#notifyFollowUpQueueChanged(thread.id);
+      await this.#writer.json(
+        rpcError(
+          request,
+          error51 instanceof ExternalSteerError || error51 instanceof ExternalCommandError ? error51.code : -32073,
+          errorMessage4(error51)
+        )
+      );
+    }
+  }
+  async #startExternalQueuedTurn(request, thread) {
+    const params = requestObject(request);
+    const queuedSubmissionId = typeof params.queuedSubmissionId === "string" ? params.queuedSubmissionId : void 0;
+    const queued = this.#followUps.take(thread.id, queuedSubmissionId);
+    if (!queued) {
+      await this.#writer.json(rpcError(request, -32602, "Queued follow-up was not found"));
+      return;
+    }
+    await this.#startExternalFromFollowUp(request, thread, queued);
+  }
   async #startExternalTurn(request, thread) {
     if (this.#externalThreadBusy(thread) || this.#pendingExternalCommandRequests.has(thread.id)) {
       await this.#writer.json(
@@ -43959,10 +44182,21 @@ var AppServerHost = class {
       }
     }
     let text;
+    const clientUserMessageId = typeof params.clientUserMessageId === "string" ? params.clientUserMessageId : void 0;
     try {
       text = requestText(params);
     } catch (error51) {
-      await this.#writer.json(rpcError(request, -32602, errorMessage4(error51)));
+      const queued = this.#followUps.take(thread.id, clientUserMessageId) ?? this.#followUps.take(thread.id);
+      if (!queued) {
+        await this.#writer.json(rpcError(request, -32602, errorMessage4(error51)));
+        return;
+      }
+      await this.#startExternalFromFollowUp(
+        request,
+        thread,
+        queued,
+        params[THREAD_REFERENCE_SOURCE_HOST_PARAM]
+      );
       return;
     }
     try {
@@ -43970,7 +44204,7 @@ var AppServerHost = class {
         thread,
         text,
         void 0,
-        typeof params.clientUserMessageId === "string" ? params.clientUserMessageId : void 0,
+        clientUserMessageId,
         params[THREAD_REFERENCE_SOURCE_HOST_PARAM]
       );
       try {
@@ -44108,7 +44342,7 @@ var AppServerHost = class {
     if (thread.running || thread.activeTurnId || this.#pendingExternalCommandRequests.has(thread.id)) {
       throw new ExternalSteerError(-32072, "External Thread already has an active Turn");
     }
-    const turnId = hostTurnIdSchema.parse(randomUUID18());
+    const turnId = hostTurnIdSchema.parse(randomUUID19());
     const startedAtMs = Date.now();
     const projection = {
       projector: new CodexTurnProjector({
@@ -44541,7 +44775,7 @@ var AppServerHost = class {
     const previousItems = new Map(
       child.turns.flatMap(
         (turn) => Array.isArray(turn.items) ? turn.items.flatMap(
-          (item) => isRecord20(item) && typeof item.id === "string" ? [[item.id, JSON.stringify(item)]] : []
+          (item) => isRecord21(item) && typeof item.id === "string" ? [[item.id, JSON.stringify(item)]] : []
         ) : []
       )
     );
@@ -44554,7 +44788,7 @@ var AppServerHost = class {
     for (const turn of child.turns) {
       if (typeof turn.id !== "string" || !Array.isArray(turn.items)) continue;
       const changedItems = turn.items.filter(
-        (item) => isRecord20(item) && typeof item.id === "string" && previousItems.get(item.id) !== JSON.stringify(item)
+        (item) => isRecord21(item) && typeof item.id === "string" && previousItems.get(item.id) !== JSON.stringify(item)
       );
       if (changedItems.length > 0) {
         await this.#writer.json({
@@ -44686,7 +44920,7 @@ var AppServerHost = class {
     }
   }
   async #handleDesktopApprovalResponse(value2) {
-    if (!isRecord20(value2) || !isHostApprovalRequestId(value2.id)) return false;
+    if (!isRecord21(value2) || !isHostApprovalRequestId(value2.id)) return false;
     const requestId2 = value2.id;
     const pending = this.#pendingDesktopApprovals.get(requestId2);
     if (!pending) return true;
@@ -44770,7 +45004,7 @@ var AppServerHost = class {
     try {
       result = projection.projector.projectQuestion(
         interaction,
-        hostItemIdSchema.parse(randomUUID18())
+        hostItemIdSchema.parse(randomUUID19())
       );
     } catch (error51) {
       this.#diagnose(error51);
@@ -44815,7 +45049,7 @@ var AppServerHost = class {
     }
   }
   async #handleDesktopQuestionResponse(value2) {
-    if (!isRecord20(value2) || !isHostQuestionRequestId(value2.id)) return false;
+    if (!isRecord21(value2) || !isHostQuestionRequestId(value2.id)) return false;
     const requestId2 = value2.id;
     const pending = this.#pendingDesktopQuestions.get(requestId2);
     if (!pending) return true;
@@ -44998,7 +45232,7 @@ import path30 from "node:path";
 import { PassThrough } from "node:stream";
 
 // packages/host-runtime/src/remote-socket-lock.ts
-import { randomUUID as randomUUID19 } from "node:crypto";
+import { randomUUID as randomUUID20 } from "node:crypto";
 import { chmod as chmod3, lstat as lstat5, mkdir as mkdir14, open as open9, readFile as readFile18, readdir as readdir5, rename as rename12, rm as rm13 } from "node:fs/promises";
 import { uptime } from "node:os";
 import path29 from "node:path";
@@ -45124,7 +45358,7 @@ async function preparePrivateLockDirectory(lockDirectory) {
   await chmod3(lockDirectory, 448);
 }
 async function writeLockRecordAtomic(lockDirectory, entryPath, record4) {
-  const temporary = path29.join(lockDirectory, `.tmp-${record4.ownerToken}-${randomUUID19()}`);
+  const temporary = path29.join(lockDirectory, `.tmp-${record4.ownerToken}-${randomUUID20()}`);
   const handle = await open9(temporary, "wx", 384);
   try {
     await handle.writeFile(`${JSON.stringify(record4)}
@@ -45199,7 +45433,7 @@ async function withRemoteAppServerSocketInitializationLock(socketPath, action) {
   const legacyPath = `${socketPath}.initializing`;
   const lockDirectory = `${socketPath}.initializers`;
   await preparePrivateLockDirectory(lockDirectory);
-  const ownerToken = randomUUID19();
+  const ownerToken = randomUUID20();
   const entryPath = path29.join(lockDirectory, lockEntryName(ownerToken));
   const baseRecord = {
     version: 2,
@@ -45710,12 +45944,12 @@ function createRemoteAppServerWebSocketListener(input) {
 
 // packages/host-runtime/src/remote-official-app-server.ts
 import { spawn as spawn5 } from "node:child_process";
-import { randomUUID as randomUUID20 } from "node:crypto";
+import { randomUUID as randomUUID21 } from "node:crypto";
 import { lstat as lstat7, rm as rm15, stat as stat7 } from "node:fs/promises";
 import path31 from "node:path";
 var DEFAULT_CLOSE_TIMEOUT_MS = 2e3;
 var DEFAULT_LISTEN_TIMEOUT_MS = 1e4;
-function remoteOfficialAppServerSocketPath(desktopControlSocketPath, token = randomUUID20()) {
+function remoteOfficialAppServerSocketPath(desktopControlSocketPath, token = randomUUID21()) {
   if (!path31.posix.isAbsolute(desktopControlSocketPath)) {
     throw new Error("Desktop control socket path must be absolute");
   }
@@ -47001,11 +47235,11 @@ async function readRemoteDelegationThread(environment, input) {
 }
 
 // packages/host-runtime/src/shared-thread-owner.ts
-import { randomUUID as randomUUID22 } from "node:crypto";
+import { randomUUID as randomUUID23 } from "node:crypto";
 import { PassThrough as PassThrough3 } from "node:stream";
 
 // packages/host-runtime/src/shared-thread-peer.ts
-import { randomUUID as randomUUID21 } from "node:crypto";
+import { randomUUID as randomUUID22 } from "node:crypto";
 function object9(value2) {
   return value2 !== null && typeof value2 === "object" && !Array.isArray(value2);
 }
@@ -47019,7 +47253,7 @@ var StreamThreadPeer = class {
   input;
   output;
   stop;
-  #prefix = `shared:${randomUUID21()}:`;
+  #prefix = `shared:${randomUUID22()}:`;
   #pending = /* @__PURE__ */ new Map();
   #listeners = /* @__PURE__ */ new Set();
   #ended = Promise.withResolvers();
@@ -47097,7 +47331,7 @@ var SharedThreadOwner = class {
   input = new PassThrough3();
   output = new PassThrough3();
   #peer = new StreamThreadPeer(this.output, this.input, () => this.input.end());
-  #prefix = `shared-interaction:${randomUUID22()}:`;
+  #prefix = `shared-interaction:${randomUUID23()}:`;
   #interactions = /* @__PURE__ */ new Map();
   #listeners = /* @__PURE__ */ new Set();
   #receipts = /* @__PURE__ */ new Map();
@@ -47407,7 +47641,7 @@ var SharedThreadBridge = class {
 };
 
 // packages/host-runtime/src/remote-control-app-server.ts
-import { randomUUID as randomUUID23 } from "node:crypto";
+import { randomUUID as randomUUID24 } from "node:crypto";
 import { mkdir as mkdir17, open as open10, rename as rename13, rm as rm17 } from "node:fs/promises";
 import path37 from "node:path";
 var REMOTE_CONTROL_BRIDGE_PIPE_ENV = "CODEXHOST_REMOTE_CONTROL_BRIDGE_PIPE";
@@ -47428,7 +47662,7 @@ function nodeCompatibleWindowsPath(value2) {
   if (value2.startsWith("\\\\?\\")) return value2.slice(4);
   return value2;
 }
-function remoteControlBridgePipePath(processId = process.pid, instanceId = randomUUID23()) {
+function remoteControlBridgePipePath(processId = process.pid, instanceId = randomUUID24()) {
   const safeInstance = instanceId.replaceAll(/[^a-zA-Z0-9-]/gu, "");
   if (!safeInstance) throw new Error("Remote Control bridge instance ID is invalid");
   return `\\\\.\\pipe\\codexhost-remote-control-${processId}-${safeInstance}`;
@@ -47443,7 +47677,7 @@ async function publishRemoteControlAppServerDescriptor(plan) {
   await mkdir17(directory, { recursive: true, mode: 448 });
   const temporaryPath = path37.join(
     directory,
-    `.${REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE}.${plan.descriptor.ownerPid}.${randomUUID23()}.tmp`
+    `.${REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE}.${plan.descriptor.ownerPid}.${randomUUID24()}.tmp`
   );
   const handle = await open10(temporaryPath, "wx", 384);
   try {
@@ -47984,7 +48218,7 @@ function createHostUpdateCoordinator(options2) {
 }
 
 // packages/host-runtime/src/usage-statistics.ts
-import { randomUUID as randomUUID24 } from "node:crypto";
+import { randomUUID as randomUUID25 } from "node:crypto";
 import { mkdir as mkdir19, readFile as readFile20, readdir as readdir6, rename as rename15, rm as rm19, writeFile as writeFile11 } from "node:fs/promises";
 import path40 from "node:path";
 import { setImmediate as yieldToEventLoop } from "node:timers/promises";
@@ -48519,7 +48753,7 @@ var UsageStatistics = class {
   async #persist(harness2, cache) {
     if (!cache.dirty || this.#now() - cache.persistedAtMs < PERSIST_INTERVAL_MS) return;
     const file2 = this.#file(harness2);
-    const temporary = `${file2}.${randomUUID24()}.tmp`;
+    const temporary = `${file2}.${randomUUID25()}.tmp`;
     try {
       await mkdir19(this.#directory, { recursive: true });
       const sources = [...cache.sources].map(([id2, source]) => [
@@ -49135,7 +49369,7 @@ async function runHostRuntime(input) {
 }
 
 // packages/host-runtime/src/remote-host-install.ts
-import { createHash as createHash12, randomUUID as randomUUID25 } from "node:crypto";
+import { createHash as createHash12, randomUUID as randomUUID26 } from "node:crypto";
 import { constants as fsConstants } from "node:fs";
 import {
   access as access4,
@@ -49234,7 +49468,7 @@ async function writeAtomic(filePath, contents, mode) {
   await mkdir20(path42.dirname(filePath), { recursive: true, mode: 448 });
   const temporary = path42.join(
     path42.dirname(filePath),
-    `.${path42.basename(filePath)}.${process.pid}.${randomUUID25()}.tmp`
+    `.${path42.basename(filePath)}.${process.pid}.${randomUUID26()}.tmp`
   );
   try {
     if (typeof contents === "string") {
@@ -49258,7 +49492,7 @@ async function writeAtomicExecutable(filePath, sourcePath) {
   await mkdir20(path42.dirname(filePath), { recursive: true, mode: 448 });
   const temporary = path42.join(
     path42.dirname(filePath),
-    `.${path42.basename(filePath)}.${process.pid}.${randomUUID25()}.tmp`
+    `.${path42.basename(filePath)}.${process.pid}.${randomUUID26()}.tmp`
   );
   try {
     await copyFile4(sourcePath, temporary);
@@ -50347,7 +50581,7 @@ var harnessOutputSchema = external_exports.custom((value2) => {
 });
 
 // packages/harness-broker/dist/server.js
-import { randomBytes as randomBytes5, randomUUID as randomUUID26 } from "node:crypto";
+import { randomBytes as randomBytes5, randomUUID as randomUUID27 } from "node:crypto";
 import { chmod as chmod6, lstat as lstat10, mkdir as mkdir21, open as open11, readFile as readFile22, rename as rename17, rm as rm21 } from "node:fs/promises";
 import net4, {} from "node:net";
 import path45 from "node:path";
@@ -50406,7 +50640,7 @@ async function assertNoLiveDescriptor(descriptorPath) {
   }
 }
 async function publishDescriptor(descriptorPath, descriptor) {
-  const temporary = `${descriptorPath}.${process.pid}.${randomUUID26()}.tmp`;
+  const temporary = `${descriptorPath}.${process.pid}.${randomUUID27()}.tmp`;
   const handle = await open11(temporary, "wx", 384);
   try {
     await handle.writeFile(`${JSON.stringify(descriptor)}
@@ -50484,7 +50718,7 @@ async function startHarnessBrokerServer(input) {
   await assertNoLiveDescriptor(input.descriptorPath);
   if (process.platform !== "win32")
     await prepareUnixSocketPath(input.socketPath);
-  const generation = input.generation ?? randomUUID26();
+  const generation = input.generation ?? randomUUID27();
   const token = input.token ?? randomBytes5(32).toString("hex");
   const descriptor = {
     schemaVersion: 1,
@@ -50525,7 +50759,7 @@ async function startHarnessBrokerServer(input) {
   };
   const server = net4.createServer((socket) => {
     const state = {
-      id: randomUUID26(),
+      id: randomUUID27(),
       socket,
       authenticated: false,
       inputSequence: 0,
@@ -50763,7 +50997,7 @@ async function startHarnessBrokerServer(input) {
             }
           };
         }
-        const openReservation = randomUUID26();
+        const openReservation = randomUUID27();
         if (sourceKey)
           nativeWriters.set(sourceKey, openReservation);
         const provisionalReservation = openInput.kind === "create" ? openReservation : void 0;
@@ -51070,7 +51304,7 @@ async function startHarnessBrokerServer(input) {
           }
           state.authenticated = true;
           state.inputSequence = 1;
-          await send({ kind: "response", id: randomUUID26(), ok: true, value: { ready: true } });
+          await send({ kind: "response", id: randomUUID27(), ok: true, value: { ready: true } });
           return;
         }
         const parsed2 = harnessBrokerRequestSchema.safeParse(raw);