@omercnet/paseo-omp 0.3.0-next.102.1 → 0.3.0-next.103.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omercnet/paseo-omp",
-  "version": "0.3.0-next.102.1",
+  "version": "0.3.0-next.103.1",
   "type": "module",
   "description": "Paseo integration for OMP, including its direct provider and workspace tooling.",
   "license": "MIT",

package/server/provider/omp-rpc.ts

@@ -1262,6 +1262,7 @@ const ProtocolNegotiationResultSchema = z.object({
 });
 
 export type OmpModel = z.infer<typeof OmpModelSchema>;
+export type OmpBranchResult = z.infer<typeof OmpBranchResultSchema>;
 export type OmpSessionState = z.infer<typeof OmpSessionStateSchema>;
 export type OmpSessionStats = z.infer<typeof OmpSessionStatsSchema>;
 export type OmpCompactionResult = z.infer<typeof OmpCompactionResultSchema>;
@@ -1369,7 +1370,7 @@ export interface OmpRuntimeSession {
   respondToExtensionUi(response: OmpExtensionUiResponse): Promise<void>;
   respondToToolApproval(response: OmpToolApprovalResponse): Promise<void>;
   getBranchMessages(): Promise<Array<{ entryId: string; text: string }>>;
-  branch(entryId: string): Promise<{ text: string; cancelled: boolean }>;
+  branch(entryId: string): Promise<OmpBranchResult>;
   readonly canReplayHistory: boolean;
   getMessages(): Promise<OmpMessage[]>;
   abort(): Promise<void>;
@@ -1416,6 +1417,13 @@ export interface OmpRpcRuntimeOptions {
   ) => OmpSessionDescriptor[] | Promise<OmpSessionDescriptor[]>;
 }
 
+export class OmpRpcRequestRejectedError extends Error {
+  constructor() {
+    super("OMP RPC request failed");
+    this.name = "OmpRpcRequestRejectedError";
+  }
+}
+
 type PendingRequest = {
   resolve(value: unknown): void;
   reject(error: Error): void;
@@ -2517,7 +2525,7 @@ class OmpRpcProcess {
         settled.reject(new Error("OMP RPC response is invalid"));
       }
     } else {
-      settled.reject(new Error("OMP RPC request failed"));
+      settled.reject(new OmpRpcRequestRejectedError());
     }
   }
 

package/server/provider/session.ts

@@ -21,6 +21,7 @@ import { OmpHostToolsBridge, type OmpMcpConnector, validateOmpHostToolConfig } f
 import { isOmpImageMimeType, isValidImagePayload, OmpImageMaterializer } from "./image";
 import type {
   OmpAvailableCommand,
+  OmpBranchResult,
   OmpCompactionResult,
   OmpExtensionUiResponse,
   OmpImage,
@@ -35,7 +36,7 @@ import type {
   OmpToolApprovalCancel,
   OmpToolApprovalRequest,
 } from "./omp-rpc";
-import { buildOmpSpawnRequest } from "./omp-rpc";
+import { buildOmpSpawnRequest, OmpRpcRequestRejectedError } from "./omp-rpc";
 import {
   BoundedStringSet,
   boundedJsonBytes,
@@ -1679,19 +1680,22 @@ export class OmpProviderSession {
         throw new OmpPublicError("OMP conversation rewind requires negotiated RPC protocol v2");
       }
       const entryId = this.projector.resolveRevertToken(input.token);
-      const [branchMessages, beforeState] = await Promise.all([
-        runtime.getBranchMessages(),
-        runtime.getState(),
-      ]);
+      const beforeState = await runtime.getState();
       this.requireCurrentRuntime(runtime, generation);
       if (this.activeTurn || beforeState.isStreaming || beforeState.isCompacting) {
         throw new OmpPublicError("Cannot rewind the OMP conversation while a turn is active");
       }
-      if (!branchMessages.some((message) => message.entryId === entryId)) {
-        throw new OmpPublicError("OMP conversation rewind token is stale");
-      }
       branchMutationPossible = true;
-      const result = await runtime.branch(entryId);
+      let result: OmpBranchResult;
+      try {
+        result = await runtime.branch(entryId);
+      } catch (error) {
+        if (error instanceof OmpRpcRequestRejectedError) {
+          branchMutationPossible = false;
+          throw new OmpPublicError("OMP conversation rewind token is stale");
+        }
+        throw error;
+      }
       this.requireCurrentRuntime(runtime, generation);
       if (result.cancelled) {
         branchMutationPossible = false;