openwork-server 0.18.50 → 0.18.56

package/dist/opencode-plugins/openwork-extensions-preview.js

@@ -45,98 +45,9 @@ var __export = (target, all) => {
 };
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// src/opencode-plugins/openwork-extensions-preview.ts
-import { randomUUID } from "node:crypto";
-import { realpath } from "node:fs/promises";
-
-// src/errors.ts
-class ApiError extends Error {
-  status;
-  code;
-  details;
-  constructor(status, code, message, details) {
-    super(message);
-    this.status = status;
-    this.code = code;
-    this.details = details;
-  }
-}
-
-// src/opencode-plugins/openwork-ui-bridge.ts
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
-import { homedir, platform } from "node:os";
-var cachedBridge = null;
-var cachedBridgeAt = 0;
-var cachedBridgeDiscovery;
-var BRIDGE_CACHE_MS = 2000;
-var BRIDGE_TIMEOUT_MS = 5000;
-function userAppDataDir() {
-  if (platform() === "darwin")
-    return join(homedir(), "Library", "Application Support");
-  if (platform() === "win32")
-    return process.env.APPDATA || join(homedir(), "AppData", "Roaming");
-  return process.env.XDG_CONFIG_HOME || join(homedir(), ".config");
-}
-function uiControlDiscoveryPaths() {
-  const explicit = process.env.OPENWORK_UI_CONTROL_DISCOVERY?.trim();
-  if (explicit)
-    return [explicit];
-  return [
-    join(userAppDataDir(), "com.differentai.openwork", "openwork-ui-control.json"),
-    join(userAppDataDir(), "com.differentai.openwork.dev", "openwork-ui-control.json")
-  ].filter((p) => Boolean(p));
-}
-async function discoverUiBridge() {
-  const discovery = process.env.OPENWORK_UI_CONTROL_DISCOVERY?.trim();
-  if (cachedBridge && cachedBridgeDiscovery === discovery && Date.now() - cachedBridgeAt < BRIDGE_CACHE_MS)
-    return cachedBridge;
-  cachedBridge = null;
-  for (const candidate of uiControlDiscoveryPaths()) {
-    try {
-      const raw = await readFile(candidate, "utf8");
-      const parsed = JSON.parse(raw);
-      if (typeof parsed.baseUrl === "string" && typeof parsed.token === "string") {
-        const url = new URL(parsed.baseUrl);
-        if (url.protocol !== "http:" || !["127.0.0.1", "localhost", "[::1]"].includes(url.hostname) || url.username || url.password)
-          continue;
-        cachedBridge = { baseUrl: parsed.baseUrl, token: parsed.token };
-        cachedBridgeAt = Date.now();
-        cachedBridgeDiscovery = discovery;
-        return cachedBridge;
-      }
-    } catch {}
-  }
-  return null;
-}
-async function uiBridgeRequest(path, options = {}) {
-  const bridge = await discoverUiBridge();
-  if (!bridge)
-    return { ok: false, code: "browser_unavailable", dispatched: false, error: "The built-in browser is unavailable. Open the desktop app on the same machine as this task's server." };
-  try {
-    const response = await fetch(`${bridge.baseUrl}${path}`, {
-      method: options.method || "GET",
-      redirect: "error",
-      signal: options.signal ? AbortSignal.any([options.signal, AbortSignal.timeout(options.timeoutMs ?? BRIDGE_TIMEOUT_MS)]) : AbortSignal.timeout(options.timeoutMs ?? BRIDGE_TIMEOUT_MS),
-      headers: {
-        Authorization: `Bearer ${bridge.token}`,
-        ...options.body ? { "Content-Type": "application/json" } : {}
-      },
-      ...options.body ? { body: JSON.stringify(options.body) } : {}
-    });
-    const text = await response.text();
-    try {
-      return JSON.parse(text);
-    } catch {
-      return { ok: false, code: "browser_disconnected", mayHaveChangedState: true, retrySafe: false, error: "The browser returned no readable receipt. Inspect the page before retrying an action." };
-    }
-  } catch {
-    cachedBridge = null;
-    cachedBridgeAt = 0;
-    cachedBridgeDiscovery = undefined;
-    return { ok: false, code: "browser_disconnected", mayHaveChangedState: true, retrySafe: false, error: "The browser connection was interrupted. An action may already have run. Reconnect, list this conversation's tabs and observe before deciding what remains." };
-  }
-}
+// src/opencode-plugins/openwork-read-transport.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var openworkReadTransport = new AsyncLocalStorage;
 
 // ../../node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -13670,6 +13581,279 @@ function date4(params) {
 
 // ../../node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/external.js
 config(en_default());
