@ganglion/xacpx 0.18.0 → 0.19.0

package/dist/cli.js

@@ -33177,2125 +33177,2146 @@ var init_prompt_media = __esm(() => {
   };
 });
 
-// src/transport/tool-kind-emoji.ts
-var TOOL_KIND_EMOJI, DEFAULT_TOOL_EMOJI;
-var init_tool_kind_emoji = __esm(() => {
-  TOOL_KIND_EMOJI = {
-    read: "\uD83D\uDCD6",
-    search: "\uD83D\uDD0D",
-    execute: "\uD83D\uDCBB",
-    edit: "✏️",
-    think: "\uD83E\uDDE0",
-    other: "\uD83D\uDD27"
-  };
-  DEFAULT_TOOL_EMOJI = TOOL_KIND_EMOJI.other;
-});
-
-// src/transport/streaming-prompt.ts
-function createStreamingPromptState(formatToolCalls = false, options) {
-  let toolEventMode;
-  let onToolEvent;
-  let onThought;
-  let onPlan;
-  let onUsage;
-  let onCommands;
-  let rawStream = false;
-  let driver;
-  if (options === undefined) {
-    toolEventMode = "text";
-    onToolEvent = undefined;
-  } else if (typeof options === "function") {
-    onToolEvent = options;
-    toolEventMode = "structured";
-  } else {
-    onToolEvent = options.onToolEvent;
-    onThought = options.onThought;
-    onPlan = options.onPlan;
-    onUsage = options.onUsage;
-    onCommands = options.onCommands;
-    rawStream = options.rawStream ?? false;
-    driver = options.driver?.trim().toLowerCase() || undefined;
-    toolEventMode = resolveToolEventMode({
-      toolEventMode: options.mode,
-      onToolEvent
-    });
-  }
-  return {
-    buffer: "",
-    segments: [],
-    hasAgentMessage: false,
-    pendingLine: "",
-    formatToolCalls,
-    emittedToolCallIds: new Set,
-    toolCalls: new Map,
-    toolEventMode,
-    driver,
-    rawStream,
-    onToolEvent,
-    onThought,
-    onPlan,
-    onUsage,
-    onCommands,
-    finalize() {
-      if (this.pendingLine.trim().length > 0) {
-        parseStreamingChunks(this, this.pendingLine);
-      }
-      const remaining = this.rawStream ? this.buffer : this.buffer.trim();
-      this.buffer = "";
-      this.pendingLine = "";
-      return remaining;
-    }
-  };
+// src/transport/background-followup.ts
+import { access as access4, open as open5, readFile as readFile14, readdir as readdir3, stat as stat3 } from "node:fs/promises";
+import { constants as fsConstants } from "node:fs";
+import { homedir as homedir10 } from "node:os";
+import { basename as basename3, dirname as dirname12, join as join20 } from "node:path";
+function isAsyncAgentLaunch(event) {
+  return isAsyncAgentLaunchOutput(event.rawOutput);
 }
-function parseStreamingDataChunk(state, chunk) {
-  state.pendingLine += chunk;
-  let boundary;
-  while ((boundary = state.pendingLine.indexOf(`
-`)) !== -1) {
-    const line = state.pendingLine.slice(0, boundary);
-    state.pendingLine = state.pendingLine.slice(boundary + 1);
-    parseStreamingChunks(state, line);
+function isAsyncAgentLaunchOutput(rawOutput) {
+  const candidate = typeof rawOutput === "string" ? tryParseJsonObject(rawOutput) ?? rawOutput : rawOutput;
+  if (candidate && typeof candidate === "object" && !Array.isArray(candidate)) {
+    const status = candidate.status;
+    if (status !== undefined)
+      return status === "async_launched";
   }
+  return ASYNC_AGENT_LAUNCH.test(textOfUnknown(rawOutput));
 }
-function parseStreamingChunks(state, line) {
-  const trimmed = line.trim();
-  if (trimmed.length === 0)
+function tryParseJsonObject(text) {
+  if (!text.trimStart().startsWith("{"))
     return;
-  let event;
   try {
-    event = JSON.parse(trimmed);
+    const parsed = JSON.parse(text);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : undefined;
   } catch {
     return;
   }
-  if (event.method !== "session/update")
-    return;
-  const update = event.params?.update;
-  if (!update)
-    return;
-  if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") {
-    const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
-    const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
-    if (wantsStructured && state.onToolEvent) {
-      const merged = update.toolCallId ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
-      const toolEvent = buildToolUseEvent(merged, state.driver);
-      if (toolEvent)
-        state.onToolEvent(toolEvent);
-    }
-    if (wantsText) {
-      const formatted = formatToolCallEvent(update, update.sessionUpdate);
-      if (formatted) {
-        const toolCallId = update.toolCallId;
-        if (toolCallId) {
-          if (state.emittedToolCallIds.has(toolCallId))
-            return;
-          state.emittedToolCallIds.add(toolCallId);
-        }
-        state.segments.push(formatted);
-      }
+}
+function asyncAgentId(event) {
+  const fromObject = findStringField(event.rawOutput, new Set(["agentId", "agent_id"]));
+  if (fromObject)
+    return fromObject;
+  return /\bagent(?:Id|_id)["']?\s*[:=]\s*["']?([A-Za-z0-9_-]+)/i.exec(textOfUnknown(event.rawOutput))?.[1];
+}
+async function findNativeTranscriptPath(input) {
+  const configDirName = input.driver === "qoder" ? ".qoder" : ".claude";
+  const projectsDir = join20(input.homeDir ?? homedir10(), configDirName, "projects");
+  const direct = join20(projectsDir, encodeClaudeProjectDirectory(input.cwd), `${input.sessionId}.jsonl`);
+  if (await exists(direct))
+    return direct;
+  try {
+    const entries = await readdir3(projectsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory())
+        continue;
+      const candidate = join20(projectsDir, entry.name, `${input.sessionId}.jsonl`);
+      if (await exists(candidate))
+        return candidate;
     }
+  } catch {
     return;
   }
-  if (update.sessionUpdate === "plan") {
-    const entries = Array.isArray(update.entries) ? update.entries.filter((x) => !!x && typeof x === "object" && typeof x.content === "string" && typeof x.status === "string") : [];
-    if (entries.length > 0)
-      state.onPlan?.(entries);
-    return;
-  }
-  if (update.sessionUpdate === "usage_update") {
-    const used = typeof update.used === "number" && Number.isFinite(update.used) ? update.used : undefined;
-    const size = typeof update.size === "number" && Number.isFinite(update.size) ? update.size : undefined;
-    if (used !== undefined && size !== undefined && size > 0) {
-      const cost = normalizeUsageCost(update.cost);
-      const breakdown = normalizeUsageBreakdown(update._meta?.usage);
-      state.onUsage?.({ used, size, ...cost ? { cost } : {}, ...breakdown ? { breakdown } : {} });
-    }
-    return;
+  return;
+}
+async function followBackgroundTurn(options) {
+  const transcriptPath = options.transcriptPath ?? await findNativeTranscriptPath(options);
+  if (!transcriptPath) {
+    return { status: "unavailable", completedToolCallIds: [], failedToolCallIds: [] };
   }
-  if (update.sessionUpdate === "available_commands_update") {
-    if (Array.isArray(update.availableCommands)) {
-      state.onCommands?.(normalizeAgentCommands(update.availableCommands));
-    }
-    return;
+  let initial;
+  try {
+    initial = await readFile14(transcriptPath);
+  } catch {
+    return { status: "unavailable", transcriptPath, completedToolCallIds: [], failedToolCallIds: [] };
   }
-  const isThoughtChunk = update.sessionUpdate === "agent_thought_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
-  if (isThoughtChunk) {
-    const chunk2 = update.content.text;
-    if (chunk2.length > 0) {
-      state.onThought?.(chunk2);
-    }
-    return;
+  const initialCompleteEnd = initial.lastIndexOf(10);
+  const initialComplete = initial.subarray(0, initialCompleteEnd >= 0 ? initialCompleteEnd : 0).toString("utf8");
+  const mainCursor = {
+    offset: initial.length,
+    partial: initialCompleteEnd >= 0 ? initial.subarray(initialCompleteEnd + 1).toString("utf8") : initial.toString("utf8")
+  };
+  const initialRecords = initialComplete.split(`
+`).map(parseRecord);
+  const launched = new Set([...options.launchedToolCallIds].filter(Boolean));
+  const completed = new Set;
+  const failed = new Set;
+  const toolEvents = new Map;
+  for (const event of options.initialToolEvents ?? [])
+    toolEvents.set(event.toolCallId, event);
+  const parentToolCallIdByAgentId = new Map;
+  for (const [toolCallId, agentId] of options.subagentIdsByToolCallId ?? []) {
+    if (toolCallId && agentId)
+      parentToolCallIdByAgentId.set(agentId, toolCallId);
   }
-  const isMessageChunk = update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
-  if (!isMessageChunk)
-    return;
-  state.hasAgentMessage = true;
-  const chunk = update.content.text ?? "";
-  if (chunk.length === 0)
-    return;
-  state.buffer += chunk;
-  if (state.rawStream)
-    return;
-  let boundary;
-  while ((boundary = state.buffer.indexOf(`
-
-`)) !== -1) {
-    const segment = state.buffer.slice(0, boundary).trim();
-    state.buffer = state.buffer.slice(boundary + 2);
-    if (segment.length > 0) {
-      state.segments.push(segment);
+  const boundary = findPromptBoundary(initialRecords, launched);
+  let launchSeen = boundary >= 0 || initialRecords.some((record3) => hasTrackedLaunch(record3, launched));
+  let boundarySeen = boundary >= 0;
+  let sequence = 0;
+  let lastNotificationSequence = -1;
+  let done = false;
+  const emitTool = async (event) => {
+    toolEvents.set(event.toolCallId, event);
+    await options.onToolEvent?.(event);
+  };
+  const processRecord = async (record3) => {
+    if (!record3)
+      return;
+    sequence += 1;
+    const blocks = contentBlocks(record3.message?.content);
+    if (record3.type === "user") {
+      const userText = blocks.map(blockText).filter(Boolean).join(`
+`);
+      for (const notification of taskNotifications(userText)) {
+        if (launched.has(notification.toolCallId)) {
+          completed.add(notification.toolCallId);
+          if (notification.failed)
+            failed.add(notification.toolCallId);
+          lastNotificationSequence = sequence;
+          const previous = toolEvents.get(notification.toolCallId);
+          if (previous) {
+            await emitTool({
+              ...previous,
+              status: notification.failed ? "error" : "success",
+              ...notification.failed ? { rawOutput: { message: "background Agent failed" } } : {}
+            });
+          }
+        }
+      }
+      for (const block of blocks) {
+        if (readString(block, "type") !== "tool_result")
+          continue;
+        const toolCallId = readString(block, "tool_use_id");
+        if (!toolCallId)
+          continue;
+        const output = blockText(block);
+        if (ASYNC_AGENT_LAUNCH.test(output))
+          launched.add(toolCallId);
+        const previous = toolEvents.get(toolCallId);
+        await emitTool({
+          toolCallId,
+          toolName: previous?.toolName ?? "Tool",
+          kind: previous?.kind ?? "other",
+          ...previous?.parentToolCallId ? { parentToolCallId: previous.parentToolCallId } : {},
+          ...previous?.isSubagent ? { isSubagent: true } : {},
+          ...previous?.summary ? { summary: previous.summary } : {},
+          ...previous?.rawInput !== undefined ? { rawInput: previous.rawInput } : {},
+          ...output ? { rawOutput: output } : {},
+          status: readBoolean(block, "is_error") ? "error" : "success"
+        });
+      }
+      return;
     }
-  }
-}
-function formatToolCallEvent(update, sessionUpdate) {
-  if (!update)
-    return null;
-  const kind = update.kind ?? "";
-  const title = update.title ?? "";
-  if (title.length === 0)
-    return null;
-  const emoji2 = TOOL_KIND_EMOJI[kind] ?? DEFAULT_TOOL_EMOJI;
-  const inputSummary = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
-  const status = readString(update, "status");
-  if (!inputSummary && status === "pending")
-    return null;
-  if (!inputSummary && isGenericToolTitle(kind, title))
-    return null;
-  const summaryText = inputSummary && inputSummary !== title ? `: ${truncateToolDisplay(inputSummary)}` : "";
-  const statusText = status ? ` (${status})` : "";
-  return `${emoji2} ${title}${statusText}${summaryText}`;
-}
-function isEmptyToolField(v) {
-  if (v === undefined || v === null)
-    return true;
-  if (typeof v === "string")
-    return v.trim().length === 0;
-  if (Array.isArray(v))
-    return v.length === 0;
-  if (typeof v === "object")
-    return Object.keys(v).length === 0;
-  return false;
-}
-function mergeToolCallUpdate(state, toolCallId, update) {
-  const prev = state.toolCalls.get(toolCallId) ?? { toolCallId };
-  const merged = { ...prev };
-  for (const key of ["kind", "title", "rawInput", "content", "rawOutput", "locations", "status"]) {
-    const next = update[key];
-    if (!isEmptyToolField(next))
-      merged[key] = next;
-  }
-  const nextMeta = update._meta;
-  if (nextMeta) {
-    const previousMeta = merged._meta;
-    merged._meta = {
-      ...previousMeta,
-      ...nextMeta,
-      ...previousMeta?.qoder || nextMeta.qoder ? { qoder: { ...previousMeta?.qoder, ...nextMeta.qoder } } : {},
-      ...previousMeta?.codex || nextMeta.codex ? {
-        codex: {
-          ...previousMeta?.codex,
-          ...nextMeta.codex,
-          ...previousMeta?.codex?.subagent || nextMeta.codex?.subagent ? { subagent: { ...previousMeta?.codex?.subagent, ...nextMeta.codex?.subagent } } : {}
-        }
-      } : {},
-      ...previousMeta?.claudeCode || nextMeta.claudeCode ? { claudeCode: { ...previousMeta?.claudeCode, ...nextMeta.claudeCode } } : {}
-    };
-  }
-  merged.toolCallId = toolCallId;
-  state.toolCalls.set(toolCallId, merged);
-  return merged;
-}
-function buildToolUseEvent(update, driver) {
-  if (!update)
-    return null;
-  const toolCallId = update.toolCallId;
-  if (!toolCallId)
-    return null;
-  const kindRaw = update.kind ?? "";
-  const kind = (() => {
-    switch (kindRaw) {
-      case "read":
-      case "search":
-      case "execute":
-      case "edit":
-      case "think":
-        return kindRaw;
-      default:
-        return "other";
+    if (record3.type !== "assistant" || record3.isSidechain === true)
+      return;
+    for (const block of blocks) {
+      const type = readString(block, "type");
+      if (type === "text") {
+        const text = readString(block, "text");
+        if (text)
+          await options.onText?.(text);
+      } else if (type === "thinking") {
+        const thought = readString(block, "thinking");
+        if (thought)
+          await options.onThought?.(thought);
+      } else if (type === "tool_use") {
+        const toolCallId = readString(block, "id");
+        if (!toolCallId)
+          continue;
+        const name = readString(block, "name") ?? "Tool";
+        const rawInput = block.input;
+        const event = {
+          toolCallId,
+          toolName: name,
+          kind: classifyToolKind(name),
+          ...toolSummary(rawInput) ? { summary: toolSummary(rawInput) } : {},
+          ...rawInput !== undefined ? { rawInput } : {},
+          status: "running"
+        };
+        await emitTool(event);
+      }
+    }
+    if (record3.message?.stop_reason === "end_turn" && launched.size > 0 && [...launched].every((id) => completed.has(id)) && lastNotificationSequence >= 0 && sequence > lastNotificationSequence) {
+      done = true;
     }
-  })();
-  const title = (update.title ?? "").trim();
-  const toolName = title || "Tool";
-  const summaryRaw = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
-  const summary = summaryRaw && summaryRaw !== title ? summaryRaw : undefined;
-  const statusRaw = readString(update, "status");
-  const isClaudeDriver = driver === undefined || driver === "claude";
-  const claudeMeta = isClaudeDriver ? update._meta?.claudeCode : undefined;
-  const claudeToolResponse = claudeMeta?.toolResponse;
-  const hasClaudeToolResponse = !isEmptyToolField(claudeToolResponse);
-  const isAsyncAgentLaunch = update._meta?.claudeCode?.toolName === "Agent" && isRecord4(claudeToolResponse) && claudeToolResponse.status === "async_launched";
-  const status = isAsyncAgentLaunch ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
-  const rawInput = update.rawInput;
-  const content = update.content;
-  const rawOutput = update.rawOutput ?? claudeToolResponse;
-  const locations = update.locations;
-  const parentToolCallId = claudeMeta?.parentToolUseId?.trim();
-  const isSubagent = claudeMeta?.toolName === "Agent" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" || driver === "kimi" && isKimiSubagentInput(rawInput) || driver === "codex" && isCodexSubagentMeta(update._meta?.codex?.subagent);
-  return {
-    toolCallId,
-    ...parentToolCallId ? { parentToolCallId } : {},
-    ...isSubagent ? { isSubagent: true } : {},
-    toolName,
-    kind,
-    ...summary ? { summary } : {},
-    ...rawInput !== undefined ? { rawInput } : {},
-    ...content !== undefined ? { content } : {},
-    ...rawOutput !== undefined ? { rawOutput } : {},
-    ...locations !== undefined ? { locations } : {},
-    status
   };
-}
-function isKimiSubagentInput(rawInput) {
-  return isRecord4(rawInput) && readFirstString(rawInput, ["prompt"]) !== undefined && readFirstString(rawInput, ["subagent_type", "subagentType"]) !== undefined;
-}
-function isCodexSubagentMeta(meta2) {
-  return typeof meta2?.threadId === "string" && meta2.threadId.trim().length > 0 && typeof meta2.activity === "string" && meta2.activity.trim().length > 0;
-}
-function summarizeToolInput(rawInput, title = "") {
-  if (rawInput == null)
-    return;
-  if (typeof rawInput === "string" || typeof rawInput === "number" || typeof rawInput === "boolean") {
-    return String(rawInput);
-  }
-  if (!isRecord4(rawInput))
-    return;
-  const taskSummary = summarizeTaskInput(rawInput, title);
-  if (taskSummary)
-    return taskSummary;
-  const command = readFirstString(rawInput, ["command", "cmd", "program"]);
-  const args = readFirstStringArray(rawInput, ["args", "arguments"]);
-  if (command) {
-    return [command, ...args ?? []].join(" ");
-  }
-  const parsedCmd = rawInput.parsed_cmd;
-  if (Array.isArray(parsedCmd) && parsedCmd.length > 0) {
-    const parts = [];
-    for (const entry of parsedCmd) {
-      if (isRecord4(entry) && typeof entry.cmd === "string" && entry.cmd.length > 0) {
-        parts.push(entry.cmd);
+  const processAfterBoundary = async (record3) => {
+    if (!record3)
+      return;
+    if (!boundarySeen) {
+      if (hasTrackedLaunch(record3, launched))
+        launchSeen = true;
+      if (launchSeen && isMainEndTurn(record3))
+        boundarySeen = true;
+      return;
+    }
+    await processRecord(record3);
+  };
+  const processSubagentRecord = async (record3, parentToolCallId) => {
+    if (!record3)
+      return;
+    const blocks = contentBlocks(record3.message?.content);
+    if (record3.type === "assistant") {
+      for (const block of blocks) {
+        if (readString(block, "type") !== "tool_use")
+          continue;
+        const toolCallId = readString(block, "id");
+        if (!toolCallId)
+          continue;
+        const name = readString(block, "name") ?? "Tool";
+        const rawInput = block.input;
+        const previous = toolEvents.get(toolCallId);
+        await emitTool({
+          ...previous,
+          toolCallId,
+          parentToolCallId: previous?.parentToolCallId ?? parentToolCallId,
+          ...previous?.isSubagent || isAgentToolName(name) ? { isSubagent: true } : {},
+          toolName: previous?.toolName ?? name,
+          kind: previous?.kind ?? classifyToolKind(name),
+          ...previous?.summary ? { summary: previous.summary } : toolSummary(rawInput) ? { summary: toolSummary(rawInput) } : {},
+          ...previous?.rawInput !== undefined ? { rawInput: previous.rawInput } : rawInput !== undefined ? { rawInput } : {},
+          status: previous?.status === "success" || previous?.status === "error" ? previous.status : "running"
+        });
       }
+      return;
     }
-    if (parts.length > 0) {
-      return parts.join(" ");
+    if (record3.type !== "user")
+      return;
+    for (const block of blocks) {
+      if (readString(block, "type") !== "tool_result")
+        continue;
+      const toolCallId = readString(block, "tool_use_id");
+      if (!toolCallId)
+        continue;
+      const previous = toolEvents.get(toolCallId);
+      const output = blockText(block);
+      const event = {
+        ...previous,
+        toolCallId,
+        parentToolCallId: previous?.parentToolCallId ?? parentToolCallId,
+        ...previous?.isSubagent ? { isSubagent: true } : {},
+        toolName: previous?.toolName ?? "Tool",
+        kind: previous?.kind ?? "other",
+        ...previous?.summary ? { summary: previous.summary } : {},
+        ...previous?.rawInput !== undefined ? { rawInput: previous.rawInput } : {},
+        ...previous?.rawOutput !== undefined ? { rawOutput: previous.rawOutput } : output ? { rawOutput: output } : {},
+        status: readBoolean(block, "is_error") || previous?.status === "error" ? "error" : "success"
+      };
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
+        const agentId = asyncAgentId(event);
+        if (agentId)
+          parentToolCallIdByAgentId.set(agentId, event.toolCallId);
+      }
+      await emitTool(event);
+    }
+  };
+  const subagentCursors = new Map;
+  const processSubagentTranscripts = async () => {
+    const transcripts = await findSubagentTranscripts(transcriptPath);
+    let advanced = false;
+    let discoveredNestedAgent = true;
+    while (discoveredNestedAgent) {
+      const mappedAgentCount = parentToolCallIdByAgentId.size;
+      for (const subagent of transcripts) {
+        const parentToolCallId = parentToolCallIdByAgentId.get(subagent.agentId);
+        if (!parentToolCallId)
+          continue;
+        const cursor = subagentCursors.get(subagent.path) ?? { offset: 0, partial: "" };
+        const previousOffset = cursor.offset;
+        const lines = await readJsonlDelta(subagent.path, cursor);
+        if (cursor.offset !== previousOffset)
+          advanced = true;
+        subagentCursors.set(subagent.path, cursor);
+        for (const line of lines)
+          await processSubagentRecord(parseRecord(line), parentToolCallId);
+      }
+      discoveredNestedAgent = parentToolCallIdByAgentId.size > mappedAgentCount;
+    }
+    return advanced;
+  };
+  await processSubagentTranscripts();
+  if (boundary >= 0) {
+    for (const record3 of initialRecords.slice(boundary + 1)) {
+      await processRecord(record3);
+      if (done)
+        break;
     }
   }
-  return readFirstString(rawInput, [
-    "path",
-    "file",
-    "filePath",
-    "filepath",
-    "file_path",
-    "target",
-    "uri",
-    "url",
-    "query",
-    "pattern",
-    "text",
-    "search",
-    "name",
-    "description"
-  ]);
-}
-function summarizeTaskInput(rawInput, title) {
-  const subagentType = readFirstString(rawInput, ["subagent_type", "subagentType", "agent", "agentType"]);
-  const description = readFirstString(rawInput, ["description", "task", "summary"]);
-  if (subagentType && description) {
-    return description === title ? subagentType : `${subagentType}: ${description}`;
+  const startedAt = Date.now();
+  const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  while (!done) {
+    throwIfAborted(options.signal);
+    if (Date.now() - startedAt >= timeoutMs) {
+      return {
+        status: "timeout",
+        transcriptPath,
+        completedToolCallIds: [...completed],
+        failedToolCallIds: [...failed]
+      };
+    }
+    await waitForPoll(pollIntervalMs, options.signal);
+    await processSubagentTranscripts();
+    const lines = await readJsonlDelta(transcriptPath, mainCursor);
+    for (const line of lines) {
+      await processAfterBoundary(parseRecord(line));
+      if (done)
+        break;
+    }
   }
-  if (subagentType)
-    return subagentType;
-  return;
+  if (parentToolCallIdByAgentId.size > 0) {
+    let stablePolls = 0;
+    for (let poll = 0;poll < FINAL_SUBAGENT_DRAIN_MAX_POLLS && stablePolls < FINAL_SUBAGENT_DRAIN_STABLE_POLLS; poll += 1) {
+      await waitForPoll(pollIntervalMs, options.signal);
+      stablePolls = await processSubagentTranscripts() ? 0 : stablePolls + 1;
+    }
+  }
+  return {
+    status: "completed",
+    transcriptPath,
+    completedToolCallIds: [...completed],
+    failedToolCallIds: [...failed]
+  };
 }
-function readFirstString(record3, keys) {
-  for (const key of keys) {
-    const value = record3[key];
-    if (typeof value === "string" && value.trim().length > 0) {
-      return value.trim();
+async function readJsonlDelta(path14, cursor) {
+  let size;
+  try {
+    size = (await stat3(path14)).size;
+  } catch {
+    return [];
+  }
+  if (size < cursor.offset) {
+    cursor.offset = 0;
+    cursor.partial = "";
+  }
+  if (size <= cursor.offset)
+    return [];
+  let chunk;
+  try {
+    const handle = await open5(path14, "r");
+    try {
+      chunk = Buffer.alloc(size - cursor.offset);
+      const result = await handle.read(chunk, 0, chunk.length, cursor.offset);
+      chunk = chunk.subarray(0, result.bytesRead);
+    } finally {
+      await handle.close();
     }
+  } catch {
+    return [];
   }
-  return;
+  cursor.offset += chunk.length;
+  cursor.partial += chunk.toString("utf8");
+  const lines = cursor.partial.split(`
+`);
+  cursor.partial = lines.pop() ?? "";
+  return lines;
 }
-function readFirstStringArray(record3, keys) {
-  for (const key of keys) {
-    const value = record3[key];
-    if (!Array.isArray(value))
+function findPromptBoundary(records, launched) {
+  let launchIndex = -1;
+  for (let index = 0;index < records.length; index += 1) {
+    const record3 = records[index];
+    if (record3?.type !== "assistant" || record3.isSidechain === true)
       continue;
-    const entries = value.map((entry) => typeof entry === "string" && entry.trim().length > 0 ? entry.trim() : undefined).filter((entry) => entry !== undefined);
-    if (entries.length > 0) {
-      return entries;
+    for (const block of contentBlocks(record3.message?.content)) {
+      if (readString(block, "type") === "tool_use" && launched.has(readString(block, "id") ?? "")) {
+        launchIndex = index;
+      }
     }
   }
-  return;
-}
-function asFiniteNumber(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
-}
-function firstFiniteNumber(record3, keys) {
-  for (const key of keys) {
-    const n = asFiniteNumber(record3[key]);
-    if (n !== undefined)
-      return n;
+  if (launchIndex < 0)
+    return -1;
+  for (let index = launchIndex + 1;index < records.length; index += 1) {
+    const record3 = records[index];
+    if (record3?.type === "assistant" && record3.isSidechain !== true && record3.message?.stop_reason === "end_turn") {
+      return index;
+    }
   }
-  return;
+  return -1;
 }
-function normalizeUsageBreakdown(value) {
-  if (!isRecord4(value))
-    return;
-  const out = {};
-  for (const [key, aliases] of USAGE_BREAKDOWN_FIELDS) {
-    const n = firstFiniteNumber(value, aliases);
-    if (n !== undefined)
-      out[key] = n;
-  }
-  return Object.keys(out).length > 0 ? out : undefined;
+function hasTrackedLaunch(record3, launched) {
+  if (record3?.type !== "assistant" || record3.isSidechain === true)
+    return false;
+  return contentBlocks(record3.message?.content).some((block) => readString(block, "type") === "tool_use" && launched.has(readString(block, "id") ?? ""));
 }
-function normalizeUsageCost(value) {
-  if (!isRecord4(value))
+function isMainEndTurn(record3) {
+  return record3.type === "assistant" && record3.isSidechain !== true && record3.message?.stop_reason === "end_turn";
+}
+function parseRecord(line) {
+  if (!line.trim())
     return;
-  const amount = asFiniteNumber(value.amount);
-  const currency = readString(value, "currency");
-  if (amount === undefined && !currency)
+  try {
+    return JSON.parse(line);
+  } catch {
     return;
-  return { ...amount !== undefined ? { amount } : {}, ...currency ? { currency } : {} };
-}
-function normalizeAgentCommands(value) {
-  if (!Array.isArray(value))
-    return [];
-  const out = [];
-  for (const entry of value) {
-    if (!isRecord4(entry))
-      continue;
-    const name = readString(entry, "name");
-    if (!name)
-      continue;
-    const description = readString(entry, "description");
-    out.push({ name, ...description ? { description } : {}, hasInput: entry.input != null });
   }
-  return out;
 }
-function isRecord4(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function contentBlocks(content) {
+  if (typeof content === "string")
+    return [{ type: "text", text: content }];
+  return Array.isArray(content) ? content.filter((block) => !!block && typeof block === "object") : [];
 }
-function readString(rawInput, key) {
-  if (!isRecord4(rawInput))
-    return;
-  const value = rawInput[key];
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+function blockText(block) {
+  if (typeof block.text === "string")
+    return block.text;
+  if (typeof block.content === "string")
+    return block.content;
+  if (Array.isArray(block.content))
+    return block.content.map((item) => textOfUnknown(item)).filter(Boolean).join(`
+`);
+  return textOfUnknown(block.content);
 }
-function truncateToolDisplay(text) {
-  return text.length > 60 ? `${text.slice(0, 57)}...` : text;
+function textOfUnknown(value) {
+  if (typeof value === "string")
+    return value;
+  if (Array.isArray(value))
+    return value.map(textOfUnknown).filter(Boolean).join(`
+`);
+  if (!value || typeof value !== "object")
+    return "";
+  const object4 = value;
+  if (typeof object4.text === "string")
+    return object4.text;
+  if (object4.content !== undefined)
+    return textOfUnknown(object4.content);
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return "";
+  }
 }
-function isGenericToolTitle(kind, title) {
-  const normalizedTitle = title.trim().toLowerCase();
-  if (kind === "execute" && ["bash", "shell", "sh", "powershell", "cmd"].includes(normalizedTitle)) {
-    return true;
+function findStringField(value, keys) {
+  if (!value || typeof value !== "object")
+    return;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const found = findStringField(item, keys);
+      if (found)
+        return found;
+    }
+    return;
   }
-  if (kind === "search" && ["grep", "rg", "search"].includes(normalizedTitle)) {
-    return true;
+  const object4 = value;
+  for (const key of keys) {
+    const candidate = object4[key];
+    if (typeof candidate === "string" && candidate.trim())
+      return candidate.trim();
   }
-  if (kind === "read" && ["read", "cat"].includes(normalizedTitle)) {
-    return true;
+  for (const candidate of Object.values(object4)) {
+    const found = findStringField(candidate, keys);
+    if (found)
+      return found;
   }
-  return false;
+  return;
 }
-var USAGE_BREAKDOWN_FIELDS;
-var init_streaming_prompt = __esm(() => {
-  init_tool_kind_emoji();
-  USAGE_BREAKDOWN_FIELDS = [
-    ["inputTokens", ["inputTokens", "input_tokens"]],
-    ["outputTokens", ["outputTokens", "output_tokens"]],
-    ["cachedReadTokens", ["cachedReadTokens", "cacheReadInputTokens", "cache_read_input_tokens"]],
-    ["cachedWriteTokens", ["cachedWriteTokens", "cacheCreationInputTokens", "cache_creation_input_tokens"]],
-    ["thoughtTokens", ["thoughtTokens", "thought_tokens"]],
-    ["totalTokens", ["totalTokens", "total_tokens"]]
-  ];
-});
-
-// src/transport/acpx-cli/node-pty-helper.ts
-import { chmod as chmodFs } from "node:fs/promises";
-import { dirname as dirname12, join as join20 } from "node:path";
-function resolveNodePtyHelperPath(packageJsonPath, platform, arch) {
-  if (platform === "win32") {
-    return null;
+function taskNotifications(text) {
+  const notifications = [];
+  const blocks = [...text.matchAll(/<task-notification>([\s\S]*?)<\/task-notification>/gi)].map((match) => match[1] ?? "");
+  for (const block of blocks.length > 0 ? blocks : [text]) {
+    const toolCallId = /<tool-use-id>([^<]+)<\/tool-use-id>/i.exec(block)?.[1]?.trim();
+    if (!toolCallId)
+      continue;
+    const status = /<status>([^<]+)<\/status>/i.exec(block)?.[1]?.trim().toLowerCase();
+    notifications.push({
+      toolCallId,
+      failed: status === "failed" || status === "error" || status === "cancelled" || status === "canceled"
+    });
   }
-  return join20(dirname12(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
+  return notifications;
 }
-async function ensureNodePtyHelperExecutable(helperPath, chmod5 = chmodFs) {
-  if (!helperPath) {
-    return;
-  }
-  try {
-    await chmod5(helperPath, 493);
-  } catch (error2) {
-    if (error2.code === "ENOENT") {
-      return;
-    }
-    throw error2;
-  }
-}
-var init_node_pty_helper = () => {};
-
-// src/transport/codex-subagent-filter.ts
-import { closeSync, openSync, readdirSync, readSync, statSync as statSync2 } from "node:fs";
-import { homedir as homedir10 } from "node:os";
-import { join as join21 } from "node:path";
-function resolveCodexHome(env = process.env) {
-  const fromEnv = env.CODEX_HOME?.trim();
-  return fromEnv ? fromEnv : join21(homedir10(), ".codex");
-}
-function isPlainObject3(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function isSubagentSource(source) {
-  if (!isPlainObject3(source) || !Object.hasOwn(source, "subagent"))
-    return false;
-  const subagent = source.subagent;
-  if (!isPlainObject3(subagent))
-    return false;
-  return Object.values(subagent).some((variant) => isPlainObject3(variant) && typeof variant.parent_thread_id === "string");
+function classifyToolKind(name) {
+  const normalized = name.toLowerCase();
+  if (/(read|view|open)/.test(normalized))
+    return "read";
+  if (/(grep|search|find|glob)/.test(normalized))
+    return "search";
+  if (/(edit|write|patch|replace|create)/.test(normalized))
+    return "edit";
+  if (/(bash|shell|exec|run|terminal|command)/.test(normalized))
+    return "execute";
+  if (/(think|reason|plan|agent|task)/.test(normalized))
+    return "think";
+  return "other";
 }
-function sessionMetaLineIsSubagent(line) {
-  if (!line)
-    return false;
-  let parsed;
-  try {
-    parsed = JSON.parse(line);
-  } catch {
-    return false;
-  }
-  const payload = parsed?.payload;
-  return isSubagentSource(payload?.source);
+function isAgentToolName(name) {
+  const normalized = name.trim().toLowerCase();
+  return normalized === "agent" || normalized === "task";
 }
-function createSubagentPredicate(reader) {
-  let index = null;
-  const cache = new Map;
-  return (sessionId) => {
-    const cached2 = cache.get(sessionId);
-    if (cached2 !== undefined)
-      return cached2;
-    let result = false;
+async function findSubagentTranscripts(transcriptPath) {
+  const sessionDir = join20(dirname12(transcriptPath), basename3(transcriptPath, ".jsonl"), "subagents");
+  const found = [];
+  const visit = async (directory) => {
+    let entries;
     try {
-      if (!index) {
-        index = new Map;
-        for (const path15 of reader.listRolloutPaths()) {
-          const id = path15.match(ROLLOUT_RE)?.[1];
-          if (id)
-            index.set(id.toLowerCase(), path15);
-        }
-      }
-      const path14 = index.get(sessionId.toLowerCase());
-      if (path14)
-        result = sessionMetaLineIsSubagent(reader.readFirstLine(path14));
+      entries = await readdir3(directory, { withFileTypes: true });
     } catch {
-      result = false;
+      return;
     }
-    cache.set(sessionId, result);
-    return result;
-  };
-}
-function filterSubagentSessions(result, isSubagent) {
-  return {
-    ...result,
-    sessions: result.sessions.filter((session3) => {
-      try {
-        return !isSubagent(session3.sessionId);
-      } catch {
-        return true;
-      }
-    })
-  };
-}
-function nodeRolloutReader(home) {
-  const root = join21(home, "sessions");
-  return {
-    listRolloutPaths() {
-      const out = [];
-      const walk = (dir) => {
-        let entries;
-        try {
-          entries = readdirSync(dir, { withFileTypes: true });
-        } catch {
-          return;
-        }
-        for (const entry of entries) {
-          const full = join21(dir, entry.name);
-          if (entry.isDirectory())
-            walk(full);
-          else if (entry.isFile() && entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl"))
-            out.push(full);
-        }
-      };
-      walk(root);
-      return out;
-    },
-    readFirstLine(path14) {
-      let fd;
-      try {
-        statSync2(path14);
-        fd = openSync(path14, "r");
-        const buf = Buffer.alloc(READ_CHUNK);
-        let acc = "";
-        let total = 0;
-        for (;; ) {
-          const bytes = readSync(fd, buf, 0, READ_CHUNK, total);
-          if (bytes <= 0)
-            break;
-          acc += buf.toString("utf8", 0, bytes);
-          total += bytes;
-          const nl = acc.indexOf(`
-`);
-          if (nl !== -1)
-            return acc.slice(0, nl);
-          if (total >= FIRST_LINE_READ_CAP)
-            return;
-        }
-        return acc.length ? acc : undefined;
-      } catch {
-        return;
-      } finally {
-        if (fd !== undefined) {
-          try {
-            closeSync(fd);
-          } catch {}
-        }
+    for (const entry of entries) {
+      const path14 = join20(directory, entry.name);
+      if (entry.isDirectory()) {
+        await visit(path14);
+      } else if (entry.isFile() && entry.name.startsWith("agent-") && entry.name.endsWith(".jsonl")) {
+        found.push({ agentId: entry.name.slice("agent-".length, -".jsonl".length), path: path14 });
       }
     }
   };
+  await visit(sessionDir);
+  return found;
 }
-function codexSubagentPredicate(env) {
-  return createSubagentPredicate(nodeRolloutReader(resolveCodexHome(env)));
+function toolSummary(input) {
+  if (!input || typeof input !== "object")
+    return;
+  const object4 = input;
+  for (const key of ["description", "summary", "path", "file_path", "query", "pattern", "command"]) {
+    if (typeof object4[key] === "string" && object4[key].trim())
+      return object4[key].trim();
+  }
+  return;
 }
-var CODEX_AGENT_NAME = "codex", FIRST_LINE_READ_CAP, READ_CHUNK, ROLLOUT_RE;
-var init_codex_subagent_filter = __esm(() => {
-  FIRST_LINE_READ_CAP = 1024 * 1024;
-  READ_CHUNK = 64 * 1024;
-  ROLLOUT_RE = /rollout-.*-([0-9a-fA-F-]{36})\.jsonl$/;
-});
-
-// src/transport/agent-session-list.ts
-function isUnknownFilterCwdOption(output) {
-  return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
+function readString(object4, key) {
+  if (!object4 || typeof object4 !== "object")
+    return;
+  const value = object4[key];
+  return typeof value === "string" ? value : undefined;
 }
-async function runAgentSessionList(options) {
-  let result = await options.runList(true);
-  let filterLocally = false;
-  if (result.code !== 0 && options.filterCwd && isUnknownFilterCwdOption(result.stdout + result.stderr)) {
-    result = await options.runList(false);
-    filterLocally = true;
-  }
-  if (result.code !== 0) {
-    if ((result.stdout + result.stderr).includes("sessionCapabilities.list")) {
-      return;
-    }
-    throw new Error(options.formatError(result));
-  }
-  const parsed = parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
-  if (parsed && options.isSubagentSession) {
-    return filterSubagentSessions(parsed, options.isSubagentSession);
-  }
-  return parsed;
+function readBoolean(object4, key) {
+  return !!object4 && typeof object4 === "object" && object4[key] === true;
 }
-function parseAgentSessionListOutput(stdout2, filterCwd) {
-  let parsed;
+function encodeClaudeProjectDirectory(cwd) {
+  return cwd.replace(/[:\\/]/g, "-");
+}
+async function exists(path14) {
   try {
-    parsed = JSON.parse(stdout2);
+    await access4(path14, fsConstants.R_OK);
+    return true;
   } catch {
-    throw new Error("failed to parse acpx sessions list output");
+    return false;
   }
-  if (!isAgentSessionListResult(parsed)) {
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted)
+    throw new DOMException("background follow-up aborted", "AbortError");
+}
+async function waitForPoll(ms, signal) {
+  if (!signal) {
+    await new Promise((resolve4) => setTimeout(resolve4, ms));
     return;
   }
-  return filterCwd ? filterAgentSessionListByCwd(parsed, filterCwd) : parsed;
-}
-function isAgentSessionListResult(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value))
-    return false;
-  const record3 = value;
-  if (record3.source !== "agent" || !Array.isArray(record3.sessions))
-    return false;
-  return record3.sessions.every((session3) => {
-    if (!session3 || typeof session3 !== "object" || Array.isArray(session3))
-      return false;
-    const item = session3;
-    return typeof item.sessionId === "string";
+  throwIfAborted(signal);
+  await new Promise((resolve4, reject) => {
+    const timer = setTimeout(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve4();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(new DOMException("background follow-up aborted", "AbortError"));
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
   });
 }
-function filterAgentSessionListByCwd(result, cwd) {
-  return {
-    ...result,
-    sessions: result.sessions.filter((session3) => session3.cwd && isSamePath(session3.cwd, cwd))
-  };
-}
-var init_agent_session_list = __esm(() => {
-  init_path();
-  init_codex_subagent_filter();
+var DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_TIMEOUT_MS, FINAL_SUBAGENT_DRAIN_MAX_POLLS = 4, FINAL_SUBAGENT_DRAIN_STABLE_POLLS = 2, ASYNC_AGENT_LAUNCH;
+var init_background_followup = __esm(() => {
+  DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
+  ASYNC_AGENT_LAUNCH = /Async agent launched successfully|["']?status["']?\s*:\s*["']async_launched["']/i;
 });
 
-// src/transport/acpx-session-files.ts
-import { readdir as readdir3, unlink as unlink2 } from "node:fs/promises";
-import { homedir as homedir11 } from "node:os";
-import { join as join22 } from "node:path";
-async function deleteAcpxSessionFiles(options) {
-  const dir = options.sessionsDir ?? join22(homedir11(), ".acpx", "sessions");
-  const safeId = encodeURIComponent(options.acpxRecordId);
-  await unlink2(join22(dir, `${safeId}.json`)).catch(() => {
-    return;
-  });
-  let entries;
-  try {
-    entries = await readdir3(dir);
-  } catch {
-    return;
-  }
-  const streamFiles = entries.filter((name) => name.startsWith(`${safeId}.stream.`));
-  for (const name of streamFiles) {
-    await unlink2(join22(dir, name)).catch(() => {
-      return;
+// src/transport/tool-kind-emoji.ts
+var TOOL_KIND_EMOJI, DEFAULT_TOOL_EMOJI;
+var init_tool_kind_emoji = __esm(() => {
+  TOOL_KIND_EMOJI = {
+    read: "\uD83D\uDCD6",
+    search: "\uD83D\uDD0D",
+    execute: "\uD83D\uDCBB",
+    edit: "✏️",
+    think: "\uD83E\uDDE0",
+    other: "\uD83D\uDD27"
+  };
+  DEFAULT_TOOL_EMOJI = TOOL_KIND_EMOJI.other;
+});
+
+// src/transport/streaming-prompt.ts
+function createStreamingPromptState(formatToolCalls = false, options) {
+  let toolEventMode;
+  let onToolEvent;
+  let onThought;
+  let onPlan;
+  let onUsage;
+  let onCommands;
+  let rawStream = false;
+  let driver;
+  if (options === undefined) {
+    toolEventMode = "text";
+    onToolEvent = undefined;
+  } else if (typeof options === "function") {
+    onToolEvent = options;
+    toolEventMode = "structured";
+  } else {
+    onToolEvent = options.onToolEvent;
+    onThought = options.onThought;
+    onPlan = options.onPlan;
+    onUsage = options.onUsage;
+    onCommands = options.onCommands;
+    rawStream = options.rawStream ?? false;
+    driver = options.driver?.trim().toLowerCase() || undefined;
+    toolEventMode = resolveToolEventMode({
+      toolEventMode: options.mode,
+      onToolEvent
     });
   }
+  return {
+    buffer: "",
+    segments: [],
+    hasAgentMessage: false,
+    pendingLine: "",
+    formatToolCalls,
+    emittedToolCallIds: new Set,
+    toolCalls: new Map,
+    toolEventMode,
+    driver,
+    rawStream,
+    onToolEvent,
+    onThought,
+    onPlan,
+    onUsage,
+    onCommands,
+    finalize() {
+      if (this.pendingLine.trim().length > 0) {
+        parseStreamingChunks(this, this.pendingLine);
+      }
+      const remaining = this.rawStream ? this.buffer : this.buffer.trim();
+      this.buffer = "";
+      this.pendingLine = "";
+      return remaining;
+    }
+  };
 }
-var init_acpx_session_files = () => {};
-
-// src/transport/session-effort.ts
-function requireAdvertisedSessionEffort(raw, value) {
-  const advertised = parseSessionEffortRecord(raw);
-  if (!advertised) {
-    throw new Error("the active agent does not advertise a reasoning-effort option");
-  }
-  if (!advertised.available.includes(value)) {
-    throw new Error(`reasoning effort "${value}" is not advertised by the active agent`);
+function parseStreamingDataChunk(state, chunk) {
+  state.pendingLine += chunk;
+  let boundary;
+  while ((boundary = state.pendingLine.indexOf(`
+`)) !== -1) {
+    const line = state.pendingLine.slice(0, boundary);
+    state.pendingLine = state.pendingLine.slice(boundary + 1);
+    parseStreamingChunks(state, line);
   }
-  return advertised;
 }
-function parseSessionEffortRecord(raw) {
-  let record3;
+function parseStreamingChunks(state, line) {
+  const trimmed = line.trim();
+  if (trimmed.length === 0)
+    return;
+  let event;
   try {
-    record3 = JSON.parse(raw);
+    event = JSON.parse(trimmed);
   } catch {
     return;
   }
-  if (!isRecord5(record3) || !isRecord5(record3.acpx) || !Array.isArray(record3.acpx.config_options)) {
+  if (event.method !== "session/update")
+    return;
+  const update = event.params?.update;
+  if (!update)
+    return;
+  if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") {
+    const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
+    const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
+    if (wantsStructured && state.onToolEvent) {
+      const merged = update.toolCallId ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
+      const toolEvent = buildToolUseEvent(merged, state.driver);
+      if (toolEvent)
+        state.onToolEvent(toolEvent);
+    }
+    if (wantsText) {
+      const formatted = formatToolCallEvent(update, update.sessionUpdate);
+      if (formatted) {
+        const toolCallId = update.toolCallId;
+        if (toolCallId) {
+          if (state.emittedToolCallIds.has(toolCallId))
+            return;
+          state.emittedToolCallIds.add(toolCallId);
+        }
+        state.segments.push(formatted);
+      }
+    }
     return;
   }
-  for (const candidate of record3.acpx.config_options) {
-    if (!isRecord5(candidate) || typeof candidate.id !== "string")
-      continue;
-    if (candidate.category !== "thought_level" && !EFFORT_CONFIG_IDS.has(candidate.id))
-      continue;
-    const available = Array.isArray(candidate.options) ? candidate.options.flatMap(effortOptionValues) : [];
-    return {
-      configId: candidate.id,
-      current: typeof candidate.currentValue === "string" ? candidate.currentValue : undefined,
-      available
-    };
+  if (update.sessionUpdate === "plan") {
+    const entries = Array.isArray(update.entries) ? update.entries.filter((x) => !!x && typeof x === "object" && typeof x.content === "string" && typeof x.status === "string") : [];
+    if (entries.length > 0)
+      state.onPlan?.(entries);
+    return;
   }
-  return;
-}
-function effortOptionValues(option) {
-  if (!isRecord5(option))
-    return [];
-  if (typeof option.value === "string")
-    return [option.value];
-  return Array.isArray(option.options) ? option.options.flatMap(effortOptionValues) : [];
-}
-function isRecord5(value) {
-  return typeof value === "object" && value !== null;
-}
-var EFFORT_CONFIG_IDS;
-var init_session_effort = __esm(() => {
-  EFFORT_CONFIG_IDS = new Set([
-    "reasoning_effort",
-    "effort",
-    "thought_level",
-    "thinking"
-  ]);
-});
-
-// src/transport/permission-mode-flag.ts
-function permissionModeToFlag(permissionMode) {
-  switch (permissionMode) {
-    case "approve-reads":
-      return "--approve-reads";
-    case "deny-all":
-      return "--deny-all";
-    case "approve-all":
-      return "--approve-all";
+  if (update.sessionUpdate === "usage_update") {
+    const used = typeof update.used === "number" && Number.isFinite(update.used) ? update.used : undefined;
+    const size = typeof update.size === "number" && Number.isFinite(update.size) ? update.size : undefined;
+    if (used !== undefined && size !== undefined && size > 0) {
+      const cost = normalizeUsageCost(update.cost);
+      const breakdown = normalizeUsageBreakdown(update._meta?.usage);
+      state.onUsage?.({ used, size, ...cost ? { cost } : {}, ...breakdown ? { breakdown } : {} });
+    }
+    return;
   }
-}
+  if (update.sessionUpdate === "available_commands_update") {
+    if (Array.isArray(update.availableCommands)) {
+      state.onCommands?.(normalizeAgentCommands(update.availableCommands));
+    }
+    return;
+  }
+  const isThoughtChunk = update.sessionUpdate === "agent_thought_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
+  if (isThoughtChunk) {
+    const chunk2 = update.content.text;
+    if (chunk2.length > 0) {
+      state.onThought?.(chunk2);
+    }
+    return;
+  }
+  const isMessageChunk = update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
+  if (!isMessageChunk)
+    return;
+  state.hasAgentMessage = true;
+  const chunk = update.content.text ?? "";
+  if (chunk.length === 0)
+    return;
+  state.buffer += chunk;
+  if (state.rawStream)
+    return;
+  let boundary;
+  while ((boundary = state.buffer.indexOf(`
 
-// src/transport/acpx-command-builder.ts
-function buildPermissionArgs(input) {
-  const args = [permissionModeToFlag(input.permissionMode), "--non-interactive-permissions", input.nonInteractivePermissions];
-  if (typeof input.permissionPolicy === "string" && input.permissionPolicy.trim().length > 0) {
-    args.push("--permission-policy", input.permissionPolicy);
+`)) !== -1) {
+    const segment = state.buffer.slice(0, boundary).trim();
+    state.buffer = state.buffer.slice(boundary + 2);
+    if (segment.length > 0) {
+      state.segments.push(segment);
+    }
   }
-  return args;
-}
-function buildQueueOwnerTtlArgs(queueOwnerTtlSeconds) {
-  if (typeof queueOwnerTtlSeconds !== "number" || !Number.isFinite(queueOwnerTtlSeconds))
-    return [];
-  return ["--ttl", String(queueOwnerTtlSeconds)];
 }
-function buildModelArgs(model) {
-  const trimmed = model?.trim();
-  return trimmed ? ["--model", trimmed] : [];
+function formatToolCallEvent(update, sessionUpdate) {
+  if (!update)
+    return null;
+  const kind = update.kind ?? "";
+  const title = update.title ?? "";
+  if (title.length === 0)
+    return null;
+  const emoji2 = TOOL_KIND_EMOJI[kind] ?? DEFAULT_TOOL_EMOJI;
+  const inputSummary = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
+  const status = readString2(update, "status");
+  if (!inputSummary && status === "pending")
+    return null;
+  if (!inputSummary && isGenericToolTitle(kind, title))
+    return null;
+  const summaryText = inputSummary && inputSummary !== title ? `: ${truncateToolDisplay(inputSummary)}` : "";
+  const statusText = status ? ` (${status})` : "";
+  return `${emoji2} ${title}${statusText}${summaryText}`;
 }
-function appendAgentAndTail(prefix, input, tail2) {
-  if (input.agentCommand)
-    return [...prefix, "--agent", input.agentCommand, ...tail2];
-  return [...prefix, input.agent, ...tail2];
+function isEmptyToolField(v) {
+  if (v === undefined || v === null)
+    return true;
+  if (typeof v === "string")
+    return v.trim().length === 0;
+  if (Array.isArray(v))
+    return v.length === 0;
+  if (typeof v === "object")
+    return Object.keys(v).length === 0;
+  return false;
 }
-function buildSessionArgs(input, tail2, options = {}) {
-  const prefix = [
-    "--format",
-    options.format ?? "quiet",
-    "--cwd",
-    input.cwd,
-    ...buildPermissionArgs(input.permission),
-    ...buildModelArgs(input.model)
-  ];
-  if (options.verbose)
-    prefix.push("--verbose");
-  return appendAgentAndTail(prefix, input, tail2);
+function mergeToolCallUpdate(state, toolCallId, update) {
+  const prev = state.toolCalls.get(toolCallId) ?? { toolCallId };
+  const merged = { ...prev };
+  for (const key of ["kind", "title", "rawInput", "content", "rawOutput", "locations", "status"]) {
+    const next = update[key];
+    if (!isEmptyToolField(next))
+      merged[key] = next;
+  }
+  const nextMeta = update._meta;
+  if (nextMeta) {
+    const previousMeta = merged._meta;
+    merged._meta = {
+      ...previousMeta,
+      ...nextMeta,
+      ...previousMeta?.qoder || nextMeta.qoder ? { qoder: { ...previousMeta?.qoder, ...nextMeta.qoder } } : {},
+      ...previousMeta?.codex || nextMeta.codex ? {
+        codex: {
+          ...previousMeta?.codex,
+          ...nextMeta.codex,
+          ...previousMeta?.codex?.subagent || nextMeta.codex?.subagent ? { subagent: { ...previousMeta?.codex?.subagent, ...nextMeta.codex?.subagent } } : {}
+        }
+      } : {},
+      ...previousMeta?.claudeCode || nextMeta.claudeCode ? { claudeCode: { ...previousMeta?.claudeCode, ...nextMeta.claudeCode } } : {}
+    };
+  }
+  merged.toolCallId = toolCallId;
+  state.toolCalls.set(toolCallId, merged);
+  return merged;
 }
-function buildPromptArgs(input, tail2) {
-  const prefix = [
-    "--format",
-    "json",
-    "--json-strict",
-    "--cwd",
-    input.cwd,
-    ...buildPermissionArgs(input.permission),
-    ...buildModelArgs(input.model),
-    ...buildQueueOwnerTtlArgs(input.queueOwnerTtlSeconds)
-  ];
-  return appendAgentAndTail(prefix, input, tail2);
+function buildToolUseEvent(update, driver) {
+  if (!update)
+    return null;
+  const toolCallId = update.toolCallId;
+  if (!toolCallId)
+    return null;
+  const kindRaw = update.kind ?? "";
+  const kind = (() => {
+    switch (kindRaw) {
+      case "read":
+      case "search":
+      case "execute":
+      case "edit":
+      case "think":
+        return kindRaw;
+      default:
+        return "other";
+    }
+  })();
+  const title = (update.title ?? "").trim();
+  const toolName = title || "Tool";
+  const summaryRaw = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
+  const summary = summaryRaw && summaryRaw !== title ? summaryRaw : undefined;
+  const statusRaw = readString2(update, "status");
+  const isClaudeDriver = driver === undefined || driver === "claude";
+  const claudeMeta = isClaudeDriver ? update._meta?.claudeCode : undefined;
+  const claudeToolResponse = claudeMeta?.toolResponse;
+  const hasClaudeToolResponse = !isEmptyToolField(claudeToolResponse);
+  const isAsyncAgentLaunch2 = update._meta?.claudeCode?.toolName === "Agent" && isRecord4(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
+  const status = isAsyncAgentLaunch2 ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
+  const rawInput = update.rawInput;
+  const content = update.content;
+  const rawOutput = update.rawOutput ?? claudeToolResponse;
+  const locations = update.locations;
+  const parentToolCallId = claudeMeta?.parentToolUseId?.trim();
+  const isSubagent = claudeMeta?.toolName === "Agent" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" || driver === "kimi" && isKimiSubagentInput(rawInput) || driver === "codex" && isCodexSubagentMeta(update._meta?.codex?.subagent);
+  return {
+    toolCallId,
+    ...parentToolCallId ? { parentToolCallId } : {},
+    ...isSubagent ? { isSubagent: true } : {},
+    toolName,
+    kind,
+    ...summary ? { summary } : {},
+    ...rawInput !== undefined ? { rawInput } : {},
+    ...content !== undefined ? { content } : {},
+    ...rawOutput !== undefined ? { rawOutput } : {},
+    ...locations !== undefined ? { locations } : {},
+    status
+  };
 }
-function buildAgentQueryArgs(input, format, tail2) {
-  const prefix = ["--format", format, "--cwd", input.cwd, ...buildPermissionArgs(input.permission)];
-  return appendAgentAndTail(prefix, input, tail2);
+function isKimiSubagentInput(rawInput) {
+  return isRecord4(rawInput) && readFirstString(rawInput, ["prompt"]) !== undefined && readFirstString(rawInput, ["subagent_type", "subagentType"]) !== undefined;
 }
-function isMissingAcpxSessionError(stderr, stdout2) {
-  const combined = `${stderr}
-${stdout2}`.toLowerCase();
-  return combined.includes("no named session") || combined.includes("no cwd session") || combined.includes("session not found") || combined.includes("unknown session") || combined.includes("no acpx session found");
+function isCodexSubagentMeta(meta2) {
+  return typeof meta2?.threadId === "string" && meta2.threadId.trim().length > 0 && typeof meta2.activity === "string" && meta2.activity.trim().length > 0;
 }
-function parseAcpxSessionRecordId(stdout2) {
-  try {
-    const parsed = JSON.parse(stdout2);
-    const acpxRecordId = typeof parsed.acpxRecordId === "string" ? parsed.acpxRecordId : typeof parsed.id === "string" ? parsed.id : undefined;
-    const providerSessionId = typeof parsed.agentSessionId === "string" && parsed.agentSessionId.length > 0 ? parsed.agentSessionId : undefined;
-    const acpSessionId = typeof parsed.acpSessionId === "string" && parsed.acpSessionId.length > 0 ? parsed.acpSessionId : undefined;
-    const agentSessionId = providerSessionId ?? acpSessionId;
-    if (acpxRecordId && /^[\w.:-]+$/.test(acpxRecordId) && acpxRecordId.length >= 8) {
-      return { acpxRecordId, agentSessionId };
+function summarizeToolInput(rawInput, title = "") {
+  if (rawInput == null)
+    return;
+  if (typeof rawInput === "string" || typeof rawInput === "number" || typeof rawInput === "boolean") {
+    return String(rawInput);
+  }
+  if (!isRecord4(rawInput))
+    return;
+  const taskSummary = summarizeTaskInput(rawInput, title);
+  if (taskSummary)
+    return taskSummary;
+  const command = readFirstString(rawInput, ["command", "cmd", "program"]);
+  const args = readFirstStringArray(rawInput, ["args", "arguments"]);
+  if (command) {
+    return [command, ...args ?? []].join(" ");
+  }
+  const parsedCmd = rawInput.parsed_cmd;
+  if (Array.isArray(parsedCmd) && parsedCmd.length > 0) {
+    const parts = [];
+    for (const entry of parsedCmd) {
+      if (isRecord4(entry) && typeof entry.cmd === "string" && entry.cmd.length > 0) {
+        parts.push(entry.cmd);
+      }
     }
-  } catch {
-    const firstLine = stdout2.trim().split(/\r?\n/, 1)[0];
-    if (firstLine && /^[\w.:-]+$/.test(firstLine) && firstLine.length >= 8) {
-      return { acpxRecordId: firstLine };
+    if (parts.length > 0) {
+      return parts.join(" ");
     }
   }
+  return readFirstString(rawInput, [
+    "path",
+    "file",
+    "filePath",
+    "filepath",
+    "file_path",
+    "target",
+    "uri",
+    "url",
+    "query",
+    "pattern",
+    "text",
+    "search",
+    "name",
+    "description"
+  ]);
+}
+function summarizeTaskInput(rawInput, title) {
+  const subagentType = readFirstString(rawInput, ["subagent_type", "subagentType", "agent", "agentType"]);
+  const description = readFirstString(rawInput, ["description", "task", "summary"]);
+  if (subagentType && description) {
+    return description === title ? subagentType : `${subagentType}: ${description}`;
+  }
+  if (subagentType)
+    return subagentType;
   return;
 }
-var DEFAULT_PERMISSION_MODE2 = "approve-all", DEFAULT_NON_INTERACTIVE = "deny";
-var init_acpx_command_builder = () => {};
-
-// src/transport/acpx-cli/acpx-cli-transport.ts
-import { createRequire as createRequire5 } from "node:module";
-import { spawn as spawn11 } from "node:child_process";
-import { spawn as spawnPty } from "node-pty";
-function managementTimeoutError(args, options, output = {}) {
-  return new CommandTimeoutError(options.timeoutMs, renderCommandForError(args), {
-    stage: options.stage,
-    ...output
-  });
+function readFirstString(record3, keys) {
+  for (const key of keys) {
+    const value = record3[key];
+    if (typeof value === "string" && value.trim().length > 0) {
+      return value.trim();
+    }
+  }
+  return;
 }
-async function defaultRunner(command, args, options) {
-  return await new Promise((resolve4, reject) => {
-    const spawnSpec = resolveSpawnCommand(command, args);
-    const child = spawn11(spawnSpec.command, spawnSpec.args, {
-      env: options?.env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let stdout2 = "";
-    let stderr = "";
-    const onAbort = () => {
-      terminateProcessTree(child.pid ?? 0, { detachedProcessGroup: false });
-    };
-    options?.signal?.addEventListener("abort", onAbort, { once: true });
-    const timeoutId = options?.timeoutMs ? setTimeout(() => {
-      onAbort();
-      reject(managementTimeoutError(args, options, { stdout: stdout2, stderr }));
-    }, options.timeoutMs) : undefined;
-    child.stdout.on("data", (chunk) => {
-      stdout2 += String(chunk);
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr += String(chunk);
-    });
-    child.on("error", (error2) => {
-      options?.signal?.removeEventListener("abort", onAbort);
-      if (timeoutId)
-        clearTimeout(timeoutId);
-      reject(error2);
-    });
-    child.on("close", (code) => {
-      options?.signal?.removeEventListener("abort", onAbort);
-      if (timeoutId)
-        clearTimeout(timeoutId);
-      resolve4({ code: code ?? 1, stdout: stdout2, stderr });
-    });
-  });
+function readFirstStringArray(record3, keys) {
+  for (const key of keys) {
+    const value = record3[key];
+    if (!Array.isArray(value))
+      continue;
+    const entries = value.map((entry) => typeof entry === "string" && entry.trim().length > 0 ? entry.trim() : undefined).filter((entry) => entry !== undefined);
+    if (entries.length > 0) {
+      return entries;
+    }
+  }
+  return;
 }
-async function defaultPtyRunner(command, args, options) {
-  const helperPath = resolveNodePtyHelperPath(require4.resolve("node-pty/package.json"), process.platform, process.arch);
-  await ensureNodePtyHelperExecutable(helperPath);
-  return await new Promise((resolve4, reject) => {
-    const spawnSpec = resolveSpawnCommand(command, args);
-    const child = spawnPty(spawnSpec.command, spawnSpec.args, {
-      name: "xterm-color",
-      cols: 80,
-      rows: 24,
-      cwd: process.cwd(),
-      env: resolveChildEnvironment(process.env, options?.env, getLocale())
-    });
-    let output = "";
-    const onAbort = () => {
-      child.kill();
-    };
-    options?.signal?.addEventListener("abort", onAbort, { once: true });
-    const timeoutId = options?.timeoutMs ? setTimeout(() => {
-      onAbort();
-      reject(managementTimeoutError(args, options, { stdout: output }));
-    }, options.timeoutMs) : undefined;
-    child.onData((chunk) => {
-      output += chunk;
-    });
-    child.onExit(({ exitCode }) => {
-      options?.signal?.removeEventListener("abort", onAbort);
-      if (timeoutId)
-        clearTimeout(timeoutId);
-      resolve4({ code: exitCode, stdout: output, stderr: "" });
-    });
-  });
+function asFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
-
-class AcpxCliTransport {
-  command;
-  sessionInitTimeoutMs;
-  managementCommandTimeoutMs;
-  permissionMode;
-  nonInteractivePermissions;
-  permissionPolicy;
-  queueOwnerTtlSeconds;
-  runCommand;
-  runPtyCommand;
-  queueOwnerLauncher;
-  streamingHooks;
-  resolveSpawnEnvironment;
-  constructor(options, runCommand = defaultRunner, runPtyCommand = defaultPtyRunner, queueOwnerLauncher, streamingHooks = {}) {
-    this.command = options.command ?? "acpx";
-    this.sessionInitTimeoutMs = options.sessionInitTimeoutMs ?? 120000;
-    this.managementCommandTimeoutMs = options.managementCommandTimeoutMs ?? DEFAULT_MANAGEMENT_COMMAND_TIMEOUT_MS;
-    this.permissionMode = options.permissionMode ?? DEFAULT_PERMISSION_MODE2;
-    this.nonInteractivePermissions = options.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE;
-    this.permissionPolicy = options.permissionPolicy;
-    this.queueOwnerTtlSeconds = options.queueOwnerTtlSeconds;
-    this.runCommand = runCommand;
-    this.runPtyCommand = runPtyCommand;
-    this.queueOwnerLauncher = queueOwnerLauncher ?? new AcpxQueueOwnerLauncher({
-      acpxCommand: this.command,
-      ...typeof this.queueOwnerTtlSeconds === "number" && Number.isFinite(this.queueOwnerTtlSeconds) ? { ttlMs: this.queueOwnerTtlSeconds * 1000 } : {}
-    });
-    this.streamingHooks = streamingHooks;
-    this.resolveSpawnEnvironment = options.resolveSpawnEnvironment ?? resolveClaudeSpawnEnvironment;
+function firstFiniteNumber(record3, keys) {
+  for (const key of keys) {
+    const n = asFiniteNumber(record3[key]);
+    if (n !== undefined)
+      return n;
   }
-  async ensureSession(session3, _onProgress) {
-    this.invalidateRecordIdCache(session3);
-    try {
-      await this.runEnsureSession(session3);
-    } catch (error2) {
-      const requestedModel = session3.model?.trim();
-      if (requestedModel && isModelNotAdvertisedError(error2 instanceof Error ? error2.message : null)) {
-        await this.runEnsureSession({ ...session3, model: undefined });
-        return;
-      }
-      throw error2;
-    }
+  return;
+}
+function normalizeUsageBreakdown(value) {
+  if (!isRecord4(value))
+    return;
+  const out = {};
+  for (const [key, aliases] of USAGE_BREAKDOWN_FIELDS) {
+    const n = firstFiniteNumber(value, aliases);
+    if (n !== undefined)
+      out[key] = n;
   }
-  async runEnsureSession(session3) {
-    const args = this.buildArgs(session3, [
-      "sessions",
-      "new",
-      "--name",
-      session3.transportSession
-    ]);
-    const runEnsure = session3.agentCommand ? this.run : this.runWithPty;
-    await runEnsure.call(this, args, {
-      timeoutMs: this.sessionInitTimeoutMs,
-      env: this.spawnEnvironment(session3)
-    });
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+function normalizeUsageCost(value) {
+  if (!isRecord4(value))
+    return;
+  const amount = asFiniteNumber(value.amount);
+  const currency = readString2(value, "currency");
+  if (amount === undefined && !currency)
+    return;
+  return { ...amount !== undefined ? { amount } : {}, ...currency ? { currency } : {} };
+}
+function normalizeAgentCommands(value) {
+  if (!Array.isArray(value))
+    return [];
+  const out = [];
+  for (const entry of value) {
+    if (!isRecord4(entry))
+      continue;
+    const name = readString2(entry, "name");
+    if (!name)
+      continue;
+    const description = readString2(entry, "description");
+    out.push({ name, ...description ? { description } : {}, hasInput: entry.input != null });
   }
-  async listAgentSessions(query) {
-    return await runAgentSessionList({
-      filterCwd: query.filterCwd,
-      runList: async (includeFilterCwd) => {
-        const args = this.buildAgentQueryArgs(query, "json", [
-          "sessions",
-          "list",
-          ...includeFilterCwd && query.filterCwd ? ["--filter-cwd", query.filterCwd] : [],
-          ...query.cursor ? ["--cursor", query.cursor] : []
-        ]);
-        return await this.runCommandWithTimeout(this.runCommand, args, {
-          timeoutMs: this.sessionInitTimeoutMs,
-          env: this.spawnEnvironment(query)
-        });
-      },
-      formatError: (result) => normalizeCommandError(result) ?? `command failed with exit code ${result.code}`,
-      isSubagentSession: (query.driver ?? query.agent) === CODEX_AGENT_NAME ? codexSubagentPredicate() : undefined
-    });
+  return out;
+}
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readString2(rawInput, key) {
+  if (!isRecord4(rawInput))
+    return;
+  const value = rawInput[key];
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+}
+function truncateToolDisplay(text) {
+  return text.length > 60 ? `${text.slice(0, 57)}...` : text;
+}
+function isGenericToolTitle(kind, title) {
+  const normalizedTitle = title.trim().toLowerCase();
+  if (kind === "execute" && ["bash", "shell", "sh", "powershell", "cmd"].includes(normalizedTitle)) {
+    return true;
   }
-  async tailSessionHistory(session3, lines) {
-    const candidates = [
-      ["sessions", "history", session3.transportSession, "--limit", String(lines)],
-      ["sessions", "history", "quiet", "-s", session3.transportSession, String(lines)],
-      ["sessions", "history", "quiet", session3.transportSession, String(lines)],
-      ["sessions", "history", "-s", session3.transportSession, "--tail", String(lines)],
-      ["sessions", "history", session3.transportSession, "--tail", String(lines)],
-      ["sessions", "history", "--name", session3.transportSession, "--tail", String(lines)]
-    ];
-    const deadline = Date.now() + this.managementCommandTimeoutMs;
-    let lastResult;
-    for (const tail2 of candidates) {
-      const args = this.buildArgs(session3, tail2);
-      const result = await this.runCommandWithTimeout(this.runCommand, args, {
-        timeoutMs: Math.max(deadline - Date.now(), 1),
-        stage: "session-history",
-        env: this.spawnEnvironment(session3)
-      });
-      if (result.code === 0) {
-        return { text: result.stdout.trimEnd() };
-      }
-      lastResult = result;
-    }
-    const detail = lastResult ? normalizeCommandError(lastResult) ?? `command failed with exit code ${lastResult.code}` : "command failed";
-    throw new Error(detail);
+  if (kind === "search" && ["grep", "rg", "search"].includes(normalizedTitle)) {
+    return true;
   }
-  async prompt(session3, text, reply, replyContext, options) {
-    if (session3.effort?.trim()) {
-      await this.reapplySessionEffort(session3, session3.effort.trim());
-    }
-    await this.launchMcpQueueOwnerIfNeeded(session3);
-    const structuredPrompt = await createStructuredPromptFile(text, options?.media);
-    const args = this.buildPromptArgs(session3, text, structuredPrompt?.filePath);
-    try {
-      if (reply || options?.onSegment || options?.onToolEvent || options?.onThought || options?.onPlan || options?.onUsage || options?.onCommands) {
-        const effectiveReplyMode = session3.effectiveReplyMode ?? session3.replyMode;
-        const formatToolCalls = (effectiveReplyMode ?? "verbose") === "verbose";
-        const rawStream = effectiveReplyMode === "stream";
-        let toolEventMode = resolveToolEventMode(options);
-        if ((toolEventMode === "structured" || toolEventMode === "both") && !options?.onToolEvent) {
-          toolEventMode = "text";
-        }
-        const { result: result2, overflowCount } = await this.runStreamingPrompt(this.command, args, reply, formatToolCalls, toolEventMode, replyContext, options?.onSegment, options?.onToolEvent, options?.onThought, options?.onPlan, options?.onUsage, options?.onCommands, rawStream, this.spawnEnvironment(session3), session3.driver ?? session3.agent);
-        const baseText = getPromptText(result2);
-        if (!reply) {
-          return { text: baseText };
-        }
-        const summary = buildOverflowSummary(overflowCount);
-        return { text: summary ? `${summary}
+  if (kind === "read" && ["read", "cat"].includes(normalizedTitle)) {
+    return true;
+  }
+  return false;
+}
+var USAGE_BREAKDOWN_FIELDS;
+var init_streaming_prompt = __esm(() => {
+  init_background_followup();
+  init_tool_kind_emoji();
+  USAGE_BREAKDOWN_FIELDS = [
+    ["inputTokens", ["inputTokens", "input_tokens"]],
+    ["outputTokens", ["outputTokens", "output_tokens"]],
+    ["cachedReadTokens", ["cachedReadTokens", "cacheReadInputTokens", "cache_read_input_tokens"]],
+    ["cachedWriteTokens", ["cachedWriteTokens", "cacheCreationInputTokens", "cache_creation_input_tokens"]],
+    ["thoughtTokens", ["thoughtTokens", "thought_tokens"]],
+    ["totalTokens", ["totalTokens", "total_tokens"]]
+  ];
+});
 
-${baseText}` : "" };
-      }
-      const spawnOptions = this.withSpawnEnvironment(session3);
-      const result = spawnOptions ? await this.runCommand(this.command, args, spawnOptions) : await this.runCommand(this.command, args);
-      return { text: getPromptText(result) };
-    } finally {
-      try {
-        await structuredPrompt?.cleanup();
-      } catch {}
-    }
+// src/transport/acpx-cli/node-pty-helper.ts
+import { chmod as chmodFs } from "node:fs/promises";
+import { dirname as dirname13, join as join21 } from "node:path";
+function resolveNodePtyHelperPath(packageJsonPath, platform, arch) {
+  if (platform === "win32") {
+    return null;
   }
-  async setMode(session3, modeId) {
-    await this.run(this.buildArgs(session3, [
-      "set-mode",
-      "-s",
-      session3.transportSession,
-      modeId
-    ]), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "set-mode"
-    }));
+  return join21(dirname13(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
+}
+async function ensureNodePtyHelperExecutable(helperPath, chmod5 = chmodFs) {
+  if (!helperPath) {
+    return;
   }
-  async setModel(session3, modelId) {
-    await this.run(this.buildArgs({ ...session3, model: modelId }, [
-      "set",
-      "-s",
-      session3.transportSession,
-      "model",
-      modelId
-    ]), this.withSpawnEnvironment({ ...session3, model: modelId }, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "set-model"
-    }));
-  }
-  async getSessionModel(session3) {
-    const prefix = ["--format", "json", "--cwd", session3.cwd, ...this.buildPermissionArgs()];
-    const tail2 = ["status", "-s", session3.transportSession];
-    const args = session3.agentCommand ? [...prefix, "--agent", session3.agentCommand, ...tail2] : [...prefix, session3.agent, ...tail2];
-    const result = await this.runCommandWithTimeout(this.runCommand, args, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "get-session-model",
-      env: this.spawnEnvironment(session3)
-    });
-    if (result.code !== 0) {
-      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
-      throw new Error(detail);
+  try {
+    await chmod5(helperPath, 493);
+  } catch (error2) {
+    if (error2.code === "ENOENT") {
+      return;
     }
+    throw error2;
+  }
+}
+var init_node_pty_helper = () => {};
+
+// src/transport/codex-subagent-filter.ts
+import { closeSync, openSync, readdirSync, readSync, statSync as statSync2 } from "node:fs";
+import { homedir as homedir11 } from "node:os";
+import { join as join22 } from "node:path";
+function resolveCodexHome(env = process.env) {
+  const fromEnv = env.CODEX_HOME?.trim();
+  return fromEnv ? fromEnv : join22(homedir11(), ".codex");
+}
+function isPlainObject3(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isSubagentSource(source) {
+  if (!isPlainObject3(source) || !Object.hasOwn(source, "subagent"))
+    return false;
+  const subagent = source.subagent;
+  if (!isPlainObject3(subagent))
+    return false;
+  return Object.values(subagent).some((variant) => isPlainObject3(variant) && typeof variant.parent_thread_id === "string");
+}
+function sessionMetaLineIsSubagent(line) {
+  if (!line)
+    return false;
+  let parsed;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    return false;
+  }
+  const payload = parsed?.payload;
+  return isSubagentSource(payload?.source);
+}
+function createSubagentPredicate(reader) {
+  let index = null;
+  const cache = new Map;
+  return (sessionId) => {
+    const cached2 = cache.get(sessionId);
+    if (cached2 !== undefined)
+      return cached2;
+    let result = false;
     try {
-      const json = JSON.parse(result.stdout);
-      return {
-        current: typeof json.model === "string" ? json.model : undefined,
-        available: Array.isArray(json.availableModels) ? json.availableModels.filter((m) => typeof m === "string") : []
-      };
+      if (!index) {
+        index = new Map;
+        for (const path15 of reader.listRolloutPaths()) {
+          const id = path15.match(ROLLOUT_RE)?.[1];
+          if (id)
+            index.set(id.toLowerCase(), path15);
+        }
+      }
+      const path14 = index.get(sessionId.toLowerCase());
+      if (path14)
+        result = sessionMetaLineIsSubagent(reader.readFirstLine(path14));
     } catch {
-      return { available: [] };
+      result = false;
     }
+    cache.set(sessionId, result);
+    return result;
+  };
+}
+function filterSubagentSessions(result, isSubagent) {
+  return {
+    ...result,
+    sessions: result.sessions.filter((session3) => {
+      try {
+        return !isSubagent(session3.sessionId);
+      } catch {
+        return true;
+      }
+    })
+  };
+}
+function nodeRolloutReader(home) {
+  const root = join22(home, "sessions");
+  return {
+    listRolloutPaths() {
+      const out = [];
+      const walk = (dir) => {
+        let entries;
+        try {
+          entries = readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return;
+        }
+        for (const entry of entries) {
+          const full = join22(dir, entry.name);
+          if (entry.isDirectory())
+            walk(full);
+          else if (entry.isFile() && entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl"))
+            out.push(full);
+        }
+      };
+      walk(root);
+      return out;
+    },
+    readFirstLine(path14) {
+      let fd;
+      try {
+        statSync2(path14);
+        fd = openSync(path14, "r");
+        const buf = Buffer.alloc(READ_CHUNK);
+        let acc = "";
+        let total = 0;
+        for (;; ) {
+          const bytes = readSync(fd, buf, 0, READ_CHUNK, total);
+          if (bytes <= 0)
+            break;
+          acc += buf.toString("utf8", 0, bytes);
+          total += bytes;
+          const nl = acc.indexOf(`
+`);
+          if (nl !== -1)
+            return acc.slice(0, nl);
+          if (total >= FIRST_LINE_READ_CAP)
+            return;
+        }
+        return acc.length ? acc : undefined;
+      } catch {
+        return;
+      } finally {
+        if (fd !== undefined) {
+          try {
+            closeSync(fd);
+          } catch {}
+        }
+      }
+    }
+  };
+}
+function codexSubagentPredicate(env) {
+  return createSubagentPredicate(nodeRolloutReader(resolveCodexHome(env)));
+}
+var CODEX_AGENT_NAME = "codex", FIRST_LINE_READ_CAP, READ_CHUNK, ROLLOUT_RE;
+var init_codex_subagent_filter = __esm(() => {
+  FIRST_LINE_READ_CAP = 1024 * 1024;
+  READ_CHUNK = 64 * 1024;
+  ROLLOUT_RE = /rollout-.*-([0-9a-fA-F-]{36})\.jsonl$/;
+});
+
+// src/transport/agent-session-list.ts
+function isUnknownFilterCwdOption(output) {
+  return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
+}
+async function runAgentSessionList(options) {
+  let result = await options.runList(true);
+  let filterLocally = false;
+  if (result.code !== 0 && options.filterCwd && isUnknownFilterCwdOption(result.stdout + result.stderr)) {
+    result = await options.runList(false);
+    filterLocally = true;
   }
-  async getSessionEffort(session3) {
-    const output = await this.run(this.buildArgs(session3, [
-      "sessions",
-      "show",
-      session3.transportSession
-    ], "json"), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "get-session-effort"
-    }));
-    const effort = parseSessionEffortRecord(output);
-    return effort ? { current: effort.current, available: effort.available } : { available: [] };
-  }
-  async setSessionEffort(session3, effort) {
-    const record3 = await this.readSessionEffortRecord(session3);
-    await this.applyAdvertisedSessionEffort(session3, effort, record3);
-  }
-  async reapplySessionEffort(session3, effort) {
-    const record3 = await this.readSessionEffortRecord(session3);
-    const observed = parseSessionEffortRecord(record3);
-    if (!observed?.available.includes(effort)) {
+  if (result.code !== 0) {
+    if ((result.stdout + result.stderr).includes("sessionCapabilities.list")) {
       return;
     }
-    await this.applyAdvertisedSessionEffort(session3, effort, record3);
+    throw new Error(options.formatError(result));
   }
-  async readSessionEffortRecord(session3) {
-    return await this.run(this.buildArgs(session3, [
-      "sessions",
-      "show",
-      session3.transportSession
-    ], "json"), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "get-session-effort"
-    }));
+  const parsed = parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
+  if (parsed && options.isSubagentSession) {
+    return filterSubagentSessions(parsed, options.isSubagentSession);
   }
-  async applyAdvertisedSessionEffort(session3, effort, record3) {
-    const advertised = requireAdvertisedSessionEffort(record3, effort);
-    await this.run(this.buildArgs(session3, [
-      "set",
-      "-s",
-      session3.transportSession,
-      advertised.configId,
-      effort
-    ]), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "set-session-effort"
-    }));
+  return parsed;
+}
+function parseAgentSessionListOutput(stdout2, filterCwd) {
+  let parsed;
+  try {
+    parsed = JSON.parse(stdout2);
+  } catch {
+    throw new Error("failed to parse acpx sessions list output");
   }
-  async cancel(session3) {
-    const output = await this.run(this.buildArgs(session3, [
-      "cancel",
-      "-s",
-      session3.transportSession
-    ]), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "cancel"
-    }));
-    return {
-      cancelled: true,
-      message: output.trim()
-    };
+  if (!isAgentSessionListResult(parsed)) {
+    return;
   }
-  async resumeAgentSession(session3, agentSessionId) {
-    this.invalidateRecordIdCache(session3);
-    const args = this.buildArgs(session3, [
-      "sessions",
-      "new",
-      "--name",
-      session3.transportSession,
-      "--resume-session",
-      agentSessionId
-    ]);
-    const runResume = session3.agentCommand ? this.run : this.runWithPty;
-    await runResume.call(this, args, {
-      timeoutMs: this.sessionInitTimeoutMs,
-      env: this.spawnEnvironment(session3)
-    });
-  }
-  async updatePermissionPolicy(policy) {
-    this.permissionMode = policy.permissionMode;
-    this.nonInteractivePermissions = policy.nonInteractivePermissions;
-    this.permissionPolicy = policy.permissionPolicy;
-  }
-  async removeSession(session3) {
-    this.invalidateRecordIdCache(session3);
-    const result = await this.runCommandWithTimeout(this.runCommand, this.buildArgs(session3, [
-      "sessions",
-      "close",
-      session3.transportSession
-    ]), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "remove-session"
-    }));
-    if (result.code === 0) {
-      return;
-    }
-    if (isMissingAcpxSessionError(result.stderr, result.stdout)) {
-      return;
-    }
-    const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
-    throw new Error(detail);
-  }
-  async deleteSession(session3) {
-    let acpxRecordId;
-    try {
-      ({ acpxRecordId } = await this.readSessionRecord(session3));
-    } catch {
-      return;
-    }
-    await this.removeSession(session3);
-    await deleteAcpxSessionFiles({ acpxRecordId });
-  }
-  async freeWarmProcess(session3) {
-    let acpxRecordId;
-    try {
-      ({ acpxRecordId } = await this.readSessionRecord(session3));
-    } catch {
-      return;
-    }
-    await terminateAcpxQueueOwner(acpxRecordId);
-  }
-  recordIdCache = new Map;
-  recordIdCacheKey(session3) {
-    return JSON.stringify([session3.agent, session3.agentCommand ?? null, session3.cwd, session3.transportSession]);
-  }
-  invalidateRecordIdCache(session3) {
-    this.recordIdCache.delete(this.recordIdCacheKey(session3));
-  }
-  async isSessionWarm(session3) {
-    const cacheKey = this.recordIdCacheKey(session3);
-    let acpxRecordId = this.recordIdCache.get(cacheKey);
-    if (!acpxRecordId) {
-      try {
-        ({ acpxRecordId } = await this.readSessionRecord(session3));
-      } catch {
-        return false;
-      }
-      this.recordIdCache.set(cacheKey, acpxRecordId);
-    }
-    const pid = await readQueueOwnerPid(acpxRecordId);
-    if (pid === undefined) {
+  return filterCwd ? filterAgentSessionListByCwd(parsed, filterCwd) : parsed;
+}
+function isAgentSessionListResult(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return false;
+  const record3 = value;
+  if (record3.source !== "agent" || !Array.isArray(record3.sessions))
+    return false;
+  return record3.sessions.every((session3) => {
+    if (!session3 || typeof session3 !== "object" || Array.isArray(session3))
       return false;
-    }
-    return isProcessAlive(pid);
-  }
-  async hasSession(session3) {
-    const result = await this.runCommandWithTimeout(this.runCommand, this.buildArgs(session3, [
-      "sessions",
-      "show",
-      session3.transportSession
-    ]), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "has-session"
-    }));
-    return result.code === 0;
+    const item = session3;
+    return typeof item.sessionId === "string";
+  });
+}
+function filterAgentSessionListByCwd(result, cwd) {
+  return {
+    ...result,
+    sessions: result.sessions.filter((session3) => session3.cwd && isSamePath(session3.cwd, cwd))
+  };
+}
+var init_agent_session_list = __esm(() => {
+  init_path();
+  init_codex_subagent_filter();
+});
+
+// src/transport/acpx-session-files.ts
+import { readdir as readdir4, unlink as unlink2 } from "node:fs/promises";
+import { homedir as homedir12 } from "node:os";
+import { join as join23 } from "node:path";
+async function deleteAcpxSessionFiles(options) {
+  const dir = options.sessionsDir ?? join23(homedir12(), ".acpx", "sessions");
+  const safeId = encodeURIComponent(options.acpxRecordId);
+  await unlink2(join23(dir, `${safeId}.json`)).catch(() => {
+    return;
+  });
+  let entries;
+  try {
+    entries = await readdir4(dir);
+  } catch {
+    return;
   }
-  async launchMcpQueueOwnerIfNeeded(session3) {
-    if (!session3.mcpCoordinatorSession) {
+  const streamFiles = entries.filter((name) => name.startsWith(`${safeId}.stream.`));
+  for (const name of streamFiles) {
+    await unlink2(join23(dir, name)).catch(() => {
       return;
-    }
-    const record3 = await this.readSessionRecord(session3);
-    const env = this.spawnEnvironment(session3);
-    await this.queueOwnerLauncher.launch({
-      acpxRecordId: record3.acpxRecordId,
-      coordinatorSession: session3.mcpCoordinatorSession,
-      ...session3.mcpSourceHandle ? { sourceHandle: session3.mcpSourceHandle } : {},
-      permissionMode: this.permissionMode,
-      nonInteractivePermissions: this.nonInteractivePermissions,
-      ...session3.model?.trim() ? { sessionOptions: { model: session3.model.trim() } } : {},
-      ...env ? { env } : {}
     });
   }
-  async readSessionRecord(session3) {
-    const result = await this.runCommandWithTimeout(this.runCommand, this.buildArgs(session3, [
-      "sessions",
-      "show",
-      session3.transportSession
-    ], "json"), this.withSpawnEnvironment(session3, {
-      timeoutMs: this.managementCommandTimeoutMs,
-      stage: "read-session-record"
-    }));
-    if (result.code !== 0) {
-      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
-      throw new Error(detail);
-    }
-    const record3 = parseAcpxSessionRecordId(result.stdout);
-    if (record3)
-      return record3;
-    throw new Error("failed to resolve acpx session record id");
+}
+var init_acpx_session_files = () => {};
+
+// src/transport/session-effort.ts
+function requireAdvertisedSessionEffort(raw, value) {
+  const advertised = parseSessionEffortRecord(raw);
+  if (!advertised) {
+    throw new Error("the active agent does not advertise a reasoning-effort option");
   }
-  async getAgentSessionId(session3) {
-    const record3 = await this.readSessionRecord(session3);
-    return record3.agentSessionId;
+  if (!advertised.available.includes(value)) {
+    throw new Error(`reasoning effort "${value}" is not advertised by the active agent`);
   }
-  async run(args, options) {
-    const result = await this.runCommandWithTimeout(this.runCommand, args, options);
-    if (result.code !== 0) {
-      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
-      throw new Error(detail);
-    }
-    return result.stdout;
+  return advertised;
+}
+function parseSessionEffortRecord(raw) {
+  let record3;
+  try {
+    record3 = JSON.parse(raw);
+  } catch {
+    return;
   }
-  async runWithPty(args, options) {
-    const result = await this.runCommandWithTimeout(this.runPtyCommand, args, options);
-    if (result.code !== 0) {
-      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
-      throw new Error(detail);
-    }
-    return result.stdout;
+  if (!isRecord5(record3) || !isRecord5(record3.acpx) || !Array.isArray(record3.acpx.config_options)) {
+    return;
   }
-  async runCommandWithTimeout(runner, args, options) {
-    const spawnSpec = resolveSpawnCommand(this.command, args);
-    if (!options?.timeoutMs) {
-      return await runner(spawnSpec.command, spawnSpec.args, options);
-    }
-    const abortController = new AbortController;
-    let timeoutId;
-    return await Promise.race([
-      runner(spawnSpec.command, spawnSpec.args, { ...options, signal: abortController.signal }).finally(() => {
-        if (timeoutId)
-          clearTimeout(timeoutId);
-      }),
-      new Promise((_, reject) => {
-        timeoutId = setTimeout(() => {
-          reject(managementTimeoutError(args, options));
-          abortController.abort();
-        }, options.timeoutMs);
-      })
-    ]);
+  for (const candidate of record3.acpx.config_options) {
+    if (!isRecord5(candidate) || typeof candidate.id !== "string")
+      continue;
+    if (candidate.category !== "thought_level" && !EFFORT_CONFIG_IDS.has(candidate.id))
+      continue;
+    const available = Array.isArray(candidate.options) ? candidate.options.flatMap(effortOptionValues) : [];
+    return {
+      configId: candidate.id,
+      current: typeof candidate.currentValue === "string" ? candidate.currentValue : undefined,
+      available
+    };
   }
-  async runStreamingPrompt(command, args, reply, formatToolCalls = false, toolEventMode = "text", replyContext, onSegment, onToolEvent, onThought, onPlan, onUsage, onCommands, rawStream = false, env, driver) {
-    const hooks = this.streamingHooks;
-    const doSpawn = hooks.spawnPrompt ?? ((cmd, spawnArgs) => spawn11(cmd, spawnArgs, {
-      env,
-      stdio: ["ignore", "pipe", "pipe"]
-    }));
-    const setIntervalFn = hooks.setIntervalFn ?? ((fn, delay) => setInterval(fn, delay));
-    const clearIntervalFn = hooks.clearIntervalFn ?? ((timer) => clearInterval(timer));
-    const maxSegmentWaitMs = hooks.maxSegmentWaitMs ?? (rawStream ? 200 : 30000);
-    const flushCheckIntervalMs = hooks.flushCheckIntervalMs ?? (rawStream ? 80 : 5000);
-    const now = hooks.now ?? (() => Date.now());
-    return await new Promise((resolve4, reject) => {
-      const spawnSpec = resolveSpawnCommand(command, args);
-      const child = doSpawn(spawnSpec.command, spawnSpec.args);
-      let stdout2 = "";
-      let stderr = "";
-      let lastReplyAt = now();
-      let segmentChain = Promise.resolve();
-      let segmentError;
-      let toolEventChain = Promise.resolve();
-      let toolEventError;
-      let thoughtChain = Promise.resolve();
-      let thoughtError;
-      let planChain = Promise.resolve();
-      let planError;
-      let usageChain = Promise.resolve();
-      let usageError;
-      let commandsChain = Promise.resolve();
-      let commandsError;
-      const userOnToolEvent = onToolEvent;
-      const userOnThought = onThought;
-      const userOnPlan = onPlan;
-      const userOnUsage = onUsage;
-      const userOnCommands = onCommands;
-      const state = createStreamingPromptState(formatToolCalls, {
-        mode: toolEventMode,
-        driver,
-        rawStream,
-        ...userOnToolEvent ? {
-          onToolEvent: (event) => {
-            toolEventChain = toolEventChain.then(() => userOnToolEvent(event)).catch((error2) => {
-              toolEventError ??= error2;
-            });
-          }
-        } : {},
-        ...userOnThought ? {
-          onThought: (chunk) => {
-            thoughtChain = thoughtChain.then(() => userOnThought(chunk)).catch((error2) => {
-              thoughtError ??= error2;
-            });
-          }
-        } : {},
-        ...userOnPlan ? {
-          onPlan: (entries) => {
-            planChain = planChain.then(() => userOnPlan(entries)).catch((error2) => {
-              planError ??= error2;
-            });
-          }
-        } : {},
-        ...userOnUsage ? {
-          onUsage: (usage) => {
-            usageChain = usageChain.then(() => userOnUsage(usage)).catch((error2) => {
-              usageError ??= error2;
-            });
-          }
-        } : {},
-        ...userOnCommands ? {
-          onCommands: (commands) => {
-            commandsChain = commandsChain.then(() => userOnCommands(commands)).catch((error2) => {
-              commandsError ??= error2;
-            });
-          }
-        } : {}
-      });
-      const sink2 = reply ? rawStream ? createVerbatimReplySink(reply) : createQuotaGatedReplySink({
-        reply,
-        ...replyContext ? { replyContext } : {}
-      }) : null;
-      const feedSegment = (segment) => {
-        if (onSegment) {
-          segmentChain = segmentChain.then(() => onSegment(segment)).catch((error2) => {
-            segmentError ??= error2;
-          });
-        }
-        sink2?.feedSegment(segment);
-        lastReplyAt = now();
-      };
-      const flushBuffer = () => {
-        const remaining = rawStream ? state.buffer : state.buffer.trim();
-        if (remaining.length > 0) {
-          state.buffer = "";
-          feedSegment(remaining);
-        }
-      };
-      const timer = setIntervalFn(() => {
-        if (state.buffer.trim().length > 0 && now() - lastReplyAt >= maxSegmentWaitMs) {
-          flushBuffer();
-        }
-      }, flushCheckIntervalMs);
-      child.stdout.setEncoding("utf8");
-      child.stdout.on("data", (chunk) => {
-        stdout2 += String(chunk);
-        parseStreamingDataChunk(state, String(chunk));
-        for (const segment of state.segments.splice(0)) {
-          feedSegment(segment);
-        }
-      });
-      child.stderr.on("data", (chunk) => {
-        stderr += String(chunk);
-      });
-      child.on("error", (err) => {
-        clearIntervalFn(timer);
-        reject(err);
-      });
-      child.on("close", (code) => {
-        clearIntervalFn(timer);
-        const remaining = state.finalize();
-        if (remaining.length > 0) {
-          feedSegment(remaining);
-        }
-        const { overflowCount } = sink2?.finalize() ?? { overflowCount: 0 };
-        Promise.all([
-          sink2?.drain({ timeoutMs: 30000 }) ?? Promise.resolve(),
-          segmentChain,
-          toolEventChain,
-          thoughtChain,
-          planChain,
-          usageChain,
-          commandsChain
-        ]).then(() => {
-          const deferred = sink2?.getPendingError();
-          if (deferred) {
-            reject(deferred);
-            return;
-          }
-          if (segmentError) {
-            reject(segmentError);
-            return;
-          }
-          if (toolEventError) {
-            reject(toolEventError);
-            return;
-          }
-          if (thoughtError) {
-            reject(thoughtError);
-            return;
-          }
-          if (planError) {
-            reject(planError);
-            return;
-          }
-          if (usageError) {
-            reject(usageError);
-            return;
-          }
-          if (commandsError) {
-            reject(commandsError);
-            return;
-          }
-          resolve4({
-            result: { code: code ?? 1, stdout: stdout2, stderr },
-            overflowCount
-          });
-        }).catch((error2) => {
-          reject(error2);
-        });
-      });
-    });
+  return;
+}
+function effortOptionValues(option) {
+  if (!isRecord5(option))
+    return [];
+  if (typeof option.value === "string")
+    return [option.value];
+  return Array.isArray(option.options) ? option.options.flatMap(effortOptionValues) : [];
+}
+function isRecord5(value) {
+  return typeof value === "object" && value !== null;
+}
+var EFFORT_CONFIG_IDS;
+var init_session_effort = __esm(() => {
+  EFFORT_CONFIG_IDS = new Set([
+    "reasoning_effort",
+    "effort",
+    "thought_level",
+    "thinking"
+  ]);
+});
+
+// src/transport/permission-mode-flag.ts
+function permissionModeToFlag(permissionMode) {
+  switch (permissionMode) {
+    case "approve-reads":
+      return "--approve-reads";
+    case "deny-all":
+      return "--deny-all";
+    case "approve-all":
+      return "--approve-all";
+  }
+}
+
+// src/transport/acpx-command-builder.ts
+function buildPermissionArgs(input) {
+  const args = [permissionModeToFlag(input.permissionMode), "--non-interactive-permissions", input.nonInteractivePermissions];
+  if (typeof input.permissionPolicy === "string" && input.permissionPolicy.trim().length > 0) {
+    args.push("--permission-policy", input.permissionPolicy);
+  }
+  return args;
+}
+function buildQueueOwnerTtlArgs(queueOwnerTtlSeconds) {
+  if (typeof queueOwnerTtlSeconds !== "number" || !Number.isFinite(queueOwnerTtlSeconds))
+    return [];
+  return ["--ttl", String(queueOwnerTtlSeconds)];
+}
+function buildModelArgs(model) {
+  const trimmed = model?.trim();
+  return trimmed ? ["--model", trimmed] : [];
+}
+function appendAgentAndTail(prefix, input, tail2) {
+  if (input.agentCommand)
+    return [...prefix, "--agent", input.agentCommand, ...tail2];
+  return [...prefix, input.agent, ...tail2];
+}
+function buildSessionArgs(input, tail2, options = {}) {
+  const prefix = [
+    "--format",
+    options.format ?? "quiet",
+    "--cwd",
+    input.cwd,
+    ...buildPermissionArgs(input.permission),
+    ...buildModelArgs(input.model)
+  ];
+  if (options.verbose)
+    prefix.push("--verbose");
+  return appendAgentAndTail(prefix, input, tail2);
+}
+function buildPromptArgs(input, tail2) {
+  const prefix = [
+    "--format",
+    "json",
+    "--json-strict",
+    "--cwd",
+    input.cwd,
+    ...buildPermissionArgs(input.permission),
+    ...buildModelArgs(input.model),
+    ...buildQueueOwnerTtlArgs(input.queueOwnerTtlSeconds)
+  ];
+  return appendAgentAndTail(prefix, input, tail2);
+}
+function buildAgentQueryArgs(input, format, tail2) {
+  const prefix = ["--format", format, "--cwd", input.cwd, ...buildPermissionArgs(input.permission)];
+  return appendAgentAndTail(prefix, input, tail2);
+}
+function isMissingAcpxSessionError(stderr, stdout2) {
+  const combined = `${stderr}
+${stdout2}`.toLowerCase();
+  return combined.includes("no named session") || combined.includes("no cwd session") || combined.includes("session not found") || combined.includes("unknown session") || combined.includes("no acpx session found");
+}
+function parseAcpxSessionRecordId(stdout2) {
+  try {
+    const parsed = JSON.parse(stdout2);
+    const acpxRecordId = typeof parsed.acpxRecordId === "string" ? parsed.acpxRecordId : typeof parsed.id === "string" ? parsed.id : undefined;
+    const providerSessionId = typeof parsed.agentSessionId === "string" && parsed.agentSessionId.length > 0 ? parsed.agentSessionId : undefined;
+    const acpSessionId = typeof parsed.acpSessionId === "string" && parsed.acpSessionId.length > 0 ? parsed.acpSessionId : undefined;
+    const agentSessionId = providerSessionId ?? acpSessionId;
+    if (acpxRecordId && /^[\w.:-]+$/.test(acpxRecordId) && acpxRecordId.length >= 8) {
+      return { acpxRecordId, agentSessionId };
+    }
+  } catch {
+    const firstLine = stdout2.trim().split(/\r?\n/, 1)[0];
+    if (firstLine && /^[\w.:-]+$/.test(firstLine) && firstLine.length >= 8) {
+      return { acpxRecordId: firstLine };
+    }
   }
-  permissionInput() {
-    return {
-      permissionMode: this.permissionMode,
-      nonInteractivePermissions: this.nonInteractivePermissions,
-      permissionPolicy: this.permissionPolicy
+  return;
+}
+var DEFAULT_PERMISSION_MODE2 = "approve-all", DEFAULT_NON_INTERACTIVE = "deny";
+var init_acpx_command_builder = () => {};
+
+// src/transport/acpx-cli/acpx-cli-transport.ts
+import { createRequire as createRequire5 } from "node:module";
+import { spawn as spawn11 } from "node:child_process";
+import { spawn as spawnPty } from "node-pty";
+function managementTimeoutError(args, options, output = {}) {
+  return new CommandTimeoutError(options.timeoutMs, renderCommandForError(args), {
+    stage: options.stage,
+    ...output
+  });
+}
+async function defaultRunner(command, args, options) {
+  return await new Promise((resolve4, reject) => {
+    const spawnSpec = resolveSpawnCommand(command, args);
+    const child = spawn11(spawnSpec.command, spawnSpec.args, {
+      env: options?.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout2 = "";
+    let stderr = "";
+    const onAbort = () => {
+      terminateProcessTree(child.pid ?? 0, { detachedProcessGroup: false });
+    };
+    options?.signal?.addEventListener("abort", onAbort, { once: true });
+    const timeoutId = options?.timeoutMs ? setTimeout(() => {
+      onAbort();
+      reject(managementTimeoutError(args, options, { stdout: stdout2, stderr }));
+    }, options.timeoutMs) : undefined;
+    child.stdout.on("data", (chunk) => {
+      stdout2 += String(chunk);
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += String(chunk);
+    });
+    child.on("error", (error2) => {
+      options?.signal?.removeEventListener("abort", onAbort);
+      if (timeoutId)
+        clearTimeout(timeoutId);
+      reject(error2);
+    });
+    child.on("close", (code) => {
+      options?.signal?.removeEventListener("abort", onAbort);
+      if (timeoutId)
+        clearTimeout(timeoutId);
+      resolve4({ code: code ?? 1, stdout: stdout2, stderr });
+    });
+  });
+}
+async function defaultPtyRunner(command, args, options) {
+  const helperPath = resolveNodePtyHelperPath(require4.resolve("node-pty/package.json"), process.platform, process.arch);
+  await ensureNodePtyHelperExecutable(helperPath);
+  return await new Promise((resolve4, reject) => {
+    const spawnSpec = resolveSpawnCommand(command, args);
+    const child = spawnPty(spawnSpec.command, spawnSpec.args, {
+      name: "xterm-color",
+      cols: 80,
+      rows: 24,
+      cwd: process.cwd(),
+      env: resolveChildEnvironment(process.env, options?.env, getLocale())
+    });
+    let output = "";
+    const onAbort = () => {
+      child.kill();
     };
+    options?.signal?.addEventListener("abort", onAbort, { once: true });
+    const timeoutId = options?.timeoutMs ? setTimeout(() => {
+      onAbort();
+      reject(managementTimeoutError(args, options, { stdout: output }));
+    }, options.timeoutMs) : undefined;
+    child.onData((chunk) => {
+      output += chunk;
+    });
+    child.onExit(({ exitCode }) => {
+      options?.signal?.removeEventListener("abort", onAbort);
+      if (timeoutId)
+        clearTimeout(timeoutId);
+      resolve4({ code: exitCode, stdout: output, stderr: "" });
+    });
+  });
+}
+
+class AcpxCliTransport {
+  command;
+  sessionInitTimeoutMs;
+  managementCommandTimeoutMs;
+  permissionMode;
+  nonInteractivePermissions;
+  permissionPolicy;
+  queueOwnerTtlSeconds;
+  runCommand;
+  runPtyCommand;
+  queueOwnerLauncher;
+  streamingHooks;
+  resolveSpawnEnvironment;
+  constructor(options, runCommand = defaultRunner, runPtyCommand = defaultPtyRunner, queueOwnerLauncher, streamingHooks = {}) {
+    this.command = options.command ?? "acpx";
+    this.sessionInitTimeoutMs = options.sessionInitTimeoutMs ?? 120000;
+    this.managementCommandTimeoutMs = options.managementCommandTimeoutMs ?? DEFAULT_MANAGEMENT_COMMAND_TIMEOUT_MS;
+    this.permissionMode = options.permissionMode ?? DEFAULT_PERMISSION_MODE2;
+    this.nonInteractivePermissions = options.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE;
+    this.permissionPolicy = options.permissionPolicy;
+    this.queueOwnerTtlSeconds = options.queueOwnerTtlSeconds;
+    this.runCommand = runCommand;
+    this.runPtyCommand = runPtyCommand;
+    this.queueOwnerLauncher = queueOwnerLauncher ?? new AcpxQueueOwnerLauncher({
+      acpxCommand: this.command,
+      ...typeof this.queueOwnerTtlSeconds === "number" && Number.isFinite(this.queueOwnerTtlSeconds) ? { ttlMs: this.queueOwnerTtlSeconds * 1000 } : {}
+    });
+    this.streamingHooks = streamingHooks;
+    this.resolveSpawnEnvironment = options.resolveSpawnEnvironment ?? resolveClaudeSpawnEnvironment;
   }
-  spawnEnvironment(input) {
-    return this.resolveSpawnEnvironment(input);
+  async ensureSession(session3, _onProgress) {
+    this.invalidateRecordIdCache(session3);
+    try {
+      await this.runEnsureSession(session3);
+    } catch (error2) {
+      const requestedModel = session3.model?.trim();
+      if (requestedModel && isModelNotAdvertisedError(error2 instanceof Error ? error2.message : null)) {
+        await this.runEnsureSession({ ...session3, model: undefined });
+        return;
+      }
+      throw error2;
+    }
   }
-  withSpawnEnvironment(input, options) {
-    const env = this.spawnEnvironment(input);
-    return env ? { ...options ?? {}, env } : options;
+  async runEnsureSession(session3) {
+    const args = this.buildArgs(session3, [
+      "sessions",
+      "new",
+      "--name",
+      session3.transportSession
+    ]);
+    const runEnsure = session3.agentCommand ? this.run : this.runWithPty;
+    await runEnsure.call(this, args, {
+      timeoutMs: this.sessionInitTimeoutMs,
+      env: this.spawnEnvironment(session3)
+    });
   }
-  sessionInput(session3) {
-    return {
-      agent: session3.agent,
-      agentCommand: session3.agentCommand,
-      cwd: session3.cwd,
-      model: session3.model,
-      permission: this.permissionInput()
-    };
+  async listAgentSessions(query) {
+    return await runAgentSessionList({
+      filterCwd: query.filterCwd,
+      runList: async (includeFilterCwd) => {
+        const args = this.buildAgentQueryArgs(query, "json", [
+          "sessions",
+          "list",
+          ...includeFilterCwd && query.filterCwd ? ["--filter-cwd", query.filterCwd] : [],
+          ...query.cursor ? ["--cursor", query.cursor] : []
+        ]);
+        return await this.runCommandWithTimeout(this.runCommand, args, {
+          timeoutMs: this.sessionInitTimeoutMs,
+          env: this.spawnEnvironment(query)
+        });
+      },
+      formatError: (result) => normalizeCommandError(result) ?? `command failed with exit code ${result.code}`,
+      isSubagentSession: (query.driver ?? query.agent) === CODEX_AGENT_NAME ? codexSubagentPredicate() : undefined
+    });
   }
-  buildArgs(session3, tail2, format = "quiet") {
-    return buildSessionArgs(this.sessionInput(session3), tail2, { format });
+  async tailSessionHistory(session3, lines) {
+    const candidates = [
+      ["sessions", "history", session3.transportSession, "--limit", String(lines)],
+      ["sessions", "history", "quiet", "-s", session3.transportSession, String(lines)],
+      ["sessions", "history", "quiet", session3.transportSession, String(lines)],
+      ["sessions", "history", "-s", session3.transportSession, "--tail", String(lines)],
+      ["sessions", "history", session3.transportSession, "--tail", String(lines)],
+      ["sessions", "history", "--name", session3.transportSession, "--tail", String(lines)]
+    ];
+    const deadline = Date.now() + this.managementCommandTimeoutMs;
+    let lastResult;
+    for (const tail2 of candidates) {
+      const args = this.buildArgs(session3, tail2);
+      const result = await this.runCommandWithTimeout(this.runCommand, args, {
+        timeoutMs: Math.max(deadline - Date.now(), 1),
+        stage: "session-history",
+        env: this.spawnEnvironment(session3)
+      });
+      if (result.code === 0) {
+        return { text: result.stdout.trimEnd() };
+      }
+      lastResult = result;
+    }
+    const detail = lastResult ? normalizeCommandError(lastResult) ?? `command failed with exit code ${lastResult.code}` : "command failed";
+    throw new Error(detail);
   }
-  buildAgentQueryArgs(query, format, tail2) {
-    return buildAgentQueryArgs({ agent: query.agent, agentCommand: query.agentCommand, cwd: query.cwd, permission: this.permissionInput() }, format, tail2);
+  async prompt(session3, text, reply, replyContext, options) {
+    if (session3.effort?.trim()) {
+      await this.reapplySessionEffort(session3, session3.effort.trim());
+    }
+    await this.launchMcpQueueOwnerIfNeeded(session3);
+    const structuredPrompt = await createStructuredPromptFile(text, options?.media);
+    const args = this.buildPromptArgs(session3, text, structuredPrompt?.filePath);
+    try {
+      if (reply || options?.onSegment || options?.onToolEvent || options?.onThought || options?.onPlan || options?.onUsage || options?.onCommands) {
+        const effectiveReplyMode = session3.effectiveReplyMode ?? session3.replyMode;
+        const formatToolCalls = (effectiveReplyMode ?? "verbose") === "verbose";
+        const rawStream = effectiveReplyMode === "stream";
+        let toolEventMode = resolveToolEventMode(options);
+        if ((toolEventMode === "structured" || toolEventMode === "both") && !options?.onToolEvent) {
+          toolEventMode = "text";
+        }
+        const { result: result2, overflowCount } = await this.runStreamingPrompt(this.command, args, reply, formatToolCalls, toolEventMode, replyContext, options?.onSegment, options?.onToolEvent, options?.onThought, options?.onPlan, options?.onUsage, options?.onCommands, rawStream, this.spawnEnvironment(session3), session3.driver ?? session3.agent);
+        const baseText = getPromptText(result2);
+        if (!reply) {
+          return { text: baseText };
+        }
+        const summary = buildOverflowSummary(overflowCount);
+        return { text: summary ? `${summary}
+
+${baseText}` : "" };
+      }
+      const spawnOptions = this.withSpawnEnvironment(session3);
+      const result = spawnOptions ? await this.runCommand(this.command, args, spawnOptions) : await this.runCommand(this.command, args);
+      return { text: getPromptText(result) };
+    } finally {
+      try {
+        await structuredPrompt?.cleanup();
+      } catch {}
+    }
   }
-  buildPromptArgs(session3, text, promptFile) {
-    const tail2 = promptFile ? ["prompt", "-s", session3.transportSession, "--file", promptFile] : ["prompt", "-s", session3.transportSession, text];
-    return buildPromptArgs({ ...this.sessionInput(session3), queueOwnerTtlSeconds: this.queueOwnerTtlSeconds }, tail2);
+  async setMode(session3, modeId) {
+    await this.run(this.buildArgs(session3, [
+      "set-mode",
+      "-s",
+      session3.transportSession,
+      modeId
+    ]), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "set-mode"
+    }));
   }
-  buildPermissionArgs() {
-    return buildPermissionArgs(this.permissionInput());
+  async setModel(session3, modelId) {
+    await this.run(this.buildArgs({ ...session3, model: modelId }, [
+      "set",
+      "-s",
+      session3.transportSession,
+      "model",
+      modelId
+    ]), this.withSpawnEnvironment({ ...session3, model: modelId }, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "set-model"
+    }));
   }
-}
-function renderCommandForError(args) {
-  const rendered = [];
-  for (let index = 0;index < args.length; index += 1) {
-    const arg = args[index];
-    if (arg === undefined) {
-      continue;
-    }
-    if (arg === "--format") {
-      index += 1;
-      continue;
+  async getSessionModel(session3) {
+    const prefix = ["--format", "json", "--cwd", session3.cwd, ...this.buildPermissionArgs()];
+    const tail2 = ["status", "-s", session3.transportSession];
+    const args = session3.agentCommand ? [...prefix, "--agent", session3.agentCommand, ...tail2] : [...prefix, session3.agent, ...tail2];
+    const result = await this.runCommandWithTimeout(this.runCommand, args, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "get-session-model",
+      env: this.spawnEnvironment(session3)
+    });
+    if (result.code !== 0) {
+      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
+      throw new Error(detail);
     }
-    if (arg === "--cwd") {
-      index += 1;
-      continue;
+    try {
+      const json = JSON.parse(result.stdout);
+      return {
+        current: typeof json.model === "string" ? json.model : undefined,
+        available: Array.isArray(json.availableModels) ? json.availableModels.filter((m) => typeof m === "string") : []
+      };
+    } catch {
+      return { available: [] };
     }
-    rendered.push(/\s/.test(arg) || arg.includes(":") ? `"${arg}"` : arg);
   }
-  return rendered.join(" ");
-}
-function resolveChildEnvironment(baseEnv, explicitEnv, locale) {
-  const source = explicitEnv ?? baseEnv;
-  const env = {};
-  for (const [key, value] of Object.entries(source)) {
-    if (typeof value === "string")
-      env[key] = value;
+  async getSessionEffort(session3) {
+    const output = await this.run(this.buildArgs(session3, [
+      "sessions",
+      "show",
+      session3.transportSession
+    ], "json"), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "get-session-effort"
+    }));
+    const effort = parseSessionEffortRecord(output);
+    return effort ? { current: effort.current, available: effort.available } : { available: [] };
   }
-  env.XACPX_LANG = locale;
-  return env;
-}
-var require4;
-var init_acpx_cli_transport = __esm(() => {
-  init_spawn_command();
-  init_claude_settings_policy();
-  init_i18n();
-  init_prompt_output();
-  init_prompt_media();
-  init_streaming_prompt();
-  init_quota_gated_reply_sink();
-  init_node_pty_helper();
-  init_terminate_process_tree();
-  init_acpx_queue_owner_launcher();
-  init_daemon_files();
-  init_agent_session_list();
-  init_codex_subagent_filter();
-  init_acpx_session_files();
-  init_session_effort();
-  init_command_timeouts();
-  init_acpx_command_builder();
-  require4 = createRequire5(import.meta.url);
-});
-
-// src/transport/claude-background-followup.ts
-import { access as access4, open as open5, readFile as readFile14, readdir as readdir4, stat as stat3 } from "node:fs/promises";
-import { constants as fsConstants } from "node:fs";
-import { homedir as homedir12 } from "node:os";
-import { basename as basename3, dirname as dirname13, join as join23 } from "node:path";
-function isClaudeAsyncAgentLaunch(event) {
-  return ASYNC_AGENT_LAUNCH.test(textOfUnknown(event.rawOutput));
-}
-function claudeAsyncAgentId(event) {
-  const fromObject = findStringField(event.rawOutput, new Set(["agentId", "agent_id"]));
-  if (fromObject)
-    return fromObject;
-  return /\bagent(?:Id|_id)["']?\s*[:=]\s*["']?([A-Za-z0-9_-]+)/i.exec(textOfUnknown(event.rawOutput))?.[1];
-}
-async function findClaudeTranscriptPath(input) {
-  const projectsDir = join23(input.homeDir ?? homedir12(), ".claude", "projects");
-  const direct = join23(projectsDir, encodeClaudeProjectDirectory(input.cwd), `${input.sessionId}.jsonl`);
-  if (await exists(direct))
-    return direct;
-  try {
-    const entries = await readdir4(projectsDir, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isDirectory())
-        continue;
-      const candidate = join23(projectsDir, entry.name, `${input.sessionId}.jsonl`);
-      if (await exists(candidate))
-        return candidate;
+  async setSessionEffort(session3, effort) {
+    const record3 = await this.readSessionEffortRecord(session3);
+    await this.applyAdvertisedSessionEffort(session3, effort, record3);
+  }
+  async reapplySessionEffort(session3, effort) {
+    const record3 = await this.readSessionEffortRecord(session3);
+    const observed = parseSessionEffortRecord(record3);
+    if (!observed?.available.includes(effort)) {
+      return;
     }
-  } catch {
-    return;
+    await this.applyAdvertisedSessionEffort(session3, effort, record3);
   }
-  return;
-}
-async function followClaudeBackgroundTurn(options) {
-  const transcriptPath = options.transcriptPath ?? await findClaudeTranscriptPath(options);
-  if (!transcriptPath) {
-    return { status: "unavailable", completedToolCallIds: [], failedToolCallIds: [] };
+  async readSessionEffortRecord(session3) {
+    return await this.run(this.buildArgs(session3, [
+      "sessions",
+      "show",
+      session3.transportSession
+    ], "json"), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "get-session-effort"
+    }));
   }
-  let initial;
-  try {
-    initial = await readFile14(transcriptPath);
-  } catch {
-    return { status: "unavailable", transcriptPath, completedToolCallIds: [], failedToolCallIds: [] };
+  async applyAdvertisedSessionEffort(session3, effort, record3) {
+    const advertised = requireAdvertisedSessionEffort(record3, effort);
+    await this.run(this.buildArgs(session3, [
+      "set",
+      "-s",
+      session3.transportSession,
+      advertised.configId,
+      effort
+    ]), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "set-session-effort"
+    }));
   }
-  const initialCompleteEnd = initial.lastIndexOf(10);
-  const initialComplete = initial.subarray(0, initialCompleteEnd >= 0 ? initialCompleteEnd : 0).toString("utf8");
-  const mainCursor = {
-    offset: initial.length,
-    partial: initialCompleteEnd >= 0 ? initial.subarray(initialCompleteEnd + 1).toString("utf8") : initial.toString("utf8")
-  };
-  const initialRecords = initialComplete.split(`
-`).map(parseRecord);
-  const launched = new Set([...options.launchedToolCallIds].filter(Boolean));
-  const completed = new Set;
-  const failed = new Set;
-  const toolEvents = new Map;
-  for (const event of options.initialToolEvents ?? [])
-    toolEvents.set(event.toolCallId, event);
-  const parentToolCallIdByAgentId = new Map;
-  for (const [toolCallId, agentId] of options.subagentIdsByToolCallId ?? []) {
-    if (toolCallId && agentId)
-      parentToolCallIdByAgentId.set(agentId, toolCallId);
+  async cancel(session3) {
+    const output = await this.run(this.buildArgs(session3, [
+      "cancel",
+      "-s",
+      session3.transportSession
+    ]), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "cancel"
+    }));
+    return {
+      cancelled: true,
+      message: output.trim()
+    };
   }
-  const boundary = findPromptBoundary(initialRecords, launched);
-  let launchSeen = boundary >= 0 || initialRecords.some((record3) => hasTrackedLaunch(record3, launched));
-  let boundarySeen = boundary >= 0;
-  let sequence = 0;
-  let lastNotificationSequence = -1;
-  let done = false;
-  const emitTool = async (event) => {
-    toolEvents.set(event.toolCallId, event);
-    await options.onToolEvent?.(event);
-  };
-  const processRecord = async (record3) => {
-    if (!record3)
-      return;
-    sequence += 1;
-    const blocks = contentBlocks(record3.message?.content);
-    if (record3.type === "user") {
-      const userText = blocks.map(blockText).filter(Boolean).join(`
-`);
-      for (const notification of taskNotifications(userText)) {
-        if (launched.has(notification.toolCallId)) {
-          completed.add(notification.toolCallId);
-          if (notification.failed)
-            failed.add(notification.toolCallId);
-          lastNotificationSequence = sequence;
-          const previous = toolEvents.get(notification.toolCallId);
-          if (previous) {
-            await emitTool({
-              ...previous,
-              status: notification.failed ? "error" : "success",
-              ...notification.failed ? { rawOutput: { message: "Claude background Agent failed" } } : {}
-            });
-          }
-        }
-      }
-      for (const block of blocks) {
-        if (readString2(block, "type") !== "tool_result")
-          continue;
-        const toolCallId = readString2(block, "tool_use_id");
-        if (!toolCallId)
-          continue;
-        const output = blockText(block);
-        if (ASYNC_AGENT_LAUNCH.test(output))
-          launched.add(toolCallId);
-        const previous = toolEvents.get(toolCallId);
-        await emitTool({
-          toolCallId,
-          toolName: previous?.toolName ?? "Tool",
-          kind: previous?.kind ?? "other",
-          ...previous?.parentToolCallId ? { parentToolCallId: previous.parentToolCallId } : {},
-          ...previous?.isSubagent ? { isSubagent: true } : {},
-          ...previous?.summary ? { summary: previous.summary } : {},
-          ...previous?.rawInput !== undefined ? { rawInput: previous.rawInput } : {},
-          ...output ? { rawOutput: output } : {},
-          status: readBoolean(block, "is_error") ? "error" : "success"
-        });
-      }
-      return;
-    }
-    if (record3.type !== "assistant" || record3.isSidechain === true)
+  async resumeAgentSession(session3, agentSessionId) {
+    this.invalidateRecordIdCache(session3);
+    const args = this.buildArgs(session3, [
+      "sessions",
+      "new",
+      "--name",
+      session3.transportSession,
+      "--resume-session",
+      agentSessionId
+    ]);
+    const runResume = session3.agentCommand ? this.run : this.runWithPty;
+    await runResume.call(this, args, {
+      timeoutMs: this.sessionInitTimeoutMs,
+      env: this.spawnEnvironment(session3)
+    });
+  }
+  async updatePermissionPolicy(policy) {
+    this.permissionMode = policy.permissionMode;
+    this.nonInteractivePermissions = policy.nonInteractivePermissions;
+    this.permissionPolicy = policy.permissionPolicy;
+  }
+  async removeSession(session3) {
+    this.invalidateRecordIdCache(session3);
+    const result = await this.runCommandWithTimeout(this.runCommand, this.buildArgs(session3, [
+      "sessions",
+      "close",
+      session3.transportSession
+    ]), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "remove-session"
+    }));
+    if (result.code === 0) {
       return;
-    for (const block of blocks) {
-      const type = readString2(block, "type");
-      if (type === "text") {
-        const text = readString2(block, "text");
-        if (text)
-          await options.onText?.(text);
-      } else if (type === "thinking") {
-        const thought = readString2(block, "thinking");
-        if (thought)
-          await options.onThought?.(thought);
-      } else if (type === "tool_use") {
-        const toolCallId = readString2(block, "id");
-        if (!toolCallId)
-          continue;
-        const name = readString2(block, "name") ?? "Tool";
-        const rawInput = block.input;
-        const event = {
-          toolCallId,
-          toolName: name,
-          kind: classifyToolKind(name),
-          ...toolSummary(rawInput) ? { summary: toolSummary(rawInput) } : {},
-          ...rawInput !== undefined ? { rawInput } : {},
-          status: "running"
-        };
-        await emitTool(event);
-      }
     }
-    if (record3.message?.stop_reason === "end_turn" && launched.size > 0 && [...launched].every((id) => completed.has(id)) && lastNotificationSequence >= 0 && sequence > lastNotificationSequence) {
-      done = true;
-    }
-  };
-  const processAfterBoundary = async (record3) => {
-    if (!record3)
-      return;
-    if (!boundarySeen) {
-      if (hasTrackedLaunch(record3, launched))
-        launchSeen = true;
-      if (launchSeen && isMainEndTurn(record3))
-        boundarySeen = true;
+    if (isMissingAcpxSessionError(result.stderr, result.stdout)) {
       return;
     }
-    await processRecord(record3);
-  };
-  const processSubagentRecord = async (record3, parentToolCallId) => {
-    if (!record3)
-      return;
-    const blocks = contentBlocks(record3.message?.content);
-    if (record3.type === "assistant") {
-      for (const block of blocks) {
-        if (readString2(block, "type") !== "tool_use")
-          continue;
-        const toolCallId = readString2(block, "id");
-        if (!toolCallId)
-          continue;
-        const name = readString2(block, "name") ?? "Tool";
-        const rawInput = block.input;
-        const previous = toolEvents.get(toolCallId);
-        await emitTool({
-          ...previous,
-          toolCallId,
-          parentToolCallId: previous?.parentToolCallId ?? parentToolCallId,
-          ...previous?.isSubagent || isAgentToolName(name) ? { isSubagent: true } : {},
-          toolName: previous?.toolName ?? name,
-          kind: previous?.kind ?? classifyToolKind(name),
-          ...previous?.summary ? { summary: previous.summary } : toolSummary(rawInput) ? { summary: toolSummary(rawInput) } : {},
-          ...previous?.rawInput !== undefined ? { rawInput: previous.rawInput } : rawInput !== undefined ? { rawInput } : {},
-          status: previous?.status === "success" || previous?.status === "error" ? previous.status : "running"
-        });
-      }
+    const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
+    throw new Error(detail);
+  }
+  async deleteSession(session3) {
+    let acpxRecordId;
+    try {
+      ({ acpxRecordId } = await this.readSessionRecord(session3));
+    } catch {
       return;
     }
-    if (record3.type !== "user")
+    await this.removeSession(session3);
+    await deleteAcpxSessionFiles({ acpxRecordId });
+  }
+  async freeWarmProcess(session3) {
+    let acpxRecordId;
+    try {
+      ({ acpxRecordId } = await this.readSessionRecord(session3));
+    } catch {
       return;
-    for (const block of blocks) {
-      if (readString2(block, "type") !== "tool_result")
-        continue;
-      const toolCallId = readString2(block, "tool_use_id");
-      if (!toolCallId)
-        continue;
-      const previous = toolEvents.get(toolCallId);
-      const output = blockText(block);
-      const event = {
-        ...previous,
-        toolCallId,
-        parentToolCallId: previous?.parentToolCallId ?? parentToolCallId,
-        ...previous?.isSubagent ? { isSubagent: true } : {},
-        toolName: previous?.toolName ?? "Tool",
-        kind: previous?.kind ?? "other",
-        ...previous?.summary ? { summary: previous.summary } : {},
-        ...previous?.rawInput !== undefined ? { rawInput: previous.rawInput } : {},
-        ...previous?.rawOutput !== undefined ? { rawOutput: previous.rawOutput } : output ? { rawOutput: output } : {},
-        status: readBoolean(block, "is_error") || previous?.status === "error" ? "error" : "success"
-      };
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
-        const agentId = claudeAsyncAgentId(event);
-        if (agentId)
-          parentToolCallIdByAgentId.set(agentId, event.toolCallId);
-      }
-      await emitTool(event);
     }
-  };
-  const subagentCursors = new Map;
-  const processSubagentTranscripts = async () => {
-    const transcripts = await findSubagentTranscripts(transcriptPath);
-    let advanced = false;
-    let discoveredNestedAgent = true;
-    while (discoveredNestedAgent) {
-      const mappedAgentCount = parentToolCallIdByAgentId.size;
-      for (const subagent of transcripts) {
-        const parentToolCallId = parentToolCallIdByAgentId.get(subagent.agentId);
-        if (!parentToolCallId)
-          continue;
-        const cursor = subagentCursors.get(subagent.path) ?? { offset: 0, partial: "" };
-        const previousOffset = cursor.offset;
-        const lines = await readJsonlDelta(subagent.path, cursor);
-        if (cursor.offset !== previousOffset)
-          advanced = true;
-        subagentCursors.set(subagent.path, cursor);
-        for (const line of lines)
-          await processSubagentRecord(parseRecord(line), parentToolCallId);
+    await terminateAcpxQueueOwner(acpxRecordId);
+  }
+  recordIdCache = new Map;
+  recordIdCacheKey(session3) {
+    return JSON.stringify([session3.agent, session3.agentCommand ?? null, session3.cwd, session3.transportSession]);
+  }
+  invalidateRecordIdCache(session3) {
+    this.recordIdCache.delete(this.recordIdCacheKey(session3));
+  }
+  async isSessionWarm(session3) {
+    const cacheKey = this.recordIdCacheKey(session3);
+    let acpxRecordId = this.recordIdCache.get(cacheKey);
+    if (!acpxRecordId) {
+      try {
+        ({ acpxRecordId } = await this.readSessionRecord(session3));
+      } catch {
+        return false;
       }
-      discoveredNestedAgent = parentToolCallIdByAgentId.size > mappedAgentCount;
+      this.recordIdCache.set(cacheKey, acpxRecordId);
     }
-    return advanced;
-  };
-  await processSubagentTranscripts();
-  if (boundary >= 0) {
-    for (const record3 of initialRecords.slice(boundary + 1)) {
-      await processRecord(record3);
-      if (done)
-        break;
+    const pid = await readQueueOwnerPid(acpxRecordId);
+    if (pid === undefined) {
+      return false;
     }
+    return isProcessAlive(pid);
   }
-  const startedAt = Date.now();
-  const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
-  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  while (!done) {
-    throwIfAborted(options.signal);
-    if (Date.now() - startedAt >= timeoutMs) {
-      return {
-        status: "timeout",
-        transcriptPath,
-        completedToolCallIds: [...completed],
-        failedToolCallIds: [...failed]
-      };
-    }
-    await waitForPoll(pollIntervalMs, options.signal);
-    await processSubagentTranscripts();
-    const lines = await readJsonlDelta(transcriptPath, mainCursor);
-    for (const line of lines) {
-      await processAfterBoundary(parseRecord(line));
-      if (done)
-        break;
-    }
+  async hasSession(session3) {
+    const result = await this.runCommandWithTimeout(this.runCommand, this.buildArgs(session3, [
+      "sessions",
+      "show",
+      session3.transportSession
+    ]), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "has-session"
+    }));
+    return result.code === 0;
   }
-  if (parentToolCallIdByAgentId.size > 0) {
-    let stablePolls = 0;
-    for (let poll = 0;poll < FINAL_SUBAGENT_DRAIN_MAX_POLLS && stablePolls < FINAL_SUBAGENT_DRAIN_STABLE_POLLS; poll += 1) {
-      await waitForPoll(pollIntervalMs, options.signal);
-      stablePolls = await processSubagentTranscripts() ? 0 : stablePolls + 1;
+  async launchMcpQueueOwnerIfNeeded(session3) {
+    if (!session3.mcpCoordinatorSession) {
+      return;
     }
+    const record3 = await this.readSessionRecord(session3);
+    const env = this.spawnEnvironment(session3);
+    await this.queueOwnerLauncher.launch({
+      acpxRecordId: record3.acpxRecordId,
+      coordinatorSession: session3.mcpCoordinatorSession,
+      ...session3.mcpSourceHandle ? { sourceHandle: session3.mcpSourceHandle } : {},
+      permissionMode: this.permissionMode,
+      nonInteractivePermissions: this.nonInteractivePermissions,
+      ...session3.model?.trim() ? { sessionOptions: { model: session3.model.trim() } } : {},
+      ...env ? { env } : {}
+    });
   }
-  return {
-    status: "completed",
-    transcriptPath,
-    completedToolCallIds: [...completed],
-    failedToolCallIds: [...failed]
-  };
-}
-async function readJsonlDelta(path14, cursor) {
-  let size;
-  try {
-    size = (await stat3(path14)).size;
-  } catch {
-    return [];
+  async readSessionRecord(session3) {
+    const result = await this.runCommandWithTimeout(this.runCommand, this.buildArgs(session3, [
+      "sessions",
+      "show",
+      session3.transportSession
+    ], "json"), this.withSpawnEnvironment(session3, {
+      timeoutMs: this.managementCommandTimeoutMs,
+      stage: "read-session-record"
+    }));
+    if (result.code !== 0) {
+      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
+      throw new Error(detail);
+    }
+    const record3 = parseAcpxSessionRecordId(result.stdout);
+    if (record3)
+      return record3;
+    throw new Error("failed to resolve acpx session record id");
   }
-  if (size < cursor.offset) {
-    cursor.offset = 0;
-    cursor.partial = "";
+  async getAgentSessionId(session3) {
+    const record3 = await this.readSessionRecord(session3);
+    return record3.agentSessionId;
   }
-  if (size <= cursor.offset)
-    return [];
-  let chunk;
-  try {
-    const handle = await open5(path14, "r");
-    try {
-      chunk = Buffer.alloc(size - cursor.offset);
-      const result = await handle.read(chunk, 0, chunk.length, cursor.offset);
-      chunk = chunk.subarray(0, result.bytesRead);
-    } finally {
-      await handle.close();
+  async run(args, options) {
+    const result = await this.runCommandWithTimeout(this.runCommand, args, options);
+    if (result.code !== 0) {
+      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
+      throw new Error(detail);
     }
-  } catch {
-    return [];
+    return result.stdout;
   }
-  cursor.offset += chunk.length;
-  cursor.partial += chunk.toString("utf8");
-  const lines = cursor.partial.split(`
-`);
-  cursor.partial = lines.pop() ?? "";
-  return lines;
-}
-function findPromptBoundary(records, launched) {
-  let launchIndex = -1;
-  for (let index = 0;index < records.length; index += 1) {
-    const record3 = records[index];
-    if (record3?.type !== "assistant" || record3.isSidechain === true)
-      continue;
-    for (const block of contentBlocks(record3.message?.content)) {
-      if (readString2(block, "type") === "tool_use" && launched.has(readString2(block, "id") ?? "")) {
-        launchIndex = index;
-      }
+  async runWithPty(args, options) {
+    const result = await this.runCommandWithTimeout(this.runPtyCommand, args, options);
+    if (result.code !== 0) {
+      const detail = normalizeCommandError(result) ?? `command failed with exit code ${result.code}`;
+      throw new Error(detail);
     }
+    return result.stdout;
   }
-  if (launchIndex < 0)
-    return -1;
-  for (let index = launchIndex + 1;index < records.length; index += 1) {
-    const record3 = records[index];
-    if (record3?.type === "assistant" && record3.isSidechain !== true && record3.message?.stop_reason === "end_turn") {
-      return index;
+  async runCommandWithTimeout(runner, args, options) {
+    const spawnSpec = resolveSpawnCommand(this.command, args);
+    if (!options?.timeoutMs) {
+      return await runner(spawnSpec.command, spawnSpec.args, options);
     }
+    const abortController = new AbortController;
+    let timeoutId;
+    return await Promise.race([
+      runner(spawnSpec.command, spawnSpec.args, { ...options, signal: abortController.signal }).finally(() => {
+        if (timeoutId)
+          clearTimeout(timeoutId);
+      }),
+      new Promise((_, reject) => {
+        timeoutId = setTimeout(() => {
+          reject(managementTimeoutError(args, options));
+          abortController.abort();
+        }, options.timeoutMs);
+      })
+    ]);
+  }
+  async runStreamingPrompt(command, args, reply, formatToolCalls = false, toolEventMode = "text", replyContext, onSegment, onToolEvent, onThought, onPlan, onUsage, onCommands, rawStream = false, env, driver) {
+    const hooks = this.streamingHooks;
+    const doSpawn = hooks.spawnPrompt ?? ((cmd, spawnArgs) => spawn11(cmd, spawnArgs, {
+      env,
+      stdio: ["ignore", "pipe", "pipe"]
+    }));
+    const setIntervalFn = hooks.setIntervalFn ?? ((fn, delay) => setInterval(fn, delay));
+    const clearIntervalFn = hooks.clearIntervalFn ?? ((timer) => clearInterval(timer));
+    const maxSegmentWaitMs = hooks.maxSegmentWaitMs ?? (rawStream ? 200 : 30000);
+    const flushCheckIntervalMs = hooks.flushCheckIntervalMs ?? (rawStream ? 80 : 5000);
+    const now = hooks.now ?? (() => Date.now());
+    return await new Promise((resolve4, reject) => {
+      const spawnSpec = resolveSpawnCommand(command, args);
+      const child = doSpawn(spawnSpec.command, spawnSpec.args);
+      let stdout2 = "";
+      let stderr = "";
+      let lastReplyAt = now();
+      let segmentChain = Promise.resolve();
+      let segmentError;
+      let toolEventChain = Promise.resolve();
+      let toolEventError;
+      let thoughtChain = Promise.resolve();
+      let thoughtError;
+      let planChain = Promise.resolve();
+      let planError;
+      let usageChain = Promise.resolve();
+      let usageError;
+      let commandsChain = Promise.resolve();
+      let commandsError;
+      const userOnToolEvent = onToolEvent;
+      const userOnThought = onThought;
+      const userOnPlan = onPlan;
+      const userOnUsage = onUsage;
+      const userOnCommands = onCommands;
+      const state = createStreamingPromptState(formatToolCalls, {
+        mode: toolEventMode,
+        driver,
+        rawStream,
+        ...userOnToolEvent ? {
+          onToolEvent: (event) => {
+            toolEventChain = toolEventChain.then(() => userOnToolEvent(event)).catch((error2) => {
+              toolEventError ??= error2;
+            });
+          }
+        } : {},
+        ...userOnThought ? {
+          onThought: (chunk) => {
+            thoughtChain = thoughtChain.then(() => userOnThought(chunk)).catch((error2) => {
+              thoughtError ??= error2;
+            });
+          }
+        } : {},
+        ...userOnPlan ? {
+          onPlan: (entries) => {
+            planChain = planChain.then(() => userOnPlan(entries)).catch((error2) => {
+              planError ??= error2;
+            });
+          }
+        } : {},
+        ...userOnUsage ? {
+          onUsage: (usage) => {
+            usageChain = usageChain.then(() => userOnUsage(usage)).catch((error2) => {
+              usageError ??= error2;
+            });
+          }
+        } : {},
+        ...userOnCommands ? {
+          onCommands: (commands) => {
+            commandsChain = commandsChain.then(() => userOnCommands(commands)).catch((error2) => {
+              commandsError ??= error2;
+            });
+          }
+        } : {}
+      });
+      const sink2 = reply ? rawStream ? createVerbatimReplySink(reply) : createQuotaGatedReplySink({
+        reply,
+        ...replyContext ? { replyContext } : {}
+      }) : null;
+      const feedSegment = (segment) => {
+        if (onSegment) {
+          segmentChain = segmentChain.then(() => onSegment(segment)).catch((error2) => {
+            segmentError ??= error2;
+          });
+        }
+        sink2?.feedSegment(segment);
+        lastReplyAt = now();
+      };
+      const flushBuffer = () => {
+        const remaining = rawStream ? state.buffer : state.buffer.trim();
+        if (remaining.length > 0) {
+          state.buffer = "";
+          feedSegment(remaining);
+        }
+      };
+      const timer = setIntervalFn(() => {
+        if (state.buffer.trim().length > 0 && now() - lastReplyAt >= maxSegmentWaitMs) {
+          flushBuffer();
+        }
+      }, flushCheckIntervalMs);
+      child.stdout.setEncoding("utf8");
+      child.stdout.on("data", (chunk) => {
+        stdout2 += String(chunk);
+        parseStreamingDataChunk(state, String(chunk));
+        for (const segment of state.segments.splice(0)) {
+          feedSegment(segment);
+        }
+      });
+      child.stderr.on("data", (chunk) => {
+        stderr += String(chunk);
+      });
+      child.on("error", (err) => {
+        clearIntervalFn(timer);
+        reject(err);
+      });
+      child.on("close", (code) => {
+        clearIntervalFn(timer);
+        const remaining = state.finalize();
+        if (remaining.length > 0) {
+          feedSegment(remaining);
+        }
+        const { overflowCount } = sink2?.finalize() ?? { overflowCount: 0 };
+        Promise.all([
+          sink2?.drain({ timeoutMs: 30000 }) ?? Promise.resolve(),
+          segmentChain,
+          toolEventChain,
+          thoughtChain,
+          planChain,
+          usageChain,
+          commandsChain
+        ]).then(() => {
+          const deferred = sink2?.getPendingError();
+          if (deferred) {
+            reject(deferred);
+            return;
+          }
+          if (segmentError) {
+            reject(segmentError);
+            return;
+          }
+          if (toolEventError) {
+            reject(toolEventError);
+            return;
+          }
+          if (thoughtError) {
+            reject(thoughtError);
+            return;
+          }
+          if (planError) {
+            reject(planError);
+            return;
+          }
+          if (usageError) {
+            reject(usageError);
+            return;
+          }
+          if (commandsError) {
+            reject(commandsError);
+            return;
+          }
+          resolve4({
+            result: { code: code ?? 1, stdout: stdout2, stderr },
+            overflowCount
+          });
+        }).catch((error2) => {
+          reject(error2);
+        });
+      });
+    });
+  }
+  permissionInput() {
+    return {
+      permissionMode: this.permissionMode,
+      nonInteractivePermissions: this.nonInteractivePermissions,
+      permissionPolicy: this.permissionPolicy
+    };
+  }
+  spawnEnvironment(input) {
+    return this.resolveSpawnEnvironment(input);
+  }
+  withSpawnEnvironment(input, options) {
+    const env = this.spawnEnvironment(input);
+    return env ? { ...options ?? {}, env } : options;
   }
-  return -1;
-}
-function hasTrackedLaunch(record3, launched) {
-  if (record3?.type !== "assistant" || record3.isSidechain === true)
-    return false;
-  return contentBlocks(record3.message?.content).some((block) => readString2(block, "type") === "tool_use" && launched.has(readString2(block, "id") ?? ""));
-}
-function isMainEndTurn(record3) {
-  return record3.type === "assistant" && record3.isSidechain !== true && record3.message?.stop_reason === "end_turn";
-}
-function parseRecord(line) {
-  if (!line.trim())
-    return;
-  try {
-    return JSON.parse(line);
-  } catch {
-    return;
+  sessionInput(session3) {
+    return {
+      agent: session3.agent,
+      agentCommand: session3.agentCommand,
+      cwd: session3.cwd,
+      model: session3.model,
+      permission: this.permissionInput()
+    };
   }
-}
-function contentBlocks(content) {
-  if (typeof content === "string")
-    return [{ type: "text", text: content }];
-  return Array.isArray(content) ? content.filter((block) => !!block && typeof block === "object") : [];
-}
-function blockText(block) {
-  if (typeof block.text === "string")
-    return block.text;
-  if (typeof block.content === "string")
-    return block.content;
-  if (Array.isArray(block.content))
-    return block.content.map((item) => textOfUnknown(item)).filter(Boolean).join(`
-`);
-  return textOfUnknown(block.content);
-}
-function textOfUnknown(value) {
-  if (typeof value === "string")
-    return value;
-  if (Array.isArray(value))
-    return value.map(textOfUnknown).filter(Boolean).join(`
-`);
-  if (!value || typeof value !== "object")
-    return "";
-  const object4 = value;
-  if (typeof object4.text === "string")
-    return object4.text;
-  if (object4.content !== undefined)
-    return textOfUnknown(object4.content);
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return "";
+  buildArgs(session3, tail2, format = "quiet") {
+    return buildSessionArgs(this.sessionInput(session3), tail2, { format });
   }
-}
-function findStringField(value, keys) {
-  if (!value || typeof value !== "object")
-    return;
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      const found = findStringField(item, keys);
-      if (found)
-        return found;
-    }
-    return;
+  buildAgentQueryArgs(query, format, tail2) {
+    return buildAgentQueryArgs({ agent: query.agent, agentCommand: query.agentCommand, cwd: query.cwd, permission: this.permissionInput() }, format, tail2);
   }
-  const object4 = value;
-  for (const key of keys) {
-    const candidate = object4[key];
-    if (typeof candidate === "string" && candidate.trim())
-      return candidate.trim();
+  buildPromptArgs(session3, text, promptFile) {
+    const tail2 = promptFile ? ["prompt", "-s", session3.transportSession, "--file", promptFile] : ["prompt", "-s", session3.transportSession, text];
+    return buildPromptArgs({ ...this.sessionInput(session3), queueOwnerTtlSeconds: this.queueOwnerTtlSeconds }, tail2);
   }
-  for (const candidate of Object.values(object4)) {
-    const found = findStringField(candidate, keys);
-    if (found)
-      return found;
+  buildPermissionArgs() {
+    return buildPermissionArgs(this.permissionInput());
   }
-  return;
 }
-function taskNotifications(text) {
-  const notifications = [];
-  const blocks = [...text.matchAll(/<task-notification>([\s\S]*?)<\/task-notification>/gi)].map((match) => match[1] ?? "");
-  for (const block of blocks.length > 0 ? blocks : [text]) {
-    const toolCallId = /<tool-use-id>([^<]+)<\/tool-use-id>/i.exec(block)?.[1]?.trim();
-    if (!toolCallId)
+function renderCommandForError(args) {
+  const rendered = [];
+  for (let index = 0;index < args.length; index += 1) {
+    const arg = args[index];
+    if (arg === undefined) {
       continue;
-    const status = /<status>([^<]+)<\/status>/i.exec(block)?.[1]?.trim().toLowerCase();
-    notifications.push({
-      toolCallId,
-      failed: status === "failed" || status === "error" || status === "cancelled" || status === "canceled"
-    });
-  }
-  return notifications;
-}
-function classifyToolKind(name) {
-  const normalized = name.toLowerCase();
-  if (/(read|view|open)/.test(normalized))
-    return "read";
-  if (/(grep|search|find|glob)/.test(normalized))
-    return "search";
-  if (/(edit|write|patch|replace|create)/.test(normalized))
-    return "edit";
-  if (/(bash|shell|exec|run|terminal|command)/.test(normalized))
-    return "execute";
-  if (/(think|reason|plan|agent|task)/.test(normalized))
-    return "think";
-  return "other";
-}
-function isAgentToolName(name) {
-  const normalized = name.trim().toLowerCase();
-  return normalized === "agent" || normalized === "task";
-}
-async function findSubagentTranscripts(transcriptPath) {
-  const sessionDir = join23(dirname13(transcriptPath), basename3(transcriptPath, ".jsonl"), "subagents");
-  const found = [];
-  const visit = async (directory) => {
-    let entries;
-    try {
-      entries = await readdir4(directory, { withFileTypes: true });
-    } catch {
-      return;
     }
-    for (const entry of entries) {
-      const path14 = join23(directory, entry.name);
-      if (entry.isDirectory()) {
-        await visit(path14);
-      } else if (entry.isFile() && entry.name.startsWith("agent-") && entry.name.endsWith(".jsonl")) {
-        found.push({ agentId: entry.name.slice("agent-".length, -".jsonl".length), path: path14 });
-      }
+    if (arg === "--format") {
+      index += 1;
+      continue;
     }
-  };
-  await visit(sessionDir);
-  return found;
-}
-function toolSummary(input) {
-  if (!input || typeof input !== "object")
-    return;
-  const object4 = input;
-  for (const key of ["description", "summary", "path", "file_path", "query", "pattern", "command"]) {
-    if (typeof object4[key] === "string" && object4[key].trim())
-      return object4[key].trim();
-  }
-  return;
-}
-function readString2(object4, key) {
-  if (!object4 || typeof object4 !== "object")
-    return;
-  const value = object4[key];
-  return typeof value === "string" ? value : undefined;
-}
-function readBoolean(object4, key) {
-  return !!object4 && typeof object4 === "object" && object4[key] === true;
-}
-function encodeClaudeProjectDirectory(cwd) {
-  return cwd.replace(/[:\\/]/g, "-");
-}
-async function exists(path14) {
-  try {
-    await access4(path14, fsConstants.R_OK);
-    return true;
-  } catch {
-    return false;
+    if (arg === "--cwd") {
+      index += 1;
+      continue;
+    }
+    rendered.push(/\s/.test(arg) || arg.includes(":") ? `"${arg}"` : arg);
   }
+  return rendered.join(" ");
 }
-function throwIfAborted(signal) {
-  if (signal?.aborted)
-    throw new DOMException("Claude background follow-up aborted", "AbortError");
-}
-async function waitForPoll(ms, signal) {
-  if (!signal) {
-    await new Promise((resolve4) => setTimeout(resolve4, ms));
-    return;
+function resolveChildEnvironment(baseEnv, explicitEnv, locale) {
+  const source = explicitEnv ?? baseEnv;
+  const env = {};
+  for (const [key, value] of Object.entries(source)) {
+    if (typeof value === "string")
+      env[key] = value;
   }
-  throwIfAborted(signal);
-  await new Promise((resolve4, reject) => {
-    const timer = setTimeout(() => {
-      signal.removeEventListener("abort", onAbort);
-      resolve4();
-    }, ms);
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(new DOMException("Claude background follow-up aborted", "AbortError"));
-    };
-    signal.addEventListener("abort", onAbort, { once: true });
-  });
+  env.XACPX_LANG = locale;
+  return env;
 }
-var DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_TIMEOUT_MS, FINAL_SUBAGENT_DRAIN_MAX_POLLS = 4, FINAL_SUBAGENT_DRAIN_STABLE_POLLS = 2, ASYNC_AGENT_LAUNCH;
-var init_claude_background_followup = __esm(() => {
-  DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
-  ASYNC_AGENT_LAUNCH = /Async agent launched successfully|["']?status["']?\s*:\s*["']async_launched["']/i;
+var require4;
+var init_acpx_cli_transport = __esm(() => {
+  init_spawn_command();
+  init_claude_settings_policy();
+  init_i18n();
+  init_prompt_output();
+  init_prompt_media();
+  init_streaming_prompt();
+  init_quota_gated_reply_sink();
+  init_node_pty_helper();
+  init_terminate_process_tree();
+  init_acpx_queue_owner_launcher();
+  init_daemon_files();
+  init_agent_session_list();
+  init_codex_subagent_filter();
+  init_acpx_session_files();
+  init_session_effort();
+  init_command_timeouts();
+  init_acpx_command_builder();
+  require4 = createRequire5(import.meta.url);
 });
 
-// src/transport/claude-background-followup-transport.ts
-function createClaudeBackgroundFollowupTransport(delegate, options) {
-  const followBackgroundTurn = options.followBackgroundTurn ?? followClaudeBackgroundTurn;
+// src/transport/background-followup-transport.ts
+function createBackgroundFollowupTransport(delegate, options) {
+  const runBackgroundFollowup = options.followBackgroundTurn ?? followBackgroundTurn;
   const prompt = async (session3, text, reply, replyContext, promptOptions) => {
     const latestToolEvents = new Map;
     const pendingToolEvents = new Map;
@@ -35308,9 +35329,9 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
         pendingToolEvents.set(event.toolCallId, event);
       else
         pendingToolEvents.delete(event.toolCallId);
-      if (isClaudeAsyncAgentLaunch(event)) {
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
         asyncToolCallIds.add(event.toolCallId);
-        const agentId = claudeAsyncAgentId(event);
+        const agentId = asyncAgentId(event);
         if (agentId)
           subagentIdsByToolCallId.set(event.toolCallId, agentId);
       }
@@ -35320,31 +35341,33 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
       ...promptOptions,
       ...forwardToolEvent ? { onToolEvent: forwardToolEvent } : {}
     });
-    const isClaude = (options.resolveDriver?.(session3.agent) ?? session3.agent) === "claude";
-    if (!isClaude || asyncToolCallIds.size === 0 || !reply || !forwardToolEvent)
+    const driver = (options.resolveDriver?.(session3.agent) ?? session3.agent).trim().toLowerCase();
+    const supportsFollowup = driver === "claude" || driver === "qoder";
+    if (!supportsFollowup || asyncToolCallIds.size === 0 || !reply || !forwardToolEvent)
       return result;
     let agentSessionId = session3.agentSessionId;
     if (!agentSessionId) {
       try {
         agentSessionId = await delegate.getAgentSessionId?.(session3);
       } catch (error2) {
-        await options.logger.error("transport.claude_background_followup.session_id_failed", "failed to resolve Claude session id for background follow-up", { alias: session3.alias, error: error2 instanceof Error ? error2.message : String(error2) });
+        await options.logger.error(`${LEGACY_LOG_EVENT_PREFIX}.session_id_failed`, "failed to resolve agent session id for background follow-up", { alias: session3.alias, error: error2 instanceof Error ? error2.message : String(error2) });
       }
     }
     if (!agentSessionId) {
       for (const event of [...pendingToolEvents.values()]) {
         await forwardToolEvent({
           ...event,
-          rawOutput: { message: "Claude background continuation could not be tracked: session id unavailable" },
+          rawOutput: { message: "background continuation could not be tracked: session id unavailable" },
           status: "error"
         });
       }
       return result;
     }
-    await options.logger.info("transport.claude_background_followup.started", "following Claude background-agent continuation", { alias: session3.alias, agentSessionId, taskCount: asyncToolCallIds.size });
-    const followup = await followBackgroundTurn({
+    await options.logger.info(`${LEGACY_LOG_EVENT_PREFIX}.started`, "following background-agent continuation", { alias: session3.alias, agentSessionId, driver, taskCount: asyncToolCallIds.size });
+    const followup = await runBackgroundFollowup({
       cwd: session3.cwd,
       sessionId: agentSessionId,
+      driver,
       launchedToolCallIds: asyncToolCallIds,
       initialToolEvents: latestToolEvents.values(),
       subagentIdsByToolCallId,
@@ -35373,12 +35396,13 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
       await forwardToolEvent({
         ...event,
         status: followup.status === "completed" && !failed ? "success" : "error",
-        ...followup.status === "completed" && !failed ? {} : { rawOutput: { message: failed ? "Claude background Agent failed" : `Claude background continuation ${followup.status}` } }
+        ...followup.status === "completed" && !failed ? {} : { rawOutput: { message: failed ? "background Agent failed" : `background continuation ${followup.status}` } }
       });
     }
-    await options.logger.info(`transport.claude_background_followup.${followup.status}`, `Claude background-agent follow-up ${followup.status}`, {
+    await options.logger.info(`${LEGACY_LOG_EVENT_PREFIX}.${followup.status}`, `background-agent follow-up ${followup.status}`, {
       alias: session3.alias,
       agentSessionId,
+      driver,
       completedTaskCount: followup.completedToolCallIds.length,
       failedTaskCount: followup.failedToolCallIds.length
     });
@@ -35393,8 +35417,9 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
     }
   });
 }
-var init_claude_background_followup_transport = __esm(() => {
-  init_claude_background_followup();
+var LEGACY_LOG_EVENT_PREFIX = "transport.claude_background_followup";
+var init_background_followup_transport = __esm(() => {
+  init_background_followup();
 });
 
 // src/util/async.ts
@@ -36758,21 +36783,28 @@ class WorkspaceGit {
     }
     return startPoint;
   }
-  async includeRenameSources(root, paths) {
-    const selected = new Set(paths);
-    const expanded = new Set(paths);
+  async readPorcelain(root) {
     const fields = (await this.runRaw(root, ["-c", "core.quotePath=false", "status", "--porcelain", "-z"])).split("\x00");
+    const entries = [];
     for (let index = 0;index < fields.length; index += 1) {
       const field = fields[index];
       if (!field)
         continue;
       const status = field.slice(0, 2);
       const path14 = field.slice(3);
-      if (status[0] !== "R" && status[0] !== "C")
-        continue;
-      const originalPath = fields[++index];
-      if (originalPath && selected.has(path14))
-        expanded.add(originalPath);
+      const entry = { status, path: path14 };
+      if (status[0] === "R" || status[0] === "C")
+        entry.originalPath = fields[++index];
+      entries.push(entry);
+    }
+    return entries;
+  }
+  async includeRenameSources(root, paths) {
+    const selected = new Set(paths);
+    const expanded = new Set(paths);
+    for (const entry of await this.readPorcelain(root)) {
+      if (entry.originalPath && selected.has(entry.path))
+        expanded.add(entry.originalPath);
     }
     return [...expanded];
   }
@@ -36810,6 +36842,38 @@ class WorkspaceGit {
       }
     });
   }
+  async untrack(workspace3, paths) {
+    await this.withWrite(workspace3, async () => {
+      const root = await this.rootFor(workspace3);
+      await this.run(root, ["--literal-pathspecs", "rm", "--cached", "--force", "--", ...this.validatePaths(paths)]);
+    });
+  }
+  async discard(workspace3, paths) {
+    await this.withWrite(workspace3, async () => {
+      const root = await this.rootFor(workspace3);
+      const selected = new Set(this.validatePaths(paths));
+      const deletePaths = new Set;
+      const restorePaths = new Set;
+      for (const entry of await this.readPorcelain(root)) {
+        if (!selected.has(entry.path))
+          continue;
+        if (entry.status === "??" || entry.status[0] === "A" || entry.originalPath !== undefined) {
+          deletePaths.add(entry.path);
+          if (entry.originalPath)
+            restorePaths.add(entry.originalPath);
+        } else {
+          restorePaths.add(entry.path);
+        }
+      }
+      if (deletePaths.size) {
+        await this.run(root, ["--literal-pathspecs", "reset", "-q", "--", ...deletePaths]);
+        await this.run(root, ["--literal-pathspecs", "clean", "-qf", "--", ...deletePaths]);
+      }
+      if (restorePaths.size) {
+        await this.run(root, ["--literal-pathspecs", "restore", "--source=HEAD", "--staged", "--worktree", "--", ...restorePaths]);
+      }
+    });
+  }
   async commit(workspace3, message) {
     return this.withWrite(workspace3, async () => {
       const root = await this.rootFor(workspace3);
@@ -37540,6 +37604,12 @@ class ControlService {
   gitUnstage(workspace3, paths) {
     return this.mutateWorkspaceGit(() => this.workspaceGit.unstage(workspace3, paths));
   }
+  gitUntrack(workspace3, paths) {
+    return this.mutateWorkspaceGit(() => this.workspaceGit.untrack(workspace3, paths));
+  }
+  gitDiscard(workspace3, paths) {
+    return this.mutateWorkspaceGit(() => this.workspaceGit.discard(workspace3, paths));
+  }
   gitCommit(workspace3, message) {
     return this.mutateWorkspaceGit(() => this.workspaceGit.commit(workspace3, message));
   }
@@ -38570,7 +38640,7 @@ async function buildApp(paths, deps = {}) {
       });
     }
   })))) : deps.createCliTransport?.(acpxCommand) ?? new AcpxCliTransport({ ...config4.transport, command: acpxCommand });
-  const transport = createClaudeBackgroundFollowupTransport(baseTransport, {
+  const transport = createBackgroundFollowupTransport(baseTransport, {
     logger,
     resolveDriver: (agent4) => config4.agents[agent4]?.driver
   });
@@ -39245,7 +39315,7 @@ var init_main = __esm(async () => {
   init_acpx_bridge_client();
   init_acpx_bridge_transport();
   init_acpx_cli_transport();
-  init_claude_background_followup_transport();
+  init_background_followup_transport();
   init_queue_owner_reaper();
   init_collect_reap_targets();
   init_channel_registry();