ryco-cli 0.1.30 → 0.1.31

package/dist/{OpenCodeDriver-DhyVaBMT.mjs → OpenCodeDriver-BWEZD841.mjs}

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 
-import { Dt as ServerConfig, It as createModelCapabilities, X as ServerSettingsService, zt as getModelSelectionStringOptionValue } from "./Metrics-CnmjpbWk.mjs";
-import { $r as OpenCodeSettings, Dr as TextGenerationError, Du as EventId, Fu as RuntimeRequestId, Lu as RuntimeSubagentId, Nu as ProviderItemId, Oa as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, Pu as RuntimeItemId, Qo as ProviderInstanceId, Vu as TurnId, Zo as ProviderDriverKind } from "./src-CtsgPPhb.mjs";
-import { m as sanitizeFeatureBranchName, p as sanitizeBranchFragment } from "./git-9xWsJYIH.mjs";
-import { A as makeEventNdjsonLogger, Bt as ProviderAdapterSessionNotFoundError, C as parseOpenCodeModelSlug, Cr as sanitizePrTitle, Ct as buildServerProvider, D as toOpenCodeQuestionAnswers, Dt as nonEmptyTrimmed, E as toOpenCodePermissionReply, Ht as ProviderDriverError, It as createProcessDeviceToolBinding, Lt as ProviderAdapterProcessError, Mt as agentControlHostContext, O as verifyOpenCodeServerVersion, Ot as parseGenericCliVersion, Pt as installAgentControlNativeHttp, Q as enrichProviderSnapshotWithVersionAdvisory, Rt as ProviderAdapterRequestError, S as openCodeRuntimeErrorDetail, Sr as sanitizeCommitSubject, T as toOpenCodeFileParts, Vt as ProviderAdapterValidationError, _ as OpenCodeRuntime, at as compareCliVersions, b as isOpenCodeNativeAttachment, br as extractJsonObject, ct as resolveAttachmentPath, dr as validateRankInboxThreadsResult, et as makePackageManagedProviderMaintenanceResolver, f as computerTurnPlan, fr as buildBranchNamePrompt, g as MINIMUM_OPENCODE_VERSION, gr as buildPrContentPrompt, hr as buildIssueContentTitlePrompt, it as resolveProviderMaintenanceCapabilitiesEffect, k as ProviderEventLoggers, kt as providerModelsFromSettings, mr as buildIssueContentPolishPrompt, mt as mergeProviderInstanceEnvironment, n as AgentControlSessionRegistry, pr as buildCommitMessagePrompt, rt as normalizeCommandPath, st as readPersistedAttachment, t as makeServerQueueMetrics, v as OpenCodeRuntimeError, vr as buildThreadPriorityPrompt, w as runOpenCodeSdk, wr as sanitizeThreadTitle, x as openCodeQuestionId, y as buildOpenCodePermissionRules, yr as buildThreadTitlePrompt, zt as ProviderAdapterSessionClosedError } from "./bin.mjs";
-import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-V3RIy8Ao.mjs";
+import { Kt as getModelSelectionStringOptionValue, Nt as ServerConfig, Ut as createModelCapabilities, X as ServerSettingsService } from "./Metrics-C3vLS9rz.mjs";
+import { Ad as ProviderItemId, Ks as ProviderDriverKind, Md as RuntimeRequestId, Oi as OpenCodeSettings, Pd as RuntimeSubagentId, Rd as TurnId, ei as TextGenerationError, fo as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, jd as RuntimeItemId, qs as ProviderInstanceId, wd as EventId } from "./src-VTj60bUm.mjs";
+import { $n as readPersistedAttachment, A as ProviderEventLoggers, Bt as createProcessDeviceToolBinding, C as openCodeRuntimeErrorDetail, Ci as sanitizeFeatureBranchName, D as toOpenCodePermissionReply, Dt as buildServerProvider, E as toOpenCodeFileParts, Gt as ProviderAdapterValidationError, Ht as ProviderAdapterRequestError, It as agentControlHostContext, Kt as ProviderDriverError, Mt as parseGenericCliVersion, Nt as providerModelsFromSettings, O as toOpenCodeQuestionAnswers, Rt as installAgentControlNativeHttp, S as openCodeQuestionId, Si as sanitizeBranchFragment, T as runOpenCodeSdk, Ut as ProviderAdapterSessionClosedError, Vt as ProviderAdapterProcessError, Wt as ProviderAdapterSessionNotFoundError, _t as mergeProviderInstanceEnvironment, at as enrichProviderSnapshotWithVersionAdvisory, b as buildOpenCodePermissionRules, bi as sanitizeThreadTitle, ci as buildBranchNamePrompt, di as buildIssueContentTitlePrompt, dt as resolveProviderMaintenanceCapabilitiesEffect, er as resolveAttachmentPath, fi as buildPrContentPrompt, gi as extractJsonObject, hi as buildThreadTitlePrompt, i as AgentControlSessionRegistry, j as makeEventNdjsonLogger, jt as nonEmptyTrimmed, k as verifyOpenCodeServerVersion, li as buildCommitMessagePrompt, m as computerTurnPlan, mi as buildThreadPriorityPrompt, nt as OPENCODE_UNKNOWN_CLI_VERSION_MESSAGE, r as makeServerQueueMetrics, rt as describeUnsupportedOpenCodeVersion, si as validateRankInboxThreadsResult, st as makePackageManagedProviderMaintenanceResolver, ui as buildIssueContentPolishPrompt, ut as normalizeCommandPath, v as OpenCodeRuntime, vi as sanitizeCommitSubject, w as parseOpenCodeModelSlug, x as isOpenCodeNativeAttachment, y as OpenCodeRuntimeError, yi as sanitizePrTitle } from "./bin.mjs";
+import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-D_BZ-wRH.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
-import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B90UKjnv.mjs";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B65ipCxM.mjs";
 import { Cause, Data, Effect, Exit, Fiber, Option, Queue, Ref, Schema, Scope, Semaphore, Stream } from "effect";
 import * as NodePath from "node:path";
 import { createHash } from "node:crypto";