+// src/opencode-plugins/session-activity.ts
+var engineSessionStatusesSchema = exports_external.record(exports_external.string(), exports_external.object({ type: exports_external.string() }).passthrough());
+var enginePendingRequestsSchema = exports_external.array(exports_external.object({ sessionID: exports_external.string() }).passthrough());
+function sessionActivityFrom(statuses, permissions, questions, sessionId, descendantIds = [], unknownDescendants = 0) {
+  const parsedStatuses = engineSessionStatusesSchema.safeParse(statuses);
+  const parsedPermissions = enginePendingRequestsSchema.safeParse(permissions);
+  const parsedQuestions = enginePendingRequestsSchema.safeParse(questions);
+  const probesComplete = parsedStatuses.success && parsedPermissions.success && parsedQuestions.success;
+  const waiting = new Set([
+    ...parsedPermissions.success ? parsedPermissions.data.map((request) => request.sessionID) : [],
+    ...parsedQuestions.success ? parsedQuestions.data.map((request) => request.sessionID) : []
+  ]);
+  const statusFor = (id) => {
+    const type = parsedStatuses.success ? parsedStatuses.data[id]?.type : undefined;
+    if (type === "error")
+      return "error";
+    if (waiting.has(id) || type === "waiting")
+      return "waiting";
+    if (type === "busy" || type === "running")
+      return "busy";
+    if (type === "retry" || type === "compacting" || type === "thinking" || type === "responding")
+      return type;
+    return probesComplete && (type === undefined || type === "idle") ? "idle" : "unknown";
+  };
+  const descendantActivity = { busy: 0, waiting: 0, unknown: unknownDescendants };
+  for (const id of new Set(descendantIds)) {
+    if (id === sessionId)
+      continue;
+    const status = statusFor(id);
+    if (status === "unknown")
+      descendantActivity.unknown += 1;
+    else if (status === "waiting")
+      descendantActivity.waiting += 1;
+    else if (status !== "idle" && status !== "error")
+      descendantActivity.busy += 1;
+  }
+  const own = statusFor(sessionId);
+  return {
+    status: own !== "error" && descendantActivity.waiting > 0 ? "waiting" : own,
+    working: own !== "idle" && own !== "error" && own !== "unknown" || descendantActivity.busy > 0 || descendantActivity.waiting > 0,
+    descendantActivity,
+    inventoryComplete: probesComplete && own !== "unknown" && descendantActivity.unknown === 0
+  };
+}
+
+// src/opencode-v2-read-adapter.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function data(value) {
+  return isRecord(value) && "data" in value ? value.data : value;
+}
+function items(value) {
+  const rows = data(value);
+  if (!Array.isArray(rows))
+    throw new Error("Invalid engine list response");
+  return rows.filter(isRecord);
+}
+function session(value) {
+  const row = data(value);
+  if (!isRecord(row))
+    throw new Error("Invalid engine session response");
+  const info = isRecord(row.info) ? row.info : row;
+  const home = info.openworkHomeDirectory;
+  return { ...info, directory: home ?? (isRecord(info.location) ? info.location.directory : undefined) };
+}
+async function pages(read, path, limit) {
+  const url2 = new URL(path, "http://engine");
+  url2.searchParams.set("limit", String(limit ?? 200));
+  const rows = [];
+  const cursors = new Set;
+  while (true) {
+    const result = await read(url2.pathname + url2.search);
+    rows.push(...items(result));
+    const next = isRecord(result) && isRecord(result.cursor) ? result.cursor.next : undefined;
+    if (limit !== undefined || typeof next !== "string" || !next)
+      return rows;
+    if (cursors.has(next))
+      throw new Error("Invalid engine pagination cursor");
+    cursors.add(next);
+    url2.searchParams.set("cursor", next);
+  }
+}
+function createV2ReadAdapter(read) {
+  return async (path) => {
+    const match = /^\/workspace\/([^/]+)\/opencode(\/.*)$/.exec(path);
+    if (!match)
+      return read(path);
+    const base = `/workspace/${match[1]}/opencode2`;
+    const native = (path2) => read(base + path2);
+    const url2 = new URL(match[2], "http://engine");
+    if (url2.pathname === "/session/status") {
+      const active = data(await native("/api/session/active"));
+      if (!isRecord(active))
+        throw new Error("Invalid engine activity response");
+      return Object.fromEntries(Object.entries(active).map(([id, value]) => [
+        id,
+        { type: isRecord(value) && value.type === "running" ? "busy" : "idle" }
+      ]));
+    }
+    if (url2.pathname === "/session") {
+      const rows2 = await pages(native, "/api/session");
+      return rows2.filter((row) => url2.searchParams.get("roots") !== "true" || !row.parentID).map(session);
+    }
+    if (url2.pathname === "/provider") {
+      const [models, providers] = await Promise.all([native("/api/model").then(items), native("/api/provider").then(items)]);
+      const names = new Map(providers.map((provider) => [provider.id, provider.name]));
+      const catalog = new Map;
+      for (const model of models) {
+        if (typeof model.id !== "string" || typeof model.providerID !== "string")
+          continue;
+        const name = names.get(model.providerID);
+        const provider = catalog.get(model.providerID) ?? {
+          id: model.providerID,
+          name: typeof name === "string" ? name : model.providerID,
+          models: {}
+        };
+        provider.models[model.id] = { name: typeof model.name === "string" ? model.name : model.id };
+        catalog.set(model.providerID, provider);
+      }
+      return { all: [...catalog.values()], connected: [...catalog.keys()] };
+    }
+    if (url2.pathname === "/question")
+      return items(await native("/api/form/request"));
+    const target = /^\/session\/([^/]+)(\/message|\/children)?$/.exec(url2.pathname);
+    if (!target)
+      throw new Error("Unsupported native engine read");
+    if (!target[2])
+      return session(await native(`/api/session/${target[1]}`));
+    if (target[2] === "/children") {
+      return (await pages(native, "/api/session")).filter((row) => row.parentID === decodeURIComponent(target[1])).map(session);
+    }
+    const limit = url2.searchParams.get("limit");
+    const rows = await pages(native, `/api/session/${target[1]}/message`, limit === null ? undefined : Number(limit));
+    return rows.filter((row) => row.type === "user" || row.type === "assistant").sort((a, b) => Number(isRecord(a.time) ? a.time.created : 0) - Number(isRecord(b.time) ? b.time.created : 0)).map((row) => ({
+      info: { id: row.id, role: row.type, time: row.time, ...row.error ? { error: row.error } : {} },
+      parts: Array.isArray(row.content) ? row.content.filter((part) => isRecord(part) && part.type === "text") : typeof row.text === "string" ? [{ type: "text", text: row.text }] : []
+    }));
+  };
+}
+async function readV2SessionActivity(read, workspaceId, sessionId) {
+  const base = `/workspace/${encodeURIComponent(workspaceId)}/opencode2`;
+  const native = (path) => read(base + path);
+  const [listed, statuses] = await Promise.all([
+    pages(native, "/api/session").catch(() => null),
+    native("/api/session/active").then(data).catch(() => null)
+  ]);
+  const ids = new Set([sessionId]);
+  if (listed) {
+    for (let changed = true;changed; ) {
+      changed = false;
+      for (const row of listed) {
+        if (typeof row.id !== "string" || typeof row.parentID !== "string" || !ids.has(row.parentID) || ids.has(row.id))
+          continue;
+        ids.add(row.id);
+        changed = true;
+      }
+    }
+  }
+  const permissions = [];
+  const questions = [];
+  let complete = listed !== null;
+  const pending = [...ids];
+  await Promise.all(Array.from({ length: Math.min(4, pending.length) }, async () => {
+    for (let id = pending.shift();id; id = pending.shift()) {
+      try {
+        const [p, q] = await Promise.all([
+          native(`/api/session/${encodeURIComponent(id)}/permission`),
+          native(`/api/session/${encodeURIComponent(id)}/form`)
+        ]);
+        permissions.push(...items(p).map((item) => ({ ...item, sessionID: id })));
+        questions.push(...items(q).map((item) => ({ ...item, sessionID: id })));
+      } catch {
+        complete = false;
+      }
+    }
+  }));
+  return sessionActivityFrom(statuses, complete ? permissions : null, complete ? questions : null, sessionId, [...ids].filter((id) => id !== sessionId), listed ? 0 : 1);
+}
+
+// src/opencode-plugins/openwork-extensions-preview.ts
+import { randomUUID } from "node:crypto";
+import { realpath } from "node:fs/promises";
+
+// src/errors.ts
+class ApiError extends Error {
+  status;
+  code;
+  details;
+  constructor(status, code, message, details) {
+    super(message);
+    this.status = status;
+    this.code = code;
+    this.details = details;
+  }
+}
+
+// src/opencode-plugins/openwork-ui-bridge.ts
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { homedir, platform } from "node:os";
+var cachedBridge = null;
+var cachedBridgeAt = 0;
+var cachedBridgeDiscovery;
+var BRIDGE_CACHE_MS = 2000;
+var BRIDGE_TIMEOUT_MS = 5000;
+function userAppDataDir() {
+  if (platform() === "darwin")
+    return join(homedir(), "Library", "Application Support");
+  if (platform() === "win32")
+    return process.env.APPDATA || join(homedir(), "AppData", "Roaming");
+  return process.env.XDG_CONFIG_HOME || join(homedir(), ".config");
+}
+function uiControlDiscoveryPaths() {
+  const explicit = process.env.OPENWORK_UI_CONTROL_DISCOVERY?.trim();
+  if (explicit)
+    return [explicit];
+  return [
+    join(userAppDataDir(), "com.differentai.openwork", "openwork-ui-control.json"),
+    join(userAppDataDir(), "com.differentai.openwork.dev", "openwork-ui-control.json")
+  ].filter((p) => Boolean(p));
+}
+async function discoverUiBridge() {
+  const discovery = process.env.OPENWORK_UI_CONTROL_DISCOVERY?.trim();
+  if (cachedBridge && cachedBridgeDiscovery === discovery && Date.now() - cachedBridgeAt < BRIDGE_CACHE_MS)
+    return cachedBridge;
+  cachedBridge = null;
+  for (const candidate of uiControlDiscoveryPaths()) {
+    try {
+      const raw = await readFile(candidate, "utf8");
+      const parsed = JSON.parse(raw);
+      if (typeof parsed.baseUrl === "string" && typeof parsed.token === "string") {
+        const url2 = new URL(parsed.baseUrl);
+        if (url2.protocol !== "http:" || !["127.0.0.1", "localhost", "[::1]"].includes(url2.hostname) || url2.username || url2.password)
+          continue;
+        cachedBridge = { baseUrl: parsed.baseUrl, token: parsed.token };
+        cachedBridgeAt = Date.now();
+        cachedBridgeDiscovery = discovery;
+        return cachedBridge;
+      }
+    } catch {}
+  }
+  return null;
+}
+async function uiBridgeRequest(path, options = {}) {
+  const bridge = await discoverUiBridge();
+  if (!bridge)
+    return { ok: false, code: "browser_unavailable", dispatched: false, error: "The built-in browser is unavailable. Open the desktop app on the same machine as this task's server." };
+  try {
+    const response = await fetch(`${bridge.baseUrl}${path}`, {
+      method: options.method || "GET",
+      redirect: "error",
+      signal: options.signal ? AbortSignal.any([options.signal, AbortSignal.timeout(options.timeoutMs ?? BRIDGE_TIMEOUT_MS)]) : AbortSignal.timeout(options.timeoutMs ?? BRIDGE_TIMEOUT_MS),
+      headers: {
+        Authorization: `Bearer ${bridge.token}`,
+        ...options.body ? { "Content-Type": "application/json" } : {}
+      },
+      ...options.body ? { body: JSON.stringify(options.body) } : {}
+    });
+    const text = await response.text();
+    try {
+      return JSON.parse(text);
+    } catch {
+      return { ok: false, code: "browser_disconnected", mayHaveChangedState: true, retrySafe: false, error: "The browser returned no readable receipt. Inspect the page before retrying an action." };
+    }
+  } catch {
+    cachedBridge = null;
+    cachedBridgeAt = 0;
+    cachedBridgeDiscovery = undefined;
+    return { ok: false, code: "browser_disconnected", mayHaveChangedState: true, retrySafe: false, error: "The browser connection was interrupted. An action may already have run. Reconnect, list this conversation's tabs and observe before deciding what remains." };
+  }
+}
+
 // src/opencode-plugins/gmail-attachment-fulfillment.ts
 var draftSchema = exports_external.object({
   to: exports_external.string().trim().min(3).max(320),
@@ -13702,7 +13886,7 @@ var receiptSchema = exports_external.object({
     size: exports_external.number().int().nonnegative()
   })).optional()
 });
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function normalizeJson(value) {
@@ -13752,11 +13936,11 @@ var CLOUD_NO_WRITE = new Set([
   "mcp_membership_revoked:403"
 ]);
 function noWriteMessage(error48) {
-  if (!isRecord(error48) || typeof error48.message !== "string")
+  if (!isRecord2(error48) || typeof error48.message !== "string")
     return;
   if (LOCAL_NO_WRITE.has(`${error48.code}:${error48.status}`))
     return `${error48.message} No draft created.`;
-  if (error48.code === "cloud_upload_failed" && isRecord(error48.details) && CLOUD_NO_WRITE.has(`${error48.details.upstreamCode}:${error48.status}`)) {
+  if (error48.code === "cloud_upload_failed" && isRecord2(error48.details) && CLOUD_NO_WRITE.has(`${error48.details.upstreamCode}:${error48.status}`)) {
     return `${error48.message} No draft created.`;
   }
 }
@@ -13776,18 +13960,18 @@ function createGmailAttachmentFulfillment(dependencies, factoryContext = {}) {
     return call;
   }
   const fulfill = async (input, output) => {
-    if (!isRecord(input) || input.tool !== "openwork-cloud_execute_capability")
+    if (!isRecord2(input) || input.tool !== "openwork-cloud_execute_capability")
       return;
-    if (!isRecord(input.args) || typeof input.args.name !== "string")
+    if (!isRecord2(input.args) || typeof input.args.name !== "string")
       return;
     const native = NATIVE_GMAIL.exec(input.args.name);
     const connectionId = native?.[1];
-    if (!connectionId || !isRecord(output) || output.isError === true)
+    if (!connectionId || !isRecord2(output) || output.isError === true)
       return;
     if (!Array.isArray(output.content) || output.content.length !== 1)
       return;
     const part = output.content[0];
-    if (!isRecord(part) || part.type !== "text" || typeof part.text !== "string")
+    if (!isRecord2(part) || part.type !== "text" || typeof part.text !== "string")
       return;
     if (!markerSchema.safeParse(normalizeJson(part.text)).success)
       return;
@@ -13822,7 +14006,7 @@ function createGmailAttachmentFulfillment(dependencies, factoryContext = {}) {
     }
     if (call.controller.signal.aborted)
       throw new Error(UNKNOWN_OUTCOME);
-    if (isRecord(result) && result.ok === false) {
+    if (isRecord2(result) && result.ok === false) {
       throw new Error(UNKNOWN_OUTCOME);
     }
     const receipt = receiptSchema.safeParse(result);
@@ -13838,17 +14022,17 @@ function createGmailAttachmentFulfillment(dependencies, factoryContext = {}) {
   };
   return Object.assign(fulfill, {
     before: async (input, output) => {
-      if (!isRecord(input) || input.tool !== "openwork-cloud_execute_capability" || typeof input.sessionID !== "string" || typeof input.callID !== "string" || !isRecord(output) || !isRecord(output.args) || typeof output.args.name !== "string" || !NATIVE_GMAIL.test(output.args.name))
+      if (!isRecord2(input) || input.tool !== "openwork-cloud_execute_capability" || typeof input.sessionID !== "string" || typeof input.callID !== "string" || !isRecord2(output) || !isRecord2(output.args) || typeof output.args.name !== "string" || !NATIVE_GMAIL.test(output.args.name))
         return;
       const body = normalizeJson(output.args.body);
-      if (isRecord(body) && Array.isArray(body.attachments))
+      if (isRecord2(body) && Array.isArray(body.attachments))
         invocation(input.sessionID, input.callID);
     },
     event: async (input) => {
-      if (!isRecord(input) || !isRecord(input.event) || input.event.type !== "session.status")
+      if (!isRecord2(input) || !isRecord2(input.event) || input.event.type !== "session.status")
         return;
       const props = input.event.properties;
-      if (!isRecord(props) || typeof props.sessionID !== "string" || !isRecord(props.status))
+      if (!isRecord2(props) || typeof props.sessionID !== "string" || !isRecord2(props.status))
         return;
       if (props.status.type === "busy")
         idleSessions.delete(props.sessionID);
@@ -13868,51 +14052,6 @@ function createGmailAttachmentFulfillment(dependencies, factoryContext = {}) {
   });
 }
 
-// src/opencode-plugins/session-activity.ts
-var engineSessionStatusesSchema = exports_external.record(exports_external.string(), exports_external.object({ type: exports_external.string() }).passthrough());
-var enginePendingRequestsSchema = exports_external.array(exports_external.object({ sessionID: exports_external.string() }).passthrough());
-function sessionActivityFrom(statuses, permissions, questions, sessionId, descendantIds = [], unknownDescendants = 0) {
-  const parsedStatuses = engineSessionStatusesSchema.safeParse(statuses);
-  const parsedPermissions = enginePendingRequestsSchema.safeParse(permissions);
-  const parsedQuestions = enginePendingRequestsSchema.safeParse(questions);
-  const probesComplete = parsedStatuses.success && parsedPermissions.success && parsedQuestions.success;
-  const waiting = new Set([
-    ...parsedPermissions.success ? parsedPermissions.data.map((request) => request.sessionID) : [],
-    ...parsedQuestions.success ? parsedQuestions.data.map((request) => request.sessionID) : []
-  ]);
-  const statusFor = (id) => {
-    const type = parsedStatuses.success ? parsedStatuses.data[id]?.type : undefined;
-    if (type === "error")
-      return "error";
-    if (waiting.has(id) || type === "waiting")
-      return "waiting";
-    if (type === "busy" || type === "running")
-      return "busy";
-    if (type === "retry" || type === "compacting" || type === "thinking" || type === "responding")
-      return type;
-    return probesComplete && (type === undefined || type === "idle") ? "idle" : "unknown";
-  };
-  const descendantActivity = { busy: 0, waiting: 0, unknown: unknownDescendants };
-  for (const id of new Set(descendantIds)) {
-    if (id === sessionId)
-      continue;
-    const status = statusFor(id);
-    if (status === "unknown")
-      descendantActivity.unknown += 1;
-    else if (status === "waiting")
-      descendantActivity.waiting += 1;
-    else if (status !== "idle" && status !== "error")
-      descendantActivity.busy += 1;
-  }
-  const own = statusFor(sessionId);
-  return {
-    status: own !== "error" && descendantActivity.waiting > 0 ? "waiting" : own,
-    working: own !== "idle" && own !== "error" && own !== "unknown" || descendantActivity.busy > 0 || descendantActivity.waiting > 0,
-    descendantActivity,
-    inventoryComplete: probesComplete && own !== "unknown" && descendantActivity.unknown === 0
-  };
-}
-
 // ../../packages/types/src/openwork-affordance.ts
 var openworkAffordanceKindSchema = exports_external.enum(["query", "command", "guidance"]);
 var openworkProviderKindSchema = exports_external.enum(["builtin", "extension", "mcp", "connect"]);
@@ -14216,15 +14355,18 @@ var automationExecutionThreadSchema = exports_external.object({
 var automationExecutionTargetSchema = exports_external.enum(["desktop", "cloud"]);
 var AUTOMATION_MODEL_ATTENTION_CAPABILITY = "model_attention_v1";
 var REMOTE_SESSION_DESKTOP_RUNNER_CAPABILITY = "remote_session_v1";
+var REMOTE_SESSION_CONTROL_RUNNER_CAPABILITY = "remote_session_control_v1";
 var automationDesktopRunnerCapabilitySchema = exports_external.enum([
   AUTOMATION_MODEL_ATTENTION_CAPABILITY,
-  REMOTE_SESSION_DESKTOP_RUNNER_CAPABILITY
+  REMOTE_SESSION_DESKTOP_RUNNER_CAPABILITY,
+  REMOTE_SESSION_CONTROL_RUNNER_CAPABILITY
 ]);
+var AUTOMATION_DESKTOP_RUNNER_CAPABILITY_LIMIT = 3;
 var automationDesktopRunnerRegistrationSchema = exports_external.object({
   runnerId: idSchema.min(8),
   protocolVersion: exports_external.literal(1),
   supportedExecutionTargets: exports_external.array(exports_external.literal("desktop")).length(1),
-  capabilities: exports_external.array(automationDesktopRunnerCapabilitySchema).max(2).default([]),
+  capabilities: exports_external.array(automationDesktopRunnerCapabilitySchema).max(AUTOMATION_DESKTOP_RUNNER_CAPABILITY_LIMIT).default([]),
   appVersion: exports_external.string().trim().min(1).max(80),
   platform: exports_external.enum(["darwin", "win32", "linux"]),
   concurrency: exports_external.number().int().min(1).max(4)
@@ -14240,10 +14382,11 @@ var automationRunnerNotificationSchema = exports_external.object({
 }).strict();
 var automationRunnerWorkItemSchema = exports_external.union([
   exports_external.object({ runId: idSchema, executionTarget: exports_external.literal("desktop") }),
-  exports_external.object({ kind: exports_external.literal("remote_session_create"), commandId: idSchema })
+  exports_external.object({ kind: exports_external.literal("remote_session_create"), commandId: idSchema }),
+  exports_external.object({ kind: exports_external.literal("remote_session_request"), requestId: idSchema })
 ]);
 var automationRunnerWorkResponseSchema = exports_external.object({
-  items: exports_external.array(automationRunnerWorkItemSchema).max(9)
+  items: exports_external.array(automationRunnerWorkItemSchema).max(14)
 });
 var remoteSessionCommandAssignmentSchema = exports_external.object({
   commandId: idSchema,
@@ -14289,6 +14432,127 @@ var remoteSessionCommandCompleteResponseSchema = exports_external.object({
     workspaceId: exports_external.string().max(240).nullable()
   })
 });
+var REMOTE_SESSION_FINAL_TEXT_MAX_LENGTH = 20000;
+var remoteSessionStatusSchema = exports_external.enum(["running", "waiting", "idle", "error"]);
+var remoteSessionWaitingForSchema = exports_external.enum(["permission", "question"]);
+var remoteSessionEngineSchema = exports_external.enum(["v1", "v2"]);
+var remoteSessionModelSchema = exports_external.object({
+  providerId: idSchema,
+  modelId: idSchema,
+  variant: exports_external.string().trim().min(1).max(60).nullable().optional()
+});
+var remoteSessionCommandSessionReportSchema = exports_external.object({
+  status: remoteSessionStatusSchema,
+  waitingFor: remoteSessionWaitingForSchema.nullable().optional(),
+  engine: remoteSessionEngineSchema.optional(),
+  model: remoteSessionModelSchema.nullable().optional(),
+  finalText: exports_external.string().max(REMOTE_SESSION_FINAL_TEXT_MAX_LENGTH).optional(),
+  error: remoteSessionCommandErrorSchema.nullable().optional(),
+  messageCount: exports_external.number().int().min(0).optional(),
+  observedAt: timestampSchema
+});
+var remoteSessionCommandSessionReportResponseSchema = exports_external.object({ ok: exports_external.literal(true) });
+var REMOTE_SESSION_REQUEST_RESULT_MAX_BYTES = 256 * 1024;
+var REMOTE_SESSION_TRANSCRIPT_TEXT_MAX_LENGTH = 20000;
+var REMOTE_SESSION_TOOL_SUMMARY_MAX_LENGTH = 2000;
+var REMOTE_SESSION_TRANSCRIPT_PAGE_MAX = 100;
+var remoteSessionRequestActionSchema = exports_external.enum(["read", "send", "stop"]);
+var remoteSessionMessageIdSchema = exports_external.string().regex(/^msg_[a-zA-Z0-9]+$/).max(160);
+var remoteSessionReadInputSchema = exports_external.object({
+  from: exports_external.enum(["start", "end"]),
+  cursor: exports_external.string().trim().min(1).max(160).nullable(),
+  limit: exports_external.number().int().min(1).max(REMOTE_SESSION_TRANSCRIPT_PAGE_MAX)
+});
+var remoteSessionSendInputSchema = exports_external.object({
+  prompt: exports_external.string().min(1).max(1e5),
+  messageId: remoteSessionMessageIdSchema.nullable(),
+  model: remoteSessionModelSchema.nullable()
+});
+var remoteSessionStopInputSchema = exports_external.object({
+  messageId: exports_external.string().trim().min(1).max(160).nullable()
+});
+var remoteSessionRequestInputSchema = exports_external.discriminatedUnion("action", [
+  exports_external.object({ action: exports_external.literal("read"), input: remoteSessionReadInputSchema }),
+  exports_external.object({ action: exports_external.literal("send"), input: remoteSessionSendInputSchema }),
+  exports_external.object({ action: exports_external.literal("stop"), input: remoteSessionStopInputSchema })
+]);
+var remoteSessionRequestAssignmentBase = {
+  requestId: idSchema,
+  kind: exports_external.literal("remote_session_request"),
+  commandId: idSchema,
+  sessionId: exports_external.string().trim().min(1).max(240),
+  workspaceId: exports_external.string().trim().min(1).max(240),
+  engine: remoteSessionEngineSchema.nullable(),
+  expiresAt: timestampSchema
+};
+var remoteSessionRequestAssignmentSchema = exports_external.discriminatedUnion("action", [
+  exports_external.object({ ...remoteSessionRequestAssignmentBase, action: exports_external.literal("read"), input: remoteSessionReadInputSchema }),
+  exports_external.object({ ...remoteSessionRequestAssignmentBase, action: exports_external.literal("send"), input: remoteSessionSendInputSchema }),
+  exports_external.object({ ...remoteSessionRequestAssignmentBase, action: exports_external.literal("stop"), input: remoteSessionStopInputSchema })
+]);
+var remoteSessionRequestClaimResponseSchema = exports_external.object({
+  assignment: remoteSessionRequestAssignmentSchema
+});
+var boundedSummarySchema = exports_external.string().max(REMOTE_SESSION_TOOL_SUMMARY_MAX_LENGTH).nullable();
+var remoteSessionTranscriptToolCallSchema = exports_external.object({
+  id: exports_external.string().max(240),
+  name: exports_external.string().max(240),
+  status: exports_external.string().max(60).nullable(),
+  input: boundedSummarySchema,
+  output: boundedSummarySchema,
+  error: boundedSummarySchema,
+  truncated: exports_external.boolean()
+});
+var remoteSessionTranscriptMessageSchema = exports_external.object({
+  id: exports_external.string().max(240),
+  role: exports_external.enum(["user", "assistant"]),
+  createdAt: timestampSchema.nullable(),
+  text: exports_external.string().max(REMOTE_SESSION_TRANSCRIPT_TEXT_MAX_LENGTH),
+  truncated: exports_external.boolean(),
+  toolCalls: exports_external.array(remoteSessionTranscriptToolCallSchema).max(200),
+  error: remoteSessionCommandErrorSchema.nullable()
+});
+var remoteSessionReadResultSchema = exports_external.object({
+  title: exports_external.string().max(240).nullable(),
+  status: remoteSessionStatusSchema,
+  waitingFor: remoteSessionWaitingForSchema.nullable(),
+  lastError: remoteSessionCommandErrorSchema.nullable(),
+  messageCount: exports_external.number().int().min(0),
+  from: exports_external.enum(["start", "end"]),
+  messages: exports_external.array(remoteSessionTranscriptMessageSchema).max(REMOTE_SESSION_TRANSCRIPT_PAGE_MAX),
+  nextCursor: exports_external.string().max(160).nullable()
+});
+var remoteSessionSendResultSchema = exports_external.object({
+  messageId: exports_external.string().max(160).nullable(),
+  alreadyPresent: exports_external.boolean()
+});
+var remoteSessionStopResultSchema = exports_external.object({
+  stopped: exports_external.boolean(),
+  reason: exports_external.enum(["different_turn"]).nullable()
+});
+var remoteSessionRequestResultSchema = exports_external.discriminatedUnion("action", [
+  exports_external.object({ action: exports_external.literal("read"), result: remoteSessionReadResultSchema }),
+  exports_external.object({ action: exports_external.literal("send"), result: remoteSessionSendResultSchema }),
+  exports_external.object({ action: exports_external.literal("stop"), result: remoteSessionStopResultSchema })
+]);
+var remoteSessionRequestCompleteRequestSchema = exports_external.discriminatedUnion("status", [
+  exports_external.object({
+    status: exports_external.literal("done"),
+    outcome: remoteSessionRequestResultSchema,
+    error: exports_external.never().optional()
+  }),
+  exports_external.object({
+    status: exports_external.literal("failed"),
+    outcome: exports_external.never().optional(),
+    error: remoteSessionCommandErrorSchema
+  })
+]).refine((body) => body.status !== "done" || new TextEncoder().encode(JSON.stringify(body.outcome)).byteLength <= REMOTE_SESSION_REQUEST_RESULT_MAX_BYTES, { message: `The result must be at most ${REMOTE_SESSION_REQUEST_RESULT_MAX_BYTES} bytes`, path: ["outcome"] });
+var remoteSessionRequestCompleteResponseSchema = exports_external.object({
+  request: exports_external.object({ id: idSchema, status: exports_external.enum(["done", "failed"]) })
+});
+var remoteSessionRequestPendingResponseSchema = exports_external.object({
+  items: exports_external.array(exports_external.object({ kind: exports_external.literal("remote_session_request"), requestId: idSchema })).max(5)
+});
 var automationDesktopRunnerAssignmentSchema = exports_external.object({
   executionTarget: exports_external.literal("desktop"),
   runId: idSchema,
@@ -14544,14 +14808,14 @@ var OPENWORK_CLOUD_CONNECTION_INSTRUCTION = `The OpenWork Cloud connection is ve
 var OPENWORK_CONNECT_SIGN_IN_INSTRUCTION = `${OPENWORK_EXTENSION_DISCOVERY_INSTRUCTION} OpenWork Cloud is not signed in or no desired agent access configuration exists for this workspace. Direct the user to sign in to OpenWork and connect the service in Settings → Connect.`;
 var OPENWORK_CONNECT_DISABLED_INSTRUCTION = `${OPENWORK_EXTENSION_DISCOVERY_INSTRUCTION} OpenWork Cloud agent access is explicitly disabled for this workspace. Explain that the user can enable agent access in Settings → Connect.`;
 var OPENWORK_CLOUD_MCP_NAME = "openwork-cloud";
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function readString(value) {
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
 function getRecordProperty(value, key) {
-  return isRecord2(value) ? value[key] : undefined;
+  return isRecord3(value) ? value[key] : undefined;
 }
 function readNestedString(value, keys) {
   let current = value;
@@ -14561,9 +14825,9 @@ function readNestedString(value, keys) {
 }
 function readContext(input) {
   const context = getRecordProperty(input, "context");
-  const session = getRecordProperty(input, "session");
-  const directory = readNestedString(input, ["directory"]) ?? readNestedString(context, ["directory"]) ?? readNestedString(session, ["directory"]);
-  const worktree = readNestedString(input, ["worktree"]) ?? readNestedString(context, ["worktree"]) ?? readNestedString(session, ["worktree"]);
+  const session2 = getRecordProperty(input, "session");
+  const directory = readNestedString(input, ["directory"]) ?? readNestedString(context, ["directory"]) ?? readNestedString(session2, ["directory"]);
+  const worktree = readNestedString(input, ["worktree"]) ?? readNestedString(context, ["worktree"]) ?? readNestedString(session2, ["worktree"]);
   const workspaceId = readNestedString(input, ["workspaceId"]) ?? readNestedString(input, ["workspaceID"]) ?? readNestedString(context, ["workspaceId"]) ?? readNestedString(context, ["workspaceID"]);
   return {
     ...directory ? { directory } : {},
@@ -14611,7 +14875,7 @@ async function parseResponse(response) {
   }
 }
 function getStringProperty(value, key) {
-  if (!isRecord2(value))
+  if (!isRecord3(value))
     return null;
   const property = value[key];
   return typeof property === "string" ? property : null;
@@ -14624,11 +14888,11 @@ function readEngineDirectory(input, fallback) {
   return context.directory ?? context.worktree ?? readString(fallback);
 }
 function engineStatusPayload(result) {
-  if (!isRecord2(result))
+  if (!isRecord3(result))
     return result;
-  const data = result.data;
-  if (data !== undefined)
-    return data;
+  const data2 = result.data;
+  if (data2 !== undefined)
+    return data2;
   if (result.error !== undefined)
     throw new Error("OpenCode MCP status request failed");
   const responseOk = getRecordProperty(result.response, "ok");
@@ -14845,7 +15109,7 @@ function sessionContribution() {
         id: "session.search",
         kind: "query",
         title: "Find sessions",
-        description: "Search session titles and transcripts without changing the visible workbench. Every root session's title is matched; transcripts are scanned for the `scanLimit` newest sessions only, so when the result's `truncated` is true, retry with a larger `scanLimit` (max 500). Title and phrase matches rank first, then newest `updatedAt`. Each result carries `createdAt`, `archived` and `parentId`.",
+        description: "Search session titles and transcripts without changing the visible workbench. Every root session's title is matched; transcripts are scanned for the `scanLimit` newest sessions only, so when the result's `truncated` is true, retry with a larger `scanLimit` (max 500). Title and phrase matches rank first, then newest `updatedAt`. Each result carries `createdAt`, `archived`, `parentId` and `engine` (v1 or v2, the engine that holds the session).",
         provider,
         arguments: [
           argument("query", "string", true, "Text to find in session titles or messages."),
@@ -14864,7 +15128,7 @@ function sessionContribution() {
         id: "session.read",
         kind: "query",
         title: "Read a session transcript",
-        description: "Read messages from a session without opening it. The result also carries `createdAt`, `archived`, `parentId`, `status` (idle, busy, retry, waiting), `working` (check it before session.archive), and `model` ({ providerId, modelId, variant, displayName?, providerName? } the session is bound to, variant being its reasoning effort; null before a model is bound). Pass `summary: true` to get only the first user message and the last assistant message (what was asked, what was concluded) in one call. Both modes include `lastError` ({ code, message } or null) from the latest assistant info.error before text filtering: end reads inspect only the fetched newest `count` messages; start/summary inspect the whole transcript, even outside displayed text. Null means no assistant error observed in that window; a later assistant without an error clears it. Codes are allowlisted error names (otherwise UnknownError); messages are fixed labels under 160 characters, never arbitrary provider details. Snapshot errors only: event-only failures, including pre-assistant model-not-found, are not observable here.",
+        description: "Read messages from a session without opening it. Finds the session on either engine. The result also carries `engine` (v1 or v2), `createdAt`, `archived`, `parentId`, `status` (idle, busy, retry, waiting), `working` (check it before session.archive), and `model` ({ providerId, modelId, variant, displayName?, providerName? } the session is bound to, variant being its reasoning effort; null before a model is bound). Pass `summary: true` to get only the first user message and the last assistant message (what was asked, what was concluded) in one call. Both modes include `lastError` ({ code, message } or null) from the latest assistant info.error before text filtering: end reads inspect only the fetched newest `count` messages; start/summary inspect the whole transcript, even outside displayed text. Null means no assistant error observed in that window; a later assistant without an error clears it. Codes are allowlisted error names (otherwise UnknownError); messages are fixed labels under 160 characters, never arbitrary provider details. Snapshot errors only: event-only failures, including pre-assistant model-not-found, are not observable here.",
         provider,
         arguments: [
           argument("sessionId", "string", true, "Session id returned by session.search."),
@@ -15123,18 +15387,18 @@ A dispatch receipt or a website callback returning does not prove the requested
 If sign-in, CAPTCHA or a sensitive input is needed, call browser_handoff. Ask the user to sign in directly in the browser and resume there; never request passwords, cookies, tokens or one-time codes in chat. Do not put page content or authentication data into logs or evidence.
 Models without vision should use site tools and text observations. When a task requires visual interpretation they cannot perform, request user help. No model selection changes permission or session boundaries.`;
 var WEBMCP_EXECUTION_TIMEOUT_MS = 125000;
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var MAX_PRESERVED_MCP_APP_RESULT_BYTES = 1024 * 1024;
 function preserveMcpResult(output) {
-  if (!isRecord3(output) || !Array.isArray(output.content))
+  if (!isRecord4(output) || !Array.isArray(output.content))
     return;
   const appResult = {
     content: output.content,
     ...typeof output.isError === "boolean" ? { isError: output.isError } : {},
     ...output.structuredContent !== undefined ? { structuredContent: output.structuredContent } : {},
-    ...isRecord3(output._meta) ? { _meta: output._meta } : {}
+    ...isRecord4(output._meta) ? { _meta: output._meta } : {}
   };
   try {
     if (new TextEncoder().encode(JSON.stringify(appResult)).byteLength > MAX_PRESERVED_MCP_APP_RESULT_BYTES)
@@ -15142,7 +15406,7 @@ function preserveMcpResult(output) {
   } catch {
     return;
   }
-  const existing = isRecord3(output.metadata) ? output.metadata : {};
+  const existing = isRecord4(output.metadata) ? output.metadata : {};
   output.metadata = {
     ...existing,
     openworkMcpApp: appResult
@@ -15154,7 +15418,7 @@ var affordanceExternalWriteEffects = { data: "write", ui: "none", external: true
 var affordanceWriteNavigateEffects = { data: "write", ui: "navigate", external: false };
 var affordanceProposalEffects = { data: "none", ui: "none", external: false };
 function affordanceResult(id, result, effects) {
-  if (isRecord3(result) && result.ok === false) {
+  if (isRecord4(result) && result.ok === false) {
     return {
       ok: false,
       id,
@@ -15169,7 +15433,7 @@ function unavailableAffordance(id, error48) {
   return { ok: false, id, error: error48, code: "unavailable" };
 }
 function optionalStringProperty(value, key) {
-  if (!isRecord3(value))
+  if (!isRecord4(value))
     return;
   const property = value[key];
   return typeof property === "string" && property.trim().length > 0 ? property : undefined;
@@ -15178,15 +15442,15 @@ function isOpenWorkEngineMcpStatusFunction(value) {
   return typeof value === "function";
 }
 function readEngineMcpStatusClient(value) {
-  const client = isRecord3(value) ? value.client : undefined;
-  const mcp = isRecord3(client) ? client.mcp : undefined;
-  const status = isRecord3(mcp) ? mcp.status : undefined;
+  const client = isRecord4(value) ? value.client : undefined;
+  const mcp = isRecord4(client) ? client.mcp : undefined;
+  const status = isRecord4(mcp) ? mcp.status : undefined;
   if (!isOpenWorkEngineMcpStatusFunction(status))
     return;
   return { mcp: { status: (request) => status.call(mcp, request) } };
 }
 function normalizeOpenCodeContext(value) {
-  const nested = isRecord3(value) && isRecord3(value.context) ? value.context : value;
+  const nested = isRecord4(value) && isRecord4(value.context) ? value.context : value;
   const agent = optionalStringProperty(nested, "agent");
   const sessionID = optionalStringProperty(nested, "sessionID");
   const messageID = optionalStringProperty(nested, "messageID");
@@ -15219,6 +15483,9 @@ async function uiControlRequest(kind, input) {
   }
 }
 async function serverGet(path) {
+  const transport = openworkReadTransport.getStore();
+  if (transport)
+    return transport.get(path);
   const { url: url2, token } = requireOpenWorkServer2();
   const response = await fetch(`${url2}${path}`, {
     headers: { Authorization: `Bearer ${token}` }
@@ -15241,8 +15508,8 @@ async function readEngineMcpDescriptors(client, directory) {
     return [];
   try {
     const result = await client.mcp.status(directory ? { query: { directory } } : undefined);
-    const payload = isRecord3(result) && result.data !== undefined ? result.data : result;
-    if (!isRecord3(payload))
+    const payload = isRecord4(result) && result.data !== undefined ? result.data : result;
+    if (!isRecord4(payload))
       return [];
     return Object.entries(payload).map(([name, entry]) => {
       const status = typeof entry === "string" ? entry : optionalStringProperty(entry, "status");
@@ -15260,7 +15527,7 @@ async function readOpenworkAgentContext(engineMcpStatusClient, engineMcpStatusDi
   ]);
   const contributions = buildOpenworkProviderContributions(skills, mcps);
   const providerAffordances = contributions.flatMap((contribution) => contribution.affordances);
-  const uiContext = isRecord3(uiResult) && isRecord3(uiResult.context) ? uiResult.context : null;
+  const uiContext = isRecord4(uiResult) && isRecord4(uiResult.context) ? uiResult.context : null;
   if (!uiContext) {
     return {
       ok: true,
@@ -15297,7 +15564,7 @@ async function queryOpenworkAffordance(rawArgs) {
     return unavailableAffordance(request.id, "This affordance declares a dedicated Connect executor. Call the tool named in openwork_context.");
   }
   const result = await uiControlRequest("query", request);
-  return isRecord3(result) && typeof result.ok === "boolean" ? result : unavailableAffordance(request.id, "OpenWork UI query returned an invalid response.");
+  return isRecord4(result) && typeof result.ok === "boolean" ? result : unavailableAffordance(request.id, "OpenWork UI query returned an invalid response.");
 }
 async function executeOpenworkAffordance(rawArgs, context) {
   const request = openworkAffordanceRequestSchema2.parse(rawArgs);
@@ -15324,7 +15591,7 @@ async function executeOpenworkAffordance(rawArgs, context) {
     return unavailableAffordance(request.id, "This affordance declares a dedicated Connect executor. Call the tool named in openwork_context.");
   }
   const result = await uiControlRequest("command", { ...request, ...affordanceOrigin(context) });
-  return isRecord3(result) && typeof result.ok === "boolean" ? result : unavailableAffordance(request.id, "OpenWork UI command returned an invalid response.");
+  return isRecord4(result) && typeof result.ok === "boolean" ? result : unavailableAffordance(request.id, "OpenWork UI command returned an invalid response.");
 }
 function affordanceOrigin(context) {
   const sessionId = context.sessionID?.trim();
@@ -15346,46 +15613,47 @@ function buildSessionSnippet(text, index, length) {
 function workspaceLabel(workspace) {
   return workspace.displayName?.trim() || workspace.name?.trim() || workspace.path?.trim() || workspace.id;
 }
-function sessionTitle(session) {
-  return session.title?.trim() || session.id;
+function sessionTitle(session2) {
+  return session2.title?.trim() || session2.id;
 }
-function sessionUpdatedAt(session) {
-  return session.time?.updated ?? session.time?.created ?? 0;
+function sessionUpdatedAt(session2) {
+  return session2.time?.updated ?? session2.time?.created ?? 0;
 }
-function sessionCreatedAt(session) {
-  return session.time?.created ?? session.time?.updated ?? 0;
+function sessionCreatedAt(session2) {
+  return session2.time?.created ?? session2.time?.updated ?? 0;
 }
-function sessionArchived(session) {
-  const archived = session.time?.archived;
+function sessionArchived(session2) {
+  const archived = session2.time?.archived;
   return typeof archived === "number" && archived > 0;
 }
-function sessionMetadata(workspace, session) {
+function sessionMetadata(workspace, session2, engine) {
   return {
     workspaceId: workspace.id,
+    engine,
     workspace: workspaceLabel(workspace),
-    sessionId: session.id,
-    title: sessionTitle(session),
-    createdAt: sessionCreatedAt(session),
-    updatedAt: sessionUpdatedAt(session),
-    archived: sessionArchived(session),
-    parentId: session.parentID ?? null
+    sessionId: session2.id,
+    title: sessionTitle(session2),
+    createdAt: sessionCreatedAt(session2),
+    updatedAt: sessionUpdatedAt(session2),
+    archived: sessionArchived(session2),
+    parentId: session2.parentID ?? null
   };
 }
-function sessionPassesFilters(session, args) {
-  const createdAt = sessionCreatedAt(session);
+function sessionPassesFilters(session2, args) {
+  const createdAt = sessionCreatedAt(session2);
   if (args.createdAfter !== undefined && createdAt < sessionTimestampMs(args.createdAfter))
     return false;
   if (args.createdBefore !== undefined && createdAt > sessionTimestampMs(args.createdBefore))
     return false;
   const archived = args.archived ?? "include";
-  if (archived === "exclude" && sessionArchived(session))
+  if (archived === "exclude" && sessionArchived(session2))
     return false;
-  if (archived === "only" && !sessionArchived(session))
+  if (archived === "only" && !sessionArchived(session2))
     return false;
   return true;
 }
-function sessionModelOf(session) {
-  const model = session.model;
+function sessionModelOf(session2) {
+  const model = session2.model;
   if (!model)
     return null;
   const variant = model.variant?.trim();
@@ -15432,19 +15700,19 @@ function findTextMatch(text, queryLower, mode) {
   }
   return Number.isFinite(firstIndex) ? { index: firstIndex, length: firstLength, phrase: false } : null;
 }
-function titleSearchResult(workspace, session, queryLower, mode) {
-  const text = `${sessionTitle(session)} ${workspaceLabel(workspace)}`;
+function titleSearchResult(workspace, session2, engine, queryLower, mode) {
+  const text = `${sessionTitle(session2)} ${workspaceLabel(workspace)}`;
   const match = findTextMatch(text, queryLower, mode);
   if (!match)
     return null;
   return {
-    ...sessionMetadata(workspace, session),
+    ...sessionMetadata(workspace, session2, engine),
     kind: "title",
     phrase: match.phrase,
     snippet: buildSessionSnippet(text, match.index, match.length)
   };
 }
-function messageSearchResult(workspace, session, messages, queryLower, mode) {
+function messageSearchResult(workspace, session2, engine, messages, queryLower, mode) {
   let fallback = null;
   for (const [index, message] of messages.entries()) {
     const role = message.info.role;
@@ -15457,7 +15725,7 @@ function messageSearchResult(workspace, session, messages, queryLower, mode) {
     if (!match)
       continue;
     const result = {
-      ...sessionMetadata(workspace, session),
+      ...sessionMetadata(workspace, session2, engine),
       kind: "message",
       phrase: match.phrase,
       role,
@@ -15488,13 +15756,35 @@ function filterWorkspaces(workspaces, workspaceId) {
     return labels.includes(query);
   });
 }
-async function listWorkspaceSessions(workspace, limit) {
+function ownEngineReader() {
+  const transport = openworkReadTransport.getStore();
+  if (!transport)
+    return { engine: "v1", get: serverGet };
+  const activity = transport.activity;
+  return {
+    engine: transport.engine ?? "v1",
+    get: (path) => transport.get(path),
+    ...activity ? { activity: (workspaceId, sessionId) => activity(workspaceId, sessionId) } : {}
+  };
+}
+function engineReaders() {
+  const own = ownEngineReader();
+  const transport = openworkReadTransport.getStore();
+  if (transport)
+    return transport.other ? [own, transport.other] : [own];
+  return [own, {
+    engine: "v2",
+    get: createV2ReadAdapter(serverGet),
+    activity: (workspaceId, sessionId) => readV2SessionActivity(serverGet, workspaceId, sessionId)
+  }];
+}
+async function listWorkspaceSessions(reader, workspace, limit) {
   const query = new URLSearchParams({ roots: "true", limit: String(limit) });
-  return exports_external.array(sessionInfoSchema).parse(await serverGet(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session?${query.toString()}`));
+  return exports_external.array(sessionInfoSchema).parse(await reader.get(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session?${query.toString()}`));
 }
-async function assertSessionInWorkspace(workspace, session) {
+async function assertSessionInWorkspace(workspace, session2) {
   const workspacePath = workspace.path?.trim();
-  const sessionDirectory = session.directory?.trim();
+  const sessionDirectory = session2.directory?.trim();
   if (!workspacePath || !sessionDirectory)
     return;
   const [root, dir] = await Promise.all([
@@ -15505,26 +15795,26 @@ async function assertSessionInWorkspace(workspace, session) {
   const normalizedDir = normalizeDirPath(dir);
   if (normalizedDir === normalizedRoot || normalizedDir.startsWith(`${normalizedRoot}/`))
     return;
-  throw new Error(`Session ${session.id} not found in workspace ${workspaceLabel(workspace)}`);
+  throw new Error(`Session ${session2.id} not found in workspace ${workspaceLabel(workspace)}`);
 }
-async function readWorkspaceSession(workspace, sessionId) {
-  const session = sessionInfoSchema.parse(await serverGet(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(sessionId)}`));
-  await assertSessionInWorkspace(workspace, session);
-  return session;
+async function readWorkspaceSession(workspace, sessionId, reader = ownEngineReader()) {
+  const session2 = sessionInfoSchema.parse(await reader.get(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(sessionId)}`));
+  await assertSessionInWorkspace(workspace, session2);
+  return session2;
 }
 var MAX_SESSION_DESCENDANTS = 256;
 var sessionChildrenSchema = exports_external.array(exports_external.object({
   id: exports_external.string().trim().min(1),
   time: exports_external.object({ archived: exports_external.number().optional() }).optional()
 }).passthrough());
-async function readSessionDescendantIds(base, sessionId) {
+async function readSessionDescendantIds(get, base, sessionId) {
   const queue = [sessionId];
   const seen = new Set(queue);
   const ids = [];
   let unknown2 = 0;
   let index = 0;
   for (;index < queue.length && index < MAX_SESSION_DESCENDANTS; index += 1) {
-    const parsed = sessionChildrenSchema.safeParse(await serverGet(`${base}/session/${encodeURIComponent(queue[index])}/children`).catch(() => null));
+    const parsed = sessionChildrenSchema.safeParse(await get(`${base}/session/${encodeURIComponent(queue[index])}/children`).catch(() => null));
     if (!parsed.success) {
       unknown2 += 1;
       continue;
@@ -15545,32 +15835,34 @@ async function readSessionDescendantIds(base, sessionId) {
   }
   return { ids, unknown: unknown2 };
 }
-async function readSessionActivity(workspace, session) {
+async function readSessionActivity(reader, workspace, session2) {
+  if (reader.activity)
+    return reader.activity(workspace.id, session2.id);
   const base = `/workspace/${encodeURIComponent(workspace.id)}/opencode`;
-  const probe = (path) => serverGet(`${base}${path}`).catch(() => null);
+  const probe = (path) => reader.get(`${base}${path}`).catch(() => null);
   const [statuses, permissions, questions, descendants] = await Promise.all([
     probe("/session/status"),
     probe("/permission"),
     probe("/question"),
-    session.time?.archived ? { ids: [], unknown: 0 } : readSessionDescendantIds(base, session.id)
+    session2.time?.archived ? { ids: [], unknown: 0 } : readSessionDescendantIds((path) => reader.get(path), base, session2.id)
   ]);
-  return sessionActivityFrom(statuses, permissions, questions, session.id, descendants.ids, descendants.unknown);
+  return sessionActivityFrom(statuses, permissions, questions, session2.id, descendants.ids, descendants.unknown);
 }
-async function readSessionMessages(workspace, sessionId, limit) {
+async function readSessionMessages(reader, workspace, sessionId, limit) {
   const query = limit === undefined ? "" : `?${new URLSearchParams({ limit: String(limit) }).toString()}`;
-  return exports_external.array(sessionMessageSchema).parse(await serverGet(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(sessionId)}/message${query}`));
+  return exports_external.array(sessionMessageSchema).parse(await reader.get(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(sessionId)}/message${query}`));
 }
-async function forEachWithConcurrency(items, concurrency, run) {
+async function forEachWithConcurrency(items2, concurrency, run) {
   let index = 0;
   const worker = async () => {
-    while (index < items.length) {
-      const item = items[index];
+    while (index < items2.length) {
+      const item = items2[index];
       index += 1;
       if (item !== undefined)
         await run(item);
     }
   };
-  await Promise.all(Array.from({ length: Math.min(Math.max(1, concurrency), Math.max(1, items.length)) }, () => worker()));
+  await Promise.all(Array.from({ length: Math.min(Math.max(1, concurrency), Math.max(1, items2.length)) }, () => worker()));
 }
 async function searchOpenWorkSessions(rawArgs) {
   const parsed = sessionSearchArgsSchema.safeParse(rawArgs);
@@ -15588,34 +15880,45 @@ async function searchOpenWorkSessions(rawArgs) {
   }
   const sessions = [];
   const workspaceErrors = [];
+  const readers = engineReaders();
   await Promise.all(workspaces.map(async (workspace) => {
-    try {
-      const items = await listWorkspaceSessions(workspace, SESSION_SEARCH_TITLE_LIST_LIMIT);
-      for (const session of items)
-        if (sessionPassesFilters(session, args))
-          sessions.push({ workspace, session });
-    } catch (error48) {
-      workspaceErrors.push({ workspaceId: workspace.id, workspace: workspaceLabel(workspace), error: unknownErrorMessage(error48) });
-    }
+    const listed = await Promise.all(readers.map((reader, index) => listWorkspaceSessions(reader, workspace, SESSION_SEARCH_TITLE_LIST_LIMIT).catch((error48) => {
+      if (index === 0)
+        workspaceErrors.push({ workspaceId: workspace.id, workspace: workspaceLabel(workspace), error: unknownErrorMessage(error48) });
+      return [];
+    })));
+    const seen = new Set;
+    listed.forEach((items2, index) => {
+      const reader = readers[index];
+      if (!reader)
+        return;
+      for (const session2 of items2) {
+        if (seen.has(session2.id))
+          continue;
+        seen.add(session2.id);
+        if (sessionPassesFilters(session2, args))
+          sessions.push({ workspace, session: session2, reader });
+      }
+    });
   }));
   sessions.sort((left, right) => sessionUpdatedAt(right.session) - sessionUpdatedAt(left.session));
   const sessionsToScan = sessions.slice(0, scanLimit);
   const matches = [];
   const titleMatched = new Set;
-  for (const { workspace, session } of sessions.slice(scanLimit)) {
-    const titleMatch = titleSearchResult(workspace, session, queryLower, mode);
+  for (const { workspace, session: session2, reader } of sessions.slice(scanLimit)) {
+    const titleMatch = titleSearchResult(workspace, session2, reader.engine, queryLower, mode);
     if (!titleMatch)
       continue;
-    titleMatched.add(session.id);
+    titleMatched.add(session2.id);
     matches.push(titleMatch);
   }
-  await forEachWithConcurrency(sessionsToScan, SESSION_SEARCH_CONCURRENCY, async ({ workspace, session }) => {
-    const titleMatch = titleSearchResult(workspace, session, queryLower, mode);
+  await forEachWithConcurrency(sessionsToScan, SESSION_SEARCH_CONCURRENCY, async ({ workspace, session: session2, reader }) => {
+    const titleMatch = titleSearchResult(workspace, session2, reader.engine, queryLower, mode);
     if (titleMatch)
-      titleMatched.add(session.id);
+      titleMatched.add(session2.id);
     try {
-      const messages = await readSessionMessages(workspace, session.id, messageLimit);
-      const messageMatch = messageSearchResult(workspace, session, messages, queryLower, mode);
+      const messages = await readSessionMessages(reader, workspace, session2.id, messageLimit);
+      const messageMatch = messageSearchResult(workspace, session2, reader.engine, messages, queryLower, mode);
       if (messageMatch)
         matches.push(messageMatch);
       else if (titleMatch)
@@ -15654,7 +15957,7 @@ function lastAssistantError(messages) {
   const error48 = [...messages].reverse().find((message) => message.info.role === "assistant")?.info.error;
   if (error48 === undefined || error48 === null)
     return null;
-  if (isRecord3(error48) && typeof error48.name === "string") {
+  if (isRecord4(error48) && typeof error48.name === "string") {
     const message = assistantErrorMessages.get(error48.name);
     if (message !== undefined)
       return { code: error48.name, message };
@@ -15670,8 +15973,16 @@ function readableMessages(messages) {
     text: messageText(message)
   })).filter((message) => message.text.trim().length > 0);
 }
-async function readWorkspaceModels(workspace) {
-  return openworkCatalogModels(openworkEngineProviderCatalogSchema.parse(await serverGet(`/workspace/${encodeURIComponent(workspace.id)}/opencode/provider`)));
+async function readWorkspaceModels(reader, workspace) {
+  return openworkCatalogModels(openworkEngineProviderCatalogSchema.parse(await reader.get(`/workspace/${encodeURIComponent(workspace.id)}/opencode/provider`)));
+}
+async function readSessionOnEitherEngine(workspace, sessionId, readers) {
+  for (const reader of readers) {
+    try {
+      return { session: await readWorkspaceSession(workspace, sessionId, reader), reader };
+    } catch {}
+  }
+  return null;
 }
 async function readOpenWorkSession(rawArgs) {
   const parsed = sessionReadArgsSchema.safeParse(rawArgs);
@@ -15685,19 +15996,26 @@ async function readOpenWorkSession(rawArgs) {
   if (!workspaces.length) {
     return { ok: false, error: args.workspaceId ? `No workspace matched ${args.workspaceId}` : "No OpenWork workspaces are available" };
   }
+  const readers = engineReaders();
   for (const workspace of workspaces) {
     try {
-      const session = await readWorkspaceSession(workspace, args.sessionId);
+      const located = await readSessionOnEitherEngine(workspace, args.sessionId, readers);
+      if (!located) {
+        if (args.workspaceId)
+          break;
+        continue;
+      }
+      const { session: session2, reader } = located;
       const needsFullTranscript = summary || from === "start";
       const [messages, activity, catalog] = await Promise.all([
-        readSessionMessages(workspace, args.sessionId, needsFullTranscript ? undefined : count),
-        readSessionActivity(workspace, session),
-        readWorkspaceModels(workspace).catch(() => [])
+        readSessionMessages(reader, workspace, args.sessionId, needsFullTranscript ? undefined : count),
+        readSessionActivity(reader, workspace, session2),
+        readWorkspaceModels(reader, workspace).catch(() => [])
       ]);
       const lastError = lastAssistantError(messages);
       const readable = readableMessages(messages);
       const metadata = {
-        ...sessionMetadata(workspace, session),
+        ...sessionMetadata(workspace, session2, reader.engine),
         ...activity,
         lastError
       };
@@ -15705,7 +16023,7 @@ async function readOpenWorkSession(rawArgs) {
         return {
           ok: true,
           ...metadata,
-          model: labelOpenworkSessionModel(sessionModelOf(session), catalog),
+          model: labelOpenworkSessionModel(sessionModelOf(session2), catalog),
           totalMessages: readable.length,
           firstUser: readable.find((message) => message.role === "user") ?? null,
           lastAssistant: [...readable].reverse().find((message) => message.role === "assistant") ?? null
@@ -15715,7 +16033,7 @@ async function readOpenWorkSession(rawArgs) {
       return {
         ok: true,
         ...metadata,
-        model: labelOpenworkSessionModel(sessionModelOf(session), catalog),
+        model: labelOpenworkSessionModel(sessionModelOf(session2), catalog),
         from,
         returned: window.length,
         requested: count,
@@ -15756,26 +16074,26 @@ async function sendToOpenWorkSession(rawArgs, context) {
   const located = await locateOpenWorkSession(args.sessionId, args.workspaceId);
   if ("error" in located)
     return { ok: false, error: located.error };
-  const { workspace, session } = located;
+  const { workspace, session: session2 } = located;
   const messageId = createSendMessageId();
-  await postJson(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(session.id)}/prompt_async`, { messageID: messageId, parts: [{ type: "text", text: args.text }] });
+  await postJson(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(session2.id)}/prompt_async`, { messageID: messageId, parts: [{ type: "text", text: args.text }] });
   const result = {
     ok: true,
     accepted: true,
-    sessionId: session.id,
+    sessionId: session2.id,
     workspaceId: workspace.id,
     workspace: workspaceLabel(workspace),
-    title: sessionTitle(session),
+    title: sessionTitle(session2),
     messageId
   };
   if (args.reveal !== true)
     return result;
   const opened = await uiControlRequest("command", {
     id: "session.open",
-    args: { sessionId: session.id },
+    args: { sessionId: session2.id },
     ...affordanceOrigin(context)
   });
-  return { ...result, revealed: isRecord3(opened) && opened.ok === true };
+  return { ...result, revealed: isRecord4(opened) && opened.ok === true };
 }
 function serverUrl2() {
   return String(process.env.OPENWORK_SERVER_URL || "").replace(/\/$/, "");
@@ -15876,7 +16194,7 @@ async function createOpenWorkSessions(rawArgs, context) {
   let models;
   try {
     catalog = [];
-    if (args.model || args.sessions.some((session) => session.model)) {
+    if (args.model || args.sessions.some((session2) => session2.model)) {
       const envelope = openworkAffordanceResultSchema.safeParse(await uiControlRequest("query", {
         id: "models.list",
         args: { workspaceId: workspace.id }
@@ -15890,23 +16208,23 @@ async function createOpenWorkSessions(rawArgs, context) {
       catalog = result.models;
     }
     const defaultModel = args.model ? resolveOpenworkModel(args.model, catalog) : undefined;
-    models = args.sessions.map((session) => session.model ? resolveOpenworkModel(session.model, catalog) : defaultModel);
+    models = args.sessions.map((session2) => session2.model ? resolveOpenworkModel(session2.model, catalog) : defaultModel);
   } catch (error48) {
     return { ok: false, error: unknownErrorMessage(error48) };
   }
   let createdOnEngine = false;
-  const results = await Promise.all(args.sessions.map(async (session, index) => {
+  const results = await Promise.all(args.sessions.map(async (session2, index) => {
     const inputTitle = argumentAtPath(rawArgs, ["sessions", index, "title"]);
     const titleTruncated = typeof inputTitle === "string" && inputTitle.trim().length > 120;
     const model = models[index];
     try {
-      const payload = sessionInfoSchema.parse(await postJson(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session`, { title: session.title, ...model ? { model: engineSessionCreateModel(model) } : {} }));
+      const payload = sessionInfoSchema.parse(await postJson(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session`, { title: session2.title, ...model ? { model: engineSessionCreateModel(model) } : {} }));
       createdOnEngine = true;
-      await postJson(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(payload.id)}/prompt_async`, { ...model ? enginePromptModel(model) : {}, parts: [{ type: "text", text: session.prompt }] });
+      await postJson(`/workspace/${encodeURIComponent(workspace.id)}/opencode/session/${encodeURIComponent(payload.id)}/prompt_async`, { ...model ? enginePromptModel(model) : {}, parts: [{ type: "text", text: session2.prompt }] });
       return {
         ok: true,
         sessionId: payload.id,
-        title: session.title,
+        title: session2.title,
         titleTruncated,
         started: true,
         model: labelOpenworkSessionModel(sessionModelOf(payload), catalog),
@@ -15915,7 +16233,7 @@ async function createOpenWorkSessions(rawArgs, context) {
     } catch (error48) {
       return {
         ok: false,
-        title: session.title,
+        title: session2.title,
         titleTruncated,
         error: unknownErrorMessage(error48)
       };
@@ -15950,6 +16268,9 @@ function proposeAutomation(rawArgs, context) {
   };
 }
 async function postJson(path, body, signal, gmailAttachment = false) {
+  const transport = openworkReadTransport.getStore();
+  if (transport)
+    return transport.post(path, body, signal);
   if (gmailAttachment && (!serverUrl2() || !serverToken2())) {
     throw new ApiError(409, "gmail_host_unavailable", "OpenWork host transport is unavailable. Run this tool from OpenWork.");
   }
@@ -15966,7 +16287,7 @@ async function postJson(path, body, signal, gmailAttachment = false) {
   const payload = await parseResponse2(response);
   if (!response.ok) {
     if (gmailAttachment) {
-      throw new ApiError(response.status, getStringProperty2(payload, "code") ?? "gmail_attachment_http_error", errorMessage2(payload, "OpenWork extension call failed"), isRecord3(payload) ? payload.details : undefined);
+      throw new ApiError(response.status, getStringProperty2(payload, "code") ?? "gmail_attachment_http_error", errorMessage2(payload, "OpenWork extension call failed"), isRecord4(payload) ? payload.details : undefined);
     }
     throw new Error(errorMessage2(payload, "OpenWork extension call failed"));
   }
@@ -15992,7 +16313,7 @@ var OpenWorkExtensionsPreview = async (factoryInput, _options, dependencies) =>
     event: fulfillGmailAttachments.event,
     dispose: fulfillGmailAttachments.dispose,
     "chat.headers": async (input, output) => {
-      if (input.model.providerID !== "openwork")
+      if (input.model.providerID !== "openwork" && input.model.providerID !== "openwork-free")
         return;
       output.headers["x-openwork-session-id"] = input.sessionID;
       output.headers["x-openwork-task-id"] = input.message.id;