@liberseek/boft-cli-win32-arm64 0.6.4 → 0.6.6

package/app/plugins/opencode/plugin.mjs

@@ -7,8 +7,8 @@ var __export = (target, all) => {
 
 // dist/opencode-adapter.js
 import { randomUUID } from "node:crypto";
-import fs2 from "node:fs";
-import path4 from "node:path";
+import fs3 from "node:fs";
+import path5 from "node:path";
 
 // ../../../node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -776,10 +776,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path5) {
-  if (!path5)
+function getElementAtPath(obj, path6) {
+  if (!path6)
     return obj;
-  return path5.reduce((acc, key) => acc?.[key], obj);
+  return path6.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1188,11 +1188,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path5, issues) {
+function prefixIssues(path6, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path5);
+    iss.path.unshift(path6);
     return iss;
   });
 }
@@ -1339,16 +1339,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path5 = []) => {
+  const processError = (error52, path6 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path5, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path6, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else {
-        const fullpath = [...path5, ...issue2.path];
+        const fullpath = [...path6, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -1375,17 +1375,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path5 = []) => {
+  const processError = (error52, path6 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path5, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path6, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else {
-        const fullpath = [...path5, ...issue2.path];
+        const fullpath = [...path6, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1417,8 +1417,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path5 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path5) {
+  const path6 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path6) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14110,13 +14110,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path5 = ref.slice(1).split("/").filter(Boolean);
-  if (path5.length === 0) {
+  const path6 = ref.slice(1).split("/").filter(Boolean);
+  if (path6.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path5[0] === defsKey) {
-    const key = path5[1];
+  if (path6[0] === defsKey) {
+    const key = path6[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -15525,6 +15525,12 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage contains unknown field '${key}'`);
     }
   }
+  for (const field of ["totalCredits", "contextUsagePercent"]) {
+    const candidate = value[field];
+    if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
+      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+    }
+  }
   for (const field of tokenFields) {
     const candidate = value[field];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
@@ -16219,7 +16225,7 @@ var serializeObjectParam = ({ allowReserved, explode, name, style, value, valueO
 
 // ../../../node_modules/@opencode-ai/sdk/dist/v2/gen/core/utils.gen.js
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
-var defaultPathSerializer = ({ path: path5, url: _url2 }) => {
+var defaultPathSerializer = ({ path: path6, url: _url2 }) => {
   let url2 = _url2;
   const matches = _url2.match(PATH_PARAM_RE);
   if (matches) {
@@ -16238,7 +16244,7 @@ var defaultPathSerializer = ({ path: path5, url: _url2 }) => {
         name = name.substring(1);
         style = "matrix";
       }
-      const value = path5[name];
+      const value = path6[name];
       if (value === void 0 || value === null) {
         continue;
       }
@@ -16269,11 +16275,11 @@ var defaultPathSerializer = ({ path: path5, url: _url2 }) => {
   }
   return url2;
 };
-var getUrl = ({ baseUrl, path: path5, query, querySerializer, url: _url2 }) => {
+var getUrl = ({ baseUrl, path: path6, query, querySerializer, url: _url2 }) => {
   const pathUrl = _url2.startsWith("/") ? _url2 : `/${_url2}`;
   let url2 = (baseUrl ?? "") + pathUrl;
-  if (path5) {
-    url2 = defaultPathSerializer({ path: path5, url: url2 });
+  if (path6) {
+    url2 = defaultPathSerializer({ path: path6, url: url2 });
   }
   let search = query ? querySerializer(query) : "";
   if (search.startsWith("?")) {
@@ -22001,6 +22007,10 @@ var SdkOpenCodeTransport = class {
     const client2 = await this.#getClient();
     return responseData2(await withTimeout2(client2.session.get({ sessionID }), this.#commandTimeoutMs, "OpenCode Session read"), "Session read");
   }
+  async getPaths() {
+    const client2 = await this.#getClient();
+    return responseData2(await withTimeout2(client2.path.get(), this.#commandTimeoutMs, "OpenCode Path read"), "Path read");
+  }
   async updateSessionMetadata(sessionID, metadata) {
     const client2 = await this.#getClient();
     return responseData2(await withTimeout2(client2.session.update({ sessionID, metadata }), this.#commandTimeoutMs, "OpenCode Session metadata update"), "Session metadata update");
@@ -22143,6 +22153,65 @@ var SdkOpenCodeTransport = class {
   }
 };
 
+// dist/file-change-verification.js
+import fs2 from "node:fs";
+import path4 from "node:path";
+function missingPath(error51) {
+  if (!error51 || typeof error51 !== "object")
+    return false;
+  const code = Reflect.get(error51, "code");
+  return code === "ENOENT" || code === "ENOTDIR";
+}
+function hasDotPathSegment(value) {
+  const segments = process.platform === "win32" ? value.split(/[\\/]+/) : value.split("/");
+  return segments.some((segment) => segment === "." || segment === "..");
+}
+function canonicalDirectoryPath(value) {
+  let candidate = path4.resolve(value);
+  const missingSegments = [];
+  for (; ; ) {
+    try {
+      return path4.join(fs2.realpathSync.native(candidate), ...missingSegments);
+    } catch (error51) {
+      if (!missingPath(error51))
+        return void 0;
+      const parent = path4.dirname(candidate);
+      if (parent === candidate)
+        return void 0;
+      missingSegments.unshift(path4.basename(candidate));
+      candidate = parent;
+    }
+  }
+}
+function canonicalFilePath(value) {
+  const absolute = path4.resolve(value);
+  const parent = canonicalDirectoryPath(path4.dirname(absolute));
+  return parent ? path4.join(parent, path4.basename(absolute)) : void 0;
+}
+function pathIsWithin(root, candidate, allowRoot) {
+  const relative = path4.relative(root, candidate);
+  return allowRoot && relative === "" || relative !== "" && relative !== ".." && !relative.startsWith(`..${path4.sep}`) && !path4.isAbsolute(relative);
+}
+function verifiedOpenCodeWorktree(sessionDirectory, paths) {
+  if (!paths || typeof paths !== "object" || typeof sessionDirectory !== "string" || typeof paths.directory !== "string" || typeof paths.worktree !== "string" || hasDotPathSegment(sessionDirectory) || hasDotPathSegment(paths.directory) || hasDotPathSegment(paths.worktree) || !path4.isAbsolute(sessionDirectory) || !path4.isAbsolute(paths.directory) || !path4.isAbsolute(paths.worktree)) {
+    return void 0;
+  }
+  const session = canonicalDirectoryPath(sessionDirectory);
+  const directory = canonicalDirectoryPath(paths.directory);
+  const worktree = canonicalDirectoryPath(paths.worktree);
+  if (!session || !directory || !worktree || session !== directory || !pathIsWithin(worktree, directory, true)) {
+    return void 0;
+  }
+  return worktree;
+}
+function openCodeFileIdentity(file2, worktree) {
+  if (typeof file2 !== "string" || typeof worktree !== "string" || hasDotPathSegment(file2) || hasDotPathSegment(worktree) || !path4.isAbsolute(worktree) || !file2 || file2.includes("\0") || file2.includes("\n") || file2.includes("\r")) {
+    return void 0;
+  }
+  const candidate = canonicalFilePath(path4.isAbsolute(file2) ? file2 : path4.resolve(worktree, file2));
+  return candidate && pathIsWithin(worktree, candidate, false) ? candidate : void 0;
+}
+
 // dist/usage.js
 function projectOpenCodeUsage(messages, contextWindowTokens) {
   if (messages.length === 0)
@@ -22181,51 +22250,9 @@ function projectOpenCodeUsage(messages, contextWindowTokens) {
   });
 }
 
-// dist/opencode-adapter.js
-var openCodeHarnessId2 = harnessIdSchema.parse("opencode");
-var DEFAULT_TOOL_OUTPUT_LIMIT = 64e3;
-var DEFAULT_CLOSE_TIMEOUT_MS2 = 3e3;
-var DIFF_RECONCILIATION_DELAYS_MS = [25, 50, 100, 200, 400, 800];
-var COMPACT_COMMAND_ID = "opencode.compact";
+// dist/history-projection.js
 var SELECTION_METADATA_KEY = "codexhost.selection.v1";
-function invalidState(message) {
-  return { code: "invalidState", message, retryable: false };
-}
-function unsupported(message) {
-  return { code: "unsupported", message, retryable: false };
-}
-function normalizeError(error51, fallback) {
-  if (error51 instanceof OpenCodeTransportError) {
-    return {
-      code: error51.code,
-      message: error51.message,
-      retryable: error51.code === "unavailable" || error51.code === "processExited" || error51.code === "authenticationRequired"
-    };
-  }
-  const text = error51 instanceof Error ? error51.message : String(error51);
-  const lower = text.toLowerCase();
-  if (lower.includes("sessionbusy") || lower.includes("session busy")) {
-    return { code: "sessionBusy", message: text, retryable: true };
-  }
-  if (lower.includes("not found")) {
-    return { code: "sessionNotFound", message: text, retryable: false };
-  }
-  return {
-    code: fallback,
-    message: text,
-    retryable: fallback === "unavailable" || fallback === "nativeFailure"
-  };
-}
-function sameCwd(left, right) {
-  const canonical = (value) => {
-    try {
-      return fs2.realpathSync.native(value);
-    } catch {
-      return path4.resolve(value);
-    }
-  };
-  return canonical(left) === canonical(right);
-}
+var DIFF_RECONCILIATION_DELAYS_MS = [25, 50, 100, 200, 400, 800];
 function storedSelection(session) {
   const value = session.metadata?.[SELECTION_METADATA_KEY];
   if (!value || typeof value !== "object" || Array.isArray(value))
@@ -22275,32 +22302,62 @@ function nativeVariantFromSession(session, messages) {
   }
   return void 0;
 }
-function turnHasNativePatch(messages, userMessageID) {
+function turnNativePatchFiles(messages, userMessageID) {
   const start = messages.findIndex(({ info }) => info.id === userMessageID);
   if (start < 0)
-    return false;
+    return [];
   let end = start + 1;
   while (end < messages.length && messages[end]?.info.role !== "user")
     end += 1;
-  return messages.slice(start + 1, end).some(({ parts }) => parts.some((part) => part.type === "patch" && part.files.length > 0));
+  return [
+    ...new Set(messages.slice(start + 1, end).flatMap(({ parts }) => parts.flatMap((part) => part.type === "patch" ? part.files : [])))
+  ];
 }
-async function readTurnDiff(transport, sessionID, userMessageID, nativePatchObserved) {
+async function readTurnDiff(transport, sessionID, userMessageID, nativePatchFiles, options = {}) {
+  const strict = options.strict === true;
   for (let attempt = 0; ; attempt += 1) {
-    const diffs = await transport.getDiff(sessionID, userMessageID).catch(() => []);
-    if (reliableOpenCodeFileChanges(diffs).length > 0 || !nativePatchObserved || attempt >= DIFF_RECONCILIATION_DELAYS_MS.length) {
+    let diffs;
+    try {
+      diffs = await transport.getDiff(sessionID, userMessageID);
+    } catch (error51) {
+      if (strict) {
+        throw new OpenCodeTransportError("protocolError", "OpenCode could not verify FileChange history", { cause: error51 });
+      }
+      diffs = [];
+    }
+    const reliableChanges = reliableOpenCodeFileChanges(diffs);
+    const worktree = options.worktree;
+    const reliablePaths = worktree ? reliableChanges.map(({ path: file2 }) => openCodeFileIdentity(file2, worktree)) : [];
+    const nativePatchPaths = worktree ? nativePatchFiles.map((file2) => openCodeFileIdentity(file2, worktree)) : [];
+    const completeStrictProjection = Boolean(worktree) && reliableChanges.length === diffs.length && reliablePaths.every((file2) => file2 !== void 0) && nativePatchPaths.every((file2) => file2 !== void 0 && reliablePaths.includes(file2));
+    if (strict ? completeStrictProjection : reliableChanges.length > 0 || nativePatchFiles.length === 0) {
+      return diffs;
+    }
+    if (attempt >= DIFF_RECONCILIATION_DELAYS_MS.length) {
+      if (strict) {
+        throw new OpenCodeTransportError("protocolError", "OpenCode did not expose complete reliable FileChange history");
+      }
       return diffs;
     }
     await new Promise((resolve) => setTimeout(resolve, DIFF_RECONCILIATION_DELAYS_MS[attempt]));
   }
 }
-async function readProjection(transport, sessionID, providerCatalog, toolOutputLimit) {
-  const [session, messages] = await Promise.all([
+async function readProjection(transport, sessionID, providerCatalog, toolOutputLimit, options = {}) {
+  const strictFileChanges = options.strictFileChanges === true;
+  const [session, messages, paths] = await Promise.all([
     transport.getSession(sessionID),
-    transport.getMessages(sessionID)
+    transport.getMessages(sessionID),
+    strictFileChanges ? transport.getPaths().catch((error51) => {
+      throw new OpenCodeTransportError("protocolError", "OpenCode could not verify worktree paths", { cause: error51 });
+    }) : void 0
   ]);
+  const worktree = paths ? verifiedOpenCodeWorktree(session.directory, paths) : void 0;
+  if (strictFileChanges && !worktree) {
+    throw new OpenCodeTransportError("protocolError", "OpenCode returned inconsistent Session and worktree paths");
+  }
   const userMessageIds = messages.filter(({ info }) => info.role === "user").map(({ info }) => info.id);
   const diffEntries = await Promise.all(userMessageIds.map(async (messageID) => {
-    const diffs = await readTurnDiff(transport, sessionID, messageID, turnHasNativePatch(messages, messageID));
+    const diffs = await readTurnDiff(transport, sessionID, messageID, turnNativePatchFiles(messages, messageID), { strict: strictFileChanges, ...worktree ? { worktree } : {} });
     return [messageID, diffs];
   }));
   const snapshot = projectOpenCodeHistory({
@@ -22310,7 +22367,9 @@ async function readProjection(transport, sessionID, providerCatalog, toolOutputL
     toolOutputLimit
   });
   const model = nativeModelFromSession(session, messages);
-  const variant = nativeVariantFromSession(session, messages);
+  const nativeVariant = nativeVariantFromSession(session, messages);
+  const nativeModel = model ? providerCatalog.all.find(({ id }) => id === model.providerID)?.models[model.modelID] : void 0;
+  const variant = nativeVariant === "default" && nativeModel && !Object.hasOwn(nativeModel.variants ?? {}, "default") ? void 0 : nativeVariant;
   const usage = projectOpenCodeUsage(openCodeAssistantMessages(session, messages), model ? openCodeContextWindow(providerCatalog, model) : void 0);
   return {
     session,
@@ -22321,6 +22380,128 @@ async function readProjection(transport, sessionID, providerCatalog, toolOutputL
     ...variant ? { variant } : {}
   };
 }
+
+// dist/history-derivation.js
+import { isDeepStrictEqual } from "node:util";
+function semanticHistory(snapshot) {
+  return snapshot.turns.map((turn) => ({
+    input: turn.input,
+    items: turn.items.map(({ item, outcome }) => {
+      const { itemId: _itemId, ...content } = item;
+      void _itemId;
+      return { item: content, outcome };
+    }),
+    outcome: turn.outcome,
+    model: turn.model,
+    checkpoint: Boolean(turn.checkpoint)
+  }));
+}
+function sourceState(projection) {
+  return {
+    id: projection.session.id,
+    directory: projection.session.directory,
+    revert: projection.session.revert,
+    metadata: projection.session.metadata,
+    permission: projection.session.permission,
+    model: projection.model,
+    variant: projection.variant,
+    snapshot: projection.snapshot
+  };
+}
+async function deriveOpenCodeHistory(options) {
+  const { transport, source, input, providers, toolOutputLimit } = options;
+  const read = (id) => readProjection(transport, id, providers, toolOutputLimit, { strictFileChanges: true });
+  if ((await transport.getStatus(source.id)).type !== "idle") {
+    throw new Error("OpenCode source Session is busy");
+  }
+  const before = await read(source.id);
+  const expectedSource = structuredClone(sourceState(before));
+  let messageID;
+  let retainedCount;
+  if (input.kind === "fork") {
+    const boundary = resolveOpenCodeForkBoundary(before.session, before.messages, input.checkpoint);
+    if (!boundary)
+      throw new OpenCodeTransportError("checkpointNotFound", "OpenCode Checkpoint is not on the source Session transcript");
+    messageID = boundary.messageID;
+    retainedCount = boundary.sourceTurnCount;
+  } else {
+    const boundary = resolveOpenCodeLastTurnBoundary(before.session, before.messages);
+    if (!boundary)
+      throw new OpenCodeTransportError("invalidState", "OpenCode Native Session has no Turn to roll back");
+    messageID = boundary.lastUserMessageID;
+    retainedCount = boundary.sourceTurnCount - 1;
+  }
+  const expectedHistory = structuredClone(semanticHistory(before.snapshot).slice(0, retainedCount));
+  let candidate = await transport.forkSession(source.id, messageID);
+  if (candidate.id === source.id) {
+    throw new OpenCodeTransportError("protocolError", "OpenCode Fork did not create a distinct Native Session");
+  }
+  const candidateID = candidate.id;
+  options.onCreated(candidate);
+  if (candidate.directory !== expectedSource.directory) {
+    throw new OpenCodeTransportError("protocolError", "OpenCode Fork changed working directory");
+  }
+  if (expectedSource.model) {
+    candidate = await transport.updateSessionMetadata(candidateID, selectionMetadata(candidate, expectedSource.model, expectedSource.variant));
+  }
+  if (!isDeepStrictEqual(candidate.permission ?? [], expectedSource.permission ?? [])) {
+    candidate = await transport.updateSessionPermission(candidateID, expectedSource.permission ?? []);
+  }
+  const [derived, after, candidateStatus, sourceStatus] = await Promise.all([
+    read(candidateID),
+    read(source.id),
+    transport.getStatus(candidateID),
+    transport.getStatus(source.id)
+  ]);
+  if (derived.session.id !== candidateID || candidate.id !== candidateID || derived.session.directory !== before.session.directory || candidateStatus.type !== "idle" || sourceStatus.type !== "idle" || !isDeepStrictEqual(semanticHistory(derived.snapshot), expectedHistory) || !isDeepStrictEqual(sourceState(after), expectedSource) || !isDeepStrictEqual(derived.model, expectedSource.model) || derived.variant !== expectedSource.variant || !isDeepStrictEqual(derived.session.permission ?? [], expectedSource.permission ?? [])) {
+    throw new OpenCodeTransportError("protocolError", "OpenCode derived history, source or configuration changed during Fork");
+  }
+  return derived.session;
+}
+
+// dist/opencode-adapter.js
+var openCodeHarnessId2 = harnessIdSchema.parse("opencode");
+var DEFAULT_TOOL_OUTPUT_LIMIT = 64e3;
+var DEFAULT_CLOSE_TIMEOUT_MS2 = 3e3;
+var COMPACT_COMMAND_ID = "opencode.compact";
+function invalidState(message) {
+  return { code: "invalidState", message, retryable: false };
+}
+function unsupported(message) {
+  return { code: "unsupported", message, retryable: false };
+}
+function normalizeError(error51, fallback) {
+  if (error51 instanceof OpenCodeTransportError) {
+    return {
+      code: error51.code,
+      message: error51.message,
+      retryable: error51.code === "unavailable" || error51.code === "processExited" || error51.code === "authenticationRequired"
+    };
+  }
+  const text = error51 instanceof Error ? error51.message : String(error51);
+  const lower = text.toLowerCase();
+  if (lower.includes("sessionbusy") || lower.includes("session busy")) {
+    return { code: "sessionBusy", message: text, retryable: true };
+  }
+  if (lower.includes("not found")) {
+    return { code: "sessionNotFound", message: text, retryable: false };
+  }
+  return {
+    code: fallback,
+    message: text,
+    retryable: fallback === "unavailable" || fallback === "nativeFailure"
+  };
+}
+function sameCwd(left, right) {
+  const canonical = (value) => {
+    try {
+      return fs3.realpathSync.native(value);
+    } catch {
+      return path5.resolve(value);
+    }
+  };
+  return canonical(left) === canonical(right);
+}
 function sessionState(session, modelCatalog, model, variant, executionPolicy = "default", permissionModeId = OPENCODE_DEFAULT_PERMISSION_MODE_ID) {
   const effectiveModel = model ? encodeOpenCodeModelRef(model) : void 0;
   const modelEntry = effectiveModel ? modelCatalog.models.find(({ ref }) => ref.id === effectiveModel.id) : void 0;
@@ -22887,6 +23068,11 @@ var OpenCodeHarnessSession = class {
     }
     if (event.type === "session.error" && event.properties.sessionID === this.#session.id && active) {
       const error51 = event.properties.error;
+      if (active.cancellationRequested || error51?.name === "MessageAbortedError") {
+        active.cancellationRequested = true;
+        void this.#reconcileAndFinish(active);
+        return;
+      }
       this.#completeTurn(active, {
         status: active.cancellationRequested ? "cancelled" : "failed",
         ...active.cancellationRequested ? { reason: "Cancelled by user" } : {
@@ -23140,6 +23326,19 @@ var OpenCodeHarnessSession = class {
       const assistants = messages.slice(userIndex + 1, end).filter((entry) => entry.info.role === "assistant");
       const terminal = assistants.at(-1)?.info ?? active.terminalAssistant;
       if (!terminal || terminal.time.completed === void 0 && !terminal.finish && !terminal.error && !active.nativeCompleted) {
+        if (active.cancellationRequested) {
+          for (const entry of assistants) {
+            for (const part of entry.parts)
+              this.#projectPart(active, part);
+          }
+          this.#completeTurn(active, { status: "cancelled", reason: "Cancelled by user" }, {
+            harnessId: this.harnessId,
+            nativeSessionId: this.#session.id,
+            nativeTurnKey: active.userMessageID,
+            formatVersion: 1
+          });
+          void this.#refreshProjection(active.turnId);
+        }
         return;
       }
       for (const entry of assistants) {
@@ -23148,7 +23347,7 @@ var OpenCodeHarnessSession = class {
       }
       active.terminalAssistant = terminal;
       const userMessageID = active.userMessageID;
-      const changes = reliableOpenCodeFileChanges(await readTurnDiff(this.#transport, this.#session.id, userMessageID, turnHasNativePatch(messages, userMessageID)));
+      const changes = reliableOpenCodeFileChanges(await readTurnDiff(this.#transport, this.#session.id, userMessageID, turnNativePatchFiles(messages, userMessageID)));
       if (changes.length > 0) {
         const id = `opencode-live-diff:${active.userMessageID}`;
         if (!active.items.has(id)) {
@@ -23525,7 +23724,6 @@ var OpenCodeAdapter = class {
     let connection;
     let transport;
     let createdForCleanup;
-    let revertedForCleanup;
     try {
       const sourceRef = input.kind === "create" ? void 0 : parseOpenCodeSessionRef(input.kind === "resume" ? input.nativeRef : input.sourceRef);
       const executionPolicy = input.kind === "create" ? input.executionPolicy ?? "default" : sourceRef?.executionPolicy ?? "default";
@@ -23604,61 +23802,17 @@ var OpenCodeAdapter = class {
         }
         if (input.kind === "resume") {
           session = source;
-        } else if (input.kind === "fork") {
-          const checkpoint = nativeCheckpointRefSchema.parse(input.checkpoint);
-          if (checkpoint.harnessId !== this.harnessId || checkpoint.nativeSessionId !== source.id) {
-            throw new OpenCodeTransportError("protocolError", "OpenCode Checkpoint does not belong to the source Session");
-          }
-          const sourceMessages = await transport.getMessages(source.id);
-          const boundary = resolveOpenCodeForkBoundary(source, sourceMessages, checkpoint);
-          if (!boundary) {
-            await transport.close().catch(() => void 0);
-            await connection.close().catch(() => void 0);
-            return {
-              ok: false,
-              error: {
-                code: "checkpointNotFound",
-                message: "OpenCode Checkpoint is not on the source Session transcript",
-                retryable: false
-              }
-            };
-          }
-          session = await transport.forkSession(source.id, boundary.messageID);
-          createdForCleanup = session;
-          if (session.id === source.id) {
-            throw new OpenCodeTransportError("protocolError", "OpenCode Fork did not create a distinct Native Session");
-          }
-          const derivedMessages = await transport.getMessages(session.id);
-          const derived = projectOpenCodeHistory({
-            session,
-            messages: derivedMessages,
-            toolOutputLimit: this.#toolOutputLimit
-          });
-          if (derived.turns.length !== boundary.sourceTurnCount) {
-            throw new OpenCodeTransportError("protocolError", "OpenCode Fork derived history does not match the requested Checkpoint");
-          }
         } else {
-          const sourceMessages = await transport.getMessages(source.id);
-          const boundary = resolveOpenCodeLastTurnBoundary(source, sourceMessages);
-          if (!boundary) {
-            await transport.close().catch(() => void 0);
-            await connection.close().catch(() => void 0);
-            return {
-              ok: false,
-              error: invalidState("OpenCode Native Session has no Turn to roll back")
-            };
-          }
-          session = await transport.revertSession(source.id, boundary.lastUserMessageID);
-          revertedForCleanup = source.id;
-          const afterMessages = await transport.getMessages(session.id);
-          const after = projectOpenCodeHistory({
-            session,
-            messages: afterMessages,
-            toolOutputLimit: this.#toolOutputLimit
+          session = await deriveOpenCodeHistory({
+            transport,
+            source,
+            input,
+            providers,
+            toolOutputLimit: this.#toolOutputLimit,
+            onCreated: (candidate) => {
+              createdForCleanup = candidate;
+            }
           });
-          if (after.turns.length !== boundary.sourceTurnCount - 1) {
-            throw new OpenCodeTransportError("protocolError", "OpenCode rollback did not remove exactly the last Turn");
-          }
         }
       }
       const projection = await readProjection(transport, session.id, providers, this.#toolOutputLimit);
@@ -23678,12 +23832,8 @@ var OpenCodeAdapter = class {
       await harnessSession.start();
       this.#sessions.add(harnessSession);
       createdForCleanup = void 0;
-      revertedForCleanup = void 0;
       return { ok: true, value: harnessSession };
     } catch (error51) {
-      if (revertedForCleanup && transport) {
-        await transport.unrevertSession(revertedForCleanup).catch(() => void 0);
-      }
       if (createdForCleanup && transport) {
         await transport.deleteSession(createdForCleanup.id).catch(() => void 0);
       }