@@ -127,10 +126,10 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 				continue;
 			}
 			if (attachment.id === void 0) continue;
-			const persisted = readPersistedAttachment({
+			const persisted = yield* Effect.promise(() => readPersistedAttachment({
 				attachmentsDir: serverConfig.attachmentsDir,
 				attachment
-			});
+			}));
 			if (!persisted.ok) return yield* new TextGenerationError({
 				operation: input.operation,
 				detail: persisted.reason
@@ -503,6 +502,69 @@ var OpenCodeTaskLifecycle = class {
 	}
 };
 //#endregion
+//#region src/provider/openCodePartIndex.ts
+const key = (sessionId, id) => `${sessionId}:${id}`;
+/** Active text bodies only. Terminal IDs remain as small replay guards for the session. */
+var OpenCodePartIndex = class {
+	#parts = /* @__PURE__ */ new Map();
+	#partsByMessage = /* @__PURE__ */ new Map();
+	#emittedText = /* @__PURE__ */ new Map();
+	#terminalParts = /* @__PURE__ */ new Set();
+	#removedMessages = /* @__PURE__ */ new Set();
+	get(partKey) {
+		return this.#parts.get(partKey);
+	}
+	set(part) {
+		if (part.type !== "text" && part.type !== "reasoning") return true;
+		const partKey = key(part.sessionID, part.id);
+		const messageKey = key(part.sessionID, part.messageID);
+		if (this.#terminalParts.has(partKey) || this.#removedMessages.has(messageKey)) return false;
+		this.#parts.set(partKey, part);
+		let partIds = this.#partsByMessage.get(messageKey);
+		if (!partIds) this.#partsByMessage.set(messageKey, partIds = /* @__PURE__ */ new Set());
+		partIds.add(partKey);
+		return true;
+	}
+	*forMessage(sessionId, messageId) {
+		for (const partKey of this.#partsByMessage.get(key(sessionId, messageId)) ?? []) {
+			const part = this.#parts.get(partKey);
+			if (part) yield part;
+		}
+	}
+	emittedText(partKey) {
+		return this.#emittedText.get(partKey);
+	}
+	setEmittedText(partKey, text) {
+		this.#emittedText.set(partKey, text);
+	}
+	isTerminal(partKey) {
+		return this.#terminalParts.has(partKey);
+	}
+	complete(partKey) {
+		this.#terminalParts.add(partKey);
+		this.#release(partKey);
+	}
+	#release(partKey) {
+		this.#emittedText.delete(partKey);
+		const part = this.#parts.get(partKey);
+		this.#parts.delete(partKey);
+		if (part) {
+			const messageKey = key(part.sessionID, part.messageID);
+			const partIds = this.#partsByMessage.get(messageKey);
+			partIds?.delete(partKey);
+			if (partIds?.size === 0) this.#partsByMessage.delete(messageKey);
+		}
+	}
+	releaseMessageBodies(sessionId, messageId) {
+		for (const partKey of this.#partsByMessage.get(key(sessionId, messageId)) ?? []) this.#release(partKey);
+	}
+	removeMessage(sessionId, messageId) {
+		const messageKey = key(sessionId, messageId);
+		this.#removedMessages.add(messageKey);
+		for (const partKey of this.#partsByMessage.get(messageKey) ?? []) this.complete(partKey);
+	}
+};
+//#endregion
 //#region src/provider/Layers/OpenCodeAdapter.ts
 const PROVIDER$1 = ProviderDriverKind.make("opencode");
 const OPENCODE_RESUME_VERSION = 1;
@@ -516,7 +578,19 @@ function nonEmptyString(value) {
 function parseOpenCodeResume(value) {
 	if (!value || typeof value !== "object") return;
 	const cursor = value;
-	return cursor.schemaVersion === OPENCODE_RESUME_VERSION && typeof cursor.sessionId === "string" && cursor.sessionId.trim().length > 0 ? { sessionId: cursor.sessionId } : void 0;
+	if (cursor.schemaVersion !== OPENCODE_RESUME_VERSION || typeof cursor.sessionId !== "string" || cursor.sessionId.trim().length === 0) return;
+	const forgottenTurnIds = Array.isArray(cursor.forgottenTurnIds) ? cursor.forgottenTurnIds.filter((id) => typeof id === "string") : [];
+	return {
+		sessionId: cursor.sessionId,
+		forgottenTurnIds
+	};
+}
+function openCodeResumeCursor(sessionId, forgottenTurnIds) {
+	return {
+		schemaVersion: OPENCODE_RESUME_VERSION,
+		sessionId,
+		...forgottenTurnIds.length > 0 ? { forgottenTurnIds: [...forgottenTurnIds] } : {}
+	};
 }
 function isOpenCodeNotFound(error) {
 	const cause = error.cause;
@@ -663,7 +737,7 @@ function mapPermissionDecision(reply) {
 * other apps derive by summing buckets when the server reports no total.
 * Reads defensively: older servers and partial event payloads may omit fields.
 */
-function threadTokenUsageFromOpenCodeTokens(tokens) {
+function threadTokenUsageFromOpenCodeTokens(tokens, requestId) {
 	if (typeof tokens !== "object" || tokens === null) return;
 	const record = tokens;
 	const nonNegative = (value) => typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
@@ -673,6 +747,15 @@ function threadTokenUsageFromOpenCodeTokens(tokens) {
 	const usedTokens = inputTokens + outputTokens + reasoningTokens;
 	if (usedTokens <= 0) return;
 	return {
+		processedUsage: {
+			scope: "request",
+			requestId,
+			inputTokens,
+			cachedInputTokens: nonNegative(record.cache?.read),
+			outputTokens: outputTokens + reasoningTokens,
+			reasoningOutputTokens: reasoningTokens,
+			totalTokens: usedTokens
+		},
 		usedTokens,
 		lastUsedTokens: usedTokens,
 		...inputTokens > 0 ? { inputTokens } : {},
@@ -1193,9 +1276,10 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			const text = textFromPart(part);
 			if (text === void 0) return;
 			const partKey = scopedOpenCodeId(part.sessionID, part.id);
-			const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(context.emittedTextByPartId.get(partKey), text);
-			context.emittedTextByPartId.set(partKey, latestText);
-			if (latestText !== text) context.partById.set(partKey, part.type === "text" || part.type === "reasoning" ? {
+			if (context.parts.isTerminal(partKey)) return;
+			const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(context.parts.emittedText(partKey), text);
+			context.parts.setEmittedText(partKey, latestText);
+			if (latestText !== text) context.parts.set(part.type === "text" || part.type === "reasoning" ? {
 				...part,
 				text: latestText
 			} : part);
@@ -1235,8 +1319,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					}
 				});
 			}
-			if (part.type === "text" && part.time?.end !== void 0 && !context.completedAssistantPartIds.has(partKey)) {
-				context.completedAssistantPartIds.add(partKey);
+			if (part.type === "text" && part.time?.end !== void 0 && !context.parts.isTerminal(partKey)) {
 				if (!context.subagentBySessionId.get(part.sessionID)) yield* emitForContext(context, {
 					...yield* buildEventBase({
 						threadId: context.session.threadId,
@@ -1254,6 +1337,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					}
 				});
 			}
+			if ((part.type === "text" || part.type === "reasoning") && part.time?.end !== void 0) context.parts.complete(partKey);
 		});
 		const handleSubscribedEvent = Effect.fn("handleSubscribedEvent")(function* (context, event) {
 			if (yield* Ref.get(context.stopped)) return;
@@ -1278,6 +1362,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			});
 			switch (event.type) {
 				case "session.created":
+					if (context.rewinding) break;
 					yield* registerOpenCodeChildSession(context, event.properties.info, event);
 					break;
 				case "todo.updated": {
@@ -1302,7 +1387,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					context.messageRoleById.set(scopedOpenCodeId(event.properties.sessionID, event.properties.info.id), event.properties.info.role);
 					if (event.properties.info.role === "assistant") {
 						if (event.properties.sessionID === context.openCodeSessionId) {
-							const usage = threadTokenUsageFromOpenCodeTokens(event.properties.info.tokens);
+							const usage = threadTokenUsageFromOpenCodeTokens(event.properties.info.tokens, event.properties.info.id);
 							if (usage) yield* emitForContext(context, {
 								...yield* buildEventBase({
 									threadId: context.session.threadId,
@@ -1313,27 +1398,28 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 								payload: { usage }
 							});
 						}
-						for (const part of context.partById.values()) {
-							if (part.sessionID !== event.properties.sessionID || part.messageID !== event.properties.info.id) continue;
-							yield* emitAssistantTextDelta(context, part, turnId, event);
-						}
-					}
+						for (const part of context.parts.forMessage(event.properties.sessionID, event.properties.info.id)) yield* emitAssistantTextDelta(context, part, turnId, event);
+					} else context.parts.releaseMessageBodies(event.properties.sessionID, event.properties.info.id);
 					break;
 				case "message.removed":
+					context.parts.removeMessage(event.properties.sessionID, event.properties.messageID);
 					context.messageRoleById.delete(scopedOpenCodeId(event.properties.sessionID, event.properties.messageID));
 					break;
+				case "message.part.removed":
+					context.parts.complete(scopedOpenCodeId(event.properties.sessionID, event.properties.partID));
+					break;
 				case "message.part.delta": {
 					const partKey = scopedOpenCodeId(event.properties.sessionID, event.properties.partID);
-					const existingPart = context.partById.get(partKey);
+					const existingPart = context.parts.get(partKey);
 					if (!existingPart) break;
 					if (messageRoleForPart(context, existingPart) !== "assistant") break;
 					const streamKind = resolveTextStreamKind(existingPart);
 					const delta = event.properties.delta;
 					if (delta.length === 0) break;
-					const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(context.emittedTextByPartId.get(partKey) ?? textFromPart(existingPart) ?? "", delta);
+					const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(context.parts.emittedText(partKey) ?? textFromPart(existingPart) ?? "", delta);
 					if (deltaToEmit.length === 0) break;
-					context.emittedTextByPartId.set(partKey, nextText);
-					if (existingPart.type === "text" || existingPart.type === "reasoning") context.partById.set(partKey, {
+					context.parts.setEmittedText(partKey, nextText);
+					if (existingPart.type === "text" || existingPart.type === "reasoning") context.parts.set({
 						...existingPart,
 						text: nextText
 					});
@@ -1373,8 +1459,8 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				}
 				case "message.part.updated": {
 					const part = event.properties.part;
-					context.partById.set(scopedOpenCodeId(part.sessionID, part.id), part);
 					const messageRole = messageRoleForPart(context, part);
+					if (messageRole !== "user" && !context.parts.set(part)) break;
 					if (part.sessionID === context.openCodeSessionId && messageRole !== "user") yield* projectOpenCodeTask(context, part);
 					else if (part.sessionID === context.openCodeSessionId && part.type === "text" && part.synthetic) yield* projectOpenCodeTask(context, part);
 					if (messageRole === "assistant") yield* emitAssistantTextDelta(context, part, turnId, event);
@@ -1699,7 +1785,8 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				issue: "Computer Use needs a managed, isolated OpenCode server. External OpenCode servers cannot receive local desktop authority."
 			});
 			const directory = input.cwd ?? serverConfig.cwd;
-			const resumeSessionId = input.resumePolicy === "fresh" ? void 0 : parseOpenCodeResume(input.resumeCursor)?.sessionId;
+			const resume = input.resumePolicy === "fresh" ? void 0 : parseOpenCodeResume(input.resumeCursor);
+			const resumeSessionId = resume?.sessionId;
 			const existing = sessions.get(input.threadId);
 			if (existing) {
 				if (existing.session.runtimeSessionId === runtimeSessionId) return existing.session;
@@ -1796,6 +1883,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			});
 			const createdAt = nowIso();
 			const tokenMode = input.tokenMode ?? "off";
+			const forgottenTurnIds = resume !== void 0 && resume.sessionId === started.openCodeSession.id ? resume.forgottenTurnIds : [];
 			const session = {
 				provider: PROVIDER$1,
 				providerInstanceId: boundInstanceId,
@@ -1806,10 +1894,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				cwd: directory,
 				...input.modelSelection ? { model: input.modelSelection.model } : {},
 				threadId: input.threadId,
-				resumeCursor: {
-					schemaVersion: OPENCODE_RESUME_VERSION,
-					sessionId: started.openCodeSession.id
-				},
+				resumeCursor: openCodeResumeCursor(started.openCodeSession.id, forgottenTurnIds),
 				createdAt,
 				updatedAt: createdAt
 			};
@@ -1820,13 +1905,13 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				server: started.server,
 				directory,
 				openCodeSessionId: started.openCodeSession.id,
+				forgottenTurnIds,
+				rewinding: false,
 				pendingPermissions: /* @__PURE__ */ new Map(),
 				pendingQuestions: /* @__PURE__ */ new Map(),
 				resolvedRequestIds: /* @__PURE__ */ new Set(),
-				partById: /* @__PURE__ */ new Map(),
-				emittedTextByPartId: /* @__PURE__ */ new Map(),
+				parts: new OpenCodePartIndex(),
 				messageRoleById: /* @__PURE__ */ new Map(),
-				completedAssistantPartIds: /* @__PURE__ */ new Set(),
 				childSessionIds: /* @__PURE__ */ new Set(),
 				subagentBySessionId: /* @__PURE__ */ new Map(),
 				subagentBySubtaskPartId: /* @__PURE__ */ new Map(),
@@ -1925,10 +2010,10 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 						});
 						continue;
 					}
-					const persisted = readPersistedAttachment({
+					const persisted = yield* Effect.promise(() => readPersistedAttachment({
 						attachmentsDir: serverConfig.attachmentsDir,
 						attachment
-					});
+					}));
 					if (!persisted.ok) return yield* new ProviderAdapterRequestError({
 						provider: PROVIDER$1,
 						method: "session.prompt",
@@ -2139,16 +2224,60 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				}))
 			};
 		});
-		const rollbackThread = Effect.fn("rollbackThread")(function* (threadId, numTurns) {
+		/**
+		* Makes OpenCode forget the newest turns by forking the root session just
+		* before the first dropped user message and rebinding the thread to the
+		* fork. OpenCode's boundary is exclusive, and unlike 1.x `session.revert`
+		* a fork never touches files. The old session is kept for audit.
+		*/
+		const rollbackThread = Effect.fn("rollbackThread")(function* (threadId, { numTurns, droppedTurnIds }) {
 			const context = ensureSessionContext(sessions, threadId);
-			const assistantMessages = ((yield* runOpenCodeSdk("session.messages", () => context.client.session.messages({ sessionID: context.openCodeSessionId })).pipe(Effect.mapError(toRequestError))).data ?? []).filter((entry) => entry.info.role === "assistant");
-			const targetIndex = assistantMessages.length - numTurns - 1;
-			const target = targetIndex >= 0 ? assistantMessages[targetIndex] : null;
-			yield* runOpenCodeSdk("session.revert", () => context.client.session.revert({
-				sessionID: context.openCodeSessionId,
-				...target ? { messageID: target.info.id } : {}
-			})).pipe(Effect.mapError(toRequestError));
-			return yield* readThread(threadId);
+			const refuse = (detail) => new ProviderAdapterRequestError({
+				provider: PROVIDER$1,
+				method: "session.fork",
+				detail
+			});
+			if (context.activeTurnId !== void 0 || context.pendingPrompt !== void 0) return yield* refuse("An OpenCode turn is still running.");
+			if (context.rewinding) return yield* refuse("OpenCode is already rewinding this thread.");
+			if (!Number.isInteger(numTurns) || numTurns < 1) return yield* refuse("numTurns must be an integer >= 1.");
+			const dropped = new Set(droppedTurnIds);
+			const forgotten = new Set(context.forgottenTurnIds);
+			const alreadyForgotten = droppedTurnIds.filter((turnId) => forgotten.has(turnId)).length;
+			if (alreadyForgotten > 0 && (context.forgottenTurnIds.some((turnId) => !dropped.has(turnId)) || alreadyForgotten > numTurns)) return yield* refuse("An earlier revert that did not finish already removed turns this revert would keep. Revert to that checkpoint or an earlier one, or start a new thread.");
+			const remainingTurns = numTurns - alreadyForgotten;
+			if (remainingTurns === 0) return yield* readThread(threadId);
+			const rootSessionId = context.openCodeSessionId;
+			const messages = (yield* runOpenCodeSdk("session.messages", () => context.client.session.messages({ sessionID: rootSessionId })).pipe(Effect.mapError(toRequestError))).data ?? [];
+			const users = messages.filter((entry) => entry.info.role === "user");
+			if (remainingTurns > users.length) return yield* refuse("OpenCode's conversation is shorter than this thread's history; it may already be reverted.");
+			const boundary = users[users.length - remainingTurns];
+			const boundaryIndex = messages.indexOf(boundary);
+			context.rewinding = true;
+			return yield* Effect.gen(function* () {
+				const fork = (yield* runOpenCodeSdk("session.fork", () => context.client.session.fork({
+					sessionID: rootSessionId,
+					messageID: boundary.info.id
+				})).pipe(Effect.mapError(toRequestError))).data;
+				if (!fork) return yield* refuse("OpenCode session.fork returned no session.");
+				if (((yield* runOpenCodeSdk("session.messages", () => context.client.session.messages({ sessionID: fork.id })).pipe(Effect.mapError(toRequestError))).data ?? []).length !== boundaryIndex) return yield* refuse("OpenCode did not preserve the requested rewind boundary.");
+				yield* runOpenCodeSdk("session.update", () => context.client.session.update({
+					sessionID: fork.id,
+					permission: buildOpenCodePermissionRules(context.session.runtimeMode)
+				})).pipe(Effect.mapError(toRequestError));
+				context.openCodeSessionId = fork.id;
+				context.forgottenTurnIds = [...droppedTurnIds];
+				context.childSessionIds.clear();
+				context.turns.splice(Math.max(0, context.turns.length - remainingTurns));
+				if (boundaryIndex === 0) context.agentControlHostContextDelivered = false;
+				context.session = {
+					...context.session,
+					resumeCursor: openCodeResumeCursor(fork.id, context.forgottenTurnIds),
+					updatedAt: nowIso()
+				};
+				return yield* readThread(threadId);
+			}).pipe(Effect.ensuring(Effect.sync(() => {
+				context.rewinding = false;
+			})));
 		});
 		const stopAll = () => Effect.gen(function* () {
 			const contexts = [...sessions.values()];
@@ -2160,7 +2289,11 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 		});
 		return {
 			provider: PROVIDER$1,
-			capabilities: { sessionModelSwitch: "in-session" },
+			capabilities: {
+				sessionModelSwitch: "in-session",
+				conversationRollback: "native",
+				resumeSurvivesCwdChange: false
+			},
 			startSession,
 			sendTurn,
 			interruptTurn,
@@ -2486,8 +2619,9 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 		}))));
 		if (versionExit._tag === "Failure") return fallback(Cause.squash(versionExit.cause));
 		version = parseGenericCliVersion(versionExit.value.stdout) ?? null;
-		if (!version) return fallback(/* @__PURE__ */ new Error(`Unable to determine OpenCode version from \`opencode --version\` output. Ryco requires OpenCode v${MINIMUM_OPENCODE_VERSION} or newer.`), null);
-		if (compareCliVersions(version, "1.14.19") < 0) return buildServerProvider({
+		if (!version) return fallback(new Error(OPENCODE_UNKNOWN_CLI_VERSION_MESSAGE), null);
+		const versionProblem = describeUnsupportedOpenCodeVersion(version, "binary");
+		if (versionProblem !== null) return buildServerProvider({
 			presentation: OPENCODE_PRESENTATION,
 			enabled: openCodeSettings.enabled,
 			checkedAt,
@@ -2497,7 +2631,7 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 				version,
 				status: "error",
 				auth: { status: "unknown" },
-				message: `OpenCode v${version} is too old. Upgrade to v${MINIMUM_OPENCODE_VERSION} or newer.`
+				message: versionProblem
 			}
 		});
 	}