@evident-ai/cli 3.6.1-dev.00837f1 → 3.6.1-dev.0cc3c83

package/dist/index.js

@@ -335,14 +335,14 @@ function blank() {
   console.log();
 }
 function waitForEnter(prompt = "Press Enter to continue...") {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     process.stdout.write(chalk.dim(prompt));
     const handler = () => {
       process.stdin.removeListener("data", handler);
       process.stdin.setRawMode?.(false);
       process.stdin.pause();
       console.log();
-      resolve5();
+      resolve6();
     };
     if (process.stdin.isTTY) {
       process.stdin.setRawMode?.(true);
@@ -352,7 +352,7 @@ function waitForEnter(prompt = "Press Enter to continue...") {
   });
 }
 function sleep(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 
 // src/commands/login.ts
@@ -430,19 +430,19 @@ async function tokenLogin() {
   );
   blank();
   process.stdout.write("Paste token: ");
-  const token = await new Promise((resolve5) => {
+  const token = await new Promise((resolve6) => {
     let data = "";
     process.stdin.setEncoding("utf8");
     process.stdin.on("data", (chunk) => {
       data += chunk;
     });
     process.stdin.on("end", () => {
-      resolve5(data.trim());
+      resolve6(data.trim());
     });
     if (process.stdin.isTTY) {
       process.stdin.once("data", (chunk) => {
         process.stdin.pause();
-        resolve5(chunk.toString().trim());
+        resolve6(chunk.toString().trim());
       });
       process.stdin.resume();
     }
@@ -1180,8 +1180,8 @@ async function claudeUsage() {
 
 // src/commands/run.ts
 import { chmodSync as chmodSync3, existsSync as existsSync3, readFileSync as readFileSync12, writeFileSync as writeFileSync9 } from "node:fs";
-import { homedir as homedir8 } from "node:os";
-import { isAbsolute as isAbsolute4, join as join16, parse, resolve as resolvePath2 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { isAbsolute as isAbsolute6, join as join17, parse, resolve as resolvePath2 } from "node:path";
 import chalk7 from "chalk";
 
 // ../../packages/types/src/agents/index.ts
@@ -1335,6 +1335,8 @@ function decodeBinaryBodyFrame(bytes) {
 var MAX_FRAME_BYTES = 256 * 1024;
 var TUNNEL_DRAIN_PING_PATH = "/__evident/drain";
 var TUNNEL_USAGE_REARM_PING_PATH = "/__evident/usage-rearm";
+var TUNNEL_FILE_READ_PATH = "/__evident/file";
+var TUNNEL_FILE_READ_MAX_BYTES = 5 * 1024 * 1024;
 
 // ../../packages/types/src/runner-files.ts
 var MAX_FILE_PUSH_BYTES = 64 * 1024;
@@ -1475,7 +1477,7 @@ import ora4 from "ora";
 import { select as select4 } from "@inquirer/prompts";
 
 // src/lib/telemetry.ts
-var CLI_VERSION = (true ? "3.6.1-dev.00837f1" : void 0) ?? process.env.npm_package_version ?? "unknown";
+var CLI_VERSION = (true ? "3.6.1-dev.0cc3c83" : void 0) ?? process.env.npm_package_version ?? "unknown";
 function getCliVersion() {
   return CLI_VERSION;
 }
@@ -2047,8 +2049,8 @@ function resolveExistingPath(absolutePath) {
   let current = candidate;
   while (current) {
     try {
-      const stat2 = lstatSync(current);
-      if (stat2.isSymbolicLink()) {
+      const stat3 = lstatSync(current);
+      if (stat3.isSymbolicLink()) {
         if (remaining.length === 0) {
           return { path: join2(realpathSync(dirname3(current)), basename(current)) };
         }
@@ -2099,15 +2101,15 @@ function classifyScope(dir, roots) {
 function unresolvedRootForPath(path, unresolved) {
   return unresolved.find((spec) => isWithin(path, spec.configured));
 }
-function statType(stat2) {
-  if (stat2.isDirectory()) return "d";
-  if (stat2.isFile()) return "f";
-  if (stat2.isSymbolicLink()) return "l";
+function statType(stat3) {
+  if (stat3.isDirectory()) return "d";
+  if (stat3.isFile()) return "f";
+  if (stat3.isSymbolicLink()) return "l";
   return "o";
 }
-function renderStat(name, stat2) {
-  const mode = (stat2.mode & 4095).toString(8).padStart(4, "0");
-  return `${name}:${statType(stat2)}:${stat2.uid}:${stat2.gid}:${mode}`;
+function renderStat(name, stat3) {
+  const mode = (stat3.mode & 4095).toString(8).padStart(4, "0");
+  return `${name}:${statType(stat3)}:${stat3.uid}:${stat3.gid}:${mode}`;
 }
 function renderStatError(name, error2) {
   const code = getErrorCode(error2);
@@ -2133,9 +2135,9 @@ function inspectChain(rootReal, rootToken, absolutePath, resolutionFailure) {
       break;
     }
     try {
-      const stat2 = lstatSync(current);
-      entries.push(renderStat(name, stat2));
-      finalStat = stat2;
+      const stat3 = lstatSync(current);
+      entries.push(renderStat(name, stat3));
+      finalStat = stat3;
     } catch (error2) {
       entries.push(renderStatError(name, error2));
       if (getErrorCode(error2) !== "ENOENT") status2 = "stat_failed";
@@ -3355,7 +3357,7 @@ function appendError(stderr, error2) {
 ${message}`;
 }
 function runSynchroniser(args, opts) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let child;
     let stdout = "";
     let stderr = "";
@@ -3375,7 +3377,7 @@ function runSynchroniser(args, opts) {
       if (closeFallbackTimer.handle) clearTimeout(closeFallbackTimer.handle);
       if (abortListener) opts.signal?.removeEventListener("abort", abortListener);
       if (spawnListener) child.removeListener("spawn", spawnListener);
-      resolve5(result);
+      resolve6(result);
     };
     const armErrorCloseFallback = () => {
       if (closeFallbackTimer.handle) return;
@@ -4046,7 +4048,7 @@ async function waitForOpenCodeHealth(port, timeoutMs = 3e4) {
     if (health.healthy || health.authFailed) {
       return health;
     }
-    await new Promise((resolve5) => setTimeout(resolve5, 1e3));
+    await new Promise((resolve6) => setTimeout(resolve6, 1e3));
   }
   return { healthy: false, error: "Timeout waiting for OpenCode to be healthy" };
 }
@@ -4057,7 +4059,7 @@ async function waitForOpenCode2Health(port, password, timeoutMs = 3e4) {
     if (health.healthy || health.authFailed) {
       return health;
     }
-    await new Promise((resolve5) => setTimeout(resolve5, 1e3));
+    await new Promise((resolve6) => setTimeout(resolve6, 1e3));
   }
   return { healthy: false, error: "Timeout waiting for OpenCode to be healthy" };
 }
@@ -4167,1827 +4169,1786 @@ function createOpenCodeClient(options) {
   };
 }
 
-// src/lib/opencode/session.ts
+// src/lib/opencode/session-v2.ts
 var ALL_HTTP_STATUSES = Array.from({ length: 500 }, (_, index) => index + 100);
-function timedFetch(input, init) {
-  return withRequestTimeout(fetch, REQUEST_TIMEOUT_MS)(input, init);
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function requestWithClient(port, client, path, init, options) {
-  return client ? client.request(path, init, options) : timedFetch(`${opencodeBase(port)}${path}`, init);
+function finiteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
-function opencodeBase(port) {
-  return `http://127.0.0.1:${port}`;
+function adaptTime(value) {
+  if (!isRecord5(value)) return void 0;
+  const created = finiteNumber(value.created);
+  const completed = finiteNumber(value.completed);
+  if (created === void 0 && completed === void 0) return void 0;
+  return {
+    ...created !== void 0 ? { created } : {},
+    ...completed !== void 0 ? { completed } : {}
+  };
 }
-async function getOpenCodeDirectory(port, client) {
-  try {
-    const res = await requestWithClient(port, client, "/path");
-    if (!res.ok) return null;
-    const body = await res.json();
-    const dir = typeof body.directory === "string" && body.directory || typeof body.worktree === "string" && body.worktree || typeof body.path?.cwd === "string" && body.path.cwd || typeof body.path?.directory === "string" && body.path.directory || null;
-    return dir && dir.trim() ? dir.trim() : null;
-  } catch (error2) {
-    console.error(
-      `[getOpenCodeDirectory] GET /path failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return null;
+function adaptTokens(value) {
+  if (!isRecord5(value)) return void 0;
+  const input = finiteNumber(value.input);
+  const output = finiteNumber(value.output);
+  const reasoning = finiteNumber(value.reasoning);
+  const cache = isRecord5(value.cache) ? {
+    ...finiteNumber(value.cache.read) !== void 0 ? { read: finiteNumber(value.cache.read) } : {},
+    ...finiteNumber(value.cache.write) !== void 0 ? { write: finiteNumber(value.cache.write) } : {}
+  } : void 0;
+  if (input === void 0 && output === void 0 && reasoning === void 0 && !cache) {
+    return void 0;
   }
+  return {
+    ...input !== void 0 ? { input } : {},
+    ...output !== void 0 ? { output } : {},
+    ...reasoning !== void 0 ? { reasoning } : {},
+    ...cache ? { cache } : {}
+  };
 }
-function roleOf2(m) {
-  if (!m || typeof m !== "object") return void 0;
-  if (typeof m.role === "string") return m.role;
-  const infoRole = m.info?.role;
-  return typeof infoRole === "string" ? infoRole : void 0;
+function adaptMessageInfo(value, role) {
+  const info = {
+    id: value.id,
+    role
+  };
+  const time = adaptTime(value.time);
+  if (time) info.time = time;
+  if (typeof value.finish === "string") info.finish = value.finish;
+  if ("error" in value) info.error = value.error;
+  if (typeof value.agent === "string") info.agent = value.agent;
+  if (isRecord5(value.model)) {
+    if (typeof value.model.id === "string") info.modelID = value.model.id;
+    if (typeof value.model.providerID === "string") info.providerID = value.model.providerID;
+  }
+  if (typeof value.cost === "number" && Number.isFinite(value.cost)) info.cost = value.cost;
+  const tokens = adaptTokens(value.tokens);
+  if (tokens) info.tokens = tokens;
+  return info;
 }
-function completedOf(m) {
-  if (!m || typeof m !== "object") return void 0;
-  return m.info?.time?.completed ?? m.time?.completed;
+function v2ChildSessionEvidence(content) {
+  const state = isRecord5(content.state) ? content.state : null;
+  const metadata = state && isRecord5(state.metadata) ? state.metadata : null;
+  const sessionId = typeof metadata?.sessionID === "string" && metadata.sessionID.length > 0 ? metadata.sessionID : typeof metadata?.sessionId === "string" && metadata.sessionId.length > 0 ? metadata.sessionId : null;
+  if (sessionId === null) return null;
+  const time = isRecord5(content.time) ? content.time : null;
+  return { sessionId, startedAtMs: finiteNumber(time?.created) ?? null };
 }
-function createdOf(m) {
-  if (!m || typeof m !== "object") return void 0;
-  return m.info?.time?.created ?? m.time?.created;
+function adaptV2Message(value) {
+  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.type !== "string") {
+    return null;
+  }
+  if (value.type === "user") {
+    if (typeof value.text !== "string") return null;
+    return {
+      info: adaptMessageInfo(value, "user"),
+      parts: [{ type: "text", text: value.text }]
+    };
+  }
+  if (value.type !== "assistant" || !Array.isArray(value.content)) return null;
+  const parts = [];
+  for (const content of value.content) {
+    if (!isRecord5(content) || typeof content.type !== "string") return null;
+    const toolPart = projectV2ToolContent(content);
+    if (toolPart) {
+      const childSession = v2ChildSessionEvidence(content);
+      parts.push(childSession ? { ...toolPart, childSession } : toolPart);
+      continue;
+    }
+    if (content.type === "text") {
+      if (typeof content.text !== "string") return null;
+      parts.push({ type: "text", text: content.text });
+    } else {
+      parts.push({ type: content.type });
+    }
+  }
+  return {
+    info: adaptMessageInfo(value, "assistant"),
+    parts
+  };
 }
-function idOf2(m) {
-  if (!m || typeof m !== "object") return void 0;
-  if (typeof m.id === "string") return m.id;
-  const infoId = m.info?.id;
-  return typeof infoId === "string" ? infoId : void 0;
+function adaptFormTool(value) {
+  if (!isRecord5(value) || typeof value.messageID !== "string" || typeof value.id !== "string") {
+    return void 0;
+  }
+  return { messageID: value.messageID, callID: value.id };
 }
-function parentIdOf2(m) {
-  if (!m || typeof m !== "object") return void 0;
-  if (typeof m.parentID === "string") return m.parentID;
-  const infoParent = m.info?.parentID;
-  return typeof infoParent === "string" ? infoParent : void 0;
+function adaptV2FormWire(value) {
+  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
+    return null;
+  }
+  return value;
 }
-function finishOf(m) {
-  if (!m || typeof m !== "object") return void 0;
-  if (typeof m.finish === "string") return m.finish;
-  const infoFinish = m.info?.finish;
-  return typeof infoFinish === "string" ? infoFinish : void 0;
+function adaptV2FormField(value, header) {
+  if (!isRecord5(value)) return null;
+  const question = typeof value.title === "string" ? value.title : typeof value.question === "string" ? value.question : typeof value.key === "string" ? value.key : null;
+  if (!question) return null;
+  const options = Array.isArray(value.options) ? value.options.flatMap((option) => {
+    if (!isRecord5(option)) return [];
+    const label = typeof option.label === "string" ? option.label : typeof option.value === "string" ? option.value : null;
+    if (!label) return [];
+    return [
+      {
+        label,
+        description: typeof option.description === "string" ? option.description : ""
+      }
+    ];
+  }) : [];
+  return { question, header, options };
 }
-function errorOf(m) {
-  if (!m || typeof m !== "object") return void 0;
-  return m.info?.error ?? m.error;
+function adaptV2Form(value) {
+  const form = adaptV2FormWire(value);
+  if (!form || !Array.isArray(form.fields)) return null;
+  const header = typeof form.title === "string" ? form.title : "";
+  const questions = form.fields.map((field) => adaptV2FormField(field, header)).filter((question) => question !== null);
+  if (questions.length === 0) return null;
+  const tool = isRecord5(form.metadata) ? adaptFormTool(form.metadata.tool) : void 0;
+  return {
+    id: form.id,
+    sessionID: form.sessionID,
+    questions,
+    ...tool ? { tool } : {},
+    raw: form
+  };
 }
-function isTerminalStopAnswer(m) {
-  return completedOf(m) != null && errorOf(m) == null && finishOf(m) === "stop";
+function adaptV2FormList(value) {
+  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
+  return value.data.map(adaptV2Form).filter((form) => form !== null);
 }
-function isAssistantInFlight(m) {
-  if (completedOf(m) == null) return true;
-  if (errorOf(m) != null) return false;
-  return finishOf(m) === "tool-calls";
+function adaptPattern(value) {
+  if (typeof value === "string" && value.length > 0) return value;
+  if (Array.isArray(value) && value.every((pattern) => typeof pattern === "string")) {
+    return value;
+  }
+  return void 0;
 }
-async function getSessionMessages(port, sessionId, client) {
-  try {
-    const path = `/session/${sessionId}/message`;
-    const res = await requestWithClient(port, client, path);
-    if (!res.ok) return null;
-    const body = await res.json();
-    return Array.isArray(body) ? body : null;
-  } catch (error2) {
-    console.error(
-      `[getSessionMessages] GET /session/${sessionId}/message failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
+function adaptV2PermissionWire(value) {
+  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
     return null;
   }
+  if (typeof value.permission !== "string" && typeof value.action !== "string") return null;
+  return value;
 }
-async function fetchSessionMessages(port, sessionId, client) {
-  const response = await requestWithClient(port, client, `/session/${sessionId}/message`);
-  if (!response.ok) return null;
-  const body = await response.json();
-  return Array.isArray(body) ? body : null;
-}
-async function pollSessionMessagesForRedrive(port, sessionId, client) {
-  try {
-    const response = await requestWithClient(
-      port,
-      client,
-      `/session/${sessionId}/message`,
-      void 0,
-      { allowStatuses: ALL_HTTP_STATUSES }
-    );
-    if (!response.ok) {
-      return { ok: false, status: response.status, body: await response.text(), malformed: false };
-    }
-    const body = await response.json();
-    if (!Array.isArray(body)) return { ok: false, status: null, body: "", malformed: true };
-    return { ok: true, messages: body };
-  } catch (error2) {
-    console.error(
-      `[pollSessionMessagesForRedrive] GET /session/${sessionId}/message failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return { ok: false, status: null, body: "", malformed: false };
-  }
+function adaptV2Permission(value) {
+  const permission = adaptV2PermissionWire(value);
+  if (!permission) return null;
+  const type = permission.permission ?? permission.action;
+  if (!type) return null;
+  const pattern = adaptPattern(permission.pattern) ?? adaptPattern(permission.patterns) ?? adaptPattern(permission.resources);
+  const time = isRecord5(permission.time) ? finiteNumber(permission.time.created) !== void 0 ? { created: finiteNumber(permission.time.created) } : void 0 : void 0;
+  return {
+    id: permission.id,
+    type,
+    sessionID: permission.sessionID,
+    metadata: isRecord5(permission.metadata) ? permission.metadata : {},
+    raw: permission,
+    ...pattern !== void 0 ? { pattern } : {},
+    ...typeof permission.messageID === "string" ? { messageID: permission.messageID } : {},
+    ...typeof permission.callID === "string" ? { callID: permission.callID } : {},
+    ...typeof permission.title === "string" ? { title: permission.title } : {},
+    ...time ? { time } : {}
+  };
 }
-function isSessionActivelyGenerating(messages) {
-  if (!messages || messages.length === 0) return false;
-  const last = messages[messages.length - 1];
-  if (roleOf2(last) !== "assistant") return false;
-  return completedOf(last) == null;
+function adaptV2PermissionList(value) {
+  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
+  return value.data.map(adaptV2Permission).filter((permission) => permission !== null);
 }
-var FULL_SESSION_ENUMERATION_MAX_SESSIONS = 3200;
-function sessionLastActivityMs(session) {
-  const candidates = [
-    session.time?.updated,
-    session.time?.created,
-    session.time_updated,
-    session.time_created,
-    session.updated,
-    session.created
+function adaptV2Session(value) {
+  if (!isRecord5(value) || typeof value.id !== "string" || value.id.length === 0) return null;
+  const time = isRecord5(value.time) ? {
+    ...finiteNumber(value.time.created) !== void 0 ? { created: finiteNumber(value.time.created) } : {},
+    ...finiteNumber(value.time.updated) !== void 0 ? { updated: finiteNumber(value.time.updated) } : {}
+  } : void 0;
+  return {
+    id: value.id,
+    ...typeof value.title === "string" ? { title: value.title } : {},
+    ...typeof value.parentID === "string" ? { parentID: value.parentID } : {},
+    ...time && Object.keys(time).length > 0 ? { time } : {}
+  };
+}
+function adaptV2SessionList(value) {
+  if (!isRecord5(value) || !Array.isArray(value.data) || !isRecord5(value.cursor)) return null;
+  return {
+    data: value.data.map(adaptV2Session).filter((session) => session !== null),
+    cursor: value.cursor
+  };
+}
+function adaptV2Location(value) {
+  const candidates = [
+    value,
+    isRecord5(value) ? value.data : void 0,
+    isRecord5(value) ? value.location : void 0
   ];
-  for (const c of candidates) {
-    if (typeof c === "number" && Number.isFinite(c)) return c;
+  for (const candidate of candidates) {
+    if (!isRecord5(candidate) || typeof candidate.directory !== "string") continue;
+    const directory = candidate.directory.trim();
+    if (directory) return directory;
   }
   return null;
 }
-function sessionListPath(options) {
-  const params = new URLSearchParams();
-  if (options?.limit !== void 0) params.set("limit", String(options.limit));
-  const query = params.toString();
-  return query ? `/session?${query}` : "/session";
+function adaptV2Messages(value) {
+  if (!isRecord5(value) || !Array.isArray(value.data)) return [];
+  return value.data.slice().reverse().map(adaptV2Message).filter((message) => message !== null);
 }
-async function listSessionPage(port, client, options) {
-  const path = sessionListPath(options);
+async function readJson(response) {
   try {
-    const res = await requestWithClient(
-      port,
-      client,
-      path,
-      options?.signal ? { signal: options.signal } : void 0,
-      { allowStatuses: ALL_HTTP_STATUSES }
-    );
-    if (!res.ok) {
-      console.error(`[listSessionPage] GET ${path} returned HTTP ${res.status} (port ${port})`);
-      return null;
-    }
-    const body = await res.json();
-    return Array.isArray(body) ? body : null;
+    return await response.json();
   } catch (error2) {
-    if (options?.signal?.aborted) return null;
-    const errorName = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
-    console.error(`[listSessionPage] GET ${path} failed (port ${port}): ${errorName}`);
-    return null;
+    throw new Error(
+      `OpenCode V2 response was not valid JSON: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
   }
 }
-async function listSessions(port, client, options) {
-  if (client?.version === "v2") return listV2Sessions(client, options?.signal);
-  return listSessionPage(port, client, options);
+async function readData(client, path, init) {
+  const response = await client.request(path, init);
+  const body = await readJson(response);
+  if (!isRecord5(body) || !("data" in body)) {
+    throw new Error(`OpenCode V2 response for ${path} was missing its data envelope`);
+  }
+  return body.data;
 }
-async function listAllSessions(port, client, signal) {
-  if (client?.version === "v2") {
-    const sessions2 = await listV2Sessions(client, signal);
-    return sessions2 === null ? { sessions: null, reason: "opencode-unreachable" } : { sessions: sessions2 };
+var OpenCodeV2PromptAckError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OpenCodeV2PromptAckError";
   }
-  const sessions = await listSessionPage(port, client, {
-    limit: FULL_SESSION_ENUMERATION_MAX_SESSIONS,
-    signal
-  });
-  if (sessions === null) return { sessions: null, reason: "opencode-unreachable" };
-  if (sessions.length >= FULL_SESSION_ENUMERATION_MAX_SESSIONS) {
-    return { sessions: null, reason: "session-enumeration-limit-bound" };
+};
+var OpenCodeV2ModelSwitchError = class extends Error {
+  statusCode;
+  constructor(error2) {
+    super(error2 instanceof Error ? error2.message : String(error2));
+    this.name = "OpenCodeV2ModelSwitchError";
+    this.statusCode = error2 instanceof OpenCodeRequestError ? error2.statusCode : null;
+  }
+};
+async function getOpenCodeDirectoryV2(client) {
+  try {
+    return adaptV2Location(await readJson(await client.request("/api/location")));
+  } catch (error2) {
+    console.error(
+      `[getOpenCodeDirectoryV2] GET /api/location failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return null;
   }
-  return { sessions };
 }
-var INTERRUPT_NETWORK_CODES = /* @__PURE__ */ new Set([
-  "ABORT_ERR",
-  "EAI_AGAIN",
-  "ECONNREFUSED",
-  "ECONNRESET",
-  "ENETUNREACH",
-  "ENOTFOUND",
-  "ETIMEDOUT",
-  "UND_ERR_CONNECT_TIMEOUT",
-  "UND_ERR_HEADERS_TIMEOUT",
-  "UND_ERR_SOCKET"
-]);
-function interruptFailureDiagnostic(error2) {
-  const message = error2 instanceof Error ? error2.message : "";
-  const httpStatus = /^OpenCode request failed: HTTP ([1-5]\d{2})(?::|$)/.exec(message)?.[1];
-  if (httpStatus) return `HTTP ${httpStatus}`;
-  const candidates = [error2, error2 instanceof Error ? error2.cause : void 0];
-  for (const candidate of candidates) {
-    if (typeof candidate !== "object" || candidate === null || !("code" in candidate)) continue;
-    const code = candidate.code;
-    if (typeof code === "string" && INTERRUPT_NETWORK_CODES.has(code)) {
-      return redactDiagnosticText(`network ${code}`).slice(0, 120);
-    }
+async function createV2Session(client, directory) {
+  const data = await readData(client, "/api/session", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ location: { directory } })
+  });
+  if (!isRecord5(data) || typeof data.id !== "string" || data.id.length === 0) {
+    throw new Error("OpenCode V2 create session response was missing data.id");
   }
-  const name = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
-  return redactDiagnosticText(`request threw ${name}`).slice(0, 120);
+  return data.id;
 }
-async function interruptSession(port, id, client) {
-  if (client?.version === "v2") {
-    try {
-      await interruptV2Session(client, id);
-      return { kind: "confirmed_stopped" };
-    } catch (error2) {
-      return { kind: "not_confirmed", diagnostic: interruptFailureDiagnostic(error2) };
+async function getV2Session(client, sessionId) {
+  const data = await readData(client, `/api/session/${encodeURIComponent(sessionId)}`);
+  const session = adaptV2Session(data);
+  if (!session) throw new Error("OpenCode V2 get session response contained an invalid session");
+  return session;
+}
+async function listV2SessionPage(client, cursor, signal) {
+  const operation = cursor ? "GET /api/session (next page)" : "GET /api/session";
+  const path = cursor ? `/api/session?cursor=${encodeURIComponent(cursor)}` : "/api/session";
+  try {
+    const response = await client.request(path, signal ? { signal } : void 0, {
+      allowStatuses: ALL_HTTP_STATUSES
+    });
+    if (!response.ok) {
+      console.error(
+        `[listV2SessionPage] ${operation} returned HTTP ${response.status} (port ${client.port})`
+      );
+      return null;
     }
+    return adaptV2SessionList(await readJson(response));
+  } catch (error2) {
+    if (signal?.aborted) return null;
+    const errorName = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
+    console.error(`[listV2SessionPage] ${operation} failed (port ${client.port}): ${errorName}`);
+    return null;
   }
+}
+async function listV2Sessions(client, signal) {
+  const sessions = [];
+  const seenCursors = /* @__PURE__ */ new Set();
+  let cursor;
+  let hasNextPage = true;
   try {
-    const res = await requestWithClient(
-      port,
-      client,
-      `/session/${id}/abort`,
-      { method: "POST" },
-      { allowStatuses: ALL_HTTP_STATUSES }
-    );
-    if (res.status >= 200 && res.status < 300) {
-      return { kind: "confirmed_stopped", status: res.status };
+    while (hasNextPage) {
+      const page = await listV2SessionPage(client, cursor, signal);
+      if (!page) return null;
+      sessions.push(...page.data);
+      const next = page.cursor.next;
+      if (next === void 0 || next === null) {
+        hasNextPage = false;
+        continue;
+      }
+      if (typeof next !== "string" || next.length === 0 || seenCursors.has(next)) {
+        throw new Error("OpenCode V2 session list contained an invalid next cursor");
+      }
+      seenCursors.add(next);
+      cursor = next;
     }
-    return { kind: "not_confirmed", status: res.status };
+    return sessions;
   } catch (error2) {
-    return { kind: "threw", diagnostic: interruptFailureDiagnostic(error2) };
+    const errorName = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
+    console.error(
+      `[listV2Sessions] GET /api/session pagination failed (port ${client.port}): ${errorName}`
+    );
+    return null;
   }
 }
-async function deleteSession(port, id, client) {
-  if (client?.version === "v2") return deleteV2Session(client, id);
+async function deleteV2Session(client, sessionId) {
   try {
-    const res = await requestWithClient(
-      port,
-      client,
-      `/session/${id}`,
+    const response = await client.request(
+      `/api/session/${encodeURIComponent(sessionId)}`,
       { method: "DELETE" },
       { allowStatuses: ALL_HTTP_STATUSES }
     );
-    if (res.status >= 200 && res.status < 300) {
-      return { ok: true, status: res.status };
+    if (response.status >= 200 && response.status < 300) {
+      return { ok: true, status: response.status };
     }
     try {
-      const body = await res.text();
-      return body ? { ok: false, status: res.status, body } : { ok: false, status: res.status };
+      const body = await response.text();
+      return body ? { ok: false, status: response.status, body } : { ok: false, status: response.status };
     } catch (error2) {
       console.error(
-        `[deleteSession] DELETE /session/${id} response body read failed for HTTP ${res.status}: ${error2 instanceof Error ? error2.message : String(error2)}`
+        `[deleteV2Session] DELETE /api/session/${sessionId} response body read failed for HTTP ${response.status}: ${error2 instanceof Error ? error2.message : String(error2)}`
       );
-      return { ok: false, status: res.status };
+      return { ok: false, status: response.status };
     }
   } catch (error2) {
     console.error(
-      `[deleteSession] DELETE /session/${id} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+      `[deleteV2Session] DELETE /api/session/${sessionId} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return { ok: false, status: "threw" };
   }
 }
-async function sessionExists(port, id, client) {
+async function v2SessionExists(client, sessionId) {
   try {
-    const res = await requestWithClient(port, client, `/session/${id}`, void 0, {
-      allowStatuses: [404]
-    });
-    if (res.status >= 200 && res.status < 300) return true;
-    if (res.status === 404) return false;
-    return null;
-  } catch {
+    const response = await client.request(
+      `/api/session/${encodeURIComponent(sessionId)}`,
+      void 0,
+      { allowStatuses: [404] }
+    );
+    return response.status === 404 ? false : true;
+  } catch (error2) {
+    console.error(
+      `[v2SessionExists] GET /api/session/${sessionId} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
     return null;
   }
 }
-async function getOpenCodeSession(port, id, client) {
-  try {
-    const response = await requestWithClient(port, client, `/session/${id}`);
-    const body = await response.json();
-    return body && typeof body === "object" && !Array.isArray(body) ? body : null;
+async function sendV2Prompt(client, sessionId, text, options, onInvalidModelSelection) {
+  const modelSelection = options?.model?.trim();
+  const { model, variant } = splitModelVariant(modelSelection);
+  const separator = model?.indexOf("/") ?? -1;
+  const modelReference = model && separator > 0 && separator < model.length - 1 ? {
+    id: model.slice(separator + 1),
+    providerID: model.slice(0, separator),
+    ...variant ? { variant } : {}
+  } : void 0;
+  if (modelSelection && !modelReference) onInvalidModelSelection?.();
+  if (options?.agent) {
+    await client.request(`/api/session/${encodeURIComponent(sessionId)}/agent`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ agent: options.agent })
+    });
+  }
+  if (modelReference) {
+    try {
+      await client.request(`/api/session/${encodeURIComponent(sessionId)}/model`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ model: modelReference })
+      });
+    } catch (error2) {
+      throw new OpenCodeV2ModelSwitchError(error2);
+    }
+  }
+  const path = `/api/session/${encodeURIComponent(sessionId)}/prompt`;
+  const response = await client.request(path, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ text, delivery: "queue" })
+  });
+  let body;
+  try {
+    body = await readJson(response);
   } catch (error2) {
-    console.error(
-      `[getOpenCodeSession] GET /session/${id} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    throw new OpenCodeV2PromptAckError(
+      `OpenCode V2 prompt response could not be read: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
-    return null;
   }
+  const data = isRecord5(body) && "data" in body ? body.data : void 0;
+  if (!isRecord5(data) || typeof data.id !== "string" || data.id.length === 0) {
+    throw new OpenCodeV2PromptAckError("OpenCode V2 prompt response was missing data.id");
+  }
+  return data.id;
 }
-async function getSessionStatuses(port, client) {
-  if (client?.version === "v2") return null;
+async function getV2SessionMessages(client, sessionId) {
+  const path = `/api/session/${encodeURIComponent(sessionId)}/message?order=desc&limit=200`;
   try {
-    const res = await requestWithClient(port, client, "/session/status");
-    if (!res.ok) {
-      console.error(
-        `[getSessionStatuses] GET /session/status returned HTTP ${res.status} (port ${port})`
-      );
-      return null;
-    }
-    const body = await res.json();
-    if (body == null || typeof body !== "object" || Array.isArray(body)) {
-      console.error(
-        `[getSessionStatuses] GET /session/status body was not a plain object (port ${port})`
-      );
-      return null;
-    }
-    return body;
-  } catch (err) {
+    const body = await readJson(await client.request(path));
+    if (!isRecord5(body) || !Array.isArray(body.data) || !isRecord5(body.cursor)) return null;
+    return adaptV2Messages(body);
+  } catch (error2) {
     console.error(
-      `[getSessionStatuses] GET /session/status failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+      `[getV2SessionMessages] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return null;
   }
 }
-async function isSessionOngoing(port, id, client) {
-  if (client?.version === "v2") return isV2SessionOngoing(client, id);
-  const map = await getSessionStatuses(port, client);
-  if (map == null) return null;
-  const entry = map[id];
-  return entry != null && entry.type !== "idle";
-}
-async function createOpenCodeSession(port, directory, client) {
-  const path = new URL(`${opencodeBase(port)}/session`);
-  if (directory && directory.trim()) path.searchParams.set("directory", directory.trim());
-  const requestPath = `${path.pathname}${path.search}`;
-  const response = await requestWithClient(
-    port,
-    client,
-    requestPath,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({})
-    },
-    { allowStatuses: ALL_HTTP_STATUSES }
-  );
-  if (!response.ok) {
-    const text = await response.text().catch(() => "");
-    throw new Error(`Failed to create session: HTTP ${response.status}${text ? `: ${text}` : ""}`);
-  }
-  const data = await response.json();
-  return data.id;
-}
-async function getModelAttachmentCapability(port, model, client) {
-  const { model: baseModel } = splitModelVariant(model);
-  if (client?.version === "v2") {
+async function listV2Forms(client, sessionId) {
+  const path = `/api/session/${encodeURIComponent(sessionId)}/form`;
+  try {
+    return adaptV2FormList(await readJson(await client.request(path)));
+  } catch (error2) {
     console.error(
-      `[getModelAttachmentCapability] V2 provider capabilities are unavailable; using text-only fallback (port ${port})`
+      `[listV2Forms] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return null;
   }
+}
+async function listV2Permissions(client, sessionId) {
+  const path = `/api/session/${encodeURIComponent(sessionId)}/permission`;
   try {
-    const res = await requestWithClient(port, client, "/config/providers");
-    if (!res.ok) {
-      console.error(
-        `[getModelAttachmentCapability] GET /config/providers returned HTTP ${res.status} (port ${port})`
-      );
-      return null;
-    }
-    const body = await res.json();
-    const providers = Array.isArray(body?.providers) ? body.providers : null;
-    if (!providers) {
-      console.error(
-        `[getModelAttachmentCapability] GET /config/providers body had no providers array (port ${port})`
-      );
-      return null;
-    }
-    const slash = baseModel ? baseModel.indexOf("/") : -1;
-    const providerId = slash > 0 ? baseModel.slice(0, slash) : void 0;
-    let modelId = slash > 0 ? baseModel.slice(slash + 1) : void 0;
-    const defaults2 = body?.default && typeof body.default === "object" ? body.default : void 0;
-    let provider = providerId ? providers.find((p) => p?.id === providerId) : void 0;
-    if (!provider && !providerId) {
-      const defaultProviderIds = defaults2 ? Object.keys(defaults2) : [];
-      if (defaultProviderIds.length === 1) {
-        provider = providers.find((p) => p?.id === defaultProviderIds[0]);
-      }
-    }
-    if (!provider || !provider.models) return null;
-    if (!modelId && defaults2 && typeof provider.id === "string") {
-      const def = defaults2[provider.id];
-      if (typeof def === "string") modelId = def;
-    }
-    if (!modelId) {
-      if (providerId) {
-        const keys = Object.keys(provider.models);
-        if (keys.length === 1) modelId = keys[0];
-      }
-      if (!modelId) return null;
-    }
-    const entry = provider.models[modelId];
-    if (!entry || typeof entry !== "object") return null;
-    if (entry.capabilities && typeof entry.capabilities === "object") {
-      if (typeof entry.capabilities.attachment === "boolean") {
-        return entry.capabilities.attachment;
-      }
-    }
-    return typeof entry.attachment === "boolean" ? entry.attachment : null;
-  } catch (err) {
+    return adaptV2PermissionList(await readJson(await client.request(path)));
+  } catch (error2) {
     console.error(
-      `[getModelAttachmentCapability] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+      `[listV2Permissions] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return null;
   }
 }
-async function isPinnedProviderLoaded(port, model, client) {
-  if (client?.version === "v2") return null;
-  const { model: baseModel } = splitModelVariant(model);
-  if (!baseModel) return null;
-  const slash = baseModel.indexOf("/");
-  if (slash <= 0) return null;
-  const providerId = baseModel.slice(0, slash);
+async function interruptV2Session(client, sessionId) {
+  await client.request(`/api/session/${encodeURIComponent(sessionId)}/interrupt`, {
+    method: "POST"
+  });
+}
+async function getV2ActiveSessions(client) {
   try {
-    const res = await requestWithClient(port, client, "/config/providers");
-    if (!res.ok) {
-      console.error(
-        `[isPinnedProviderLoaded] GET /config/providers returned HTTP ${res.status} (port ${port})`
-      );
-      return null;
-    }
-    const body = await res.json();
-    if (body === null || typeof body !== "object" || Array.isArray(body)) {
-      console.error(
-        `[isPinnedProviderLoaded] GET /config/providers body was not a plain object (port ${port})`
-      );
-      return null;
-    }
-    const providers = body.providers;
-    if (!Array.isArray(providers)) {
-      console.error(
-        `[isPinnedProviderLoaded] GET /config/providers body had no providers array (port ${port})`
-      );
-      return null;
-    }
-    const providerIds = providers.filter(
-      (provider) => provider !== null && typeof provider === "object" && typeof provider.id === "string"
-    ).map((provider) => provider.id);
-    if (providerIds.length === 0) {
-      console.error(
-        `[isPinnedProviderLoaded] GET /config/providers had no provider entries with string ids (port ${port})`
-      );
-      return null;
-    }
-    return providerIds.includes(providerId);
-  } catch (err) {
+    const body = await readJson(await client.request("/api/session/active"));
+    if (!isRecord5(body) || !isRecord5(body.data)) return null;
+    return body.data;
+  } catch (error2) {
     console.error(
-      `[isPinnedProviderLoaded] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+      `[getV2ActiveSessions] GET /api/session/active failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return null;
   }
 }
-async function buildFileParts(attachments, capable) {
-  const outcomes = [];
-  const parts = [];
-  const capabilityUnknown = capable === null;
-  if (capable !== true) {
-    for (const a of attachments.inputs) {
-      outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "skipped" });
-    }
-    return { parts, outcomes, capabilityUnknown };
+async function isV2SessionOngoing(client, sessionId) {
+  const activeSessions = await getV2ActiveSessions(client);
+  if (activeSessions === null) return null;
+  return Object.prototype.hasOwnProperty.call(activeSessions, sessionId);
+}
+function sessionErrorReason(value) {
+  if (typeof value === "string" && value.trim()) return value.trim().slice(0, 500);
+  if (isRecord5(value)) {
+    const data = isRecord5(value.data) ? value.data : void 0;
+    const reason = typeof data?.message === "string" && data.message || typeof value.message === "string" && value.message || typeof value.name === "string" && value.name;
+    if (reason) return reason.replace(/\s+/g, " ").trim().slice(0, 500);
   }
-  for (const a of attachments.inputs) {
-    let dataUrl = null;
+  return "OpenCode reported a session error with no details";
+}
+function adaptV2SessionErrorEvent(value) {
+  let parsed = value;
+  if (typeof value === "string") {
     try {
-      dataUrl = await attachments.fetchDataUrl(a.index);
-    } catch (err) {
-      console.error(
-        `[buildFileParts] attachment ${a.index} (${a.mime}) fetch threw \u2014 omitting: ${err instanceof Error ? err.message : String(err)}`
-      );
-      dataUrl = null;
+      parsed = JSON.parse(value);
+    } catch (error2) {
+      void error2;
+      return null;
     }
-    if (dataUrl !== null && typeof dataUrl === "object") {
-      outcomes.push({
-        index: a.index,
-        mime: a.mime,
-        filename: a.filename,
-        status: "failed",
-        reason: "needs_reauth"
-      });
-      continue;
+  }
+  if (!isRecord5(parsed)) return null;
+  try {
+    const establishedShape = parseSessionErrorFrame(JSON.stringify(parsed));
+    if (establishedShape) return establishedShape;
+  } catch (error2) {
+    void error2;
+  }
+  const candidates = [parsed, parsed.payload, parsed.data].filter(isRecord5);
+  for (const event of candidates) {
+    if (event.type !== "session.error") continue;
+    const properties = [event.properties, event.data, event].find(isRecord5);
+    if (!properties) continue;
+    const sessionId = typeof properties.sessionID === "string" && properties.sessionID || typeof properties.sessionId === "string" && properties.sessionId;
+    if (!sessionId) continue;
+    return {
+      sessionId,
+      reason: sessionErrorReason(properties.error ?? properties)
+    };
+  }
+  return null;
+}
+async function readV2SessionErrorStream(client, options) {
+  let reader = null;
+  try {
+    const response = await client.request("/api/event", {
+      headers: { accept: "text/event-stream" },
+      signal: options.signal
+    });
+    if (!response.ok || !response.body) {
+      return { reason: "unavailable", detail: `HTTP ${response.status}` };
     }
-    if (dataUrl == null) {
-      outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "failed" });
-      continue;
+    reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = "";
+    const processLine = (line) => {
+      const trimmed = line.trimEnd();
+      if (!trimmed.startsWith("data:")) return;
+      const event = adaptV2SessionErrorEvent(trimmed.slice("data:".length).replace(/^ /, ""));
+      if (event) options.onSessionError(event);
+    };
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) return { reason: "ended" };
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      for (const line of lines) processLine(line);
     }
-    parts.push({
-      type: "file",
-      mime: a.mime,
-      url: dataUrl,
-      ...a.filename ? { filename: a.filename } : {}
-    });
-    outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "sent" });
+  } catch (error2) {
+    if (options.signal.aborted) return { reason: "aborted" };
+    return {
+      reason: "unavailable",
+      detail: error2 instanceof Error ? error2.message : String(error2)
+    };
+  } finally {
+    if (reader) void reader.cancel().catch(() => void 0);
   }
-  return { parts, outcomes, capabilityUnknown };
 }
-function splitModelVariant(raw) {
-  const value = raw?.trim();
-  if (!value) return {};
-  const hashIndex = value.indexOf("#");
-  if (hashIndex === -1) return { model: value };
-  const model = value.slice(0, hashIndex).trim() || void 0;
-  const variant = value.slice(hashIndex + 1).trim() || void 0;
-  return { model, variant };
+
+// src/lib/opencode/session.ts
+var ALL_HTTP_STATUSES2 = Array.from({ length: 500 }, (_, index) => index + 100);
+function timedFetch(input, init) {
+  return withRequestTimeout(fetch, REQUEST_TIMEOUT_MS)(input, init);
 }
-function applyModelOptions(body, options) {
-  if (options?.agent) body.agent = options.agent;
-  const { model, variant } = splitModelVariant(options?.model);
-  if (model) {
-    const slashIndex = model.indexOf("/");
-    if (slashIndex !== -1) {
-      body.model = {
-        providerID: model.substring(0, slashIndex),
-        modelID: model.substring(slashIndex + 1)
-      };
-    }
-  }
-  if (variant) body.variant = variant;
+function requestWithClient(port, client, path, init, options) {
+  return client ? client.request(path, init, options) : timedFetch(`${opencodeBase(port)}${path}`, init);
 }
-async function listOpenCodeQuestions(port, client) {
+function opencodeBase(port) {
+  return `http://127.0.0.1:${port}`;
+}
+async function getOpenCodeDirectory(port, client) {
   try {
-    const response = await requestWithClient(port, client, "/question");
-    const body = await response.json();
-    return Array.isArray(body) ? body : null;
+    const res = await requestWithClient(port, client, "/path");
+    if (!res.ok) return null;
+    const body = await res.json();
+    const dir = typeof body.directory === "string" && body.directory || typeof body.worktree === "string" && body.worktree || typeof body.path?.cwd === "string" && body.path.cwd || typeof body.path?.directory === "string" && body.path.directory || null;
+    return dir && dir.trim() ? dir.trim() : null;
   } catch (error2) {
     console.error(
-      `[listOpenCodeQuestions] GET /question failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+      `[getOpenCodeDirectory] GET /path failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return null;
   }
 }
-async function listOpenCodePermissions(port, client) {
+async function resolveOpenCodeDirectoryForVersion(apiVersion, port, client) {
+  if (apiVersion === "v2") return client ? getOpenCodeDirectoryV2(client) : null;
+  return getOpenCodeDirectory(port, client ?? void 0);
+}
+function roleOf2(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.role === "string") return m.role;
+  const infoRole = m.info?.role;
+  return typeof infoRole === "string" ? infoRole : void 0;
+}
+function completedOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  return m.info?.time?.completed ?? m.time?.completed;
+}
+function createdOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  return m.info?.time?.created ?? m.time?.created;
+}
+function idOf2(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.id === "string") return m.id;
+  const infoId = m.info?.id;
+  return typeof infoId === "string" ? infoId : void 0;
+}
+function parentIdOf2(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.parentID === "string") return m.parentID;
+  const infoParent = m.info?.parentID;
+  return typeof infoParent === "string" ? infoParent : void 0;
+}
+function finishOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.finish === "string") return m.finish;
+  const infoFinish = m.info?.finish;
+  return typeof infoFinish === "string" ? infoFinish : void 0;
+}
+function errorOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  return m.info?.error ?? m.error;
+}
+function isTerminalStopAnswer(m) {
+  return completedOf(m) != null && errorOf(m) == null && finishOf(m) === "stop";
+}
+function isAssistantInFlight(m) {
+  if (completedOf(m) == null) return true;
+  if (errorOf(m) != null) return false;
+  return finishOf(m) === "tool-calls";
+}
+async function getSessionMessages(port, sessionId, client) {
   try {
-    const response = await requestWithClient(port, client, "/permission");
-    const body = await response.json();
+    const path = `/session/${sessionId}/message`;
+    const res = await requestWithClient(port, client, path);
+    if (!res.ok) return null;
+    const body = await res.json();
     return Array.isArray(body) ? body : null;
   } catch (error2) {
     console.error(
-      `[listOpenCodePermissions] GET /permission failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+      `[getSessionMessages] GET /session/${sessionId}/message failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
     return null;
   }
 }
-function messageText(m) {
-  if (!m || !Array.isArray(m.parts)) return "";
-  return m.parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
-}
-function findDispatchedUserMessageId(messages, content, excludeIds) {
-  if (!messages || messages.length === 0) return null;
-  let best = null;
-  for (const message of messages) {
-    if (roleOf2(message) !== "user") continue;
-    const id = idOf2(message);
-    if (typeof id !== "string" || excludeIds?.has(id)) continue;
-    if (messageText(message) !== content) continue;
-    const created = createdOf(message) ?? 0;
-    if (best === null || created > best.created) best = { id, created };
-  }
-  return best?.id ?? null;
+async function fetchSessionMessages(port, sessionId, client) {
+  const response = await requestWithClient(port, client, `/session/${sessionId}/message`);
+  if (!response.ok) return null;
+  const body = await response.json();
+  return Array.isArray(body) ? body : null;
 }
-async function sendPromptAsync(port, sessionId, content, options, attachments, client, callbacks) {
-  const before = await getSessionMessages(port, sessionId, client);
-  const knownUserIds = new Set(
-    (before ?? []).filter((m) => roleOf2(m) === "user").map((m) => idOf2(m)).filter((id) => typeof id === "string")
-  );
-  if (callbacks) {
-    try {
-      callbacks.onKnownUserIds(before === null ? null : knownUserIds);
-    } catch (error2) {
-      callbacks.onKnownUserIdsError(error2);
+async function pollSessionMessagesForRedrive(port, sessionId, client) {
+  try {
+    const response = await requestWithClient(
+      port,
+      client,
+      `/session/${sessionId}/message`,
+      void 0,
+      { allowStatuses: ALL_HTTP_STATUSES2 }
+    );
+    if (!response.ok) {
+      return { ok: false, status: response.status, body: await response.text(), malformed: false };
     }
-  }
-  const parts = [{ type: "text", text: content }];
-  let pendingOutcomes = null;
-  if (attachments && attachments.inputs.length > 0) {
-    const capable = await getModelAttachmentCapability(port, options?.model, client);
-    const {
-      parts: fileParts,
-      outcomes,
-      capabilityUnknown
-    } = await buildFileParts(attachments, capable);
-    parts.push(...fileParts);
-    if (attachments.onOutcomes) pendingOutcomes = { outcomes, capabilityUnknown };
-  }
-  const body = {
-    parts
-  };
-  applyModelOptions(body, options);
-  const res = await requestWithClient(
-    port,
-    client,
-    `/session/${sessionId}/prompt_async`,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
-    },
-    { allowStatuses: ALL_HTTP_STATUSES }
-  );
-  if (res.status < 200 || res.status >= 300) {
-    const text = await res.text().catch(() => "");
-    const { variant } = splitModelVariant(options?.model);
-    throw new Error(
-      `OpenCode prompt_async failed: HTTP ${res.status}${text ? `: ${text}` : ""}${variant ? ` (variant: ${variant})` : ""}`
+    const body = await response.json();
+    if (!Array.isArray(body)) return { ok: false, status: null, body: "", malformed: true };
+    return { ok: true, messages: body };
+  } catch (error2) {
+    console.error(
+      `[pollSessionMessagesForRedrive] GET /session/${sessionId}/message failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
+    return { ok: false, status: null, body: "", malformed: false };
   }
-  const READ_BACK_ATTEMPTS = 5;
-  const READ_BACK_DELAY_MS = 150;
-  for (let attempt = 0; attempt < READ_BACK_ATTEMPTS; attempt++) {
-    const after = await getSessionMessages(port, sessionId, client);
-    const dispatchedUserMessageId = findDispatchedUserMessageId(after, content, knownUserIds);
-    if (dispatchedUserMessageId !== null) {
-      if (pendingOutcomes && attachments?.onOutcomes) attachments.onOutcomes(pendingOutcomes);
-      return dispatchedUserMessageId;
-    }
-    if (attempt < READ_BACK_ATTEMPTS - 1) {
-      await new Promise((resolve5) => setTimeout(resolve5, READ_BACK_DELAY_MS));
-    }
-  }
-  return null;
 }
-function findAssistantReplyAfter(messages, userMessageId) {
-  if (!messages || messages.length === 0) return null;
-  const byParent = messages.find(
-    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId
-  );
-  if (byParent) return byParent;
-  const userIndex = messages.findIndex((m) => idOf2(m) === userMessageId);
-  if (userIndex === -1) return null;
-  for (let i = userIndex + 1; i < messages.length; i++) {
-    if (roleOf2(messages[i]) === "assistant") return messages[i];
+function isSessionActivelyGenerating(messages) {
+  if (!messages || messages.length === 0) return false;
+  const last = messages[messages.length - 1];
+  if (roleOf2(last) !== "assistant") return false;
+  return completedOf(last) == null;
+}
+var FULL_SESSION_ENUMERATION_MAX_SESSIONS = 3200;
+function sessionLastActivityMs(session) {
+  const candidates = [
+    session.time?.updated,
+    session.time?.created,
+    session.time_updated,
+    session.time_created,
+    session.updated,
+    session.created
+  ];
+  for (const c of candidates) {
+    if (typeof c === "number" && Number.isFinite(c)) return c;
   }
   return null;
 }
-function findLastAssistantReplyFor(messages, userMessageId) {
-  if (!messages || messages.length === 0) return null;
-  let lastCorrelated = null;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const m = messages[i];
-    if (roleOf2(m) !== "assistant" || parentIdOf2(m) !== userMessageId) continue;
-    lastCorrelated = m;
-    break;
-  }
-  if (lastCorrelated) {
-    if (errorOf(lastCorrelated) == null) return lastCorrelated;
-    for (let i = messages.length - 1; i >= 0; i--) {
-      const m = messages[i];
-      if (roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId && isTerminalStopAnswer(m)) {
-        return m;
-      }
-    }
-    return lastCorrelated;
-  }
-  const userIndex = messages.findIndex((m) => idOf2(m) === userMessageId);
-  if (userIndex === -1) return null;
-  let last = null;
-  let lastAssistantIndex = -1;
-  for (let i = userIndex + 1; i < messages.length; i++) {
-    const role = roleOf2(messages[i]);
-    if (role === "user") break;
-    if (role === "assistant") {
-      last = messages[i];
-      lastAssistantIndex = i;
+function sessionListPath(options) {
+  const params = new URLSearchParams();
+  if (options?.limit !== void 0) params.set("limit", String(options.limit));
+  const query = params.toString();
+  return query ? `/session?${query}` : "/session";
+}
+async function listSessionPage(port, client, options) {
+  const path = sessionListPath(options);
+  try {
+    const res = await requestWithClient(
+      port,
+      client,
+      path,
+      options?.signal ? { signal: options.signal } : void 0,
+      { allowStatuses: ALL_HTTP_STATUSES2 }
+    );
+    if (!res.ok) {
+      console.error(`[listSessionPage] GET ${path} returned HTTP ${res.status} (port ${port})`);
+      return null;
     }
+    const body = await res.json();
+    return Array.isArray(body) ? body : null;
+  } catch (error2) {
+    if (options?.signal?.aborted) return null;
+    const errorName = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
+    console.error(`[listSessionPage] GET ${path} failed (port ${port}): ${errorName}`);
+    return null;
   }
-  if (last === null || errorOf(last) == null) return last;
-  for (let i = lastAssistantIndex; i > userIndex; i--) {
-    const m = messages[i];
-    if (roleOf2(m) === "user") break;
-    if (roleOf2(m) === "assistant" && isTerminalStopAnswer(m)) return m;
-  }
-  return last;
 }
-function assistantMessagesInTurnBlock(messages, userMessageId) {
-  const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
-  if (userIndex === -1) return [];
-  const assistants = [];
-  for (let i = userIndex + 1; i < messages.length; i++) {
-    const message = messages[i];
-    const role = roleOf2(message);
-    if (role === "user") break;
-    if (role === "assistant") assistants.push(message);
+async function listSessions(port, client, options) {
+  if (client?.version === "v2") return listV2Sessions(client, options?.signal);
+  return listSessionPage(port, client, options);
+}
+async function listAllSessions(port, client, signal) {
+  if (client?.version === "v2") {
+    const sessions2 = await listV2Sessions(client, signal);
+    return sessions2 === null ? { sessions: null, reason: "opencode-unreachable" } : { sessions: sessions2 };
   }
-  return assistants;
+  const sessions = await listSessionPage(port, client, {
+    limit: FULL_SESSION_ENUMERATION_MAX_SESSIONS,
+    signal
+  });
+  if (sessions === null) return { sessions: null, reason: "opencode-unreachable" };
+  if (sessions.length >= FULL_SESSION_ENUMERATION_MAX_SESSIONS) {
+    return { sessions: null, reason: "session-enumeration-limit-bound" };
+  }
+  return { sessions };
 }
-function collectSubagentSessions(messages, userMessageId) {
-  if (!messages || messages.length === 0) return [];
-  const byParent = messages.filter(
-    (message) => roleOf2(message) === "assistant" && parentIdOf2(message) === userMessageId
-  );
-  const assistants = byParent.length > 0 ? byParent : assistantMessagesInTurnBlock(messages, userMessageId);
-  const refs = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const message of assistants) {
-    const parts = Array.isArray(message.parts) ? message.parts : [];
-    for (const part of parts) {
-      if (!part || typeof part !== "object" || part.type !== "tool") continue;
-      const childSession = part.childSession;
-      if (childSession) {
-        if (seen.has(childSession.sessionId)) continue;
-        seen.add(childSession.sessionId);
-        refs.push(childSession);
-        continue;
-      }
-      if (part.tool !== "task") continue;
-      const state = part.state;
-      if (!state || typeof state !== "object") continue;
-      const metadata = state.metadata;
-      if (!metadata || typeof metadata !== "object") continue;
-      const sessionId = metadata.sessionId;
-      if (typeof sessionId !== "string" || sessionId.length === 0 || seen.has(sessionId)) continue;
-      seen.add(sessionId);
-      const start = state.time?.start;
-      refs.push({
-        sessionId,
-        startedAtMs: typeof start === "number" && Number.isFinite(start) ? start : null
-      });
+var INTERRUPT_NETWORK_CODES = /* @__PURE__ */ new Set([
+  "ABORT_ERR",
+  "EAI_AGAIN",
+  "ECONNREFUSED",
+  "ECONNRESET",
+  "ENETUNREACH",
+  "ENOTFOUND",
+  "ETIMEDOUT",
+  "UND_ERR_CONNECT_TIMEOUT",
+  "UND_ERR_HEADERS_TIMEOUT",
+  "UND_ERR_SOCKET"
+]);
+function interruptFailureDiagnostic(error2) {
+  const message = error2 instanceof Error ? error2.message : "";
+  const httpStatus = /^OpenCode request failed: HTTP ([1-5]\d{2})(?::|$)/.exec(message)?.[1];
+  if (httpStatus) return `HTTP ${httpStatus}`;
+  const candidates = [error2, error2 instanceof Error ? error2.cause : void 0];
+  for (const candidate of candidates) {
+    if (typeof candidate !== "object" || candidate === null || !("code" in candidate)) continue;
+    const code = candidate.code;
+    if (typeof code === "string" && INTERRUPT_NETWORK_CODES.has(code)) {
+      return redactDiagnosticText(`network ${code}`).slice(0, 120);
     }
   }
-  return refs;
-}
-function finiteNumber(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : null;
-}
-function taskCallModel(value) {
-  if (!value || typeof value !== "object") return null;
-  const model = value;
-  const modelID = typeof model.modelID === "string" ? model.modelID : void 0;
-  const providerID = typeof model.providerID === "string" ? model.providerID : void 0;
-  return modelID || providerID ? { modelID, providerID } : null;
+  const name = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
+  return redactDiagnosticText(`request threw ${name}`).slice(0, 120);
 }
-function collectTaskCalls(messages, userMessageId) {
-  if (!messages || messages.length === 0) return [];
-  const calls = [];
-  for (const message of messages) {
-    if (roleOf2(message) !== "assistant" || parentIdOf2(message) !== userMessageId) continue;
-    for (const part of message.parts ?? []) {
-      if (part.tool !== "task" || !part.callID || !part.state || part.state.status === "pending") {
-        continue;
-      }
-      const rawName = part.state.input?.subagent_type;
-      const subagentName = typeof rawName === "string" && rawName.trim().length > 0 ? rawName : rawName === void 0 ? "general" : "unknown";
-      const metadata = part.state.metadata;
-      calls.push({
-        callID: part.callID,
-        subagentName,
-        childSessionId: typeof metadata?.sessionId === "string" ? metadata.sessionId : null,
-        parentSessionId: typeof metadata?.parentSessionId === "string" ? metadata.parentSessionId : null,
-        model: taskCallModel(metadata?.model),
-        status: part.state.status ?? "unknown",
-        timeStart: finiteNumber(part.state.time?.start),
-        timeEnd: finiteNumber(part.state.time?.end)
-      });
+async function interruptSession(port, id, client) {
+  if (client?.version === "v2") {
+    try {
+      await interruptV2Session(client, id);
+      return { kind: "confirmed_stopped" };
+    } catch (error2) {
+      return { kind: "not_confirmed", diagnostic: interruptFailureDiagnostic(error2) };
     }
   }
-  return calls;
-}
-function attributeTaskCallUsage(messages, windows) {
-  const eligibleWindows = windows.filter(
-    (window) => window.timeStart !== null && Number.isFinite(window.timeStart)
-  );
-  const assignments = /* @__PURE__ */ new Map();
-  for (const window of eligibleWindows) assignments.set(window.callID, []);
-  const unattributed = [];
-  for (const message of messages ?? []) {
-    if (roleOf2(message) !== "assistant") continue;
-    const created = finiteNumber(createdOf(message));
-    const matching = created === null ? [] : eligibleWindows.filter(
-      (window) => window.timeStart <= created && (window.timeEnd === null || window.timeEnd === void 0 || created <= window.timeEnd)
+  try {
+    const res = await requestWithClient(
+      port,
+      client,
+      `/session/${id}/abort`,
+      { method: "POST" },
+      { allowStatuses: ALL_HTTP_STATUSES2 }
     );
-    if (matching.length === 0) {
-      unattributed.push(message);
-      continue;
+    if (res.status >= 200 && res.status < 300) {
+      return { kind: "confirmed_stopped", status: res.status };
     }
-    matching.sort((a, b) => a.timeStart - b.timeStart);
-    assignments.get(matching[0].callID)?.push(message);
+    return { kind: "not_confirmed", status: res.status };
+  } catch (error2) {
+    return { kind: "threw", diagnostic: interruptFailureDiagnostic(error2) };
   }
-  return {
-    invocations: eligibleWindows.map((window) => {
-      const assigned = assignments.get(window.callID) ?? [];
-      return { callID: window.callID, messages: assigned, usage: sumAssistantUsage(assigned) };
-    }),
-    unattributed
-  };
 }
-function sumAssistantUsage(messages) {
-  if (!messages || messages.length === 0) return null;
-  const hasTrailingError = errorOf(messages[messages.length - 1]) != null;
-  const hasTerminalStopAnswer = messages.some(isTerminalStopAnswer);
-  const selected = hasTrailingError && hasTerminalStopAnswer ? messages.filter((message) => errorOf(message) == null) : messages;
-  let sawAnyUsage = false;
-  let inputSum = 0;
-  let outputSum = 0;
-  let reasoningSum = 0;
-  let cacheReadSum = 0;
-  let cacheWriteSum = 0;
-  let costSum = 0;
-  let sawCost = false;
-  let toolCallCount = 0;
-  let modelId = null;
-  let providerId = null;
-  for (const m of selected) {
-    toolCallCount += m.parts?.filter((part) => part.type === "tool").length ?? 0;
-    const info = m.info;
-    if (!info) continue;
-    const tokens = info.tokens;
-    if (tokens) {
-      sawAnyUsage = true;
-      inputSum += tokens.input ?? 0;
-      outputSum += tokens.output ?? 0;
-      reasoningSum += tokens.reasoning ?? 0;
-      cacheReadSum += tokens.cache?.read ?? 0;
-      cacheWriteSum += tokens.cache?.write ?? 0;
-    }
-    if (typeof info.cost === "number") {
-      sawAnyUsage = true;
-      sawCost = true;
-      costSum += info.cost;
-    }
-    if (typeof info.modelID === "string") {
-      sawAnyUsage = true;
-      modelId = info.modelID;
-    }
-    if (typeof info.providerID === "string") {
-      sawAnyUsage = true;
-      providerId = info.providerID;
+async function deleteSession(port, id, client) {
+  if (client?.version === "v2") return deleteV2Session(client, id);
+  try {
+    const res = await requestWithClient(
+      port,
+      client,
+      `/session/${id}`,
+      { method: "DELETE" },
+      { allowStatuses: ALL_HTTP_STATUSES2 }
+    );
+    if (res.status >= 200 && res.status < 300) {
+      return { ok: true, status: res.status };
     }
-  }
-  if (!sawAnyUsage) return null;
-  return {
-    usage_provider_id: providerId,
-    usage_model_id: modelId,
-    usage_tokens_input: inputSum,
-    usage_tokens_output: outputSum,
-    usage_tokens_reasoning: reasoningSum,
-    usage_tokens_cache_read: cacheReadSum,
-    usage_tokens_cache_write: cacheWriteSum,
-    // NULL means OpenCode never reported a cost; it is distinct from a genuine
-    // zero-cost message, which sets `sawCost` with `costSum === 0`.
-    usage_cost_usd: sawCost ? costSum : null,
-    turn_tool_calls: toolCallCount
-  };
-}
-function messageUsage(messages, userMessageId) {
-  if (!messages || messages.length === 0) return null;
-  const byParentAll = messages.filter(
-    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId
-  );
-  let correlated;
-  if (byParentAll.length > 0) {
-    correlated = byParentAll;
-  } else {
-    correlated = assistantMessagesInTurnBlock(messages, userMessageId);
-  }
-  if (correlated.length === 0) return null;
-  return sumAssistantUsage(correlated);
-}
-function messageRunState(messages, userMessageId) {
-  if (!messages || messages.length === 0) return "unknown";
-  const hasUser = messages.some((m) => idOf2(m) === userMessageId);
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  if (!hasUser) {
-    if (!reply) return "unknown";
-  }
-  if (!reply) return "queued";
-  if (isAssistantInFlight(reply)) return "running";
-  if (errorOf(reply) != null) return "failed";
-  if (isAmbiguousTerminalFinish(reply)) return "running";
-  return "done";
-}
-function isPreamblePinnedRunning(messages, userMessageId) {
-  if (messageRunState(messages, userMessageId) !== "running") return false;
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  return completedOf(reply) != null && finishOf(reply) === "tool-calls";
-}
-function isMidFlightPinnedRunning(messages, userMessageId) {
-  if (messageRunState(messages, userMessageId) !== "running") return false;
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  return reply !== null && isAssistantInFlight(reply) && completedOf(reply) == null;
-}
-function isB2AbandonmentConfirmed(params) {
-  return params.pinnedForMs >= params.minPinnedMs && params.descendantOngoing === false && params.rootOngoing === false;
-}
-function isMidFlightOrphanConfirmed(params) {
-  return params.pinnedForMs >= params.minPinnedMs && params.notOngoingStreak >= params.minNotOngoingStreak;
-}
-function isAmbiguousTerminalFinish(m) {
-  if (completedOf(m) == null) return false;
-  if (errorOf(m) != null) return false;
-  const finish = finishOf(m);
-  return finish !== "tool-calls" && finish !== "stop";
-}
-function isAmbiguousFinishPinnedRunning(messages, userMessageId) {
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  return isAmbiguousTerminalFinish(reply);
-}
-function isAmbiguousFinishResolved(params) {
-  return params.sessionOngoing === false || params.sessionOngoing !== true && params.pinnedForMs >= params.maxPinnedMs;
-}
-function messageError(messages, userMessageId) {
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  const error2 = errorOf(reply);
-  if (error2 == null) return null;
-  let rendered;
-  if (typeof error2 === "string") {
-    rendered = error2;
-  } else if (typeof error2 === "object") {
-    const e = error2;
-    const dataMessage = e.data?.message;
-    if (typeof dataMessage === "string") {
-      rendered = dataMessage;
-    } else if (typeof e.message === "string") {
-      rendered = e.message;
-    } else {
-      rendered = "The agent run failed.";
+    try {
+      const body = await res.text();
+      return body ? { ok: false, status: res.status, body } : { ok: false, status: res.status };
+    } catch (error2) {
+      console.error(
+        `[deleteSession] DELETE /session/${id} response body read failed for HTTP ${res.status}: ${error2 instanceof Error ? error2.message : String(error2)}`
+      );
+      return { ok: false, status: res.status };
     }
-  } else {
-    rendered = "The agent run failed.";
-  }
-  const toolPart = Array.isArray(reply?.parts) ? reply.parts.find(
-    (part) => part && typeof part === "object" && part.type === "tool" && part.state?.status === "error"
-  ) : void 0;
-  return typeof toolPart?.tool === "string" && toolPart.tool.length > 0 ? `${rendered} (tool "${toolPart.tool}")` : rendered;
-}
-function describeAbandonedReplyShape(messages, userMessageId) {
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  if (!reply) return null;
-  const parts = Array.isArray(reply.parts) ? reply.parts : [];
-  const lastTool = [...parts].reverse().find((part) => part?.type === "tool");
-  return {
-    partTypes: parts.slice(-12).map((part) => typeof part?.type === "string" ? part.type : "(unknown)"),
-    droppedPartCount: Math.max(0, parts.length - 12),
-    lastToolName: typeof lastTool?.tool === "string" && lastTool.tool.length > 0 ? lastTool.tool : null,
-    lastToolStatus: typeof lastTool?.state?.status === "string" && lastTool.state.status.length > 0 ? lastTool.state.status : null
-  };
-}
-function isAbortedTerminalReply(messages, userMessageId) {
-  const reply = findLastAssistantReplyFor(messages, userMessageId);
-  const error2 = errorOf(reply);
-  if (error2 == null) return false;
-  if (typeof error2 === "string") return error2.trim() === "Aborted";
-  if (typeof error2 === "object") {
-    const e = error2;
-    if (e.name === "MessageAbortedError") return true;
-    if (e.name === "AbortError") return true;
-    const dataMessage = e.data?.message;
-    const rendered = typeof dataMessage === "string" ? dataMessage : typeof e.message === "string" ? e.message : null;
-    return rendered != null && rendered.trim() === "Aborted";
+  } catch (error2) {
+    console.error(
+      `[deleteSession] DELETE /session/${id} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return { ok: false, status: "threw" };
   }
-  return false;
 }
-var CLAUDE_AUTH_EXPIRY_MESSAGES = Object.freeze([
-  "Claude Code credentials are unavailable or expired. Run `claude` to refresh them."
-]);
-function extractReplyErrorShape(reply) {
-  const error2 = errorOf(reply);
-  if (error2 == null || typeof error2 !== "object") {
-    return { name: null, statusCode: null };
-  }
-  const e = error2;
-  const name = typeof e.name === "string" ? e.name.slice(0, 100) : null;
-  const data = e.data;
-  const statusCode = typeof data?.statusCode === "number" && Number.isFinite(data.statusCode) ? data.statusCode : null;
-  return { name, statusCode };
-}
-function classifyReplyAuthError(reply) {
-  const error2 = errorOf(reply);
-  if (error2 == null || typeof error2 !== "object") return null;
-  const e = error2;
-  const replyProviderId = reply?.info?.providerID ?? null;
-  const replyModelId = reply?.info?.modelID ?? null;
-  const data = e.data;
-  if (e.name === "ProviderAuthError") {
-    const providerId = typeof data?.providerID === "string" && data.providerID || replyProviderId;
-    return { kind: "model_auth", providerId, modelId: replyModelId, reason: "missing" };
-  }
-  if (e.name === "APIError") {
-    const statusCode = data?.statusCode;
-    if (statusCode === 401 || statusCode === 403) {
-      return {
-        kind: "model_auth",
-        providerId: replyProviderId,
-        modelId: replyModelId,
-        reason: "rejected"
-      };
-    }
-  }
-  const errorMessage4 = typeof data?.message === "string" ? data.message : typeof e.message === "string" ? e.message : null;
-  if (errorMessage4 !== null && CLAUDE_AUTH_EXPIRY_MESSAGES.some((knownMessage) => errorMessage4.includes(knownMessage))) {
-    return {
-      kind: "model_auth",
-      providerId: typeof data?.providerID === "string" && data.providerID || replyProviderId,
-      modelId: replyModelId,
-      reason: "rejected"
-    };
+async function sessionExists(port, id, client) {
+  try {
+    const res = await requestWithClient(port, client, `/session/${id}`, void 0, {
+      allowStatuses: [404]
+    });
+    if (res.status >= 200 && res.status < 300) return true;
+    if (res.status === 404) return false;
+    return null;
+  } catch {
+    return null;
   }
-  return null;
-}
-function messageFailure(messages, userMessageId) {
-  return classifyReplyAuthError(findLastAssistantReplyFor(messages, userMessageId));
-}
-function isProviderModelNotFoundError(reason) {
-  return reason.includes("Model not found:");
 }
-function findLatestSubagentAuthOutcome(messages, sinceMs) {
-  if (!messages || messages.length === 0) return null;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const message = messages[i];
-    if (roleOf2(message) !== "assistant") continue;
-    const created = createdOf(message);
-    if (sinceMs !== null && typeof created === "number" && created < sinceMs) continue;
-    const failure = classifyReplyAuthError(message);
-    if (failure) {
-      if (!failure.providerId) return null;
-      return { providerId: failure.providerId, outcome: "failed", failure };
-    }
-    const providerId = message.info?.providerID;
-    if (errorOf(message) == null && typeof providerId === "string" && providerId.length > 0) {
-      return { providerId, outcome: "succeeded" };
-    }
+async function getOpenCodeSession(port, id, client) {
+  try {
+    const response = await requestWithClient(port, client, `/session/${id}`);
+    const body = await response.json();
+    return body && typeof body === "object" && !Array.isArray(body) ? body : null;
+  } catch (error2) {
+    console.error(
+      `[getOpenCodeSession] GET /session/${id} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
     return null;
   }
-  return null;
-}
-function findSubagentAuthOutcome(messages, sinceMs) {
-  return findLatestSubagentAuthOutcome(messages, sinceMs);
-}
-function applyZeroProviderFallback(classified, hasConfiguredProvider, replyProviderId, replyModelId = null) {
-  if (classified != null) return classified;
-  if (hasConfiguredProvider !== false) return null;
-  return {
-    kind: "model_auth",
-    providerId: replyProviderId,
-    modelId: replyModelId,
-    reason: "missing"
-  };
-}
-function hasRunningAssistantExcept(messages, exceptUserMessageId) {
-  if (!messages || messages.length === 0) return false;
-  return messages.some(
-    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) !== exceptUserMessageId && isAssistantInFlight(m)
-  );
 }
-function hasLaterSiblingTurnStarted(messages, userMessageId, siblingUserMessageIds) {
-  if (!messages || messages.length === 0) return false;
-  const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
-  if (userIndex === -1) return false;
-  let hasLaterUser = false;
-  let hasStartedLaterUser = false;
-  for (let i = userIndex + 1; i < messages.length; i++) {
-    const message = messages[i];
-    if (roleOf2(message) !== "user") continue;
-    hasLaterUser = true;
-    const laterUserMessageId = idOf2(message);
-    if (laterUserMessageId === void 0 || !siblingUserMessageIds.has(laterUserMessageId)) {
-      return false;
-    }
-    if (messages.some(
-      (candidate) => roleOf2(candidate) === "assistant" && parentIdOf2(candidate) === laterUserMessageId
-    )) {
-      hasStartedLaterUser = true;
+async function getSessionStatuses(port, client) {
+  if (client?.version === "v2") return null;
+  try {
+    const res = await requestWithClient(port, client, "/session/status");
+    if (!res.ok) {
+      console.error(
+        `[getSessionStatuses] GET /session/status returned HTTP ${res.status} (port ${port})`
+      );
+      return null;
     }
-  }
-  return hasLaterUser && hasStartedLaterUser;
-}
-async function hasAnyConfiguredProvider(port, client) {
-  if (client?.version === "v2") {
-    const directory = await getOpenCodeDirectoryV2(client);
-    if (!directory) {
+    const body = await res.json();
+    if (body == null || typeof body !== "object" || Array.isArray(body)) {
       console.error(
-        `[hasAnyConfiguredProvider] V2 working directory was unavailable (port ${port})`
+        `[getSessionStatuses] GET /session/status body was not a plain object (port ${port})`
       );
       return null;
     }
-    const query = `?location%5Bdirectory%5D=${encodeURIComponent(directory)}`;
-    const integrationPath = `/api/integration${query}`;
-    let integrationReady = null;
-    try {
-      const res = await client.request(integrationPath);
-      if (!res.ok) {
-        console.error(
-          `[hasAnyConfiguredProvider] GET ${integrationPath} returned HTTP ${res.status} (port ${port})`
-        );
-      } else {
-        const body = await res.json();
-        if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
-          console.error(
-            `[hasAnyConfiguredProvider] GET ${integrationPath} body had no integration data array (port ${port})`
-          );
-        } else {
-          let valid = true;
-          for (const integration of body.data) {
-            if (!integration || typeof integration !== "object" || Array.isArray(integration) || typeof integration.id !== "string" || !Array.isArray(integration.connections)) {
-              console.error(
-                `[hasAnyConfiguredProvider] GET ${integrationPath} body contained an invalid integration (port ${port})`
-              );
-              valid = false;
-              break;
-            }
-          }
-          if (valid) {
-            integrationReady = body.data.some(
-              (integration) => integration.connections.length > 0
-            );
-          }
-        }
-      }
-    } catch (error2) {
+    return body;
+  } catch (err) {
+    console.error(
+      `[getSessionStatuses] GET /session/status failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+    );
+    return null;
+  }
+}
+async function isSessionOngoing(port, id, client) {
+  if (client?.version === "v2") return isV2SessionOngoing(client, id);
+  const map = await getSessionStatuses(port, client);
+  if (map == null) return null;
+  const entry = map[id];
+  return entry != null && entry.type !== "idle";
+}
+async function createOpenCodeSession(port, directory, client) {
+  const path = new URL(`${opencodeBase(port)}/session`);
+  if (directory && directory.trim()) path.searchParams.set("directory", directory.trim());
+  const requestPath = `${path.pathname}${path.search}`;
+  const response = await requestWithClient(
+    port,
+    client,
+    requestPath,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({})
+    },
+    { allowStatuses: ALL_HTTP_STATUSES2 }
+  );
+  if (!response.ok) {
+    const text = await response.text().catch(() => "");
+    throw new Error(`Failed to create session: HTTP ${response.status}${text ? `: ${text}` : ""}`);
+  }
+  const data = await response.json();
+  return data.id;
+}
+async function getModelAttachmentCapability(port, model, client) {
+  const { model: baseModel } = splitModelVariant(model);
+  if (client?.version === "v2") {
+    console.error(
+      `[getModelAttachmentCapability] V2 provider capabilities are unavailable; using text-only fallback (port ${port})`
+    );
+    return null;
+  }
+  try {
+    const res = await requestWithClient(port, client, "/config/providers");
+    if (!res.ok) {
       console.error(
-        `[hasAnyConfiguredProvider] GET ${integrationPath} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
+        `[getModelAttachmentCapability] GET /config/providers returned HTTP ${res.status} (port ${port})`
       );
+      return null;
     }
-    if (integrationReady === true) return true;
-    const providerPath = `/api/provider${query}`;
-    let providerReady = null;
-    try {
-      const res = await client.request(providerPath);
-      if (!res.ok) {
-        console.error(
-          `[hasAnyConfiguredProvider] GET ${providerPath} returned HTTP ${res.status} (port ${port})`
-        );
-      } else {
-        const body = await res.json();
-        if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
-          console.error(
-            `[hasAnyConfiguredProvider] GET ${providerPath} body had no provider data array (port ${port})`
-          );
-        } else {
-          let valid = true;
-          for (const provider of body.data) {
-            if (!provider || typeof provider !== "object" || Array.isArray(provider) || typeof provider.id !== "string") {
-              console.error(
-                `[hasAnyConfiguredProvider] GET ${providerPath} body contained an invalid provider (port ${port})`
-              );
-              valid = false;
-              break;
-            }
-          }
-          if (valid) {
-            providerReady = body.data.some(
-              (provider) => provider.activation === "enabled"
-            );
-          }
-        }
-      }
-    } catch (error2) {
+    const body = await res.json();
+    const providers = Array.isArray(body?.providers) ? body.providers : null;
+    if (!providers) {
       console.error(
-        `[hasAnyConfiguredProvider] GET ${providerPath} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
+        `[getModelAttachmentCapability] GET /config/providers body had no providers array (port ${port})`
       );
+      return null;
     }
-    if (providerReady === true) return true;
-    if (integrationReady === null || providerReady === null) return null;
-    return false;
+    const slash = baseModel ? baseModel.indexOf("/") : -1;
+    const providerId = slash > 0 ? baseModel.slice(0, slash) : void 0;
+    let modelId = slash > 0 ? baseModel.slice(slash + 1) : void 0;
+    const defaults2 = body?.default && typeof body.default === "object" ? body.default : void 0;
+    let provider = providerId ? providers.find((p) => p?.id === providerId) : void 0;
+    if (!provider && !providerId) {
+      const defaultProviderIds = defaults2 ? Object.keys(defaults2) : [];
+      if (defaultProviderIds.length === 1) {
+        provider = providers.find((p) => p?.id === defaultProviderIds[0]);
+      }
+    }
+    if (!provider || !provider.models) return null;
+    if (!modelId && defaults2 && typeof provider.id === "string") {
+      const def = defaults2[provider.id];
+      if (typeof def === "string") modelId = def;
+    }
+    if (!modelId) {
+      if (providerId) {
+        const keys = Object.keys(provider.models);
+        if (keys.length === 1) modelId = keys[0];
+      }
+      if (!modelId) return null;
+    }
+    const entry = provider.models[modelId];
+    if (!entry || typeof entry !== "object") return null;
+    if (entry.capabilities && typeof entry.capabilities === "object") {
+      if (typeof entry.capabilities.attachment === "boolean") {
+        return entry.capabilities.attachment;
+      }
+    }
+    return typeof entry.attachment === "boolean" ? entry.attachment : null;
+  } catch (err) {
+    console.error(
+      `[getModelAttachmentCapability] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+    );
+    return null;
   }
+}
+async function isPinnedProviderLoaded(port, model, client) {
+  if (client?.version === "v2") return null;
+  const { model: baseModel } = splitModelVariant(model);
+  if (!baseModel) return null;
+  const slash = baseModel.indexOf("/");
+  if (slash <= 0) return null;
+  const providerId = baseModel.slice(0, slash);
   try {
     const res = await requestWithClient(port, client, "/config/providers");
     if (!res.ok) {
       console.error(
-        `[hasAnyConfiguredProvider] GET /config/providers returned HTTP ${res.status} (port ${port})`
+        `[isPinnedProviderLoaded] GET /config/providers returned HTTP ${res.status} (port ${port})`
       );
       return null;
     }
     const body = await res.json();
-    if (!body || typeof body !== "object" || Array.isArray(body)) {
+    if (body === null || typeof body !== "object" || Array.isArray(body)) {
       console.error(
-        `[hasAnyConfiguredProvider] GET /config/providers body was not a plain object (port ${port})`
+        `[isPinnedProviderLoaded] GET /config/providers body was not a plain object (port ${port})`
       );
       return null;
     }
-    const defaults2 = body.default;
-    if (!defaults2 || typeof defaults2 !== "object" || Array.isArray(defaults2)) {
+    const providers = body.providers;
+    if (!Array.isArray(providers)) {
       console.error(
-        `[hasAnyConfiguredProvider] GET /config/providers body had no \`default\` object (port ${port})`
+        `[isPinnedProviderLoaded] GET /config/providers body had no providers array (port ${port})`
       );
       return null;
     }
-    return Object.keys(defaults2).length > 0;
+    const providerIds = providers.filter(
+      (provider) => provider !== null && typeof provider === "object" && typeof provider.id === "string"
+    ).map((provider) => provider.id);
+    if (providerIds.length === 0) {
+      console.error(
+        `[isPinnedProviderLoaded] GET /config/providers had no provider entries with string ids (port ${port})`
+      );
+      return null;
+    }
+    return providerIds.includes(providerId);
   } catch (err) {
     console.error(
-      `[hasAnyConfiguredProvider] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+      `[isPinnedProviderLoaded] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
     );
     return null;
   }
 }
-function sessionErrorReason(error2) {
-  const record = typeof error2 === "object" && error2 !== null ? error2 : null;
-  const data = record?.data;
-  const dataRecord = typeof data === "object" && data !== null ? data : null;
-  const rawReason = typeof dataRecord?.message === "string" && dataRecord.message || typeof record?.message === "string" && record.message || typeof error2 === "string" && error2 || typeof record?.name === "string" && record.name || "OpenCode reported a session error with no details";
-  const reason = rawReason.replace(/\s+/g, " ").trim().slice(0, 500);
-  return reason || "OpenCode reported a session error with no details";
-}
-function parseSessionErrorFrame(data) {
-  let parsed;
-  try {
-    parsed = JSON.parse(data);
-  } catch (error2) {
-    void error2;
-    return null;
-  }
-  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return null;
-  const parsedRecord = parsed;
-  const payload = parsedRecord.payload;
-  const event = payload !== null && typeof payload === "object" && !Array.isArray(payload) ? payload : parsedRecord;
-  if (event.type !== "session.error") return null;
-  const properties = event.properties;
-  if (properties === null || typeof properties !== "object" || Array.isArray(properties)) {
-    return null;
+async function buildFileParts(attachments, capable) {
+  const outcomes = [];
+  const parts = [];
+  const capabilityUnknown = capable === null;
+  if (capable !== true) {
+    for (const a of attachments.inputs) {
+      outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "skipped" });
+    }
+    return { parts, outcomes, capabilityUnknown };
   }
-  const propertiesRecord = properties;
-  const sessionId = propertiesRecord.sessionID;
-  if (typeof sessionId !== "string" || sessionId.length === 0) return null;
-  return {
-    sessionId,
-    reason: sessionErrorReason(propertiesRecord.error)
-  };
-}
-async function readSessionErrorStream(port, options, client) {
-  if (client?.version === "v2") return readV2SessionErrorStream(client, options);
-  let reader = null;
-  try {
-    const response = await (client?.request("/event", {
-      headers: { accept: "text/event-stream" },
-      signal: options.signal
-    }) ?? fetch(`${opencodeBase(port)}/event`, {
-      headers: { accept: "text/event-stream" },
-      signal: options.signal
-    }));
-    if (!response.ok || !response.body) {
-      return { reason: "unavailable", detail: `HTTP ${response.status}` };
+  for (const a of attachments.inputs) {
+    let dataUrl = null;
+    try {
+      dataUrl = await attachments.fetchDataUrl(a.index);
+    } catch (err) {
+      console.error(
+        `[buildFileParts] attachment ${a.index} (${a.mime}) fetch threw \u2014 omitting: ${err instanceof Error ? err.message : String(err)}`
+      );
+      dataUrl = null;
     }
-    reader = response.body.getReader();
-    const decoder = new TextDecoder();
-    let buffer = "";
-    const processLine = (line) => {
-      const trimmed = line.trimEnd();
-      if (!trimmed.startsWith("data:")) return;
-      const event = parseSessionErrorFrame(trimmed.slice("data:".length).replace(/^ /, ""));
-      if (event) options.onSessionError(event);
-    };
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) return { reason: "ended" };
-      buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split("\n");
-      buffer = lines.pop() ?? "";
-      for (const line of lines) processLine(line);
+    if (dataUrl !== null && typeof dataUrl === "object") {
+      outcomes.push({
+        index: a.index,
+        mime: a.mime,
+        filename: a.filename,
+        status: "failed",
+        reason: "needs_reauth"
+      });
+      continue;
+    }
+    if (dataUrl == null) {
+      outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "failed" });
+      continue;
+    }
+    parts.push({
+      type: "file",
+      mime: a.mime,
+      url: dataUrl,
+      ...a.filename ? { filename: a.filename } : {}
+    });
+    outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "sent" });
+  }
+  return { parts, outcomes, capabilityUnknown };
+}
+function splitModelVariant(raw) {
+  const value = raw?.trim();
+  if (!value) return {};
+  const hashIndex = value.indexOf("#");
+  if (hashIndex === -1) return { model: value };
+  const model = value.slice(0, hashIndex).trim() || void 0;
+  const variant = value.slice(hashIndex + 1).trim() || void 0;
+  return { model, variant };
+}
+function applyModelOptions(body, options) {
+  if (options?.agent) body.agent = options.agent;
+  const { model, variant } = splitModelVariant(options?.model);
+  if (model) {
+    const slashIndex = model.indexOf("/");
+    if (slashIndex !== -1) {
+      body.model = {
+        providerID: model.substring(0, slashIndex),
+        modelID: model.substring(slashIndex + 1)
+      };
     }
-  } catch (err) {
-    if (options.signal.aborted) return { reason: "aborted" };
-    return {
-      reason: "unavailable",
-      detail: err instanceof Error ? err.message : String(err)
-    };
-  } finally {
-    if (reader) void reader.cancel().catch(() => void 0);
   }
+  if (variant) body.variant = variant;
 }
-async function disposeAndReloadProviderConfig(port, client) {
-  if (client?.version === "v2") return { outcome: "skipped_v2" };
+async function listOpenCodeQuestions(port, client) {
   try {
-    const res = await requestWithClient(
-      port,
-      client,
-      "/config",
-      {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({})
-      },
-      { allowStatuses: ALL_HTTP_STATUSES }
-    );
-    if (!res.ok) {
-      console.error(
-        `[disposeAndReloadProviderConfig] PATCH /config returned HTTP ${res.status} (port ${port})`
-      );
-      return { outcome: "failed", status: res.status, detail: null };
-    }
-    return { outcome: "reloaded" };
-  } catch (err) {
+    const response = await requestWithClient(port, client, "/question");
+    const body = await response.json();
+    return Array.isArray(body) ? body : null;
+  } catch (error2) {
     console.error(
-      `[disposeAndReloadProviderConfig] PATCH /config failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+      `[listOpenCodeQuestions] GET /question failed: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
-    return {
-      outcome: "failed",
-      status: null,
-      detail: err instanceof Error ? err.message : String(err)
-    };
+    return null;
   }
 }
-async function probeOpenCodeRequestReadiness(port, client) {
+async function listOpenCodePermissions(port, client) {
   try {
-    const res = await requestWithClient(port, client, "/config", void 0, {
-      allowStatuses: ALL_HTTP_STATUSES
-    });
-    const body = await res.text();
-    return { ok: res.ok, status: res.status, bodyEmpty: body.trim().length === 0, detail: null };
-  } catch (err) {
-    const detail = err instanceof Error ? err.message : String(err);
-    console.error(`[probeOpenCodeRequestReadiness] GET /config failed (port ${port}): ${detail}`);
-    return { ok: false, status: null, bodyEmpty: null, detail };
+    const response = await requestWithClient(port, client, "/permission");
+    const body = await response.json();
+    return Array.isArray(body) ? body : null;
+  } catch (error2) {
+    console.error(
+      `[listOpenCodePermissions] GET /permission failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return null;
   }
 }
-
-// src/lib/opencode/session-v2.ts
-var ALL_HTTP_STATUSES2 = Array.from({ length: 500 }, (_, index) => index + 100);
-function isRecord5(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function messageText(m) {
+  if (!m || !Array.isArray(m.parts)) return "";
+  return m.parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
 }
-function finiteNumber2(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+function findDispatchedUserMessageId(messages, content, excludeIds) {
+  if (!messages || messages.length === 0) return null;
+  let best = null;
+  for (const message of messages) {
+    if (roleOf2(message) !== "user") continue;
+    const id = idOf2(message);
+    if (typeof id !== "string" || excludeIds?.has(id)) continue;
+    if (messageText(message) !== content) continue;
+    const created = createdOf(message) ?? 0;
+    if (best === null || created > best.created) best = { id, created };
+  }
+  return best?.id ?? null;
 }
-function adaptTime(value) {
-  if (!isRecord5(value)) return void 0;
-  const created = finiteNumber2(value.created);
-  const completed = finiteNumber2(value.completed);
-  if (created === void 0 && completed === void 0) return void 0;
-  return {
-    ...created !== void 0 ? { created } : {},
-    ...completed !== void 0 ? { completed } : {}
+async function sendPromptAsync(port, sessionId, content, options, attachments, client, callbacks) {
+  const before = await getSessionMessages(port, sessionId, client);
+  const knownUserIds = new Set(
+    (before ?? []).filter((m) => roleOf2(m) === "user").map((m) => idOf2(m)).filter((id) => typeof id === "string")
+  );
+  if (callbacks) {
+    try {
+      callbacks.onKnownUserIds(before === null ? null : knownUserIds);
+    } catch (error2) {
+      callbacks.onKnownUserIdsError(error2);
+    }
+  }
+  const parts = [{ type: "text", text: content }];
+  let pendingOutcomes = null;
+  if (attachments && attachments.inputs.length > 0) {
+    const capable = await getModelAttachmentCapability(port, options?.model, client);
+    const {
+      parts: fileParts,
+      outcomes,
+      capabilityUnknown
+    } = await buildFileParts(attachments, capable);
+    parts.push(...fileParts);
+    if (attachments.onOutcomes) pendingOutcomes = { outcomes, capabilityUnknown };
+  }
+  const body = {
+    parts
   };
+  applyModelOptions(body, options);
+  const res = await requestWithClient(
+    port,
+    client,
+    `/session/${sessionId}/prompt_async`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    },
+    { allowStatuses: ALL_HTTP_STATUSES2 }
+  );
+  if (res.status < 200 || res.status >= 300) {
+    const text = await res.text().catch(() => "");
+    const { variant } = splitModelVariant(options?.model);
+    throw new Error(
+      `OpenCode prompt_async failed: HTTP ${res.status}${text ? `: ${text}` : ""}${variant ? ` (variant: ${variant})` : ""}`
+    );
+  }
+  const READ_BACK_ATTEMPTS = 5;
+  const READ_BACK_DELAY_MS = 150;
+  for (let attempt = 0; attempt < READ_BACK_ATTEMPTS; attempt++) {
+    const after = await getSessionMessages(port, sessionId, client);
+    const dispatchedUserMessageId = findDispatchedUserMessageId(after, content, knownUserIds);
+    if (dispatchedUserMessageId !== null) {
+      if (pendingOutcomes && attachments?.onOutcomes) attachments.onOutcomes(pendingOutcomes);
+      return dispatchedUserMessageId;
+    }
+    if (attempt < READ_BACK_ATTEMPTS - 1) {
+      await new Promise((resolve6) => setTimeout(resolve6, READ_BACK_DELAY_MS));
+    }
+  }
+  return null;
 }
-function adaptTokens(value) {
-  if (!isRecord5(value)) return void 0;
-  const input = finiteNumber2(value.input);
-  const output = finiteNumber2(value.output);
-  const reasoning = finiteNumber2(value.reasoning);
-  const cache = isRecord5(value.cache) ? {
-    ...finiteNumber2(value.cache.read) !== void 0 ? { read: finiteNumber2(value.cache.read) } : {},
-    ...finiteNumber2(value.cache.write) !== void 0 ? { write: finiteNumber2(value.cache.write) } : {}
-  } : void 0;
-  if (input === void 0 && output === void 0 && reasoning === void 0 && !cache) {
-    return void 0;
+function findAssistantReplyAfter(messages, userMessageId) {
+  if (!messages || messages.length === 0) return null;
+  const byParent = messages.find(
+    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId
+  );
+  if (byParent) return byParent;
+  const userIndex = messages.findIndex((m) => idOf2(m) === userMessageId);
+  if (userIndex === -1) return null;
+  for (let i = userIndex + 1; i < messages.length; i++) {
+    if (roleOf2(messages[i]) === "assistant") return messages[i];
   }
-  return {
-    ...input !== void 0 ? { input } : {},
-    ...output !== void 0 ? { output } : {},
-    ...reasoning !== void 0 ? { reasoning } : {},
-    ...cache ? { cache } : {}
-  };
+  return null;
 }
-function adaptMessageInfo(value, role) {
-  const info = {
-    id: value.id,
-    role
-  };
-  const time = adaptTime(value.time);
-  if (time) info.time = time;
-  if (typeof value.finish === "string") info.finish = value.finish;
-  if ("error" in value) info.error = value.error;
-  if (typeof value.agent === "string") info.agent = value.agent;
-  if (isRecord5(value.model)) {
-    if (typeof value.model.id === "string") info.modelID = value.model.id;
-    if (typeof value.model.providerID === "string") info.providerID = value.model.providerID;
+function findLastAssistantReplyFor(messages, userMessageId) {
+  if (!messages || messages.length === 0) return null;
+  let lastCorrelated = null;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const m = messages[i];
+    if (roleOf2(m) !== "assistant" || parentIdOf2(m) !== userMessageId) continue;
+    lastCorrelated = m;
+    break;
+  }
+  if (lastCorrelated) {
+    if (errorOf(lastCorrelated) == null) return lastCorrelated;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const m = messages[i];
+      if (roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId && isTerminalStopAnswer(m)) {
+        return m;
+      }
+    }
+    return lastCorrelated;
+  }
+  const userIndex = messages.findIndex((m) => idOf2(m) === userMessageId);
+  if (userIndex === -1) return null;
+  let last = null;
+  let lastAssistantIndex = -1;
+  for (let i = userIndex + 1; i < messages.length; i++) {
+    const role = roleOf2(messages[i]);
+    if (role === "user") break;
+    if (role === "assistant") {
+      last = messages[i];
+      lastAssistantIndex = i;
+    }
+  }
+  if (last === null || errorOf(last) == null) return last;
+  for (let i = lastAssistantIndex; i > userIndex; i--) {
+    const m = messages[i];
+    if (roleOf2(m) === "user") break;
+    if (roleOf2(m) === "assistant" && isTerminalStopAnswer(m)) return m;
+  }
+  return last;
+}
+function assistantMessagesInTurnBlock(messages, userMessageId) {
+  const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
+  if (userIndex === -1) return [];
+  const assistants = [];
+  for (let i = userIndex + 1; i < messages.length; i++) {
+    const message = messages[i];
+    const role = roleOf2(message);
+    if (role === "user") break;
+    if (role === "assistant") assistants.push(message);
+  }
+  return assistants;
+}
+function collectSubagentSessions(messages, userMessageId) {
+  if (!messages || messages.length === 0) return [];
+  const byParent = messages.filter(
+    (message) => roleOf2(message) === "assistant" && parentIdOf2(message) === userMessageId
+  );
+  const assistants = byParent.length > 0 ? byParent : assistantMessagesInTurnBlock(messages, userMessageId);
+  const refs = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const message of assistants) {
+    const parts = Array.isArray(message.parts) ? message.parts : [];
+    for (const part of parts) {
+      if (!part || typeof part !== "object" || part.type !== "tool") continue;
+      const childSession = part.childSession;
+      if (childSession) {
+        if (seen.has(childSession.sessionId)) continue;
+        seen.add(childSession.sessionId);
+        refs.push(childSession);
+        continue;
+      }
+      if (part.tool !== "task") continue;
+      const state = part.state;
+      if (!state || typeof state !== "object") continue;
+      const metadata = state.metadata;
+      if (!metadata || typeof metadata !== "object") continue;
+      const sessionId = metadata.sessionId;
+      if (typeof sessionId !== "string" || sessionId.length === 0 || seen.has(sessionId)) continue;
+      seen.add(sessionId);
+      const start = state.time?.start;
+      refs.push({
+        sessionId,
+        startedAtMs: typeof start === "number" && Number.isFinite(start) ? start : null
+      });
+    }
   }
-  if (typeof value.cost === "number" && Number.isFinite(value.cost)) info.cost = value.cost;
-  const tokens = adaptTokens(value.tokens);
-  if (tokens) info.tokens = tokens;
-  return info;
+  return refs;
 }
-function v2ChildSessionEvidence(content) {
-  const state = isRecord5(content.state) ? content.state : null;
-  const metadata = state && isRecord5(state.metadata) ? state.metadata : null;
-  const sessionId = typeof metadata?.sessionID === "string" && metadata.sessionID.length > 0 ? metadata.sessionID : typeof metadata?.sessionId === "string" && metadata.sessionId.length > 0 ? metadata.sessionId : null;
-  if (sessionId === null) return null;
-  const time = isRecord5(content.time) ? content.time : null;
-  return { sessionId, startedAtMs: finiteNumber2(time?.created) ?? null };
+function finiteNumber2(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
-function adaptV2Message(value) {
-  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.type !== "string") {
-    return null;
-  }
-  if (value.type === "user") {
-    if (typeof value.text !== "string") return null;
-    return {
-      info: adaptMessageInfo(value, "user"),
-      parts: [{ type: "text", text: value.text }]
-    };
+function taskCallModel(value) {
+  if (!value || typeof value !== "object") return null;
+  const model = value;
+  const modelID = typeof model.modelID === "string" ? model.modelID : void 0;
+  const providerID = typeof model.providerID === "string" ? model.providerID : void 0;
+  return modelID || providerID ? { modelID, providerID } : null;
+}
+function collectTaskCalls(messages, userMessageId) {
+  if (!messages || messages.length === 0) return [];
+  const calls = [];
+  for (const message of messages) {
+    if (roleOf2(message) !== "assistant" || parentIdOf2(message) !== userMessageId) continue;
+    for (const part of message.parts ?? []) {
+      if (part.tool !== "task" || !part.callID || !part.state || part.state.status === "pending") {
+        continue;
+      }
+      const rawName = part.state.input?.subagent_type;
+      const subagentName = typeof rawName === "string" && rawName.trim().length > 0 ? rawName : rawName === void 0 ? "general" : "unknown";
+      const metadata = part.state.metadata;
+      calls.push({
+        callID: part.callID,
+        subagentName,
+        childSessionId: typeof metadata?.sessionId === "string" ? metadata.sessionId : null,
+        parentSessionId: typeof metadata?.parentSessionId === "string" ? metadata.parentSessionId : null,
+        model: taskCallModel(metadata?.model),
+        status: part.state.status ?? "unknown",
+        timeStart: finiteNumber2(part.state.time?.start),
+        timeEnd: finiteNumber2(part.state.time?.end)
+      });
+    }
   }
-  if (value.type !== "assistant" || !Array.isArray(value.content)) return null;
-  const parts = [];
-  for (const content of value.content) {
-    if (!isRecord5(content) || typeof content.type !== "string") return null;
-    const toolPart = projectV2ToolContent(content);
-    if (toolPart) {
-      const childSession = v2ChildSessionEvidence(content);
-      parts.push(childSession ? { ...toolPart, childSession } : toolPart);
+  return calls;
+}
+function attributeTaskCallUsage(messages, windows) {
+  const eligibleWindows = windows.filter(
+    (window) => window.timeStart !== null && Number.isFinite(window.timeStart)
+  );
+  const assignments = /* @__PURE__ */ new Map();
+  for (const window of eligibleWindows) assignments.set(window.callID, []);
+  const unattributed = [];
+  for (const message of messages ?? []) {
+    if (roleOf2(message) !== "assistant") continue;
+    const created = finiteNumber2(createdOf(message));
+    const matching = created === null ? [] : eligibleWindows.filter(
+      (window) => window.timeStart <= created && (window.timeEnd === null || window.timeEnd === void 0 || created <= window.timeEnd)
+    );
+    if (matching.length === 0) {
+      unattributed.push(message);
       continue;
     }
-    if (content.type === "text") {
-      if (typeof content.text !== "string") return null;
-      parts.push({ type: "text", text: content.text });
-    } else {
-      parts.push({ type: content.type });
-    }
+    matching.sort((a, b) => a.timeStart - b.timeStart);
+    assignments.get(matching[0].callID)?.push(message);
   }
   return {
-    info: adaptMessageInfo(value, "assistant"),
-    parts
+    invocations: eligibleWindows.map((window) => {
+      const assigned = assignments.get(window.callID) ?? [];
+      return { callID: window.callID, messages: assigned, usage: sumAssistantUsage(assigned) };
+    }),
+    unattributed
   };
 }
-function adaptFormTool(value) {
-  if (!isRecord5(value) || typeof value.messageID !== "string" || typeof value.id !== "string") {
-    return void 0;
-  }
-  return { messageID: value.messageID, callID: value.id };
-}
-function adaptV2FormWire(value) {
-  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
-    return null;
+function sumAssistantUsage(messages) {
+  if (!messages || messages.length === 0) return null;
+  const hasTrailingError = errorOf(messages[messages.length - 1]) != null;
+  const hasTerminalStopAnswer = messages.some(isTerminalStopAnswer);
+  const selected = hasTrailingError && hasTerminalStopAnswer ? messages.filter((message) => errorOf(message) == null) : messages;
+  let sawAnyUsage = false;
+  let inputSum = 0;
+  let outputSum = 0;
+  let reasoningSum = 0;
+  let cacheReadSum = 0;
+  let cacheWriteSum = 0;
+  let costSum = 0;
+  let sawCost = false;
+  let toolCallCount = 0;
+  let modelId = null;
+  let providerId = null;
+  for (const m of selected) {
+    toolCallCount += m.parts?.filter((part) => part.type === "tool").length ?? 0;
+    const info = m.info;
+    if (!info) continue;
+    const tokens = info.tokens;
+    if (tokens) {
+      sawAnyUsage = true;
+      inputSum += tokens.input ?? 0;
+      outputSum += tokens.output ?? 0;
+      reasoningSum += tokens.reasoning ?? 0;
+      cacheReadSum += tokens.cache?.read ?? 0;
+      cacheWriteSum += tokens.cache?.write ?? 0;
+    }
+    if (typeof info.cost === "number") {
+      sawAnyUsage = true;
+      sawCost = true;
+      costSum += info.cost;
+    }
+    if (typeof info.modelID === "string") {
+      sawAnyUsage = true;
+      modelId = info.modelID;
+    }
+    if (typeof info.providerID === "string") {
+      sawAnyUsage = true;
+      providerId = info.providerID;
+    }
   }
-  return value;
-}
-function adaptV2FormField(value, header) {
-  if (!isRecord5(value)) return null;
-  const question = typeof value.title === "string" ? value.title : typeof value.question === "string" ? value.question : typeof value.key === "string" ? value.key : null;
-  if (!question) return null;
-  const options = Array.isArray(value.options) ? value.options.flatMap((option) => {
-    if (!isRecord5(option)) return [];
-    const label = typeof option.label === "string" ? option.label : typeof option.value === "string" ? option.value : null;
-    if (!label) return [];
-    return [
-      {
-        label,
-        description: typeof option.description === "string" ? option.description : ""
-      }
-    ];
-  }) : [];
-  return { question, header, options };
-}
-function adaptV2Form(value) {
-  const form = adaptV2FormWire(value);
-  if (!form || !Array.isArray(form.fields)) return null;
-  const header = typeof form.title === "string" ? form.title : "";
-  const questions = form.fields.map((field) => adaptV2FormField(field, header)).filter((question) => question !== null);
-  if (questions.length === 0) return null;
-  const tool = isRecord5(form.metadata) ? adaptFormTool(form.metadata.tool) : void 0;
+  if (!sawAnyUsage) return null;
   return {
-    id: form.id,
-    sessionID: form.sessionID,
-    questions,
-    ...tool ? { tool } : {},
-    raw: form
+    usage_provider_id: providerId,
+    usage_model_id: modelId,
+    usage_tokens_input: inputSum,
+    usage_tokens_output: outputSum,
+    usage_tokens_reasoning: reasoningSum,
+    usage_tokens_cache_read: cacheReadSum,
+    usage_tokens_cache_write: cacheWriteSum,
+    // NULL means OpenCode never reported a cost; it is distinct from a genuine
+    // zero-cost message, which sets `sawCost` with `costSum === 0`.
+    usage_cost_usd: sawCost ? costSum : null,
+    turn_tool_calls: toolCallCount
   };
 }
-function adaptV2FormList(value) {
-  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
-  return value.data.map(adaptV2Form).filter((form) => form !== null);
-}
-function adaptPattern(value) {
-  if (typeof value === "string" && value.length > 0) return value;
-  if (Array.isArray(value) && value.every((pattern) => typeof pattern === "string")) {
-    return value;
+function messageUsage(messages, userMessageId) {
+  if (!messages || messages.length === 0) return null;
+  const byParentAll = messages.filter(
+    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId
+  );
+  let correlated;
+  if (byParentAll.length > 0) {
+    correlated = byParentAll;
+  } else {
+    correlated = assistantMessagesInTurnBlock(messages, userMessageId);
   }
-  return void 0;
+  if (correlated.length === 0) return null;
+  return sumAssistantUsage(correlated);
 }
-function adaptV2PermissionWire(value) {
-  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
-    return null;
+function messageRunState(messages, userMessageId) {
+  if (!messages || messages.length === 0) return "unknown";
+  const hasUser = messages.some((m) => idOf2(m) === userMessageId);
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  if (!hasUser) {
+    if (!reply) return "unknown";
   }
-  if (typeof value.permission !== "string" && typeof value.action !== "string") return null;
-  return value;
+  if (!reply) return "queued";
+  if (isAssistantInFlight(reply)) return "running";
+  if (errorOf(reply) != null) return "failed";
+  if (isAmbiguousTerminalFinish(reply)) return "running";
+  return "done";
 }
-function adaptV2Permission(value) {
-  const permission = adaptV2PermissionWire(value);
-  if (!permission) return null;
-  const type = permission.permission ?? permission.action;
-  if (!type) return null;
-  const pattern = adaptPattern(permission.pattern) ?? adaptPattern(permission.patterns) ?? adaptPattern(permission.resources);
-  const time = isRecord5(permission.time) ? finiteNumber2(permission.time.created) !== void 0 ? { created: finiteNumber2(permission.time.created) } : void 0 : void 0;
-  return {
-    id: permission.id,
-    type,
-    sessionID: permission.sessionID,
-    metadata: isRecord5(permission.metadata) ? permission.metadata : {},
-    raw: permission,
-    ...pattern !== void 0 ? { pattern } : {},
-    ...typeof permission.messageID === "string" ? { messageID: permission.messageID } : {},
-    ...typeof permission.callID === "string" ? { callID: permission.callID } : {},
-    ...typeof permission.title === "string" ? { title: permission.title } : {},
-    ...time ? { time } : {}
-  };
+function isPreamblePinnedRunning(messages, userMessageId) {
+  if (messageRunState(messages, userMessageId) !== "running") return false;
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  return completedOf(reply) != null && finishOf(reply) === "tool-calls";
+}
+function isMidFlightPinnedRunning(messages, userMessageId) {
+  if (messageRunState(messages, userMessageId) !== "running") return false;
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  return reply !== null && isAssistantInFlight(reply) && completedOf(reply) == null;
 }
-function adaptV2PermissionList(value) {
-  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
-  return value.data.map(adaptV2Permission).filter((permission) => permission !== null);
+function isB2AbandonmentConfirmed(params) {
+  return params.pinnedForMs >= params.minPinnedMs && params.descendantOngoing === false && params.rootOngoing === false;
 }
-function adaptV2Session(value) {
-  if (!isRecord5(value) || typeof value.id !== "string" || value.id.length === 0) return null;
-  const time = isRecord5(value.time) ? {
-    ...finiteNumber2(value.time.created) !== void 0 ? { created: finiteNumber2(value.time.created) } : {},
-    ...finiteNumber2(value.time.updated) !== void 0 ? { updated: finiteNumber2(value.time.updated) } : {}
-  } : void 0;
-  return {
-    id: value.id,
-    ...typeof value.title === "string" ? { title: value.title } : {},
-    ...typeof value.parentID === "string" ? { parentID: value.parentID } : {},
-    ...time && Object.keys(time).length > 0 ? { time } : {}
-  };
+function isMidFlightOrphanConfirmed(params) {
+  return params.pinnedForMs >= params.minPinnedMs && params.notOngoingStreak >= params.minNotOngoingStreak;
 }
-function adaptV2SessionList(value) {
-  if (!isRecord5(value) || !Array.isArray(value.data) || !isRecord5(value.cursor)) return null;
-  return {
-    data: value.data.map(adaptV2Session).filter((session) => session !== null),
-    cursor: value.cursor
-  };
+function isAmbiguousTerminalFinish(m) {
+  if (completedOf(m) == null) return false;
+  if (errorOf(m) != null) return false;
+  const finish = finishOf(m);
+  return finish !== "tool-calls" && finish !== "stop";
 }
-function adaptV2Location(value) {
-  const candidates = [
-    value,
-    isRecord5(value) ? value.data : void 0,
-    isRecord5(value) ? value.location : void 0
-  ];
-  for (const candidate of candidates) {
-    if (!isRecord5(candidate) || typeof candidate.directory !== "string") continue;
-    const directory = candidate.directory.trim();
-    if (directory) return directory;
+function isAmbiguousFinishPinnedRunning(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  return isAmbiguousTerminalFinish(reply);
+}
+function isAmbiguousFinishResolved(params) {
+  return params.sessionOngoing === false || params.sessionOngoing !== true && params.pinnedForMs >= params.maxPinnedMs;
+}
+function messageError(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  const error2 = errorOf(reply);
+  if (error2 == null) return null;
+  let rendered;
+  if (typeof error2 === "string") {
+    rendered = error2;
+  } else if (typeof error2 === "object") {
+    const e = error2;
+    const dataMessage = e.data?.message;
+    if (typeof dataMessage === "string") {
+      rendered = dataMessage;
+    } else if (typeof e.message === "string") {
+      rendered = e.message;
+    } else {
+      rendered = "The agent run failed.";
+    }
+  } else {
+    rendered = "The agent run failed.";
   }
-  return null;
+  const toolPart = Array.isArray(reply?.parts) ? reply.parts.find(
+    (part) => part && typeof part === "object" && part.type === "tool" && part.state?.status === "error"
+  ) : void 0;
+  return typeof toolPart?.tool === "string" && toolPart.tool.length > 0 ? `${rendered} (tool "${toolPart.tool}")` : rendered;
 }
-function adaptV2Messages(value) {
-  if (!isRecord5(value) || !Array.isArray(value.data)) return [];
-  return value.data.slice().reverse().map(adaptV2Message).filter((message) => message !== null);
+function describeAbandonedReplyShape(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  if (!reply) return null;
+  const parts = Array.isArray(reply.parts) ? reply.parts : [];
+  const lastTool = [...parts].reverse().find((part) => part?.type === "tool");
+  return {
+    partTypes: parts.slice(-12).map((part) => typeof part?.type === "string" ? part.type : "(unknown)"),
+    droppedPartCount: Math.max(0, parts.length - 12),
+    lastToolName: typeof lastTool?.tool === "string" && lastTool.tool.length > 0 ? lastTool.tool : null,
+    lastToolStatus: typeof lastTool?.state?.status === "string" && lastTool.state.status.length > 0 ? lastTool.state.status : null
+  };
 }
-async function readJson(response) {
-  try {
-    return await response.json();
-  } catch (error2) {
-    throw new Error(
-      `OpenCode V2 response was not valid JSON: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
+function isAbortedTerminalReply(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  const error2 = errorOf(reply);
+  if (error2 == null) return false;
+  if (typeof error2 === "string") return error2.trim() === "Aborted";
+  if (typeof error2 === "object") {
+    const e = error2;
+    if (e.name === "MessageAbortedError") return true;
+    if (e.name === "AbortError") return true;
+    const dataMessage = e.data?.message;
+    const rendered = typeof dataMessage === "string" ? dataMessage : typeof e.message === "string" ? e.message : null;
+    return rendered != null && rendered.trim() === "Aborted";
   }
+  return false;
 }
-async function readData(client, path, init) {
-  const response = await client.request(path, init);
-  const body = await readJson(response);
-  if (!isRecord5(body) || !("data" in body)) {
-    throw new Error(`OpenCode V2 response for ${path} was missing its data envelope`);
+var CLAUDE_AUTH_EXPIRY_MESSAGES = Object.freeze([
+  "Claude Code credentials are unavailable or expired. Run `claude` to refresh them."
+]);
+function extractReplyErrorShape(reply) {
+  const error2 = errorOf(reply);
+  if (error2 == null || typeof error2 !== "object") {
+    return { name: null, statusCode: null };
   }
-  return body.data;
+  const e = error2;
+  const name = typeof e.name === "string" ? e.name.slice(0, 100) : null;
+  const data = e.data;
+  const statusCode = typeof data?.statusCode === "number" && Number.isFinite(data.statusCode) ? data.statusCode : null;
+  return { name, statusCode };
 }
-var OpenCodeV2PromptAckError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "OpenCodeV2PromptAckError";
+function classifyReplyAuthError(reply) {
+  const error2 = errorOf(reply);
+  if (error2 == null || typeof error2 !== "object") return null;
+  const e = error2;
+  const replyProviderId = reply?.info?.providerID ?? null;
+  const replyModelId = reply?.info?.modelID ?? null;
+  const data = e.data;
+  if (e.name === "ProviderAuthError") {
+    const providerId = typeof data?.providerID === "string" && data.providerID || replyProviderId;
+    return { kind: "model_auth", providerId, modelId: replyModelId, reason: "missing" };
   }
-};
-var OpenCodeV2ModelSwitchError = class extends Error {
-  statusCode;
-  constructor(error2) {
-    super(error2 instanceof Error ? error2.message : String(error2));
-    this.name = "OpenCodeV2ModelSwitchError";
-    this.statusCode = error2 instanceof OpenCodeRequestError ? error2.statusCode : null;
+  if (e.name === "APIError") {
+    const statusCode = data?.statusCode;
+    if (statusCode === 401 || statusCode === 403) {
+      return {
+        kind: "model_auth",
+        providerId: replyProviderId,
+        modelId: replyModelId,
+        reason: "rejected"
+      };
+    }
   }
-};
-async function getOpenCodeDirectoryV2(client) {
-  try {
-    return adaptV2Location(await readJson(await client.request("/api/location")));
-  } catch (error2) {
-    console.error(
-      `[getOpenCodeDirectoryV2] GET /api/location failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return null;
+  const errorMessage4 = typeof data?.message === "string" ? data.message : typeof e.message === "string" ? e.message : null;
+  if (errorMessage4 !== null && CLAUDE_AUTH_EXPIRY_MESSAGES.some((knownMessage) => errorMessage4.includes(knownMessage))) {
+    return {
+      kind: "model_auth",
+      providerId: typeof data?.providerID === "string" && data.providerID || replyProviderId,
+      modelId: replyModelId,
+      reason: "rejected"
+    };
   }
+  return null;
 }
-async function createV2Session(client, directory) {
-  const data = await readData(client, "/api/session", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ location: { directory } })
-  });
-  if (!isRecord5(data) || typeof data.id !== "string" || data.id.length === 0) {
-    throw new Error("OpenCode V2 create session response was missing data.id");
-  }
-  return data.id;
+function messageFailure(messages, userMessageId) {
+  return classifyReplyAuthError(findLastAssistantReplyFor(messages, userMessageId));
 }
-async function getV2Session(client, sessionId) {
-  const data = await readData(client, `/api/session/${encodeURIComponent(sessionId)}`);
-  const session = adaptV2Session(data);
-  if (!session) throw new Error("OpenCode V2 get session response contained an invalid session");
-  return session;
+function isProviderModelNotFoundError(reason) {
+  return reason.includes("Model not found:");
 }
-async function listV2SessionPage(client, cursor, signal) {
-  const operation = cursor ? "GET /api/session (next page)" : "GET /api/session";
-  const path = cursor ? `/api/session?cursor=${encodeURIComponent(cursor)}` : "/api/session";
-  try {
-    const response = await client.request(path, signal ? { signal } : void 0, {
-      allowStatuses: ALL_HTTP_STATUSES2
-    });
-    if (!response.ok) {
-      console.error(
-        `[listV2SessionPage] ${operation} returned HTTP ${response.status} (port ${client.port})`
-      );
-      return null;
+function findLatestSubagentAuthOutcome(messages, sinceMs) {
+  if (!messages || messages.length === 0) return null;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (roleOf2(message) !== "assistant") continue;
+    const created = createdOf(message);
+    if (sinceMs !== null && typeof created === "number" && created < sinceMs) continue;
+    const failure = classifyReplyAuthError(message);
+    if (failure) {
+      if (!failure.providerId) return null;
+      return { providerId: failure.providerId, outcome: "failed", failure };
+    }
+    const providerId = message.info?.providerID;
+    if (errorOf(message) == null && typeof providerId === "string" && providerId.length > 0) {
+      return { providerId, outcome: "succeeded" };
     }
-    return adaptV2SessionList(await readJson(response));
-  } catch (error2) {
-    if (signal?.aborted) return null;
-    const errorName = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
-    console.error(`[listV2SessionPage] ${operation} failed (port ${client.port}): ${errorName}`);
     return null;
   }
+  return null;
 }
-async function listV2Sessions(client, signal) {
-  const sessions = [];
-  const seenCursors = /* @__PURE__ */ new Set();
-  let cursor;
-  let hasNextPage = true;
-  try {
-    while (hasNextPage) {
-      const page = await listV2SessionPage(client, cursor, signal);
-      if (!page) return null;
-      sessions.push(...page.data);
-      const next = page.cursor.next;
-      if (next === void 0 || next === null) {
-        hasNextPage = false;
-        continue;
-      }
-      if (typeof next !== "string" || next.length === 0 || seenCursors.has(next)) {
-        throw new Error("OpenCode V2 session list contained an invalid next cursor");
-      }
-      seenCursors.add(next);
-      cursor = next;
+function findSubagentAuthOutcome(messages, sinceMs) {
+  return findLatestSubagentAuthOutcome(messages, sinceMs);
+}
+function applyZeroProviderFallback(classified, hasConfiguredProvider, replyProviderId, replyModelId = null) {
+  if (classified != null) return classified;
+  if (hasConfiguredProvider !== false) return null;
+  return {
+    kind: "model_auth",
+    providerId: replyProviderId,
+    modelId: replyModelId,
+    reason: "missing"
+  };
+}
+function hasRunningAssistantExcept(messages, exceptUserMessageId) {
+  if (!messages || messages.length === 0) return false;
+  return messages.some(
+    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) !== exceptUserMessageId && isAssistantInFlight(m)
+  );
+}
+function hasLaterSiblingTurnStarted(messages, userMessageId, siblingUserMessageIds) {
+  if (!messages || messages.length === 0) return false;
+  const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
+  if (userIndex === -1) return false;
+  let hasLaterUser = false;
+  let hasStartedLaterUser = false;
+  for (let i = userIndex + 1; i < messages.length; i++) {
+    const message = messages[i];
+    if (roleOf2(message) !== "user") continue;
+    hasLaterUser = true;
+    const laterUserMessageId = idOf2(message);
+    if (laterUserMessageId === void 0 || !siblingUserMessageIds.has(laterUserMessageId)) {
+      return false;
+    }
+    if (messages.some(
+      (candidate) => roleOf2(candidate) === "assistant" && parentIdOf2(candidate) === laterUserMessageId
+    )) {
+      hasStartedLaterUser = true;
     }
-    return sessions;
-  } catch (error2) {
-    const errorName = error2 instanceof Error && ["AbortError", "Error", "TimeoutError", "TypeError"].includes(error2.name) ? error2.name : "unknown error";
-    console.error(
-      `[listV2Sessions] GET /api/session pagination failed (port ${client.port}): ${errorName}`
-    );
-    return null;
   }
+  return hasLaterUser && hasStartedLaterUser;
 }
-async function deleteV2Session(client, sessionId) {
-  try {
-    const response = await client.request(
-      `/api/session/${encodeURIComponent(sessionId)}`,
-      { method: "DELETE" },
-      { allowStatuses: ALL_HTTP_STATUSES2 }
-    );
-    if (response.status >= 200 && response.status < 300) {
-      return { ok: true, status: response.status };
+async function hasAnyConfiguredProvider(port, client) {
+  if (client?.version === "v2") {
+    const directory = await getOpenCodeDirectoryV2(client);
+    if (!directory) {
+      console.error(
+        `[hasAnyConfiguredProvider] V2 working directory was unavailable (port ${port})`
+      );
+      return null;
     }
+    const query = `?location%5Bdirectory%5D=${encodeURIComponent(directory)}`;
+    const integrationPath = `/api/integration${query}`;
+    let integrationReady = null;
     try {
-      const body = await response.text();
-      return body ? { ok: false, status: response.status, body } : { ok: false, status: response.status };
+      const res = await client.request(integrationPath);
+      if (!res.ok) {
+        console.error(
+          `[hasAnyConfiguredProvider] GET ${integrationPath} returned HTTP ${res.status} (port ${port})`
+        );
+      } else {
+        const body = await res.json();
+        if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
+          console.error(
+            `[hasAnyConfiguredProvider] GET ${integrationPath} body had no integration data array (port ${port})`
+          );
+        } else {
+          let valid = true;
+          for (const integration of body.data) {
+            if (!integration || typeof integration !== "object" || Array.isArray(integration) || typeof integration.id !== "string" || !Array.isArray(integration.connections)) {
+              console.error(
+                `[hasAnyConfiguredProvider] GET ${integrationPath} body contained an invalid integration (port ${port})`
+              );
+              valid = false;
+              break;
+            }
+          }
+          if (valid) {
+            integrationReady = body.data.some(
+              (integration) => integration.connections.length > 0
+            );
+          }
+        }
+      }
     } catch (error2) {
       console.error(
-        `[deleteV2Session] DELETE /api/session/${sessionId} response body read failed for HTTP ${response.status}: ${error2 instanceof Error ? error2.message : String(error2)}`
+        `[hasAnyConfiguredProvider] GET ${integrationPath} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
       );
-      return { ok: false, status: response.status };
     }
-  } catch (error2) {
-    console.error(
-      `[deleteV2Session] DELETE /api/session/${sessionId} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return { ok: false, status: "threw" };
-  }
-}
-async function v2SessionExists(client, sessionId) {
-  try {
-    const response = await client.request(
-      `/api/session/${encodeURIComponent(sessionId)}`,
-      void 0,
-      { allowStatuses: [404] }
-    );
-    return response.status === 404 ? false : true;
-  } catch (error2) {
-    console.error(
-      `[v2SessionExists] GET /api/session/${sessionId} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return null;
-  }
-}
-async function sendV2Prompt(client, sessionId, text, options, onInvalidModelSelection) {
-  const modelSelection = options?.model?.trim();
-  const { model, variant } = splitModelVariant(modelSelection);
-  const separator = model?.indexOf("/") ?? -1;
-  const modelReference = model && separator > 0 && separator < model.length - 1 ? {
-    id: model.slice(separator + 1),
-    providerID: model.slice(0, separator),
-    ...variant ? { variant } : {}
-  } : void 0;
-  if (modelSelection && !modelReference) onInvalidModelSelection?.();
-  if (options?.agent) {
-    await client.request(`/api/session/${encodeURIComponent(sessionId)}/agent`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ agent: options.agent })
-    });
-  }
-  if (modelReference) {
+    if (integrationReady === true) return true;
+    const providerPath = `/api/provider${query}`;
+    let providerReady = null;
     try {
-      await client.request(`/api/session/${encodeURIComponent(sessionId)}/model`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ model: modelReference })
-      });
+      const res = await client.request(providerPath);
+      if (!res.ok) {
+        console.error(
+          `[hasAnyConfiguredProvider] GET ${providerPath} returned HTTP ${res.status} (port ${port})`
+        );
+      } else {
+        const body = await res.json();
+        if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
+          console.error(
+            `[hasAnyConfiguredProvider] GET ${providerPath} body had no provider data array (port ${port})`
+          );
+        } else {
+          let valid = true;
+          for (const provider of body.data) {
+            if (!provider || typeof provider !== "object" || Array.isArray(provider) || typeof provider.id !== "string") {
+              console.error(
+                `[hasAnyConfiguredProvider] GET ${providerPath} body contained an invalid provider (port ${port})`
+              );
+              valid = false;
+              break;
+            }
+          }
+          if (valid) {
+            providerReady = body.data.some(
+              (provider) => provider.activation === "enabled"
+            );
+          }
+        }
+      }
     } catch (error2) {
-      throw new OpenCodeV2ModelSwitchError(error2);
+      console.error(
+        `[hasAnyConfiguredProvider] GET ${providerPath} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
+      );
     }
+    if (providerReady === true) return true;
+    if (integrationReady === null || providerReady === null) return null;
+    return false;
   }
-  const path = `/api/session/${encodeURIComponent(sessionId)}/prompt`;
-  const response = await client.request(path, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ text, delivery: "queue" })
-  });
-  let body;
-  try {
-    body = await readJson(response);
-  } catch (error2) {
-    throw new OpenCodeV2PromptAckError(
-      `OpenCode V2 prompt response could not be read: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-  }
-  const data = isRecord5(body) && "data" in body ? body.data : void 0;
-  if (!isRecord5(data) || typeof data.id !== "string" || data.id.length === 0) {
-    throw new OpenCodeV2PromptAckError("OpenCode V2 prompt response was missing data.id");
-  }
-  return data.id;
-}
-async function getV2SessionMessages(client, sessionId) {
-  const path = `/api/session/${encodeURIComponent(sessionId)}/message?order=desc&limit=200`;
-  try {
-    const body = await readJson(await client.request(path));
-    if (!isRecord5(body) || !Array.isArray(body.data) || !isRecord5(body.cursor)) return null;
-    return adaptV2Messages(body);
-  } catch (error2) {
-    console.error(
-      `[getV2SessionMessages] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return null;
-  }
-}
-async function listV2Forms(client, sessionId) {
-  const path = `/api/session/${encodeURIComponent(sessionId)}/form`;
-  try {
-    return adaptV2FormList(await readJson(await client.request(path)));
-  } catch (error2) {
-    console.error(
-      `[listV2Forms] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return null;
-  }
-}
-async function listV2Permissions(client, sessionId) {
-  const path = `/api/session/${encodeURIComponent(sessionId)}/permission`;
-  try {
-    return adaptV2PermissionList(await readJson(await client.request(path)));
-  } catch (error2) {
-    console.error(
-      `[listV2Permissions] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-    return null;
-  }
-}
-async function interruptV2Session(client, sessionId) {
-  await client.request(`/api/session/${encodeURIComponent(sessionId)}/interrupt`, {
-    method: "POST"
-  });
-}
-async function getV2ActiveSessions(client) {
   try {
-    const body = await readJson(await client.request("/api/session/active"));
-    if (!isRecord5(body) || !isRecord5(body.data)) return null;
-    return body.data;
-  } catch (error2) {
+    const res = await requestWithClient(port, client, "/config/providers");
+    if (!res.ok) {
+      console.error(
+        `[hasAnyConfiguredProvider] GET /config/providers returned HTTP ${res.status} (port ${port})`
+      );
+      return null;
+    }
+    const body = await res.json();
+    if (!body || typeof body !== "object" || Array.isArray(body)) {
+      console.error(
+        `[hasAnyConfiguredProvider] GET /config/providers body was not a plain object (port ${port})`
+      );
+      return null;
+    }
+    const defaults2 = body.default;
+    if (!defaults2 || typeof defaults2 !== "object" || Array.isArray(defaults2)) {
+      console.error(
+        `[hasAnyConfiguredProvider] GET /config/providers body had no \`default\` object (port ${port})`
+      );
+      return null;
+    }
+    return Object.keys(defaults2).length > 0;
+  } catch (err) {
     console.error(
-      `[getV2ActiveSessions] GET /api/session/active failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+      `[hasAnyConfiguredProvider] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
     );
     return null;
   }
 }
-async function isV2SessionOngoing(client, sessionId) {
-  const activeSessions = await getV2ActiveSessions(client);
-  if (activeSessions === null) return null;
-  return Object.prototype.hasOwnProperty.call(activeSessions, sessionId);
-}
-function sessionErrorReason2(value) {
-  if (typeof value === "string" && value.trim()) return value.trim().slice(0, 500);
-  if (isRecord5(value)) {
-    const data = isRecord5(value.data) ? value.data : void 0;
-    const reason = typeof data?.message === "string" && data.message || typeof value.message === "string" && value.message || typeof value.name === "string" && value.name;
-    if (reason) return reason.replace(/\s+/g, " ").trim().slice(0, 500);
-  }
-  return "OpenCode reported a session error with no details";
+function sessionErrorReason2(error2) {
+  const record = typeof error2 === "object" && error2 !== null ? error2 : null;
+  const data = record?.data;
+  const dataRecord = typeof data === "object" && data !== null ? data : null;
+  const rawReason = typeof dataRecord?.message === "string" && dataRecord.message || typeof record?.message === "string" && record.message || typeof error2 === "string" && error2 || typeof record?.name === "string" && record.name || "OpenCode reported a session error with no details";
+  const reason = rawReason.replace(/\s+/g, " ").trim().slice(0, 500);
+  return reason || "OpenCode reported a session error with no details";
 }
-function adaptV2SessionErrorEvent(value) {
-  let parsed = value;
-  if (typeof value === "string") {
-    try {
-      parsed = JSON.parse(value);
-    } catch (error2) {
-      void error2;
-      return null;
-    }
-  }
-  if (!isRecord5(parsed)) return null;
+function parseSessionErrorFrame(data) {
+  let parsed;
   try {
-    const establishedShape = parseSessionErrorFrame(JSON.stringify(parsed));
-    if (establishedShape) return establishedShape;
+    parsed = JSON.parse(data);
   } catch (error2) {
     void error2;
+    return null;
   }
-  const candidates = [parsed, parsed.payload, parsed.data].filter(isRecord5);
-  for (const event of candidates) {
-    if (event.type !== "session.error") continue;
-    const properties = [event.properties, event.data, event].find(isRecord5);
-    if (!properties) continue;
-    const sessionId = typeof properties.sessionID === "string" && properties.sessionID || typeof properties.sessionId === "string" && properties.sessionId;
-    if (!sessionId) continue;
-    return {
-      sessionId,
-      reason: sessionErrorReason2(properties.error ?? properties)
-    };
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  const parsedRecord = parsed;
+  const payload = parsedRecord.payload;
+  const event = payload !== null && typeof payload === "object" && !Array.isArray(payload) ? payload : parsedRecord;
+  if (event.type !== "session.error") return null;
+  const properties = event.properties;
+  if (properties === null || typeof properties !== "object" || Array.isArray(properties)) {
+    return null;
   }
-  return null;
+  const propertiesRecord = properties;
+  const sessionId = propertiesRecord.sessionID;
+  if (typeof sessionId !== "string" || sessionId.length === 0) return null;
+  return {
+    sessionId,
+    reason: sessionErrorReason2(propertiesRecord.error)
+  };
 }
-async function readV2SessionErrorStream(client, options) {
+async function readSessionErrorStream(port, options, client) {
+  if (client?.version === "v2") return readV2SessionErrorStream(client, options);
   let reader = null;
   try {
-    const response = await client.request("/api/event", {
+    const response = await (client?.request("/event", {
       headers: { accept: "text/event-stream" },
       signal: options.signal
-    });
+    }) ?? fetch(`${opencodeBase(port)}/event`, {
+      headers: { accept: "text/event-stream" },
+      signal: options.signal
+    }));
     if (!response.ok || !response.body) {
       return { reason: "unavailable", detail: `HTTP ${response.status}` };
     }
@@ -5997,7 +5958,7 @@ async function readV2SessionErrorStream(client, options) {
     const processLine = (line) => {
       const trimmed = line.trimEnd();
       if (!trimmed.startsWith("data:")) return;
-      const event = adaptV2SessionErrorEvent(trimmed.slice("data:".length).replace(/^ /, ""));
+      const event = parseSessionErrorFrame(trimmed.slice("data:".length).replace(/^ /, ""));
       if (event) options.onSessionError(event);
     };
     while (true) {
@@ -6008,16 +5969,61 @@ async function readV2SessionErrorStream(client, options) {
       buffer = lines.pop() ?? "";
       for (const line of lines) processLine(line);
     }
-  } catch (error2) {
+  } catch (err) {
     if (options.signal.aborted) return { reason: "aborted" };
     return {
       reason: "unavailable",
-      detail: error2 instanceof Error ? error2.message : String(error2)
+      detail: err instanceof Error ? err.message : String(err)
     };
   } finally {
     if (reader) void reader.cancel().catch(() => void 0);
   }
 }
+async function disposeAndReloadProviderConfig(port, client) {
+  if (client?.version === "v2") return { outcome: "skipped_v2" };
+  try {
+    const res = await requestWithClient(
+      port,
+      client,
+      "/config",
+      {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({})
+      },
+      { allowStatuses: ALL_HTTP_STATUSES2 }
+    );
+    if (!res.ok) {
+      console.error(
+        `[disposeAndReloadProviderConfig] PATCH /config returned HTTP ${res.status} (port ${port})`
+      );
+      return { outcome: "failed", status: res.status, detail: null };
+    }
+    return { outcome: "reloaded" };
+  } catch (err) {
+    console.error(
+      `[disposeAndReloadProviderConfig] PATCH /config failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+    );
+    return {
+      outcome: "failed",
+      status: null,
+      detail: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+async function probeOpenCodeRequestReadiness(port, client) {
+  try {
+    const res = await requestWithClient(port, client, "/config", void 0, {
+      allowStatuses: ALL_HTTP_STATUSES2
+    });
+    const body = await res.text();
+    return { ok: res.ok, status: res.status, bodyEmpty: body.trim().length === 0, detail: null };
+  } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
+    console.error(`[probeOpenCodeRequestReadiness] GET /config failed (port ${port}): ${detail}`);
+    return { ok: false, status: null, bodyEmpty: null, detail };
+  }
+}
 
 // src/lib/opencode/credential-import-v2.ts
 import { readFileSync as readFileSync8 } from "node:fs";
@@ -6266,7 +6272,7 @@ var INTEGRATION_LIST_RETRY_DELAY_MS = 1e3;
 function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-var sleep2 = (milliseconds) => new Promise((resolve5) => setTimeout(resolve5, milliseconds));
+var sleep2 = (milliseconds) => new Promise((resolve6) => setTimeout(resolve6, milliseconds));
 function emptyResult(unsupported = [], outcome = "completed") {
   return { outcome, imported: [], alreadyConnected: [], unsupported, failed: [] };
 }
@@ -6583,7 +6589,7 @@ function parseSynchroniserEnv(stdout) {
   return values;
 }
 function runCommand(command, args, options) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let child;
     let stdout = "";
     let stderr = "";
@@ -6592,7 +6598,7 @@ function runCommand(command, args, options) {
       if (settled) return;
       settled = true;
       if (timer) clearTimeout(timer);
-      resolve5(result);
+      resolve6(result);
     };
     try {
       child = spawn2(command, args, {
@@ -6600,7 +6606,7 @@ function runCommand(command, args, options) {
         stdio: ["ignore", "pipe", "pipe"]
       });
     } catch (error2) {
-      resolve5({
+      resolve6({
         code: null,
         stdout,
         stderr: error2 instanceof Error ? error2.message : String(error2),
@@ -7127,7 +7133,7 @@ async function stopProcessAndWait(child, timeoutMs, sendTerm, sendKill) {
   if (child.exitCode !== null || child.signalCode !== null) {
     return { outcome: "exited", code: child.exitCode, signal: child.signalCode };
   }
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     let forced = false;
     let settled = false;
     const timer = setTimeout(() => {
@@ -7147,7 +7153,7 @@ async function stopProcessAndWait(child, timeoutMs, sendTerm, sendKill) {
       settled = true;
       clearTimeout(timer);
       child.removeListener("exit", onExit);
-      resolve5(result);
+      resolve6(result);
     };
     const fail = (error2) => {
       if (settled) return;
@@ -7744,6 +7750,176 @@ import WebSocket2 from "ws";
 
 // src/lib/tunnel/forwarding.ts
 import WebSocket from "ws";
+
+// src/lib/file-read.ts
+import { constants } from "node:fs";
+import { open as open3, realpath as realpath2, stat as stat2 } from "node:fs/promises";
+import { extname, isAbsolute as isAbsolute3, resolve as resolve4 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+
+// src/lib/path-validation.ts
+import { basename as basename2, dirname as dirname9, isAbsolute as isAbsolute2, join as join12, relative as relative2, resolve as resolve3, sep as sep2 } from "node:path";
+import { realpath } from "node:fs/promises";
+function expandAndValidatePath(requestedPath, homeDir) {
+  if (requestedPath.trim() === "" || requestedPath.includes("\0")) {
+    return null;
+  }
+  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join12(homeDir, requestedPath.slice(2)) : requestedPath;
+  if (expanded.split(/[/\\]/).includes("..") || !isAbsolute2(expanded)) {
+    return null;
+  }
+  const candidate = resolve3(expanded);
+  const name = basename2(candidate);
+  return name === "" || name === "." || name === ".." ? null : candidate;
+}
+async function resolveNearestExistingAncestor(directory) {
+  const missingSegments = [];
+  let current = directory;
+  for (; ; ) {
+    try {
+      return { existingAncestor: await realpath(current), missingSegments };
+    } catch (err) {
+      const parent = dirname9(current);
+      if (err.code !== "ENOENT" || parent === current) {
+        throw err;
+      }
+      missingSegments.unshift(basename2(current));
+      current = parent;
+    }
+  }
+}
+function isPathContained(directory, target) {
+  const rel = relative2(directory, target);
+  return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep2}`) && !isAbsolute2(rel);
+}
+
+// src/lib/file-read.ts
+var FILE_MIME_TYPES = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".mp4": "video/mp4",
+  ".mov": "video/quicktime"
+};
+async function readProjectFile(projectRoot, method, requestedPath, openFile = open3) {
+  if (method !== "GET") return refuse(405, "method_not_allowed");
+  if (!projectRoot || !isAbsolute3(projectRoot)) return refuse(503, "project_root_unavailable");
+  if (!requestedPath || requestedPath.length > 4096 || requestedPath.includes("\0")) {
+    return refuse(400, "invalid_path");
+  }
+  let lexicalRoot;
+  let realRoot;
+  try {
+    lexicalRoot = resolve4(projectRoot);
+    realRoot = await realpath2(lexicalRoot);
+  } catch (err) {
+    log("warn", "tunnel_file_read_root_unavailable", { ...errorFields(err) });
+    return refuse(503, "project_root_unavailable");
+  }
+  const decodedPath = decodeRequestedPath(requestedPath);
+  if (decodedPath.path === null) return refuse(400, "invalid_path", decodedPath.error);
+  const pathValue = decodedPath.path;
+  if (pathValue.split(/[/\\]/).includes("..")) return refuse(400, "invalid_path");
+  const absolutePath = pathValue === "~" || pathValue.startsWith("~/") ? expandAndValidatePath(pathValue, homedir6()) : expandAndValidatePath(
+    isAbsolute3(pathValue) ? pathValue : resolve4(lexicalRoot, pathValue),
+    homedir6()
+  );
+  if (!absolutePath) return refuse(400, "invalid_path");
+  let realTarget;
+  try {
+    realTarget = await realpath2(absolutePath);
+  } catch (err) {
+    if (err.code === "ENOENT") return refuse(404, "not_found");
+    log("warn", "tunnel_file_read_path_resolution_failed", { ...errorFields(err) });
+    return refuse(400, "unresolvable_path");
+  }
+  if (realTarget !== realRoot && !isPathContained(realRoot, realTarget)) {
+    return refuse(
+      403,
+      isPathContained(lexicalRoot, absolutePath) ? "symlink_outside_project" : "path_outside_project"
+    );
+  }
+  let fileStats;
+  try {
+    fileStats = await stat2(realTarget);
+  } catch (err) {
+    if (err.code === "ENOENT") return refuse(404, "not_found");
+    log("warn", "tunnel_file_read_stat_failed", { ...errorFields(err) });
+    return refuse(500, "read_failed");
+  }
+  if (fileStats.isDirectory()) return refuse(409, "is_directory");
+  if (!fileStats.isFile()) return refuse(422, "not_regular_file");
+  if (fileStats.size > TUNNEL_FILE_READ_MAX_BYTES) return refuse(413, "file_too_large");
+  const mimeType = FILE_MIME_TYPES[extname(realTarget).toLowerCase()];
+  if (!mimeType) return refuse(415, "unsupported_type");
+  let handle;
+  try {
+    handle = await openFile(realTarget, constants.O_RDONLY | constants.O_NOFOLLOW);
+    const openedStats = await handle.stat();
+    if (!openedStats.isFile()) return refuse(422, "not_regular_file");
+    if (openedStats.size > TUNNEL_FILE_READ_MAX_BYTES) return refuse(413, "file_too_large");
+    const bytes = Buffer.alloc(TUNNEL_FILE_READ_MAX_BYTES + 1);
+    let length = 0;
+    while (length < bytes.length) {
+      const { bytesRead } = await handle.read(bytes, length, bytes.length - length, null);
+      if (bytesRead === 0) break;
+      length += bytesRead;
+    }
+    if (length > TUNNEL_FILE_READ_MAX_BYTES) return refuse(413, "file_too_large");
+    const body = bytes.subarray(0, length);
+    return {
+      status: 200,
+      headers: {
+        "content-type": mimeType,
+        "content-length": String(body.length)
+      },
+      body
+    };
+  } catch (err) {
+    log("error", "tunnel_file_read_failed", { ...errorFields(err) });
+    return refuse(500, "read_failed");
+  } finally {
+    try {
+      await handle?.close();
+    } catch (err) {
+      log("warn", "tunnel_file_read_close_failed", { ...errorFields(err) });
+    }
+  }
+}
+function decodeRequestedPath(target) {
+  if (/^file:/i.test(target)) {
+    try {
+      const url = new URL(target);
+      if (url.protocol !== "file:" || url.host) return { path: null };
+      const rawPath = target.slice(target.indexOf(":") + 1).split(/[?#]/, 1)[0];
+      return { path: decodeURIComponent(rawPath) };
+    } catch (error2) {
+      return { path: null, error: error2 };
+    }
+  }
+  if (/^[a-z][a-z\d+.-]*:/i.test(target)) return { path: null };
+  return { path: target };
+}
+function refuse(status2, reason, error2) {
+  const body = Buffer.from(JSON.stringify({ reason }));
+  log("warn", "tunnel_file_read_refused", {
+    reason,
+    status: status2,
+    ...error2 === void 0 ? {} : errorFields(error2)
+  });
+  return {
+    status: status2,
+    headers: {
+      "content-type": "application/json",
+      "content-length": String(body.length)
+    },
+    body
+  };
+}
+
+// src/lib/tunnel/forwarding.ts
 var LOOPBACK_HOST = "127.0.0.1";
 var FLOW_PAUSE_MAX_MS = 9e4;
 var STRIP_REQ = /* @__PURE__ */ new Set([
@@ -7771,6 +7947,7 @@ var StreamForwarder = class {
   }
   inflight = /* @__PURE__ */ new Map();
   binaryFramesSupported = false;
+  projectRoot = null;
   /**
    * Handle an edge→agent frame. Unknown frame types are ignored.
    */
@@ -7819,8 +7996,8 @@ var StreamForwarder = class {
   pauseStream(sid, stream) {
     if (!stream.paused) {
       stream.paused = true;
-      stream.pausePromise = new Promise((resolve5) => {
-        stream.resume = resolve5;
+      stream.pausePromise = new Promise((resolve6) => {
+        stream.resume = resolve6;
       });
     }
     if (stream.pauseTimer !== null) clearTimeout(stream.pauseTimer);
@@ -7854,10 +8031,56 @@ var StreamForwarder = class {
       this.ws.send(JSON.stringify(frame));
     }
   }
+  async resolveProjectRoot() {
+    if (this.projectRoot !== null) return this.projectRoot;
+    if (!this.options.resolveProjectRoot) return null;
+    try {
+      this.projectRoot = (await this.options.resolveProjectRoot())?.trim() || null;
+      return this.projectRoot;
+    } catch (err) {
+      log("warn", "tunnel_file_read_root_resolution_failed", { ...errorFields(err) });
+      return null;
+    }
+  }
+  async handleFileRead(sid, method, path) {
+    const queryStart = path.indexOf("?");
+    const query = queryStart < 0 ? "" : path.slice(queryStart + 1);
+    const requestedPath = new URLSearchParams(query).get("path");
+    const projectRoot = method === "GET" ? await this.resolveProjectRoot() : null;
+    const result = await readProjectFile(projectRoot, method, requestedPath);
+    try {
+      this.send({ type: "head", sid, status: result.status, headers: result.headers });
+      for (let offset = 0; offset < result.body.length; offset += MAX_FRAME_BYTES) {
+        const chunk = result.body.subarray(offset, offset + MAX_FRAME_BYTES);
+        if (this.binaryFramesSupported && this.ws.readyState === WebSocket.OPEN) {
+          this.ws.send(encodeBinaryBodyFrame(BINARY_FRAME_RES_DATA, sid, chunk));
+        } else {
+          this.send({ type: "res_data", sid, b64: chunk.toString("base64") });
+        }
+      }
+      this.send({ type: "res_end", sid });
+    } catch (err) {
+      log("error", "tunnel_file_read_response_failed", { sid, ...errorFields(err) });
+    }
+  }
   async handleOpen(frame) {
     const { sid, method, path, headers, has_body } = frame;
     const correlationId = headers?.[CORRELATION_ID_HEADER];
     const startedAt = Date.now();
+    const pathName = stripQuery(path);
+    if (pathName === TUNNEL_FILE_READ_PATH) {
+      try {
+        await this.handleFileRead(sid, method, path);
+      } catch (err) {
+        log("error", "tunnel_file_read_handler_failed", { sid, ...errorFields(err) });
+        this.send({
+          type: "res_err",
+          sid,
+          message: "The runner could not read the requested file."
+        });
+      }
+      return;
+    }
     if (path !== TUNNEL_DRAIN_PING_PATH && path !== TUNNEL_USAGE_REARM_PING_PATH) {
       this.callbacks.onOpen?.(sid, method, path);
     }
@@ -7887,12 +8110,12 @@ var StreamForwarder = class {
     let endBody;
     if (has_body) {
       const chunks = [];
-      bodyPromise = new Promise((resolve5) => {
+      bodyPromise = new Promise((resolve6) => {
         pushBody = (buf) => {
           chunks.push(buf);
         };
         endBody = () => {
-          resolve5(Buffer.concat(chunks));
+          resolve6(Buffer.concat(chunks));
         };
       });
     }
@@ -8059,11 +8282,12 @@ function connectTunnel(options) {
     onInfo,
     onWarning,
     onDrainPing,
-    onUsageRearmPing
+    onUsageRearmPing,
+    resolveProjectRoot
   } = options;
   const tunnelUrl = getTunnelUrlConfig();
   const url = `${tunnelUrl}/tunnel/${agentId}/connect`;
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const ws = new WebSocket2(url, {
       headers: {
         Authorization: authHeader,
@@ -8078,7 +8302,10 @@ function connectTunnel(options) {
         onDrainPing: () => onDrainPing?.(),
         onUsageRearmPing: () => onUsageRearmPing?.()
       },
-      { openCodePassword }
+      {
+        openCodePassword,
+        ...resolveProjectRoot ? { resolveProjectRoot } : {}
+      }
     );
     const connectionTimeout = setTimeout(() => {
       ws.close();
@@ -8174,7 +8401,7 @@ function connectTunnel(options) {
           const connectedAgentId = message.agent_id ?? agentId;
           relayConnectionId = message.connection_id;
           onConnected?.(connectedAgentId, relayConnectionId);
-          resolve5({
+          resolve6({
             ws,
             close: () => ws.close(1e3, "CLI shutdown")
           });
@@ -8273,6 +8500,7 @@ var RunnerConnection = class _RunnerConnection {
           authHeader: this.opts.getAuthHeader(),
           port: this.opts.port,
           openCodePassword: this.opts.openCodePassword,
+          ...this.opts.resolveProjectRoot ? { resolveProjectRoot: this.opts.resolveProjectRoot } : {},
           onConnected: (agentId, relayConnectionId) => {
             const attempt = this.reconnectAttempt + 1;
             this.reconnectAttempt = 0;
@@ -8730,28 +8958,28 @@ function createSessionStoreHealth(options = {}) {
 }
 
 // src/lib/channels/driver.ts
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 
 // src/lib/runner-file-sync.ts
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 
 // src/lib/file-push.ts
 import { randomUUID } from "node:crypto";
-import { chmod, mkdir, open as open3, realpath, rename, unlink } from "node:fs/promises";
-import { basename as basename2, dirname as dirname9, isAbsolute as isAbsolute2, join as join12, relative as relative2, resolve as resolve3, sep as sep2 } from "node:path";
+import { chmod, mkdir, open as open4, realpath as realpath3, rename, unlink } from "node:fs/promises";
+import { basename as basename3, dirname as dirname10, isAbsolute as isAbsolute4, join as join13 } from "node:path";
 var FILE_MODE = 384;
 var DIRECTORY_MODE = 448;
 async function writePushedFile(request3) {
   const { requestedPath, content, allowedDirectories, allowedFiles, homeDir } = request3;
   const bytes = content.byteLength;
   if (allowedDirectories.length === 0 && allowedFiles.length === 0) {
-    return refuse("file_sync_disabled", "File sync is not enabled on this runner.", {
+    return refuse2("file_sync_disabled", "File sync is not enabled on this runner.", {
       path: requestedPath,
       bytes
     });
   }
   if (bytes > MAX_FILE_PUSH_BYTES) {
-    return refuse(
+    return refuse2(
       "file_too_large",
       `File is ${bytes} bytes; the limit is ${MAX_FILE_PUSH_BYTES}.`,
       {
@@ -8760,30 +8988,30 @@ async function writePushedFile(request3) {
       }
     );
   }
-  const candidate = expandAndValidate(requestedPath, homeDir);
+  const candidate = expandAndValidatePath(requestedPath, homeDir);
   if (candidate === null) {
-    return refuse("invalid_path", "The requested path is not a valid absolute file path.", {
+    return refuse2("invalid_path", "The requested path is not a valid absolute file path.", {
       path: requestedPath,
       bytes
     });
   }
   try {
     const { existingAncestor, missingSegments } = await resolveNearestExistingAncestor(
-      dirname9(candidate)
+      dirname10(candidate)
     );
-    const realTarget = join12(existingAncestor, ...missingSegments, basename2(candidate));
+    const realTarget = join13(existingAncestor, ...missingSegments, basename3(candidate));
     const allowedDirectory = await findContainingAllowedDirectory(allowedDirectories, realTarget) ?? await findMatchingAllowedFile(allowedFiles, realTarget);
     if (allowedDirectory === null) {
-      return refuse("path_not_allowed", "The runner does not allow writing to that location.", {
+      return refuse2("path_not_allowed", "The runner does not allow writing to that location.", {
         path: realTarget,
         bytes
       });
     }
     if (missingSegments.length > 0) {
       await createMissingDirectories(existingAncestor, missingSegments);
-      const realParent = await realpath(dirname9(realTarget));
-      if (realParent !== dirname9(realTarget) || !contains(allowedDirectory, realTarget)) {
-        return refuse("path_not_allowed", "The runner does not allow writing to that location.", {
+      const realParent = await realpath3(dirname10(realTarget));
+      if (realParent !== dirname10(realTarget) || !isPathContained(allowedDirectory, realTarget)) {
+        return refuse2("path_not_allowed", "The runner does not allow writing to that location.", {
           path: realTarget,
           bytes,
           reason: "parent_changed_after_create"
@@ -8795,7 +9023,7 @@ async function writePushedFile(request3) {
     return { ok: true, path: realTarget };
   } catch (err) {
     const errno = err.code ?? "UNKNOWN";
-    return refuse("write_failed", `The runner could not write the file (${errno}).`, {
+    return refuse2("write_failed", `The runner could not write the file (${errno}).`, {
       path: candidate,
       bytes,
       errno,
@@ -8803,45 +9031,14 @@ async function writePushedFile(request3) {
     });
   }
 }
-function expandAndValidate(requestedPath, homeDir) {
-  if (requestedPath.trim() === "" || requestedPath.includes("\0")) {
-    return null;
-  }
-  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join12(homeDir, requestedPath.slice(2)) : requestedPath;
-  if (expanded.split(/[/\\]/).includes("..")) {
-    return null;
-  }
-  if (!isAbsolute2(expanded)) {
-    return null;
-  }
-  const candidate = resolve3(expanded);
-  const name = basename2(candidate);
-  return name === "" || name === "." || name === ".." ? null : candidate;
-}
-async function resolveNearestExistingAncestor(directory) {
-  const missingSegments = [];
-  let current = directory;
-  for (; ; ) {
-    try {
-      return { existingAncestor: await realpath(current), missingSegments };
-    } catch (err) {
-      const parent = dirname9(current);
-      if (err.code !== "ENOENT" || parent === current) {
-        throw err;
-      }
-      missingSegments.unshift(basename2(current));
-      current = parent;
-    }
-  }
-}
 async function findContainingAllowedDirectory(allowedDirectories, realTarget) {
   for (const directory of allowedDirectories) {
-    if (!isAbsolute2(directory)) {
+    if (!isAbsolute4(directory)) {
       log("warn", "file_push_allowed_directory_skipped", { directory, reason: "not_absolute" });
       continue;
     }
     const realDirectory = await realpathCreatingIfMissing(directory);
-    if (realDirectory !== null && contains(realDirectory, realTarget)) {
+    if (realDirectory !== null && isPathContained(realDirectory, realTarget)) {
       return realDirectory;
     }
   }
@@ -8849,15 +9046,15 @@ async function findContainingAllowedDirectory(allowedDirectories, realTarget) {
 }
 async function findMatchingAllowedFile(allowedFiles, realTarget) {
   for (const entry of allowedFiles) {
-    if (!isAbsolute2(entry)) {
+    if (!isAbsolute4(entry)) {
       log("warn", "file_push_allowed_directory_skipped", {
         directory: entry,
         reason: "not_absolute_file"
       });
       continue;
     }
-    const realParent = await realpathCreatingIfMissing(dirname9(entry));
-    if (realParent !== null && join12(realParent, basename2(entry)) === realTarget) {
+    const realParent = await realpathCreatingIfMissing(dirname10(entry));
+    if (realParent !== null && join13(realParent, basename3(entry)) === realTarget) {
       return realParent;
     }
   }
@@ -8865,7 +9062,7 @@ async function findMatchingAllowedFile(allowedFiles, realTarget) {
 }
 async function realpathCreatingIfMissing(directory) {
   try {
-    return await realpath(directory);
+    return await realpath3(directory);
   } catch (err) {
     if (err.code !== "ENOENT") {
       log("warn", "file_push_allowed_directory_skipped", {
@@ -8879,7 +9076,7 @@ async function realpathCreatingIfMissing(directory) {
   try {
     await mkdir(directory, { recursive: true, mode: DIRECTORY_MODE });
     await chmod(directory, DIRECTORY_MODE);
-    return await realpath(directory);
+    return await realpath3(directory);
   } catch (err) {
     log("warn", "file_push_allowed_directory_skipped", {
       directory,
@@ -8889,23 +9086,19 @@ async function realpathCreatingIfMissing(directory) {
     return null;
   }
 }
-function contains(realDirectory, realTarget) {
-  const rel = relative2(realDirectory, realTarget);
-  return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep2}`) && !isAbsolute2(rel);
-}
 async function createMissingDirectories(existingAncestor, missingSegments) {
   let current = existingAncestor;
   for (const segment of missingSegments) {
-    current = join12(current, segment);
+    current = join13(current, segment);
     await mkdir(current, { recursive: true, mode: DIRECTORY_MODE });
     await chmod(current, DIRECTORY_MODE);
   }
 }
 async function writeAtomically(realTarget, content) {
-  const temporaryPath = join12(dirname9(realTarget), `.evident-push-${randomUUID()}.tmp`);
+  const temporaryPath = join13(dirname10(realTarget), `.evident-push-${randomUUID()}.tmp`);
   let handle;
   try {
-    handle = await open3(temporaryPath, "wx", FILE_MODE);
+    handle = await open4(temporaryPath, "wx", FILE_MODE);
     await handle.writeFile(content);
     await handle.chmod(FILE_MODE);
     await handle.close();
@@ -8931,7 +9124,7 @@ async function discardTemporaryFile(temporaryPath, handle) {
     }
   }
 }
-function refuse(code, message, fields) {
+function refuse2(code, message, fields) {
   log(code === "write_failed" ? "error" : "warn", "file_push_refused", { code, ...fields });
   return { ok: false, code, message };
 }
@@ -9032,12 +9225,12 @@ var NOT_APPLIED = {
   opencodeAuthApplied: false
 };
 function isClaudeCredentialPath(requestedPath, homeDir) {
-  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join13(homeDir, requestedPath.slice(2)) : requestedPath;
-  return expanded === join13(homeDir, ...CLAUDE_CREDENTIALS_SEGMENTS);
+  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join14(homeDir, requestedPath.slice(2)) : requestedPath;
+  return expanded === join14(homeDir, ...CLAUDE_CREDENTIALS_SEGMENTS);
 }
 function isOpenCodeAuthPath(requestedPath, homeDir) {
-  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join13(homeDir, requestedPath.slice(2)) : requestedPath;
-  return expanded === join13(homeDir, ...OPENCODE_AUTH_SEGMENTS);
+  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join14(homeDir, requestedPath.slice(2)) : requestedPath;
+  return expanded === join14(homeDir, ...OPENCODE_AUTH_SEGMENTS);
 }
 async function applyOne(options, file) {
   const label = `${file.id.slice(0, 8)} (${file.path})`;
@@ -9853,7 +10046,7 @@ var ChannelDriver = class _ChannelDriver {
     this.now = config.now ?? (() => Date.now());
     this.fileSyncDirectories = config.fileSyncDirectories ?? [];
     this.fileSyncExactFiles = config.fileSyncExactFiles ?? [];
-    this.homeDir = config.homeDir ?? homedir6();
+    this.homeDir = config.homeDir ?? homedir7();
     this.maxActiveSessions = config.maxActiveSessions;
     this.watcherStallMs = config.watcherStallMs ?? WATCHER_STALL_MS;
     this.wedgeWarningIntervalMs = config.wedgeWarningIntervalMs ?? WEDGE_WARNING_INTERVAL_MS;
@@ -9883,9 +10076,6 @@ var ChannelDriver = class _ChannelDriver {
   async isSessionOngoing(sessionId) {
     return this.isV2 ? isV2SessionOngoing(this.openCodeClient, sessionId) : isSessionOngoing(this.port, sessionId, this.openCodeClient);
   }
-  async getOpenCodeDirectory() {
-    return this.isV2 ? getOpenCodeDirectoryV2(this.openCodeClient) : getOpenCodeDirectory(this.port, this.openCodeClient);
-  }
   async createOpenCodeSession(directory) {
     return this.isV2 ? createV2Session(this.openCodeClient, directory) : createOpenCodeSession(this.port, directory, this.openCodeClient);
   }
@@ -11393,7 +11583,11 @@ var ChannelDriver = class _ChannelDriver {
    */
   async resolveOpenCodeDirectory() {
     if (this.opencodeDirectory !== void 0) return this.opencodeDirectory;
-    this.opencodeDirectory = await this.getOpenCodeDirectory();
+    this.opencodeDirectory = await resolveOpenCodeDirectoryForVersion(
+      this.openCodeClient.version,
+      this.port,
+      this.openCodeClient
+    );
     if (!this.opencodeDirectory) {
       this.log({
         level: "warn",
@@ -14241,14 +14435,14 @@ var ChannelDriver = class _ChannelDriver {
     const fetchChildWithoutBlocking = async (sessionId) => {
       const pending = fetchChildMessages(sessionId);
       let timer;
-      const timeout = new Promise((resolve5) => {
+      const timeout = new Promise((resolve6) => {
         timer = setTimeout(() => {
           this.log({
             level: "warn",
             message: `Best-effort subagent session fetch for message ${messageId.slice(0, 8)} and child session ${sessionId.slice(0, 8)} was slow \u2014 omitting invocation telemetry without delaying completion`,
             message_id: messageId
           });
-          resolve5(null);
+          resolve6(null);
         }, SUBAGENT_TELEMETRY_FETCH_TIMEOUT_MS);
       });
       try {
@@ -15533,7 +15727,7 @@ function commandError2(result) {
   return result.stderr.trim() || `process exited with code ${result.code ?? "null"}`;
 }
 var runCommand2 = (command, args, opts) => {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let child;
     let stdout = "";
     let stderr = "";
@@ -15543,7 +15737,7 @@ var runCommand2 = (command, args, opts) => {
       if (settled) return;
       settled = true;
       if (timer.handle) clearTimeout(timer.handle);
-      resolve5(result);
+      resolve6(result);
     };
     try {
       child = spawn5(command, args, { env: opts.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -15799,7 +15993,7 @@ async function configureGitHubAccess({ env, log: log3 }) {
 // src/lib/opencode/config-overlay.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { copyFileSync, existsSync as existsSync2, statSync as statSync6 } from "node:fs";
-import { isAbsolute as isAbsolute3, join as join14, resolve as resolve4 } from "node:path";
+import { isAbsolute as isAbsolute5, join as join15, resolve as resolve5 } from "node:path";
 function parseConfigContent(content) {
   if (!content?.trim()) return {};
   const parsed = JSON.parse(content);
@@ -15828,8 +16022,8 @@ function applyRunnerOpenCodeConfig({
     log3("runner OpenCode config is not configured; using the baked project config", "debug");
     return;
   }
-  const source = isAbsolute3(overlayPath) ? overlayPath : resolve4(cwd, overlayPath);
-  const target = isFile(join14(cwd, "opencode.jsonc")) ? "opencode.jsonc" : "opencode.json";
+  const source = isAbsolute5(overlayPath) ? overlayPath : resolve5(cwd, overlayPath);
+  const target = isFile(join15(cwd, "opencode.jsonc")) ? "opencode.jsonc" : "opencode.json";
   if (!isFile(source)) {
     log3(
       `RUNNER-OPENCODE-CONFIG-MISSING: ${source} is not a file; headless turns will wedge on the first external-directory permission prompt (#563)`,
@@ -15837,7 +16031,7 @@ function applyRunnerOpenCodeConfig({
     );
     return;
   }
-  copyFileSync(source, join14(cwd, target));
+  copyFileSync(source, join15(cwd, target));
   try {
     execFileSync2("git", ["-C", cwd, "update-index", "--skip-worktree", target], {
       stdio: "ignore"
@@ -15846,13 +16040,13 @@ function applyRunnerOpenCodeConfig({
     const detail = error2 instanceof Error ? error2.message : String(error2);
     log3(`could not mark ${target} skip-worktree: ${detail}; it may show as a local change`, "warn");
   }
-  log3(`Applied runner OpenCode config ${source} to ${join14(cwd, target)}`);
+  log3(`Applied runner OpenCode config ${source} to ${join15(cwd, target)}`);
 }
 
 // src/lib/opencode/runtime-provenance.ts
 import { readFileSync as readFileSync11, readdirSync } from "node:fs";
-import { homedir as homedir7 } from "node:os";
-import { join as join15 } from "node:path";
+import { homedir as homedir8 } from "node:os";
+import { join as join16 } from "node:path";
 var PACKAGE_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/i;
 var REGISTRY_SPEC = /^[a-z0-9.*+^~<>=|-]+$/i;
 function errorKind(error2) {
@@ -15919,8 +16113,8 @@ function parseJsonc(value) {
   }
   return JSON.parse(output);
 }
-function openCodeCacheRoot(env = process.env, homeDir = homedir7()) {
-  return join15(env.XDG_CACHE_HOME ?? join15(homeDir, ".cache"), "opencode");
+function openCodeCacheRoot(env = process.env, homeDir = homedir8()) {
+  return join16(env.XDG_CACHE_HOME ?? join16(homeDir, ".cache"), "opencode");
 }
 function readConfiguredPluginSpecs({
   cwd = process.cwd(),
@@ -15929,10 +16123,10 @@ function readConfiguredPluginSpecs({
   let config;
   try {
     try {
-      config = parseJsonc(readFileSync11(join15(cwd, "opencode.jsonc"), "utf8"));
+      config = parseJsonc(readFileSync11(join16(cwd, "opencode.jsonc"), "utf8"));
     } catch (error2) {
       if (!("code" in Object(error2)) || Object(error2).code !== "ENOENT") throw error2;
-      config = parseJsonc(readFileSync11(join15(cwd, "opencode.json"), "utf8"));
+      config = parseJsonc(readFileSync11(join16(cwd, "opencode.json"), "utf8"));
     }
   } catch (error2) {
     log3(`Could not read OpenCode plugin configuration: ${errorKind(error2)}`);
@@ -15957,10 +16151,10 @@ function readConfiguredPluginSpecs({
 function resolveInstalledPluginVersions({
   cacheRoot,
   env = process.env,
-  homeDir = homedir7(),
+  homeDir = homedir8(),
   log: log3
 }) {
-  const packagesRoot = join15(cacheRoot ?? openCodeCacheRoot(env, homeDir), "packages");
+  const packagesRoot = join16(cacheRoot ?? openCodeCacheRoot(env, homeDir), "packages");
   let directories;
   try {
     directories = readdirSync(packagesRoot, { withFileTypes: true });
@@ -15982,7 +16176,7 @@ function resolveInstalledPluginVersions({
     try {
       const packageJson = JSON.parse(
         readFileSync11(
-          join15(packagesRoot, directory.name, "node_modules", parsed.name, "package.json"),
+          join16(packagesRoot, directory.name, "node_modules", parsed.name, "package.json"),
           "utf8"
         )
       );
@@ -16017,14 +16211,14 @@ function errorMessage3(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
 function waitForSettlement(promise, timeoutMs) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let settled = false;
     const timer = setTimeout(() => finish(false), Math.max(0, timeoutMs));
     const finish = (value) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve5(value);
+      resolve6(value);
     };
     promise.then(
       () => finish(true),
@@ -16568,8 +16762,8 @@ function resolveFileSyncEntry(entry, homeDir, flagName, labels) {
   if (trimmed === "") {
     throw new Error(`${flagName} requires a ${labels.noun} path (got an empty value)`);
   }
-  const expanded = trimmed === "~" ? homeDir : trimmed.startsWith("~/") ? join16(homeDir, trimmed.slice(2)) : trimmed;
-  if (!isAbsolute4(expanded)) {
+  const expanded = trimmed === "~" ? homeDir : trimmed.startsWith("~/") ? join17(homeDir, trimmed.slice(2)) : trimmed;
+  if (!isAbsolute6(expanded)) {
     throw new Error(`${flagName} requires an absolute ${labels.noun} path; got "${entry}"`);
   }
   const normalized = resolvePath2(expanded);
@@ -16741,7 +16935,7 @@ function logActivity(state, entry) {
 }
 function reportSessionDbRecovery(state) {
   try {
-    const report = drainSessionDbRecoveryReport({ homeDir: homedir8(), env: process.env });
+    const report = drainSessionDbRecoveryReport({ homeDir: homedir9(), env: process.env });
     for (const record of report.records) {
       const activity = buildSessionDbRecoveryActivity(record);
       if (!activity) throw new Error("could not map session-DB recovery record");
@@ -16822,7 +17016,7 @@ async function importOpenCodeV2CredentialsForState(state) {
   }
   const result = await importOpenCodeV2Credentials({
     request: client.request,
-    homeDir: homedir8(),
+    homeDir: homedir9(),
     directory,
     guard: state.opencodeV2CredentialImportGuard,
     log: (message, level = "info") => logActivity(state, { type: "info", level, message })
@@ -16997,7 +17191,7 @@ async function adoptCredentialGeneration(state, generation, adoption, activeSess
       return;
     }
     if (attempts < CREDENTIAL_ADOPTION_PROBE_ATTEMPTS) {
-      await new Promise((resolve5) => setTimeout(resolve5, CREDENTIAL_ADOPTION_PROBE_INTERVAL_MS));
+      await new Promise((resolve6) => setTimeout(resolve6, CREDENTIAL_ADOPTION_PROBE_INTERVAL_MS));
     }
   }
   logCredentialAdoptionActivity(
@@ -17198,7 +17392,7 @@ async function driveChannels(state, driver) {
         );
       }
     }
-    await new Promise((resolve5) => setTimeout(resolve5, CHANNEL_POLL_INTERVAL_MS));
+    await new Promise((resolve6) => setTimeout(resolve6, CHANNEL_POLL_INTERVAL_MS));
     const cycleMs = performance.now() - cycleStartedAtMs;
     if (idleThisCycle) idleMs += cycleMs;
     if (unreachableThisCycle) unreachableMs += cycleMs;
@@ -17243,7 +17437,7 @@ function shouldWarnForReclaimSkip(reason) {
   return major > 22 || major === 22 && (minor > 13 || minor === 13 && patch >= 0);
 }
 function sessionDbPath() {
-  return join16(homedir8(), ".local", "share", "opencode", "opencode.db");
+  return join17(homedir9(), ".local", "share", "opencode", "opencode.db");
 }
 function logSessionCleanupActivity(state, phase, entry) {
   logActivity(state, {
@@ -17340,7 +17534,7 @@ function logSessionArchiveSummary(state, phase, summary) {
   }
 }
 async function drainSessionDeletionReports(state) {
-  const path = sessionDeletionReportPath(homedir8(), process.env);
+  const path = sessionDeletionReportPath(homedir9(), process.env);
   let delivered = 0;
   let failure = null;
   try {
@@ -17580,7 +17774,7 @@ async function runSweep(state, driver, config) {
     if (deletionRecords.length > 0) {
       try {
         const dropped = appendSessionDeletionRecords(
-          sessionDeletionReportPath(homedir8(), process.env),
+          sessionDeletionReportPath(homedir9(), process.env),
           deletionRecords
         );
         if (dropped > 0) {
@@ -17698,7 +17892,7 @@ function scheduleSessionCleanup(state, driver, options) {
   for (const warning2 of config.warnings) {
     logActivity(state, { type: "info", level: "warn", message: `Session cleanup: ${warning2}` });
   }
-  const dbBytes = statSessionDbBytes(homedir8());
+  const dbBytes = statSessionDbBytes(homedir9());
   void (async () => {
     const reclaimAvailability = dbBytes !== null && config.enabled ? await probeReclaimAvailability({ dbPath: sessionDbPath(), requiredBytes: dbBytes }) : null;
     if (reclaimAvailability !== null) {
@@ -17797,7 +17991,7 @@ async function runSessionArchiveBatch(state, phase, sessions, budgetMs, signal)
     return null;
   }
   const bindings = readSessionBindings(
-    sessionBindingLedgerPath(homedir8(), process.env),
+    sessionBindingLedgerPath(homedir9(), process.env),
     (message) => logSessionArchiveActivity(state, phase, {
       type: "info",
       level: "warn",
@@ -17884,8 +18078,8 @@ async function runSessionArchiveShutdownFlush(state, budgetMs) {
     let timeout;
     const settled = await Promise.race([
       previousRun.then(() => true),
-      new Promise((resolve5) => {
-        timeout = setTimeout(() => resolve5(false), budgetMs);
+      new Promise((resolve6) => {
+        timeout = setTimeout(() => resolve6(false), budgetMs);
       })
     ]);
     if (timeout) clearTimeout(timeout);
@@ -17920,7 +18114,7 @@ async function runSessionArchiveShutdownFlush(state, budgetMs) {
 function scheduleSessionArchive(state) {
   const config = state.sessionArchiveConfig;
   if (!config.enabled) return;
-  state.sessionArchiveWatermarkPath = sessionArchiveWatermarkPath(homedir8(), process.env);
+  state.sessionArchiveWatermarkPath = sessionArchiveWatermarkPath(homedir9(), process.env);
   state.sessionArchiveWatermarks = readWatermarks(
     state.sessionArchiveWatermarkPath,
     (message) => logSessionArchiveActivity(state, "startup", {
@@ -18124,7 +18318,7 @@ function scheduleResourceUsageReporting(state, options) {
     });
     return;
   }
-  const { collect, stop } = createResourceUsageCollector(homedir8());
+  const { collect, stop } = createResourceUsageCollector(homedir9());
   state.stopResourceUsageSampling = stop;
   let consecutiveFailures = 0;
   const tick = async () => {
@@ -18362,8 +18556,8 @@ async function beginGracefulShutdown(state, trigger) {
         return true;
       }
     );
-    const timedOut = new Promise((resolve5) => {
-      timer = setTimeout(() => resolve5(false), telemetryBudgetMs);
+    const timedOut = new Promise((resolve6) => {
+      timer = setTimeout(() => resolve6(false), telemetryBudgetMs);
     });
     if (!await Promise.race([flushed, timedOut])) {
       log2(state, `Telemetry flush exceeded ${telemetryBudgetMs}ms \u2014 exiting anyway`, "warn");
@@ -18381,8 +18575,8 @@ async function run(options) {
   let fileSyncExactFiles;
   try {
     logLevel = resolveLogLevel(options);
-    fileSyncDirectories = resolveFileSyncDirectories(options.enableFileSyncTo, homedir8());
-    fileSyncExactFiles = resolveFileSyncExactFiles(options.enableFileSyncToExactFile, homedir8());
+    fileSyncDirectories = resolveFileSyncDirectories(options.enableFileSyncTo, homedir9());
+    fileSyncExactFiles = resolveFileSyncExactFiles(options.enableFileSyncToExactFile, homedir9());
     if (options.restoreSessionDb && !options.sessionDbNoReplicateMarker) {
       throw new Error(
         "--restore-session-db requires --session-db-no-replicate-marker <path>; restore failures must block Litestream replication"
@@ -18692,7 +18886,7 @@ async function run(options) {
     state.credentialSync?.arm();
     const dependencyInstallDiagnosticReporter = createDependencyInstallDiagnosticReporter({
       context: {
-        homeDir: homedir8(),
+        homeDir: homedir9(),
         cwd: process.cwd(),
         microvmId: process.env.MICROVM_ID?.trim(),
         euid: process.getuid?.(),
@@ -18715,7 +18909,7 @@ async function run(options) {
       dependencyInstallDiagnosticReporter
     );
     const openCodeLogTail = tailOpenCodeLogFile(
-      resolveOpenCodeLogPath(homedir8(), process.env),
+      resolveOpenCodeLogPath(homedir9(), process.env),
       openCodeActivityForwarder
     );
     state.stopOpenCodeLogTail = () => {
@@ -18973,7 +19167,7 @@ async function run(options) {
         const provenance = checkSessionDbProvenance({
           dbPath: sessionDbPath(),
           currentVersion: state.opencodeVersion,
-          homeDir: homedir8(),
+          homeDir: homedir9(),
           env: process.env
         });
         if (provenance.anomaly) {
@@ -19157,7 +19351,7 @@ async function run(options) {
     }
     const tunnelSpinner = interactive && !state.json ? ora4("Connecting tunnel...").start() : null;
     const recordBinding = state.sessionArchiveConfig.enabled ? (conversationId, sessionId) => appendSessionBinding(
-      sessionBindingLedgerPath(homedir8(), process.env),
+      sessionBindingLedgerPath(homedir9(), process.env),
       {
         conversation_id: conversationId,
         opencode_session_id: sessionId,
@@ -19179,7 +19373,7 @@ async function run(options) {
       // `file_sync_disabled` on the ack, not silently ignored.
       fileSyncDirectories,
       fileSyncExactFiles,
-      homeDir: homedir8(),
+      homeDir: homedir9(),
       maxActiveSessions,
       log: (entry) => (
         // Thread the driver's real level straight through so `debug`/`warn`
@@ -19199,6 +19393,11 @@ async function run(options) {
       getAuthHeader: () => state.authHeader,
       port: state.port,
       openCodePassword: state.opencodePassword,
+      resolveProjectRoot: () => resolveOpenCodeDirectoryForVersion(
+        state.opencodeApiVersion,
+        state.port,
+        state.opencodeClient
+      ),
       isRunning: () => state.running,
       events: {
         onConnected: (agentId, isReconnect, transition) => {