@evident-ai/cli 3.4.1-dev.7393414 → 3.4.1-dev.7703679

package/dist/index.js

@@ -1138,6 +1138,37 @@ var TelemetryEventTypes = {
   RUNNER_ACTIVITY: "runner.activity"
 };
 
+// ../../packages/types/src/tunnel/binary-frame.ts
+var BINARY_FRAME_REQ_DATA = 1;
+var BINARY_FRAME_RES_DATA = 2;
+var textEncoder = new TextEncoder();
+var textDecoder = new TextDecoder();
+function encodeBinaryBodyFrame(type, sid, payload) {
+  const sidBytes = textEncoder.encode(sid);
+  if (sidBytes.length === 0 || sidBytes.length > 255) {
+    throw new RangeError("sid must contain between 1 and 255 UTF-8 bytes");
+  }
+  const frame = new Uint8Array(2 + sidBytes.length + payload.length);
+  frame[0] = type;
+  frame[1] = sidBytes.length;
+  frame.set(sidBytes, 2);
+  frame.set(payload, 2 + sidBytes.length);
+  return frame;
+}
+function decodeBinaryBodyFrame(bytes) {
+  if (bytes.length < 2) return null;
+  const type = bytes[0];
+  if (type !== BINARY_FRAME_REQ_DATA && type !== BINARY_FRAME_RES_DATA) return null;
+  const sidLen = bytes[1];
+  if (sidLen === 0 || bytes.length < 2 + sidLen) return null;
+  const payloadOffset = 2 + sidLen;
+  return {
+    type,
+    sid: textDecoder.decode(bytes.subarray(2, payloadOffset)),
+    payload: bytes.subarray(payloadOffset)
+  };
+}
+
 // ../../packages/types/src/tunnel/index.ts
 var MAX_FRAME_BYTES = 256 * 1024;
 var TUNNEL_DRAIN_PING_PATH = "/__evident/drain";
@@ -1178,11 +1209,11 @@ function stripQuery(url) {
 }
 
 // src/commands/run.ts
-import ora3 from "ora";
+import ora4 from "ora";
 import { select as select4 } from "@inquirer/prompts";
 
 // src/lib/telemetry.ts
-var CLI_VERSION = (true ? "3.0.0" : void 0) ?? process.env.npm_package_version ?? "unknown";
+var CLI_VERSION = (true ? "3.4.1-dev.7703679" : void 0) ?? process.env.npm_package_version ?? "unknown";
 function getCliVersion() {
   return CLI_VERSION;
 }
@@ -1656,6 +1687,11 @@ function isSessionDbRecoveryRecord(value) {
   );
 }
 
+// src/lib/opencode/auth.ts
+function buildOpenCodeBasicAuthHeader(password) {
+  return `Basic ${Buffer.from(["opencode", password].join(":")).toString("base64")}`;
+}
+
 // src/lib/opencode/health.ts
 async function checkOpenCodeHealth(port) {
   try {
@@ -1673,6 +1709,27 @@ async function checkOpenCodeHealth(port) {
     return { healthy: false, error: message };
   }
 }
+async function checkOpenCode2Health(port, password) {
+  try {
+    const response = await fetch(`http://127.0.0.1:${port}/global/health`, {
+      headers: {
+        Authorization: buildOpenCodeBasicAuthHeader(password)
+      },
+      signal: AbortSignal.timeout(2e3)
+    });
+    if (response.status === 401) {
+      return { healthy: false, authFailed: true, error: "HTTP 401" };
+    }
+    if (!response.ok) {
+      return { healthy: false, error: `HTTP ${response.status}` };
+    }
+    const data = await response.json().catch(() => ({}));
+    return { healthy: true, version: data.version };
+  } catch (error2) {
+    const message = error2 instanceof Error ? error2.message : "Unknown error";
+    return { healthy: false, error: message };
+  }
+}
 async function waitForOpenCodeHealth(port, timeoutMs = 3e4) {
   const startTime = Date.now();
   while (Date.now() - startTime < timeoutMs) {
@@ -1684,6 +1741,61 @@ async function waitForOpenCodeHealth(port, timeoutMs = 3e4) {
   }
   return { healthy: false, error: "Timeout waiting for OpenCode to be healthy" };
 }
+async function waitForOpenCode2Health(port, password, timeoutMs = 3e4) {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeoutMs) {
+    const health = await checkOpenCode2Health(port, password);
+    if (health.healthy || health.authFailed) {
+      return health;
+    }
+    await new Promise((resolve4) => setTimeout(resolve4, 1e3));
+  }
+  return { healthy: false, error: "Timeout waiting for OpenCode to be healthy" };
+}
+
+// src/lib/http-timeout.ts
+var REQUEST_TIMEOUT_MS = 6e4;
+function withRequestTimeout(fetchImpl, timeoutMs) {
+  return ((input, init) => fetchImpl(input, { ...init, signal: AbortSignal.timeout(timeoutMs) }));
+}
+
+// src/lib/opencode/client.ts
+function redactPassword(message, password) {
+  return message.replaceAll(password, "[redacted]");
+}
+function createOpenCodeClient(options) {
+  const password = options.password ?? null;
+  const fetchImpl = withRequestTimeout(options.fetchImpl ?? fetch, REQUEST_TIMEOUT_MS);
+  const baseUrl = `http://127.0.0.1:${options.port}`;
+  return {
+    port: options.port,
+    version: options.version,
+    password,
+    async request(path, init, requestOptions) {
+      const requestInit = options.version === "v2" && password !== null ? (() => {
+        const headers = new Headers(init?.headers);
+        headers.set("Authorization", buildOpenCodeBasicAuthHeader(password));
+        return { ...init, headers };
+      })() : init;
+      try {
+        const response = await fetchImpl(`${baseUrl}${path}`, requestInit);
+        if (!response.ok && !requestOptions?.allowStatuses?.includes(response.status)) {
+          const body = await response.text();
+          throw new Error(
+            `OpenCode request failed: HTTP ${response.status}${body ? `: ${body}` : ""}`
+          );
+        }
+        return response;
+      } catch (error2) {
+        if (options.version === "v2" && password !== null) {
+          const message = error2 instanceof Error ? error2.message : String(error2);
+          throw new Error(redactPassword(message, password));
+        }
+        throw error2;
+      }
+    }
+  };
+}
 
 // src/lib/opencode/session-db-boot.ts
 import { spawn as spawn2 } from "node:child_process";
@@ -2347,15 +2459,23 @@ function isQueueValidatedVersion(version2) {
   if (!version2) return false;
   return QUEUE_VALIDATED_OPENCODE_VERSIONS.includes(version2);
 }
-function buildOpenCodeVersionWarning(version2) {
-  if (isQueueValidatedVersion(version2)) return null;
-  const detected = version2 ? `v${version2}` : "unknown";
+function buildOpenCodeVersionWarning(version2, major) {
+  if (major === "v2") return null;
   const validated = QUEUE_VALIDATED_OPENCODE_VERSIONS.map((v) => `v${v}`).join(", ");
-  return `Warning: opencode ${detected} is not a queue-validated version (validated: ${validated}). Native message queuing \u2014 which channel (Slack) message handling relies on \u2014 is unverified on this version; queued/follow-up messages may behave unexpectedly. Continuing anyway. Bumping the validated set requires re-running the queue validation.`;
+  if (!version2) {
+    return `Warning: the running opencode's version could not be determined from its health response, so queue validation could not be checked (validated: ${validated}). Compare against \`opencode --version\`; continuing anyway.`;
+  }
+  if (isQueueValidatedVersion(version2)) return null;
+  return `Warning: opencode v${version2} is not a queue-validated version (validated: ${validated}). Native message queuing \u2014 which channel (Slack) message handling relies on \u2014 is unverified on this version; queued/follow-up messages may behave unexpectedly. Continuing anyway. Bumping the validated set requires re-running the queue validation.`;
+}
+function reportedOpenCodeVersion(input) {
+  if (!input.connected) return null;
+  return input.version || `${input.major}-unknown`;
 }
 
 // src/lib/opencode/process.ts
 import { execSync, spawn as spawn3 } from "child_process";
+import { randomBytes } from "node:crypto";
 
 // src/lib/process-stop.ts
 async function stopProcessAndWait(child, timeoutMs, sendTerm, sendKill) {
@@ -2414,6 +2534,17 @@ async function stopProcessAndWait(child, timeoutMs, sendTerm, sendKill) {
 // src/lib/opencode/process.ts
 var OPENCODE_PORT_RANGE = [4096, 4097, 4098, 4099, 4100];
 var VALID_OPENCODE_LOG_LEVELS = /* @__PURE__ */ new Set(["DEBUG", "INFO", "WARN", "ERROR"]);
+var VALID_OPENCODE2_LOG_LEVELS = /* @__PURE__ */ new Set([
+  "all",
+  "trace",
+  "debug",
+  "info",
+  "warn",
+  "warning",
+  "error",
+  "fatal",
+  "none"
+]);
 function resolveOpenCodeLogLevel(env) {
   const raw = env.OPENCODE_LOG_LEVEL;
   if (!raw) return "INFO";
@@ -2424,6 +2555,16 @@ function resolveOpenCodeLogLevel(env) {
   );
   return "INFO";
 }
+function resolveOpenCode2LogLevel(env) {
+  const raw = env.OPENCODE_LOG_LEVEL;
+  if (!raw) return "info";
+  const lower = raw.toLowerCase();
+  if (VALID_OPENCODE2_LOG_LEVELS.has(lower)) return lower;
+  console.warn(
+    `startOpenCode2: ignoring invalid OPENCODE_LOG_LEVEL "${raw}" (expected all|trace|debug|info|warn|warning|error|fatal|none) \u2014 using info`
+  );
+  return "info";
+}
 function getProcessCwd(pid) {
   const platform = process.platform;
   try {
@@ -2606,6 +2747,37 @@ async function startOpenCode(port, options = {}) {
   });
   return child;
 }
+async function startOpenCode2(port, options = {}) {
+  const password = randomBytes(24).toString("hex");
+  let command = "opencode2";
+  const logLevel = options.inheritStdio ? ["--log-level", resolveOpenCode2LogLevel(process.env)] : [];
+  let args = ["serve", "--port", port.toString(), "--hostname", "127.0.0.1", ...logLevel];
+  try {
+    execSync("which opencode2", { stdio: "ignore" });
+  } catch {
+    command = "npx";
+    args = [
+      "-y",
+      "-p",
+      "@opencode-ai/cli@beta",
+      "--",
+      "opencode2",
+      "serve",
+      "--port",
+      port.toString(),
+      "--hostname",
+      "127.0.0.1",
+      ...logLevel
+    ];
+  }
+  const child = spawn3(command, args, {
+    env: { ...process.env, OPENCODE_SERVER_PASSWORD: password },
+    detached: true,
+    stdio: options.inheritStdio ? "inherit" : "ignore",
+    cwd: process.cwd()
+  });
+  return { child, password };
+}
 function stopOpenCodeAndWait(opencodeProcess, timeoutMs) {
   const sendSignal = (signal) => {
     if (process.platform === "win32") {
@@ -2753,27 +2925,500 @@ function buildNoProviderWarning(hasProvider) {
   return "Warning: opencode has no authenticated model provider configured, so it won't be able to answer prompts. Run `opencode auth login` to set one up (see https://opencode.ai for details).";
 }
 
-// src/lib/http-timeout.ts
-var REQUEST_TIMEOUT_MS = 6e4;
-function withRequestTimeout(fetchImpl, timeoutMs) {
-  return ((input, init) => fetchImpl(input, { ...init, signal: AbortSignal.timeout(timeoutMs) }));
+// src/lib/opencode/session-v2.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function finiteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function adaptTime(value) {
+  if (!isRecord(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 } : {}
+  };
+}
+function adaptTokens(value) {
+  if (!isRecord(value)) return void 0;
+  const input = finiteNumber(value.input);
+  const output = finiteNumber(value.output);
+  const reasoning = finiteNumber(value.reasoning);
+  const cache = isRecord(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 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 (isRecord(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 adaptV2Message(value) {
+  if (!isRecord(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 (!isRecord(content) || typeof content.type !== "string") return null;
+    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 adaptFormTool(value) {
+  if (!isRecord(value) || typeof value.messageID !== "string" || typeof value.id !== "string") {
+    return void 0;
+  }
+  return { messageID: value.messageID, callID: value.id };
+}
+function adaptV2FormWire(value) {
+  if (!isRecord(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
+    return null;
+  }
+  return value;
+}
+function adaptV2FormField(value, header) {
+  if (!isRecord(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 (!isRecord(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 = isRecord(form.metadata) ? adaptFormTool(form.metadata.tool) : void 0;
+  return {
+    id: form.id,
+    sessionID: form.sessionID,
+    questions,
+    ...tool ? { tool } : {},
+    raw: form
+  };
+}
+function adaptV2FormList(value) {
+  if (!isRecord(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;
+  }
+  return void 0;
+}
+function adaptV2PermissionWire(value) {
+  if (!isRecord(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
+    return null;
+  }
+  if (typeof value.permission !== "string" && typeof value.action !== "string") return null;
+  return value;
+}
+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 = isRecord(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: isRecord(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 adaptV2PermissionList(value) {
+  if (!isRecord(value) || !Array.isArray(value.data)) return null;
+  return value.data.map(adaptV2Permission).filter((permission) => permission !== null);
+}
+function adaptV2Session(value) {
+  if (!isRecord(value) || typeof value.id !== "string" || value.id.length === 0) return null;
+  const time = isRecord(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 (!isRecord(value) || !Array.isArray(value.data) || !isRecord(value.cursor)) return null;
+  return {
+    data: value.data.map(adaptV2Session).filter((session) => session !== null),
+    cursor: value.cursor
+  };
+}
+function adaptV2Location(value) {
+  const candidates = [
+    value,
+    isRecord(value) ? value.data : void 0,
+    isRecord(value) ? value.location : void 0
+  ];
+  for (const candidate of candidates) {
+    if (!isRecord(candidate) || typeof candidate.directory !== "string") continue;
+    const directory = candidate.directory.trim();
+    if (directory) return directory;
+  }
+  return null;
+}
+function adaptV2Messages(value) {
+  if (!isRecord(value) || !Array.isArray(value.data)) return [];
+  return value.data.slice().reverse().map(adaptV2Message).filter((message) => message !== 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)}`
+    );
+  }
+}
+async function readData(client, path, init) {
+  const response = await client.request(path, init);
+  const body = await readJson(response);
+  if (!isRecord(body) || !("data" in body)) {
+    throw new Error(`OpenCode V2 response for ${path} was missing its data envelope`);
+  }
+  return body.data;
+}
+var OpenCodeV2PromptAckError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OpenCodeV2PromptAckError";
+  }
+};
+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;
+  }
+}
+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 (!isRecord(data) || typeof data.id !== "string" || data.id.length === 0) {
+    throw new Error("OpenCode V2 create session response was missing data.id");
+  }
+  return data.id;
+}
+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) {
+  const path = cursor ? `/api/session?cursor=${encodeURIComponent(cursor)}` : "/api/session";
+  try {
+    return adaptV2SessionList(await readJson(await client.request(path)));
+  } catch (error2) {
+    console.error(
+      `[listV2SessionPage] GET ${path} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return null;
+  }
+}
+async function listV2Sessions(client) {
+  const sessions = [];
+  const seenCursors = /* @__PURE__ */ new Set();
+  let cursor;
+  let hasNextPage = true;
+  try {
+    while (hasNextPage) {
+      const page = await listV2SessionPage(client, cursor);
+      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 sessions;
+  } catch (error2) {
+    console.error(
+      `[listV2Sessions] session pagination failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return null;
+  }
+}
+async function deleteV2Session(client, sessionId) {
+  try {
+    await client.request(`/api/session/${encodeURIComponent(sessionId)}`, { method: "DELETE" });
+    return true;
+  } catch (error2) {
+    console.error(
+      `[deleteV2Session] DELETE /api/session/${sessionId} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return false;
+  }
+}
+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) {
+  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 = isRecord(body) && "data" in body ? body.data : void 0;
+  if (!isRecord(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 (!isRecord(body) || !Array.isArray(body.data) || !isRecord(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 getV2ActiveSessions(client) {
+  try {
+    const body = await readJson(await client.request("/api/session/active"));
+    if (!isRecord(body) || !isRecord(body.data)) return null;
+    return body.data;
+  } catch (error2) {
+    console.error(
+      `[getV2ActiveSessions] GET /api/session/active failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    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 sessionErrorReason(value) {
+  if (typeof value === "string" && value.trim()) return value.trim().slice(0, 500);
+  if (isRecord(value)) {
+    const data = isRecord(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 adaptV2SessionErrorEvent(value) {
+  let parsed = value;
+  if (typeof value === "string") {
+    try {
+      parsed = JSON.parse(value);
+    } catch (error2) {
+      void error2;
+      return null;
+    }
+  }
+  if (!isRecord(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(isRecord);
+  for (const event of candidates) {
+    if (event.type !== "session.error") continue;
+    const properties = [event.properties, event.data, event].find(isRecord);
+    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}` };
+    }
+    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);
+    }
+  } 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);
+  }
 }
 
 // src/lib/opencode/session.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 requestWithClient(port, client, path, init, options) {
+  return client ? client.request(path, init, options) : timedFetch(`${opencodeBase(port)}${path}`, init);
+}
 function opencodeBase(port) {
   return `http://127.0.0.1:${port}`;
 }
-async function getOpenCodeDirectory(port) {
+async function getOpenCodeDirectory(port, client) {
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/path`);
+    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 {
+  } catch (error2) {
+    console.error(
+      `[getOpenCodeDirectory] GET /path failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
     return null;
   }
 }
@@ -2817,16 +3462,48 @@ function isAssistantInFlight(m) {
   if (completedOf(m) == null) return true;
   return finishOf(m) === "tool-calls";
 }
-async function getSessionMessages(port, sessionId) {
+async function getSessionMessages(port, sessionId, client) {
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/session/${sessionId}/message`);
+    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 {
+  } catch (error2) {
+    console.error(
+      `[getSessionMessages] GET /session/${sessionId}/message failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
     return 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 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 isSessionActivelyGenerating(messages) {
   if (!messages || messages.length === 0) return false;
   const last = messages[messages.length - 1];
@@ -2847,27 +3524,37 @@ function sessionLastActivityMs(session) {
   }
   return null;
 }
-async function listSessions(port) {
+async function listSessions(port, client) {
+  if (client?.version === "v2") return listV2Sessions(client);
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/session`);
+    const res = await requestWithClient(port, client, "/session");
     if (!res.ok) return null;
     const body = await res.json();
     return Array.isArray(body) ? body : null;
-  } catch {
+  } catch (error2) {
+    console.error(
+      `[listSessions] GET /session failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
     return null;
   }
 }
-async function deleteSession(port, id) {
+async function deleteSession(port, id, client) {
+  if (client?.version === "v2") return deleteV2Session(client, id);
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/session/${id}`, { method: "DELETE" });
+    const res = await requestWithClient(port, client, `/session/${id}`, { method: "DELETE" });
     return res.status >= 200 && res.status < 300;
-  } catch {
+  } catch (error2) {
+    console.error(
+      `[deleteSession] DELETE /session/${id} failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
     return false;
   }
 }
-async function sessionExists(port, id) {
+async function sessionExists(port, id, client) {
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/session/${id}`);
+    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;
@@ -2875,9 +3562,22 @@ async function sessionExists(port, id) {
     return null;
   }
 }
-async function getSessionStatuses(port) {
+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;
+  }
+}
+async function getSessionStatuses(port, client) {
+  if (client?.version === "v2") return null;
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/session/status`);
+    const res = await requestWithClient(port, client, "/session/status");
     if (!res.ok) {
       console.error(
         `[getSessionStatuses] GET /session/status returned HTTP ${res.status} (port ${port})`
@@ -2899,22 +3599,28 @@ async function getSessionStatuses(port) {
     return null;
   }
 }
-async function isSessionOngoing(port, id) {
-  const map = await getSessionStatuses(port);
+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) {
-  const url = new URL(`${opencodeBase(port)}/session`);
-  if (directory && directory.trim()) {
-    url.searchParams.set("directory", directory.trim());
-  }
-  const response = await timedFetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({})
-  });
+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}` : ""}`);
@@ -2922,10 +3628,16 @@ async function createOpenCodeSession(port, directory) {
   const data = await response.json();
   return data.id;
 }
-async function getModelAttachmentCapability(port, model) {
+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 timedFetch(`${opencodeBase(port)}/config/providers`);
+    const res = await requestWithClient(port, client, "/config/providers");
     if (!res.ok) {
       console.error(
         `[getModelAttachmentCapability] GET /config/providers returned HTTP ${res.status} (port ${port})`
@@ -3045,19 +3757,43 @@ function applyModelOptions(body, options) {
   }
   if (variant) body.variant = variant;
 }
+async function listOpenCodeQuestions(port, client) {
+  try {
+    const response = await requestWithClient(port, client, "/question");
+    const body = await response.json();
+    return Array.isArray(body) ? body : null;
+  } catch (error2) {
+    console.error(
+      `[listOpenCodeQuestions] GET /question failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    );
+    return null;
+  }
+}
+async function listOpenCodePermissions(port, client) {
+  try {
+    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;
+  }
+}
 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("");
 }
-async function sendPromptAsync(port, sessionId, content, options, attachments) {
-  const before = await getSessionMessages(port, sessionId);
+async function sendPromptAsync(port, sessionId, content, options, attachments, client) {
+  const before = await getSessionMessages(port, sessionId, client);
   const knownUserIds = new Set(
     (before ?? []).filter((m) => roleOf(m) === "user").map((m) => idOf(m)).filter((id) => typeof id === "string")
   );
   const parts = [{ type: "text", text: content }];
   let pendingOutcomes = null;
   if (attachments && attachments.inputs.length > 0) {
-    const capable = await getModelAttachmentCapability(port, options?.model);
+    const capable = await getModelAttachmentCapability(port, options?.model, client);
     const {
       parts: fileParts,
       outcomes,
@@ -3070,11 +3806,17 @@ async function sendPromptAsync(port, sessionId, content, options, attachments) {
     parts
   };
   applyModelOptions(body, options);
-  const res = await timedFetch(`${opencodeBase(port)}/session/${sessionId}/prompt_async`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body)
-  });
+  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);
@@ -3085,7 +3827,7 @@ async function sendPromptAsync(port, sessionId, content, options, attachments) {
   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);
+    const after = await getSessionMessages(port, sessionId, client);
     if (after) {
       let best = null;
       for (const m of after) {
@@ -3188,7 +3930,7 @@ function collectSubagentSessions(messages, userMessageId) {
   }
   return refs;
 }
-function finiteNumber(value) {
+function finiteNumber2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 function taskCallModel(value) {
@@ -3217,8 +3959,8 @@ function collectTaskCalls(messages, userMessageId) {
         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)
+        timeStart: finiteNumber2(part.state.time?.start),
+        timeEnd: finiteNumber2(part.state.time?.end)
       });
     }
   }
@@ -3233,7 +3975,7 @@ function attributeTaskCallUsage(messages, windows) {
   const unattributed = [];
   for (const message of messages ?? []) {
     if (roleOf(message) !== "assistant") continue;
-    const created = finiteNumber(createdOf(message));
+    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)
     );
@@ -3472,11 +4214,53 @@ function hasLaterSiblingTurnStarted(messages, userMessageId, siblingUserMessageI
       hasStartedLaterUser = true;
     }
   }
-  return hasLaterUser && hasStartedLaterUser;
-}
-async function hasAnyConfiguredProvider(port) {
+  return hasLaterUser && hasStartedLaterUser;
+}
+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 path = `/api/integration?location%5Bdirectory%5D=${encodeURIComponent(directory)}`;
+    try {
+      const res = await client.request(path);
+      if (!res.ok) {
+        console.error(
+          `[hasAnyConfiguredProvider] GET ${path} returned HTTP ${res.status} (port ${port})`
+        );
+        return null;
+      }
+      const body = await res.json();
+      if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
+        console.error(
+          `[hasAnyConfiguredProvider] GET ${path} body had no integration data array (port ${port})`
+        );
+        return null;
+      }
+      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 ${path} body contained an invalid integration (port ${port})`
+          );
+          return null;
+        }
+      }
+      return body.data.some(
+        (integration) => Array.isArray(integration.connections) && integration.connections.length > 0
+      );
+    } catch (error2) {
+      console.error(
+        `[hasAnyConfiguredProvider] GET ${path} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
+      );
+      return null;
+    }
+  }
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/config/providers`);
+    const res = await requestWithClient(port, client, "/config/providers");
     if (!res.ok) {
       console.error(
         `[hasAnyConfiguredProvider] GET /config/providers returned HTTP ${res.status} (port ${port})`
@@ -3505,7 +4289,7 @@ async function hasAnyConfiguredProvider(port) {
     return null;
   }
 }
-function sessionErrorReason(error2) {
+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;
@@ -3535,16 +4319,20 @@ function parseSessionErrorFrame(data) {
   if (typeof sessionId !== "string" || sessionId.length === 0) return null;
   return {
     sessionId,
-    reason: sessionErrorReason(propertiesRecord.error)
+    reason: sessionErrorReason2(propertiesRecord.error)
   };
 }
-async function readSessionErrorStream(port, options) {
+async function readSessionErrorStream(port, options, client) {
+  if (client?.version === "v2") return readV2SessionErrorStream(client, options);
   let reader = null;
   try {
-    const response = await fetch(`${opencodeBase(port)}/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}` };
     }
@@ -3575,9 +4363,10 @@ async function readSessionErrorStream(port, options) {
     if (reader) void reader.cancel().catch(() => void 0);
   }
 }
-async function reloadProviderCache(port) {
+async function reloadProviderCache(port, client) {
+  if (client?.version === "v2") return;
   try {
-    const res = await timedFetch(`${opencodeBase(port)}/config`, {
+    const res = await requestWithClient(port, client, "/config", {
       method: "PATCH",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({})
@@ -3955,12 +4744,14 @@ var STRIP_RES = /* @__PURE__ */ new Set([
   "content-length"
 ]);
 var StreamForwarder = class {
-  constructor(ws, port, callbacks = {}) {
+  constructor(ws, port, callbacks = {}, options = {}) {
     this.ws = ws;
     this.port = port;
     this.callbacks = callbacks;
+    this.options = options;
   }
   inflight = /* @__PURE__ */ new Map();
+  binaryFramesSupported = false;
   /**
    * Handle an edge→agent frame. Unknown frame types are ignored.
    */
@@ -3980,6 +4771,12 @@ var StreamForwarder = class {
         break;
     }
   }
+  handleBinaryBodyFrame(sid, payload) {
+    this.inflight.get(sid)?.pushBody?.(payload);
+  }
+  setBinaryFramesSupported(supported) {
+    this.binaryFramesSupported = supported;
+  }
   /**
    * Abort every in-flight stream (e.g. on WebSocket close).
    */
@@ -4042,7 +4839,15 @@ var StreamForwarder = class {
     }
     const fwdHeaders = {};
     for (const [k, v] of Object.entries(headers ?? {})) {
-      if (!STRIP_REQ.has(k.toLowerCase())) fwdHeaders[k] = v;
+      const lower = k.toLowerCase();
+      if (STRIP_REQ.has(lower)) continue;
+      if (this.options.openCodePassword !== void 0 && this.options.openCodePassword !== null) {
+        if (lower === "authorization") continue;
+      }
+      fwdHeaders[k] = v;
+    }
+    if (this.options.openCodePassword !== void 0 && this.options.openCodePassword !== null) {
+      fwdHeaders.Authorization = buildOpenCodeBasicAuthHeader(this.options.openCodePassword);
     }
     this.inflight.set(sid, { pushBody, endBody, abort: () => ac.abort() });
     const body = bodyPromise ? await bodyPromise : void 0;
@@ -4089,7 +4894,13 @@ var StreamForwarder = class {
           const chunk = Buffer.from(value);
           for (let i = 0; i < chunk.length; i += MAX_FRAME_BYTES) {
             const slice = chunk.subarray(i, i + MAX_FRAME_BYTES);
-            this.send({ type: "res_data", sid, b64: slice.toString("base64") });
+            if (this.binaryFramesSupported) {
+              if (this.ws.readyState === WebSocket.OPEN) {
+                this.ws.send(encodeBinaryBodyFrame(BINARY_FRAME_RES_DATA, sid, slice));
+              }
+            } else {
+              this.send({ type: "res_data", sid, b64: slice.toString("base64") });
+            }
           }
         }
       }
@@ -4106,6 +4917,11 @@ var StreamForwarder = class {
 
 // src/lib/tunnel/connection.ts
 var FAILURE_REASON_HEADER_LC = FORWARD_FAILURE_REASON_HEADER.toLowerCase();
+function toUint8Array(data) {
+  if (Array.isArray(data)) return Buffer.concat(data);
+  if (data instanceof ArrayBuffer) return new Uint8Array(data);
+  return data;
+}
 var TunnelUpgradeRejectedError = class extends Error {
   constructor(message, reason) {
     super(message);
@@ -4155,6 +4971,7 @@ function connectTunnel(options) {
     agentId,
     authHeader,
     port,
+    openCodePassword,
     onConnected,
     onDisconnected,
     onError,
@@ -4169,14 +4986,20 @@ function connectTunnel(options) {
   return new Promise((resolve4, reject) => {
     const ws = new WebSocket2(url, {
       headers: {
-        Authorization: authHeader
+        Authorization: authHeader,
+        "X-Evident-Tunnel-Binary-Frames": "1"
       }
     });
-    const forwarder = new StreamForwarder(ws, port, {
-      onHead: () => onResponse?.(),
-      onDrainPing: () => onDrainPing?.(),
-      onUsageRearmPing: () => onUsageRearmPing?.()
-    });
+    const forwarder = new StreamForwarder(
+      ws,
+      port,
+      {
+        onHead: () => onResponse?.(),
+        onDrainPing: () => onDrainPing?.(),
+        onUsageRearmPing: () => onUsageRearmPing?.()
+      },
+      { openCodePassword }
+    );
     const connectionTimeout = setTimeout(() => {
       ws.close();
       reject(new Error("Connection timeout"));
@@ -4213,7 +5036,25 @@ function connectTunnel(options) {
     ws.on("open", () => {
       onInfo?.("WebSocket connection established");
     });
-    ws.on("message", (data) => {
+    ws.on("message", (data, isBinary) => {
+      if (isBinary) {
+        try {
+          const frame = decodeBinaryBodyFrame(toUint8Array(data));
+          if (frame === null) {
+            onError?.("Failed to handle binary message: invalid frame");
+            return;
+          }
+          if (frame.type !== BINARY_FRAME_REQ_DATA) {
+            onError?.("Failed to handle binary message: unexpected frame type");
+            return;
+          }
+          forwarder.handleBinaryBodyFrame(frame.sid, frame.payload);
+        } catch (error2) {
+          const errorMessage3 = error2 instanceof Error ? error2.message : "Unknown error";
+          onError?.(`Failed to handle binary message: ${errorMessage3}`);
+        }
+        return;
+      }
       let message;
       try {
         message = JSON.parse(data.toString());
@@ -4229,6 +5070,7 @@ function connectTunnel(options) {
       switch (message.type) {
         case "connected": {
           clearTimeout(connectionTimeout);
+          forwarder.setBinaryFramesSupported(message.binary_frames === true);
           const connectedAgentId = message.agent_id ?? agentId;
           onConnected?.(connectedAgentId);
           resolve4({
@@ -4319,6 +5161,7 @@ var RunnerConnection = class {
           agentId: this.resolvedAgentId,
           authHeader: this.opts.getAuthHeader(),
           port: this.opts.port,
+          openCodePassword: this.opts.openCodePassword,
           onConnected: (agentId) => {
             this.reconnectAttempt = 0;
             this.reconnecting = false;
@@ -4499,33 +5342,73 @@ function parseCodexUsageHeaders(headers) {
 function normalizeProbeModel(model) {
   return model.endsWith("-fast") ? model.slice(0, -"-fast".length) : model;
 }
-async function resolveProbeModels(port) {
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function unsupportedProbeModels(reason, port) {
+  console.error(`[resolveProbeModels] ${reason} (port ${port})`);
+  return { status: "unsupported", reason };
+}
+async function resolveV1ProbeModels(client, port) {
   try {
-    const res = await withRequestTimeout(
-      fetch,
-      REQUEST_TIMEOUT_MS
-    )(`${opencodeBase(port)}/config/providers`);
-    if (!res.ok) {
-      console.error(
-        `[resolveProbeModels] GET /config/providers returned HTTP ${res.status} (port ${port})`
-      );
-      return [];
+    const response = await client.request("/config/providers");
+    const body = await response.json();
+    if (!isRecord2(body) || !Array.isArray(body.providers)) {
+      return unsupportedProbeModels("V1 provider response did not contain a providers array", port);
     }
-    const body = await res.json();
-    const provider = body?.providers?.find((candidate) => candidate?.id === "openai");
-    if (!provider || !provider.models || typeof provider.models !== "object") return [];
+    const provider = body.providers.find(
+      (candidate) => isRecord2(candidate) && candidate.id === "openai"
+    );
+    if (!provider || !isRecord2(provider.models)) return { status: "supported", models: [] };
+    const defaults2 = isRecord2(body.default) ? body.default : void 0;
     const candidates = [
-      ...typeof body?.default?.openai === "string" ? [body.default.openai] : [],
+      ...typeof defaults2?.openai === "string" ? [defaults2.openai] : [],
       ...Object.keys(provider.models)
     ].map(normalizeProbeModel);
-    return [...new Set(candidates)].slice(0, 4);
+    return { status: "supported", models: [...new Set(candidates)].slice(0, 4) };
   } catch (err) {
-    console.error(
-      `[resolveProbeModels] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
+    return unsupportedProbeModels(
+      `V1 GET /config/providers failed: ${err instanceof Error ? err.message : String(err)}`,
+      port
+    );
+  }
+}
+async function resolveV2ProbeModels(client, port) {
+  const directory = await getOpenCodeDirectoryV2(client);
+  if (!directory) {
+    return unsupportedProbeModels("V2 working directory could not be verified", port);
+  }
+  const path = `/api/provider?location%5Bdirectory%5D=${encodeURIComponent(directory)}`;
+  try {
+    const response = await client.request(path);
+    const body = await response.json();
+    if (!isRecord2(body) || !Array.isArray(body.data)) {
+      return unsupportedProbeModels(`V2 GET ${path} did not contain a provider data array`, port);
+    }
+    const provider = body.data.find(
+      (candidate) => isRecord2(candidate) && candidate.id === "openai"
+    );
+    if (!provider) return { status: "supported", models: [] };
+    if (!isRecord2(provider.models)) {
+      return unsupportedProbeModels(
+        "V2 provider response has no safe OpenAI model catalogue",
+        port
+      );
+    }
+    return {
+      status: "supported",
+      models: [...new Set(Object.keys(provider.models).map(normalizeProbeModel))].slice(0, 4)
+    };
+  } catch (err) {
+    return unsupportedProbeModels(
+      `V2 GET ${path} failed: ${err instanceof Error ? err.message : String(err)}`,
+      port
     );
-    return [];
   }
 }
+async function resolveProbeModels(port, client = createOpenCodeClient({ port, version: "v1" })) {
+  return client.version === "v2" ? resolveV2ProbeModels(client, port) : resolveV1ProbeModels(client, port);
+}
 function hasPrimaryHeaders(headers) {
   return [
     "x-codex-primary-used-percent",
@@ -4533,7 +5416,7 @@ function hasPrimaryHeaders(headers) {
     "x-codex-primary-reset-at"
   ].some((name) => headers.has(name));
 }
-async function getOpenAiUsage(port) {
+async function getOpenAiUsage(port, client) {
   const credentials2 = readOpenCodeChatGptCredentials();
   if (!credentials2) {
     throw new OpenAiUsageError(
@@ -4548,12 +5431,16 @@ async function getOpenAiUsage(port) {
     );
   }
   const subscription = parseChatGptIdentity(credentials2.accessToken);
-  const models = await resolveProbeModels(port);
-  if (models.length === 0) {
-    throw new OpenAiUsageError("No supported OpenAI probe model is available.", "no_probe_model");
+  const lookup = await resolveProbeModels(port, client);
+  if (lookup.status === "unsupported" || lookup.models.length === 0) {
+    const detail = lookup.status === "unsupported" ? ` ${lookup.reason}.` : "";
+    throw new OpenAiUsageError(
+      `No supported OpenAI probe model is available.${detail}`,
+      "no_probe_model"
+    );
   }
   let lastStatus;
-  for (const model of models) {
+  for (const model of lookup.models) {
     let res;
     try {
       res = await withRequestTimeout(fetch, REQUEST_TIMEOUT_MS)(CODEX_RESPONSES_URL, {
@@ -5372,6 +6259,7 @@ var ChannelDriver = class _ChannelDriver {
   maxActiveSessions;
   watcherStallMs;
   wedgeWarningIntervalMs;
+  openCodeClient;
   /** Cache of conversationId → opencode sessionId. */
   sessions = /* @__PURE__ */ new Map();
   /**
@@ -5480,20 +6368,26 @@ var ChannelDriver = class _ChannelDriver {
    */
   readopted = /* @__PURE__ */ new Set();
   /**
-   * "Don't re-DISPATCH / re-attach this orphan again" (Bug 2/5). Set when a
-   * re-adopted running/orphan row's watcher hit its `processed_at`-anchored
-   * deadline (or an orphan whose window already elapsed): the still-`processing`
-   * server row would otherwise be re-adopted (and re-dispatched) on EVERY ~2s
-   * drain until the 15-min cron resets it — spamming new turns.
-   *
-   * CRITICAL (Bugbot #202): this suppresses ONLY the dispatch/re-attach paths, it
-   * does NOT suppress DONE delivery. A row parked here whose reply later COMPLETES
-   * in opencode must still be delivered via `markDone` on the next drain — so
-   * `readoptOne` computes `state` FIRST and this set is checked only on the
-   * non-done path. It is cleared once the row leaves the processing list (cron
-   * reset → it drains normally as `pending`), so it can never leak.
+   * Readopt give-up fence. Set when recovery declines to start or continue a turn
+   * for a row that is still `processing`, so the next drain does not re-dispatch or
+   * re-attach it before the cron safety net acts. It suppresses only non-done
+   * recovery paths; DONE delivery still runs. Clear it when
+   * `!stillProcessing.has(id)`, because leaving `processing` hands the row back to
+   * normal processing.
    */
   dontRedispatch = /* @__PURE__ */ new Set();
+  /**
+   * Untrackable-ack fence. Stores the report error so a failed terminal report can
+   * be retried without posting the accepted prompt again. Keep it fenced while the
+   * row is `processing` or `pending`; clear it only when absent from both lists.
+   */
+  untrackableAck = /* @__PURE__ */ new Map();
+  /** Messages whose untrackable-ack failure signal was emitted while fenced. */
+  untrackableAckSignalled = /* @__PURE__ */ new Set();
+  /** Messages whose first untrackable-ack fence warning was already logged. */
+  untrackableAckWarned = /* @__PURE__ */ new Set();
+  /** Pending rows seen in the current drain, used to retain terminal dispatch fences. */
+  pendingMessageIds = /* @__PURE__ */ new Set();
   /**
    * "markDone for this row is TERMINALLY undeliverable" (Bug 4). Set ONLY when a
    * re-adopted DONE row's `markDone` returned a terminal 4xx (a status that will
@@ -5616,7 +6510,8 @@ var ChannelDriver = class _ChannelDriver {
    */
   attachmentsSkippedSignalled = /* @__PURE__ */ new Set();
   /**
-   * Cache of the opencode root directory (from `GET /path`). Resolved lazily on
+   * Cache of the opencode root directory from the selected client's location lookup.
+   * Resolved lazily on
    * first session creation so drain-created sessions are rooted at the project
    * directory and thus visible in `opencode web`'s session list. `undefined` =
    * not yet resolved; `null` = resolved-but-unavailable (don't keep retrying).
@@ -5710,6 +6605,11 @@ var ChannelDriver = class _ChannelDriver {
       config.fetchImpl ?? fetch,
       config.requestTimeoutMs ?? REQUEST_TIMEOUT_MS
     );
+    this.openCodeClient = config.openCodeClient ?? createOpenCodeClient({
+      port: config.port,
+      version: "v1",
+      fetchImpl: config.fetchImpl
+    });
     this.sleep = config.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     this.pausedPollIntervalMs = config.pausedPollIntervalMs ?? DEFAULT_PAUSED_POLL_INTERVAL_MS;
     this.pausedMaxWaitMs = config.pausedMaxWaitMs ?? DEFAULT_PAUSED_MAX_WAIT_MS;
@@ -5721,9 +6621,39 @@ var ChannelDriver = class _ChannelDriver {
     this.watcherStallMs = config.watcherStallMs ?? WATCHER_STALL_MS;
     this.wedgeWarningIntervalMs = config.wedgeWarningIntervalMs ?? WEDGE_WARNING_INTERVAL_MS;
   }
-  /** The IPv4-loopback base URL for the local `opencode serve`. */
-  get opencodeBase() {
-    return `http://127.0.0.1:${this.port}`;
+  get isV2() {
+    return this.openCodeClient.version === "v2";
+  }
+  async getSessionMessages(sessionId) {
+    return this.isV2 ? getV2SessionMessages(this.openCodeClient, sessionId) : fetchSessionMessages(this.port, sessionId, this.openCodeClient);
+  }
+  async getSubagentSessionMessages(sessionId) {
+    return this.isV2 ? getV2SessionMessages(this.openCodeClient, sessionId) : getSessionMessages(this.port, sessionId, this.openCodeClient);
+  }
+  async getTelemetrySubagentSessionMessages(sessionId) {
+    if (this.isV2) return getV2SessionMessages(this.openCodeClient, sessionId);
+    return fetchSessionMessages(this.port, sessionId, this.openCodeClient);
+  }
+  async listSessions() {
+    return this.isV2 ? listV2Sessions(this.openCodeClient) : listSessions(this.port, this.openCodeClient);
+  }
+  async sessionExists(sessionId) {
+    return this.isV2 ? v2SessionExists(this.openCodeClient, sessionId) : sessionExists(this.port, sessionId, this.openCodeClient);
+  }
+  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);
+  }
+  async hasAnyConfiguredProvider() {
+    return hasAnyConfiguredProvider(this.port, this.openCodeClient);
+  }
+  async readOpenCodeSessionErrorStream(options) {
+    return this.isV2 ? readV2SessionErrorStream(this.openCodeClient, options) : readSessionErrorStream(this.port, options, this.openCodeClient);
   }
   /**
    * Drain all pending channel conversations once: poll → dispatch → register.
@@ -5801,6 +6731,7 @@ var ChannelDriver = class _ChannelDriver {
   async runDrain() {
     let dispatched = 0;
     try {
+      this.pendingMessageIds.clear();
       const conversations = await this.getPendingConversations();
       if (this.recycleRequestedFlag) {
         this.stop();
@@ -6025,6 +6956,7 @@ var ChannelDriver = class _ChannelDriver {
     const { sessionId, refusedSessionId, created: sessionCreated } = await this.ensureSession(conv);
     this.ensureSessionErrorStream();
     const messages = await this.getPendingMessages(conv.id);
+    for (const message of messages) this.pendingMessageIds.add(message.id);
     let dispatched = 0;
     let skippedAlreadyDispatched = 0;
     if (refusedSessionId && messages.length > 0) {
@@ -6038,6 +6970,27 @@ var ChannelDriver = class _ChannelDriver {
         skippedAlreadyDispatched += 1;
         continue;
       }
+      if (this.untrackableAck.has(message.id)) {
+        const firstFenceWarning = !this.untrackableAckWarned.has(message.id);
+        this.untrackableAckWarned.add(message.id);
+        this.log({
+          level: firstFenceWarning ? "warn" : "debug",
+          message: `Message ${message.id.slice(0, 8)} is fenced after an untrackable OpenCode turn \u2014 skipping re-dispatch`,
+          conversation_id: conv.id,
+          message_id: message.id
+        });
+        const errorMessage3 = this.untrackableAck.get(message.id);
+        const reportError = await this.reportUntrackableAck(
+          conv.id,
+          message.id,
+          null,
+          errorMessage3
+        );
+        if (reportError === null) {
+          continue;
+        }
+        break;
+      }
       const effectiveOpencodeMessageId = message.opencode_message_id ?? this.releasedOpencodeIds.get(message.id)?.opencodeMessageId ?? null;
       if (effectiveOpencodeMessageId) {
         const outcome = await this.resolveRedrive(
@@ -6066,15 +7019,60 @@ var ChannelDriver = class _ChannelDriver {
           conversation_id: conv.id,
           message_id: message.id
         });
-        const sendAttachments = this.buildSendAttachments(conv, message);
-        opencodeMessageId = await this.dispatchLocked(
+        const sendAttachments = this.isV2 ? void 0 : this.buildSendAttachments(conv, message);
+        if (this.isV2 && message.attachments && message.attachments.length > 0) {
+          this.signalAttachmentsSkipped(
+            conv.id,
+            message.id,
+            message.attachments.map((attachment, index) => ({
+              index,
+              mime: attachment.mime,
+              ...attachment.filename ? { filename: attachment.filename } : {},
+              status: "skipped"
+            })),
+            false
+          );
+        }
+        opencodeMessageId = this.isV2 ? await sendV2Prompt(this.openCodeClient, sessionId, message.content) : await this.dispatchLocked(
           sessionId,
-          () => sendPromptAsync(this.port, sessionId, message.content, options, sendAttachments)
+          () => sendPromptAsync(
+            this.port,
+            sessionId,
+            message.content,
+            options,
+            sendAttachments,
+            this.openCodeClient
+          )
         );
       } catch (err) {
         if (err instanceof ChannelAuthError) throw err;
+        if (this.isV2 && err instanceof OpenCodeV2PromptAckError) {
+          const errorMessage4 = err instanceof Error ? err.message : String(err);
+          this.untrackableAck.set(message.id, errorMessage4);
+          this.log({
+            level: "error",
+            message: `V2 prompt dispatch for message ${message.id.slice(0, 8)} failed after a positive ack with no usable id: ${errorMessage4}`,
+            conversation_id: conv.id,
+            message_id: message.id
+          });
+          const markError = await this.reportUntrackableAck(
+            conv.id,
+            message.id,
+            null,
+            errorMessage4
+          );
+          if (markError !== null) {
+            this.log({
+              level: "warn",
+              message: `markFailed PATCH for V2 dispatch failure on message ${message.id.slice(0, 8)} failed: ${markError.message}`,
+              conversation_id: conv.id,
+              message_id: message.id
+            });
+          }
+          break;
+        }
         this.dispatched.delete(message.id);
-        const exists = await sessionExists(this.port, sessionId);
+        const exists = await this.sessionExists(sessionId);
         if (exists === false) {
           this.sessions.delete(conv.id);
           this.log({
@@ -6123,6 +7121,9 @@ var ChannelDriver = class _ChannelDriver {
         break;
       }
       if (opencodeMessageId === null) {
+        if (this.isV2) {
+          throw new Error("V2 prompt dispatch completed without an acknowledged message id");
+        }
         const streak = this.recordUnconfirmedDispatch(message.id, sessionId);
         if (streak < MAX_IDENTICAL_REDRIVE_POLL_FAILURES) {
           this.log({
@@ -6270,29 +7271,38 @@ var ChannelDriver = class _ChannelDriver {
    */
   async pollSessionMessagesForRedrive(conv, message, sessionId) {
     try {
-      const res = await this.fetchImpl(`${this.opencodeBase}/session/${sessionId}/message`);
-      if (!res.ok) {
-        const rawBody = await res.text();
-        const normalized = normalizeRedrivePollFailureBody(rawBody);
-        this.log({
-          level: "warn",
-          message: `Re-drive: polling session ${sessionId.slice(0, 8)} for message ${message.id.slice(0, 8)} returned HTTP ${res.status}${normalized ? `: ${normalized}` : ""} \u2014 treating as unreadable this tick`,
-          conversation_id: conv.id,
-          message_id: message.id
-        });
-        return { ok: false, signature: `HTTP ${res.status}${normalized ? `: ${normalized}` : ""}` };
+      if (this.isV2) {
+        const messages = await this.getSessionMessages(sessionId);
+        if (messages === null) {
+          this.log({
+            level: "warn",
+            message: `Re-drive: failed to poll V2 session ${sessionId.slice(0, 8)} for message ${message.id.slice(0, 8)} \u2014 treating as unreadable this tick`,
+            conversation_id: conv.id,
+            message_id: message.id
+          });
+          return { ok: false, signature: null };
+        }
+        return { ok: true, messages };
       }
-      const body = await res.json();
-      if (!Array.isArray(body)) {
+      const polledV1 = await pollSessionMessagesForRedrive(
+        this.port,
+        sessionId,
+        this.openCodeClient
+      );
+      if (!polledV1.ok) {
+        const normalized = normalizeRedrivePollFailureBody(polledV1.body);
         this.log({
           level: "warn",
-          message: `Re-drive: polling session ${sessionId.slice(0, 8)} for message ${message.id.slice(0, 8)} returned a non-array message body \u2014 treating as unreadable this tick`,
+          message: `Re-drive: polling session ${sessionId.slice(0, 8)} for message ${message.id.slice(0, 8)} returned ${polledV1.malformed ? "a non-array message body" : `HTTP ${polledV1.status ?? "a network error"}${normalized ? `: ${normalized}` : ""}`} \u2014 treating as unreadable this tick`,
           conversation_id: conv.id,
           message_id: message.id
         });
-        return { ok: false, signature: "non-array message body" };
+        return {
+          ok: false,
+          signature: polledV1.status === null && !polledV1.malformed ? null : polledV1.malformed ? "non-array message body" : `HTTP ${polledV1.status}${normalized ? `: ${normalized}` : ""}`
+        };
       }
-      return { ok: true, messages: body };
+      return { ok: true, messages: polledV1.messages };
     } catch (err) {
       this.log({
         level: "warn",
@@ -6351,11 +7361,11 @@ var ChannelDriver = class _ChannelDriver {
     }
     const state = messageRunState(messages, ocId ?? "");
     if (state === "failed" && isAbortedTerminalReply(messages, ocId ?? "")) {
-      const ongoing = await isSessionOngoing(this.port, sessionId);
+      const ongoing = await this.isSessionOngoing(sessionId);
       if (ongoing === false) {
         this.log({
           level: "info",
-          message: `Re-drive: message ${message.id.slice(0, 8)} carries an abort-shaped terminal error and session ${sessionId.slice(0, 8)} is not-ongoing per GET /session/status \u2014 restart orphan, re-dispatching instead of marking it permanently failed`,
+          message: `Re-drive: message ${message.id.slice(0, 8)} carries an abort-shaped terminal error and session ${sessionId.slice(0, 8)} is not-ongoing per the active-session status check \u2014 restart orphan, re-dispatching instead of marking it permanently failed`,
           conversation_id: conv.id,
           message_id: message.id
         });
@@ -6368,7 +7378,7 @@ var ChannelDriver = class _ChannelDriver {
       return this.settleRedrive(conv, sessionId, message, ocId, messages, state);
     }
     if (state === "running" || state === "queued") {
-      const ongoing = await isSessionOngoing(this.port, sessionId);
+      const ongoing = await this.isSessionOngoing(sessionId);
       if (ongoing === true) {
         if (state === "queued") {
           const siblingOcIds = this.siblingOpencodeMessageIds(
@@ -6828,7 +7838,7 @@ var ChannelDriver = class _ChannelDriver {
       };
     }
     if (bound) {
-      const exists = await sessionExists(this.port, bound);
+      const exists = await this.sessionExists(bound);
       if (exists === false) {
         this.log({
           level: "debug",
@@ -6861,7 +7871,7 @@ var ChannelDriver = class _ChannelDriver {
    */
   async createAndBindSession(conversationId) {
     const directory = await this.resolveOpenCodeDirectory();
-    const sessionId = await createOpenCodeSession(this.port, directory);
+    const sessionId = await this.createOpenCodeSession(directory);
     this.sessions.set(conversationId, sessionId);
     await this.persistSession(conversationId, sessionId).catch((err) => {
       this.log({
@@ -6873,17 +7883,18 @@ var ChannelDriver = class _ChannelDriver {
     return sessionId;
   }
   /**
-   * Lazily resolve (and cache) opencode's root directory via `GET /path`.
+   * Lazily resolve (and cache) opencode's root directory via the selected client's
+   * location lookup.
    * Resolved once per driver: `undefined` until first lookup, then the directory
-   * string or `null` if unavailable (we don't keep retrying a missing `/path`).
+   * string or `null` if unavailable (we don't keep retrying a failed lookup).
    */
   async resolveOpenCodeDirectory() {
     if (this.opencodeDirectory !== void 0) return this.opencodeDirectory;
-    this.opencodeDirectory = await getOpenCodeDirectory(this.port);
+    this.opencodeDirectory = await this.getOpenCodeDirectory();
     if (!this.opencodeDirectory) {
       this.log({
         level: "warn",
-        message: "Could not determine opencode directory (GET /path) \u2014 new sessions may not appear in opencode web"
+        message: "Could not determine opencode directory (location lookup failed) \u2014 new sessions may not appear in opencode web"
       });
     }
     return this.opencodeDirectory;
@@ -7317,7 +8328,7 @@ var ChannelDriver = class _ChannelDriver {
     while (!this.stopped && !signal.aborted) {
       const openedAt = this.now();
       try {
-        const outcome = await readSessionErrorStream(this.port, {
+        const outcome = await this.readOpenCodeSessionErrorStream({
           signal,
           onSessionError: (event) => this.handleSessionError(event)
         });
@@ -7408,7 +8419,7 @@ var ChannelDriver = class _ChannelDriver {
   }
   async failFromSessionError(watcher, event, inFlight) {
     try {
-      const messages = await getSessionMessages(this.port, event.sessionId);
+      const messages = await this.getSessionMessages(event.sessionId);
       const state = messageRunState(messages, inFlight.opencodeMessageId);
       if (state !== "queued") {
         this.log({
@@ -7460,7 +8471,8 @@ var ChannelDriver = class _ChannelDriver {
    *      markDone (done) exactly once per transition;
    *   2. applies the idle-path re-dispatch guard (a dispatched message that never
    *      APPEARS → re-dispatch — D1 obligation 2);
-   *   3. polls `/question` + `/permission` (scoped to the session) and surfaces
+   *   3. polls V1's global `/question` + `/permission`, or V2's
+   *      `/api/session/:id/form` + `/api/session/:id/permission`, and surfaces
    *      NEW ones via `reportInteraction`, carrying the PAUSED message's own
    *      `source_message_id`;
    *   4. drops messages that completed or timed out from the in-flight set.
@@ -7486,11 +8498,7 @@ var ChannelDriver = class _ChannelDriver {
         if (watcher.generation !== generation) return;
         let messages = null;
         try {
-          const res = await this.fetchImpl(`${this.opencodeBase}/session/${sessionId}/message`);
-          if (res.ok) {
-            const body = await res.json();
-            messages = Array.isArray(body) ? body : null;
-          }
+          messages = await this.getSessionMessages(sessionId);
         } catch {
         }
         if (messages != null && messages.length > 0) {
@@ -7723,7 +8731,7 @@ var ChannelDriver = class _ChannelDriver {
         inFlight.b2LastDescendantCheckMs = this.now();
         const [descendantOngoing, rootOngoing] = await Promise.all([
           this.isAnyDescendantSessionOngoing(sessionId),
-          isSessionOngoing(this.port, sessionId)
+          this.isSessionOngoing(sessionId)
         ]);
         if (isB2AbandonmentConfirmed({
           pinnedForMs,
@@ -7783,7 +8791,7 @@ var ChannelDriver = class _ChannelDriver {
         });
       }
       const pinnedForMs = this.now() - inFlight.ambiguousPinnedSinceMs;
-      const ongoing = await isSessionOngoing(this.port, sessionId);
+      const ongoing = await this.isSessionOngoing(sessionId);
       if (isAmbiguousFinishResolved({
         pinnedForMs,
         maxPinnedMs: AMBIGUOUS_FINISH_MAX_PINNED_MS,
@@ -7966,7 +8974,7 @@ var ChannelDriver = class _ChannelDriver {
    */
   async readoptProcessing() {
     const rows = await this.getProcessingMessages();
-    if (this.dontRedispatch.size > 0 || this.doneUndeliverable.size > 0 || this.readoptPollUnresolvedSignalled.size > 0) {
+    if (this.dontRedispatch.size > 0 || this.untrackableAck.size > 0 || this.doneUndeliverable.size > 0 || this.readoptPollUnresolvedSignalled.size > 0) {
       const stillProcessing = new Set(rows.map((r) => r.id));
       for (const id of [
         ...this.dontRedispatch,
@@ -7986,6 +8994,18 @@ var ChannelDriver = class _ChannelDriver {
           }
         }
       }
+      for (const id of [...this.untrackableAck.keys()]) {
+        if (!stillProcessing.has(id) && !this.pendingMessageIds.has(id)) {
+          this.untrackableAck.delete(id);
+          this.untrackableAckSignalled.delete(id);
+          this.untrackableAckWarned.delete(id);
+          this.log({
+            level: "debug",
+            message: `Re-adopt: message ${id.slice(0, 8)} left processing and pending \u2014 cleared untrackable-ack fence`,
+            message_id: id
+          });
+        }
+      }
     }
     if (rows.length === 0) return;
     const bySession = /* @__PURE__ */ new Map();
@@ -8006,23 +9026,32 @@ var ChannelDriver = class _ChannelDriver {
     for (const [sessionId, sessionRows] of bySession) {
       let messages;
       try {
-        const res = await this.fetchImpl(`${this.opencodeBase}/session/${sessionId}/message`);
-        if (!res.ok) {
-          this.log({
-            level: "warn",
-            message: `Re-adopt: polling session ${sessionId.slice(0, 8)} returned HTTP ${res.status} \u2014 skipping this session this tick`
-          });
-          continue;
-        }
-        const body = await res.json();
-        if (!Array.isArray(body)) {
-          this.log({
-            level: "warn",
-            message: `Re-adopt: polling session ${sessionId.slice(0, 8)} returned a non-array message body \u2014 skipping this session this tick`
-          });
-          continue;
+        if (this.isV2) {
+          const snapshot = await this.getSessionMessages(sessionId);
+          if (snapshot === null) {
+            this.log({
+              level: "warn",
+              message: `Re-adopt: polling session ${sessionId.slice(0, 8)} returned an unreadable message snapshot \u2014 skipping this session this tick`
+            });
+            continue;
+          }
+          messages = snapshot;
+        } else {
+          const polled = await pollSessionMessagesForRedrive(
+            this.port,
+            sessionId,
+            this.openCodeClient
+          );
+          if (!polled.ok) {
+            const normalized = normalizeRedrivePollFailureBody(polled.body);
+            this.log({
+              level: "warn",
+              message: `Re-adopt: polling session ${sessionId.slice(0, 8)} returned ${polled.malformed ? "a non-array message body" : `HTTP ${polled.status ?? "a network error"}${normalized ? `: ${normalized}` : ""}`} \u2014 skipping this session this tick`
+            });
+            continue;
+          }
+          messages = polled.messages;
         }
-        messages = body;
       } catch (err) {
         this.log({
           level: "warn",
@@ -8031,7 +9060,7 @@ var ChannelDriver = class _ChannelDriver {
         continue;
       }
       const anyUntracked = sessionRows.some((row) => !this.isTracked(sessionId, row.id));
-      const sessionOngoing = anyUntracked ? await isSessionOngoing(this.port, sessionId) : null;
+      const sessionOngoing = anyUntracked ? await this.isSessionOngoing(sessionId) : null;
       for (const row of sessionRows) {
         await this.readoptOne(sessionId, row, messages, sessionOngoing);
       }
@@ -8078,7 +9107,7 @@ var ChannelDriver = class _ChannelDriver {
     if (restartAborted) {
       this.log({
         level: "info",
-        message: `Re-adopt: message ${row.id.slice(0, 8)} carries an abort-shaped terminal error and session ${sessionId.slice(0, 8)} is not-ongoing per GET /session/status \u2014 restart orphan, re-dispatching instead of marking it permanently failed`,
+        message: `Re-adopt: message ${row.id.slice(0, 8)} carries an abort-shaped terminal error and session ${sessionId.slice(0, 8)} is not-ongoing per the active-session status check \u2014 restart orphan, re-dispatching instead of marking it permanently failed`,
         conversation_id: row.conversation_id,
         message_id: row.id
       });
@@ -8133,10 +9162,13 @@ var ChannelDriver = class _ChannelDriver {
       }
       await this.reportSubagentAuthFailures(row.conversation_id, ocId ?? "", row.id, messages);
       this.dontRedispatch.delete(row.id);
+      this.untrackableAck.delete(row.id);
+      this.untrackableAckSignalled.delete(row.id);
+      this.untrackableAckWarned.delete(row.id);
       void this.postSignal(row.conversation_id, row.id, "readopt_failed");
       return;
     }
-    if (this.dontRedispatch.has(row.id)) {
+    if (this.dontRedispatch.has(row.id) || this.untrackableAck.has(row.id)) {
       this.log({
         level: "debug",
         message: `Re-adopt: message ${row.id.slice(0, 8)} already gave up \u2014 left to the cron; skipping until it leaves processing`,
@@ -8156,7 +9188,7 @@ var ChannelDriver = class _ChannelDriver {
           const finish = reply?.info?.finish ?? reply?.finish;
           this.log({
             level: "info",
-            message: `Re-adopt: message ${row.id.slice(0, 8)} has an ambiguous finish ("${finish ?? "(absent)"}") but session ${sessionId.slice(0, 8)} is confirmed not-ongoing per GET /session/status \u2014 delivering the existing reply instead of re-dispatching`,
+            message: `Re-adopt: message ${row.id.slice(0, 8)} has an ambiguous finish ("${finish ?? "(absent)"}") but session ${sessionId.slice(0, 8)} is confirmed not-ongoing per the active-session status check \u2014 delivering the existing reply instead of re-dispatching`,
             conversation_id: row.conversation_id,
             message_id: row.id
           });
@@ -8165,7 +9197,7 @@ var ChannelDriver = class _ChannelDriver {
         }
         this.log({
           level: "info",
-          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} but session ${sessionId.slice(0, 8)} is not-ongoing per GET /session/status (absent/idle) \u2014 re-dispatching from scratch (status-gated recovery)`,
+          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} but session ${sessionId.slice(0, 8)} is not-ongoing per the active-session status check (absent/idle) \u2014 re-dispatching from scratch (status-gated recovery)`,
           conversation_id: row.conversation_id,
           message_id: row.id
         });
@@ -8175,7 +9207,7 @@ var ChannelDriver = class _ChannelDriver {
       if (ongoing === true) {
         this.log({
           level: "debug",
-          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} and session ${sessionId.slice(0, 8)} is ongoing per GET /session/status (busy/retry) \u2014 re-attaching watcher (no re-dispatch)`,
+          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} and session ${sessionId.slice(0, 8)} is ongoing per the active-session status check (busy/retry) \u2014 re-attaching watcher (no re-dispatch)`,
           conversation_id: row.conversation_id,
           message_id: row.id
         });
@@ -8183,7 +9215,7 @@ var ChannelDriver = class _ChannelDriver {
         if (shape === "b1") {
           this.log({
             level: "debug",
-            message: `Re-adopt: message ${row.id.slice(0, 8)} running/b1 but GET /session/status was unreadable (null) for session ${sessionId.slice(0, 8)} \u2014 NOT latching a b1 row on a transient status blip; leaving it un-tracked to re-evaluate on the next drain`,
+            message: `Re-adopt: message ${row.id.slice(0, 8)} running/b1 but the active-session status check was unreadable (null) for session ${sessionId.slice(0, 8)} \u2014 NOT latching a b1 row on a transient status blip; leaving it un-tracked to re-evaluate on the next drain`,
             conversation_id: row.conversation_id,
             message_id: row.id
           });
@@ -8195,7 +9227,7 @@ var ChannelDriver = class _ChannelDriver {
         }
         this.log({
           level: "debug",
-          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} but GET /session/status was unreadable (null) for session ${sessionId.slice(0, 8)} \u2014 falling back to the #253 preamble + descendant cross-check`,
+          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} but the active-session status check was unreadable (null) for session ${sessionId.slice(0, 8)} \u2014 falling back to the #253 preamble + descendant cross-check`,
           conversation_id: row.conversation_id,
           message_id: row.id
         });
@@ -8245,7 +9277,7 @@ var ChannelDriver = class _ChannelDriver {
    * extracted (#1493 Task 2.4) so the ambiguous-finish guard above can call the
    * SAME delivery instead of duplicating it.
    *
-   * EVEN IF the row was previously parked in `dontRedispatch` (a give-up stops
+   * EVEN IF the row was previously parked by either recovery fence (a give-up stops
    * re-dispatch, not delivery — Bugbot #202). Guarded EXACTLY like the watcher's
    * `settleMessageDone`: auth re-throws; terminal → park in `doneUndeliverable` +
    * leave for cron; transient → log + leave for the next drain (the still-
@@ -8312,6 +9344,9 @@ var ChannelDriver = class _ChannelDriver {
       await this.reportSubagentAuthFailures(row.conversation_id, ocId, row.id, messages);
     }
     this.dontRedispatch.delete(row.id);
+    this.untrackableAck.delete(row.id);
+    this.untrackableAckSignalled.delete(row.id);
+    this.untrackableAckWarned.delete(row.id);
     void this.postSignal(row.conversation_id, row.id, "readopt_done");
   }
   /**
@@ -8375,19 +9410,103 @@ var ChannelDriver = class _ChannelDriver {
       conversation_id: row.conversation_id,
       message_id: row.id
     });
-    this.awaitingReadopt.add(row.id);
+    if (!this.isV2) this.awaitingReadopt.add(row.id);
     const readoptConv = this.convForRow(sessionId, row);
     const readoptMessage = this.queuedMessageForRow(row);
-    const sendAttachments = this.buildSendAttachments(readoptConv, readoptMessage);
+    const sendAttachments = this.isV2 ? void 0 : this.buildSendAttachments(readoptConv, readoptMessage);
+    if (this.isV2 && row.attachments && row.attachments.length > 0) {
+      this.signalAttachmentsSkipped(
+        row.conversation_id,
+        row.id,
+        row.attachments.map((attachment, index) => ({
+          index,
+          mime: attachment.mime,
+          ...attachment.filename ? { filename: attachment.filename } : {},
+          status: "skipped"
+        })),
+        false
+      );
+    }
     let ocId;
     try {
-      ocId = await this.dispatchLocked(
+      ocId = this.isV2 ? await sendV2Prompt(this.openCodeClient, sessionId, row.content) : await this.dispatchLocked(
         sessionId,
-        () => sendPromptAsync(this.port, sessionId, row.content, options, sendAttachments)
+        () => sendPromptAsync(
+          this.port,
+          sessionId,
+          row.content,
+          options,
+          sendAttachments,
+          this.openCodeClient
+        )
       );
     } catch (err) {
       this.awaitingReadopt.delete(row.id);
       if (err instanceof ChannelAuthError) throw err;
+      if (this.isV2) {
+        const errorMessage3 = err instanceof Error ? err.message : String(err);
+        const invalidPromptAck = err instanceof OpenCodeV2PromptAckError;
+        if (!invalidPromptAck) {
+          const exists = await this.sessionExists(sessionId);
+          if (exists === false) {
+            this.log({
+              level: "warn",
+              message: `Re-adopt: message ${row.id.slice(0, 8)} dispatch hit a session (${sessionId.slice(0, 8)}) that was deleted mid-dispatch \u2014 deferring to the next drain: ${errorMessage3}`,
+              conversation_id: row.conversation_id,
+              message_id: row.id
+            });
+            void this.postSignal(row.conversation_id, row.id, "readopt_orphan_unsent");
+            return;
+          }
+          if (exists === null) {
+            this.log({
+              level: "warn",
+              message: `Re-adopt: message ${row.id.slice(0, 8)} dispatch failed and session (${sessionId.slice(0, 8)}) existence could not be confirmed \u2014 deferring to the next drain: ${errorMessage3}`,
+              conversation_id: row.conversation_id,
+              message_id: row.id
+            });
+            void this.postSignal(row.conversation_id, row.id, "readopt_orphan_unsent");
+            return;
+          }
+        } else {
+          this.untrackableAck.set(row.id, errorMessage3);
+        }
+        this.log({
+          level: "error",
+          message: `V2 re-adopt dispatch for message ${row.id.slice(0, 8)} failed: ${errorMessage3}`,
+          conversation_id: row.conversation_id,
+          message_id: row.id
+        });
+        if (invalidPromptAck) {
+          const markError = await this.reportUntrackableAck(
+            row.conversation_id,
+            row.id,
+            sessionId,
+            errorMessage3
+          );
+          if (markError !== null) {
+            this.log({
+              level: "warn",
+              message: `markFailed PATCH for V2 re-adopt dispatch failure on message ${row.id.slice(0, 8)} failed: ${markError.message}`,
+              conversation_id: row.conversation_id,
+              message_id: row.id
+            });
+          }
+        } else {
+          await this.markFailed(row.conversation_id, row.id, sessionId, errorMessage3).catch(
+            (markErr) => {
+              this.log({
+                level: "warn",
+                message: `markFailed PATCH for V2 re-adopt dispatch failure on message ${row.id.slice(0, 8)} failed: ${markErr instanceof Error ? markErr.message : String(markErr)}`,
+                conversation_id: row.conversation_id,
+                message_id: row.id
+              });
+              this.signalDispatchNotStarted(readoptConv, readoptMessage, "failure_unreported");
+            }
+          );
+        }
+        return;
+      }
       this.log({
         level: "warn",
         message: `Re-adopt: re-dispatch failed for message ${row.id.slice(0, 8)} (will retry next drain): ${err instanceof Error ? err.message : String(err)}`,
@@ -8519,12 +9638,13 @@ var ChannelDriver = class _ChannelDriver {
     this.dispatched.delete(evidentMessageId);
   }
   /**
-   * Poll `/question` + `/permission` (scoped to the session) and surface NEW ones
-   * via `reportInteraction` (Task 3.5), carrying the PAUSED message's own
-   * `source_message_id` so the server @mentions the correct person under
-   * concurrency. Dedups by interaction id across ticks (reused per-session sets).
+   * Poll V1's global `/question` + `/permission`, or V2's watched-session form and
+   * permission routes, and surface NEW ones via `reportInteraction` (Task 3.5),
+   * carrying the PAUSED message's own `source_message_id` so the server @mentions
+   * the correct person under concurrency. Dedups by interaction id across ticks
+   * (reused per-session sets).
    *
-   * The interaction is attributed to the in-flight message it paused on. opencode
+   * The interaction is attributed to the in-flight message it paused on. OpenCode
    * stamps a `messageID` on a permission (and `tool.messageID` on a question) =
    * the assistant message id, whose `parentID` is the user message id — but the
    * simplest robust attribution here is: the single in-flight message that is
@@ -8547,16 +9667,14 @@ var ChannelDriver = class _ChannelDriver {
     let permissionsPolledOk = true;
     let questions = [];
     try {
-      const res = await this.fetchImpl(`${this.opencodeBase}/question`);
-      if (res.ok) {
-        const body = await res.json();
-        if (Array.isArray(body)) {
-          questions = body;
-        } else {
-          questionsPolledOk = false;
-        }
+      if (this.isV2) {
+        const forms = await listV2Forms(this.openCodeClient, sessionId);
+        if (forms === null) questionsPolledOk = false;
+        else questions = forms;
       } else {
-        questionsPolledOk = false;
+        const listed = await listOpenCodeQuestions(this.port, this.openCodeClient);
+        if (listed === null) questionsPolledOk = false;
+        else questions = listed;
       }
     } catch {
       questionsPolledOk = false;
@@ -8576,16 +9694,14 @@ var ChannelDriver = class _ChannelDriver {
     }
     let permissions = [];
     try {
-      const res = await this.fetchImpl(`${this.opencodeBase}/permission`);
-      if (res.ok) {
-        const body = await res.json();
-        if (Array.isArray(body)) {
-          permissions = body;
-        } else {
-          permissionsPolledOk = false;
-        }
+      if (this.isV2) {
+        const listed = await listV2Permissions(this.openCodeClient, sessionId);
+        if (listed === null) permissionsPolledOk = false;
+        else permissions = listed;
       } else {
-        permissionsPolledOk = false;
+        const listed = await listOpenCodePermissions(this.port, this.openCodeClient);
+        if (listed === null) permissionsPolledOk = false;
+        else permissions = listed;
       }
     } catch {
       permissionsPolledOk = false;
@@ -8679,10 +9795,14 @@ var ChannelDriver = class _ChannelDriver {
     if (cached !== void 0) return cached;
     let parent = void 0;
     try {
-      const res = await this.fetchImpl(`${this.opencodeBase}/session/${sessionId}`);
-      if (res.ok) {
-        const body = await res.json();
-        parent = body && typeof body.parentID === "string" ? body.parentID : null;
+      if (this.isV2) {
+        const session = await getV2Session(this.openCodeClient, sessionId);
+        parent = null;
+        const candidate = session.parentID;
+        if (typeof candidate === "string") parent = candidate;
+      } else {
+        const body = await getOpenCodeSession(this.port, sessionId, this.openCodeClient);
+        parent = typeof body?.parentID === "string" ? body.parentID : body === null ? void 0 : null;
       }
     } catch {
       parent = void 0;
@@ -8736,18 +9856,16 @@ var ChannelDriver = class _ChannelDriver {
       if (cached) return cached;
       const pending = (async () => {
         try {
-          const res = await this.fetchImpl(`${this.opencodeBase}/session/${sessionId}/message`);
-          if (!res.ok) {
+          const messages2 = await this.getTelemetrySubagentSessionMessages(sessionId);
+          if (messages2 === null) {
             this.log({
               level: "warn",
-              message: `Best-effort subagent session fetch for message ${messageId.slice(0, 8)} and child session ${sessionId.slice(0, 8)} returned HTTP ${res.status} \u2014 omitting invocation telemetry`,
+              message: `Best-effort subagent session fetch for message ${messageId.slice(0, 8)} and child session ${sessionId.slice(0, 8)} was unreadable \u2014 omitting invocation telemetry`,
               message_id: messageId
             });
             return null;
           }
-          const body = await res.json();
-          if (!Array.isArray(body)) throw new Error("response body was not a message array");
-          return body;
+          return messages2;
         } catch (err) {
           this.log({
             level: "warn",
@@ -8888,21 +10006,18 @@ var ChannelDriver = class _ChannelDriver {
     const cached = this.sessionTitles.get(sessionId);
     if (cached != null) return cached;
     try {
-      const res = await this.fetchImpl(`${this.opencodeBase}/session/${sessionId}`);
-      if (res.ok) {
-        const body = await res.json();
-        const title = body && typeof body.title === "string" ? body.title.trim() : "";
-        if (title.length > 0 && !_ChannelDriver.OPENCODE_DEFAULT_TITLE_PREFIX.test(title)) {
-          this.sessionTitles.set(sessionId, title);
-          return title;
-        }
-        return null;
+      let title = "";
+      if (this.isV2) {
+        title = (await getV2Session(this.openCodeClient, sessionId)).title?.trim() ?? "";
+      } else {
+        const body = await getOpenCodeSession(this.port, sessionId, this.openCodeClient);
+        title = typeof body?.title === "string" ? body.title.trim() : "";
       }
-      this.log({
-        level: "debug",
-        message: `Session title fetch for session ${sessionId.slice(0, 8)} (agent ${this.agentId.slice(0, 8)}) returned HTTP ${res.status} \u2014 omitting title`,
-        conversation_id: conversationId
-      });
+      if (title.length > 0 && !_ChannelDriver.OPENCODE_DEFAULT_TITLE_PREFIX.test(title)) {
+        this.sessionTitles.set(sessionId, title);
+        return title;
+      }
+      return null;
     } catch (err) {
       this.log({
         level: "debug",
@@ -9000,7 +10115,7 @@ var ChannelDriver = class _ChannelDriver {
    * `SessionStatus` only.
    */
   async isAnyDescendantSessionAlive(rootSessionId) {
-    const sessions = await listSessions(this.port);
+    const sessions = await this.listSessions();
     if (!sessions) {
       this.log({
         level: "warn",
@@ -9011,7 +10126,7 @@ var ChannelDriver = class _ChannelDriver {
     for (const candidate of sessions) {
       if (!candidate?.id || candidate.id === rootSessionId) continue;
       if (!await this.sessionBelongsTo(candidate.id, rootSessionId)) continue;
-      const childMsgs = await getSessionMessages(this.port, candidate.id);
+      const childMsgs = await this.getSubagentSessionMessages(candidate.id);
       if (isSessionActivelyGenerating(childMsgs)) {
         return true;
       }
@@ -9073,7 +10188,7 @@ var ChannelDriver = class _ChannelDriver {
    *              `isB2AbandonmentConfirmed`.
    */
   async isAnyDescendantSessionOngoing(rootSessionId) {
-    const sessions = await listSessions(this.port);
+    const sessions = await this.listSessions();
     if (!sessions) {
       this.log({
         level: "warn",
@@ -9090,7 +10205,7 @@ var ChannelDriver = class _ChannelDriver {
         continue;
       }
       if (membership === false) continue;
-      const ongoing = await isSessionOngoing(this.port, candidate.id);
+      const ongoing = await this.isSessionOngoing(candidate.id);
       if (ongoing === true) return true;
       if (ongoing === null) indeterminate = true;
     }
@@ -9366,6 +10481,26 @@ var ChannelDriver = class _ChannelDriver {
     this.clearSubagentInvocationCaches(messageId);
     throw new ChannelTerminalError(`marking message as done: HTTP ${res.status}`, res.status);
   }
+  /**
+   * Attempt the terminal report for an accepted prompt whose OpenCode id is not
+   * trackable. Callers use the returned error to keep their path-specific logging
+   * while the same report payload can be retried on a later drain.
+   */
+  async reportUntrackableAck(conversationId, messageId, sessionId, errorMessage3) {
+    try {
+      await this.markFailed(conversationId, messageId, sessionId, errorMessage3);
+      return null;
+    } catch (err) {
+      this.signalUntrackableAck(conversationId, messageId);
+      return err instanceof Error ? err : new Error(String(err));
+    }
+  }
+  /** Emit the untrackable-ack signal at most once while the row remains fenced. */
+  signalUntrackableAck(conversationId, messageId) {
+    if (this.untrackableAckSignalled.has(messageId)) return;
+    this.untrackableAckSignalled.add(messageId);
+    void this.postSignal(conversationId, messageId, "ack_untrackable");
+  }
   /**
    * Mark a message `failed`. `sessionId` / `error` are threaded to the API ONLY
    * when provided (issue #182). Three states for `sessionId`:
@@ -9430,7 +10565,7 @@ var ChannelDriver = class _ChannelDriver {
     const classified = messageFailure(messages, userMessageId);
     if (classified != null) return classified;
     const reply = findLastAssistantReplyFor(messages, userMessageId);
-    const hasProvider = await hasAnyConfiguredProvider(this.port);
+    const hasProvider = await this.hasAnyConfiguredProvider();
     return applyZeroProviderFallback(
       classified,
       hasProvider,
@@ -9503,7 +10638,7 @@ var ChannelDriver = class _ChannelDriver {
     const succeededProviders = /* @__PURE__ */ new Set();
     for (const ref of refs) {
       try {
-        const childMessages = await getSessionMessages(this.port, ref.sessionId);
+        const childMessages = await this.getSubagentSessionMessages(ref.sessionId);
         if (childMessages === null) {
           this.log({
             level: "debug",
@@ -9834,6 +10969,7 @@ Port ${port} is already in use.`));
 
 // src/commands/ensure-opencode-v2.ts
 import chalk6 from "chalk";
+import ora3 from "ora";
 import { select as select3 } from "@inquirer/prompts";
 async function probeOpenCode2WithoutPassword(port) {
   try {
@@ -9859,11 +10995,7 @@ function unknownPasswordError(port) {
     `OpenCode V2 (opencode2) is already running on port ${port} with a password this runner doesn't know. Free the port or pass --port.`
   );
 }
-function v2SessionSupportIncompleteError() {
-  return new Error(
-    "OpenCode V2 (opencode2) session support is incomplete \u2014 see https://github.com/sroze/evident/issues/2075. Not starting a new opencode2 process."
-  );
-}
+var INTERACTIVE_START_TIMEOUT_MS2 = 3e4;
 async function ensureOpenCode2Running(ctx) {
   const initialHealth = await probeOpenCode2WithoutPassword(ctx.port);
   if (initialHealth.authFailed) {
@@ -9906,13 +11038,37 @@ Port ${port} is already in use.`));
     }
   }
   if (!ctx.interactive) {
-    throw v2SessionSupportIncompleteError();
+    ctx.log(`OpenCode V2 is not running on port ${port}. Starting it automatically...`);
+    const { child: proc, password } = await startOpenCode2(port, {
+      inheritStdio: ctx.inheritStdio
+    });
+    const health = await waitForOpenCode2Health(port, password, ctx.startTimeoutMs);
+    if (!health.healthy) {
+      return {
+        port,
+        process: proc,
+        version: null,
+        notReadyReason: `it did not become healthy within ${Math.round(ctx.startTimeoutMs / 1e3)}s`,
+        password
+      };
+    }
+    ctx.log(`OpenCode V2 started on port ${port}${health.version ? ` (v${health.version})` : ""}`);
+    return {
+      port,
+      process: proc,
+      version: health.version ?? null,
+      notReadyReason: null,
+      password
+    };
   }
-  console.log(chalk6.yellow(`
-${v2SessionSupportIncompleteError().message}`));
   const action = await select3({
     message: "OpenCode V2 is not running. What would you like to do?",
     choices: [
+      {
+        name: "Start OpenCode V2 for me",
+        value: "start",
+        description: `Run 'opencode2 serve --port ${port}'`
+      },
       {
         name: "Show me the command",
         value: "manual",
@@ -9933,6 +11089,25 @@ ${v2SessionSupportIncompleteError().message}`));
     blank();
     throw new Error("Please start OpenCode V2 manually");
   }
+  if (action === "start") {
+    const spinner = ora3("Starting OpenCode V2...").start();
+    const { child: proc, password } = await startOpenCode2(port, {
+      inheritStdio: ctx.inheritStdio
+    });
+    const health = await waitForOpenCode2Health(port, password, INTERACTIVE_START_TIMEOUT_MS2);
+    if (!health.healthy) {
+      spinner.fail("Failed to start OpenCode V2");
+      throw new Error("OpenCode V2 failed to start");
+    }
+    spinner.stop();
+    return {
+      port,
+      process: proc,
+      version: health.version ?? null,
+      notReadyReason: null,
+      password
+    };
+  }
   return {
     port,
     process: null,
@@ -10826,7 +12001,7 @@ async function driveChannels(state, driver) {
       lastSeenOpencodeAuthApplies = opencodeAuthApplies;
       if (opencodeAuthApplied) state.openaiUsageRearm?.();
       if (claudeCredentialApplied || opencodeAuthApplied) {
-        void reloadProviderCache(state.port).catch(
+        void reloadProviderCache(state.port, state.opencodeClient ?? void 0).catch(
           (error2) => logActivity(state, {
             type: "error",
             error: `OpenCode provider cache reload failed on port ${state.port}: ${error2 instanceof Error ? error2.message : String(error2)}`
@@ -10951,7 +12126,7 @@ function logSessionDbProvenanceMismatch(state, provenance, currentVersion, preBo
 async function runSweep(state, driver, config) {
   const mode = `age=${config.maxAgeMs ?? "\u2014"} count=${config.maxCount ?? "\u2014"}`;
   try {
-    const sessions = await listSessions(state.port);
+    const sessions = await listSessions(state.port, state.opencodeClient ?? void 0);
     if (sessions === null) {
       logActivity(state, {
         type: "info",
@@ -10981,7 +12156,7 @@ async function runSweep(state, driver, config) {
         });
         continue;
       }
-      if (await deleteSession(state.port, id)) deleted++;
+      if (await deleteSession(state.port, id, state.opencodeClient ?? void 0)) deleted++;
       else failed++;
     }
     const failedNote = failed > 0 ? `, failed ${failed}` : "";
@@ -11488,6 +12663,9 @@ async function run(options) {
     connected: false,
     opencodeConnected: false,
     opencodeVersion: null,
+    opencodeApiVersion: "v1",
+    opencodePassword: null,
+    opencodeClient: null,
     sessionDbProvenanceAnomaly: false,
     opencodeProcess: null,
     stopOpenCodeLogTail: null,
@@ -11642,7 +12820,7 @@ async function run(options) {
       console.log(chalk7.bold("Evident Run"));
       console.log(chalk7.dim("-".repeat(40)));
     }
-    const spinner = interactive && !state.json ? ora3("Validating runner...").start() : null;
+    const spinner = interactive && !state.json ? ora4("Validating runner...").start() : null;
     let validation = await getAgentInfo(state.agentId, state.authHeader);
     if (!validation.valid && validation.authFailed && interactive) {
       spinner?.fail("Authentication failed");
@@ -11763,7 +12941,7 @@ async function run(options) {
       logActivity(state, { type: "info", level: "warn", message: warning2 });
     }
     const preBootMigrationIds = readSessionDbMigrationIds(sessionDbPath());
-    const ocSpinner = interactive && !state.json ? ora3("Checking OpenCode...").start() : null;
+    const ocSpinner = interactive && !state.json ? ora4("Checking OpenCode...").start() : null;
     try {
       const oc = opencodeVersion === "v2" ? await ensureOpenCode2Running({
         port: state.port,
@@ -11783,6 +12961,19 @@ async function run(options) {
       state.port = oc.port;
       state.opencodeProcess = options.opencodePidFile ? null : oc.process;
       state.opencodeVersion = oc.version;
+      state.opencodeApiVersion = opencodeVersion;
+      let opencodePassword = null;
+      if (opencodeVersion === "v2" && "password" in oc) {
+        const value = oc.password;
+        if (typeof value === "string" || value === null) opencodePassword = value;
+      }
+      state.opencodePassword = opencodePassword;
+      const openCodeClient = createOpenCodeClient({
+        port: state.port,
+        version: state.opencodeApiVersion,
+        password: state.opencodePassword
+      });
+      state.opencodeClient = openCodeClient;
       if (options.opencodePidFile && oc.process?.pid !== void 0) {
         try {
           writeFileSync6(options.opencodePidFile, `${oc.process.pid}
@@ -11819,16 +13010,19 @@ async function run(options) {
         const message = `OpenCode is not ready on port ${state.port}: ${oc.notReadyReason}. The runner will still come online, but messages will fail until opencode answers \u2014 raise the wait with --opencode-start-timeout <seconds> (env ${OPENCODE_START_TIMEOUT_ENV}).`;
         logActivity(state, { type: "info", level: "warn", message });
       } else {
-        const versionWarning = buildOpenCodeVersionWarning(state.opencodeVersion);
+        const versionWarning = buildOpenCodeVersionWarning(
+          state.opencodeVersion,
+          state.opencodeApiVersion
+        );
         if (versionWarning) {
           log2(state, versionWarning, "warn");
           if (state.interactive && !state.json) {
             logActivity(state, { type: "info", level: "warn", message: versionWarning });
           }
         }
-        await reloadProviderCache(state.port);
+        await reloadProviderCache(state.port, state.opencodeClient ?? void 0);
         const noProviderWarning = buildNoProviderWarning(
-          await hasAnyConfiguredProvider(state.port)
+          await hasAnyConfiguredProvider(state.port, state.opencodeClient ?? void 0)
         );
         if (noProviderWarning) {
           log2(state, noProviderWarning, "warn");
@@ -11951,11 +13145,12 @@ async function run(options) {
       });
       log2(state, `Started litestream replication with config ${options.litestreamConfig}`);
     }
-    const tunnelSpinner = interactive && !state.json ? ora3("Connecting tunnel...").start() : null;
+    const tunnelSpinner = interactive && !state.json ? ora4("Connecting tunnel...").start() : null;
     const channelDriver = new ChannelDriver({
       agentId: state.agentId,
       port: state.port,
       apiUrl: getApiUrlConfig(),
+      openCodeClient: state.opencodeClient ?? void 0,
       getAuthHeader: () => state.authHeader,
       conversationFilter: state.conversationFilter,
       stuckQueuedMs: CHANNEL_STUCK_QUEUED_MS,
@@ -11981,6 +13176,7 @@ async function run(options) {
       agentId: state.agentId,
       getAuthHeader: () => state.authHeader,
       port: state.port,
+      openCodePassword: state.opencodePassword,
       isRunning: () => state.running,
       events: {
         onConnected: (agentId, isReconnect) => {
@@ -12005,7 +13201,11 @@ async function run(options) {
           emitAgentConnected(state.agentId, {
             port: state.port,
             cli_version: getCliVersion(),
-            opencode_version: state.opencodeVersion
+            opencode_version: reportedOpenCodeVersion({
+              version: state.opencodeVersion,
+              major: state.opencodeApiVersion,
+              connected: state.opencodeConnected
+            })
           });
           if (!isReconnect) tunnelSpinner?.succeed("Tunnel connected");
           if (state.interactive) displayStatus(state);
@@ -12121,7 +13321,7 @@ async function run(options) {
         state.openaiUsageTimer = timer;
       },
       fetchUsage: async () => {
-        const usage = await getOpenAiUsage(state.port);
+        const usage = await getOpenAiUsage(state.port, state.opencodeClient ?? void 0);
         if (usage.subscription === null) {
           logActivity(state, {
             type: "info",