@omercnet/paseo-omp 0.4.0 → 1.0.0-next.160.1

package/server/provider/settings.ts

@@ -1,11 +1,14 @@
 import { z } from "zod";
+import {
+  environmentNameSchema,
+  MAX_INHERITED_ENVIRONMENT_NAMES,
+} from "../../shared/provider-launch-settings";
 
 const MAX_COMMAND_PARTS = 64;
-const MAX_ENV_ENTRIES = 256;
-const MAX_TEXT_BYTES = 64 * 1024;
-const MAX_MODEL_SELECTOR_BYTES = 513;
 const MAX_PATH_BYTES = 4_096;
 const MAX_RPC_TIMEOUT_MS = 10 * 60 * 1_000;
+const MAX_TEXT_BYTES = 64 * 1024;
+const MAX_MODEL_SELECTOR_BYTES = 513;
 
 function boundedString(maxBytes: number) {
   return z
@@ -18,7 +21,7 @@ const CommandPartSchema = boundedString(MAX_PATH_BYTES).refine(
   (value) => !value.includes("\0") && !/[\r\n]/u.test(value),
   "command arguments cannot contain NUL or line breaks",
 );
-const EnvironmentNameSchema = z.string().regex(/^[A-Za-z_][A-Za-z0-9_]{0,127}$/u);
+const EnvironmentNameSchema = environmentNameSchema;
 const EnvironmentValueSchema = z
   .string()
   .refine((value) => Buffer.byteLength(value, "utf8") <= MAX_TEXT_BYTES && !value.includes("\0"));
@@ -63,7 +66,7 @@ export const OmpProviderOptionsSchema = z
       .optional(),
     inheritEnv: z
       .array(EnvironmentNameSchema)
-      .max(MAX_ENV_ENTRIES)
+      .max(MAX_INHERITED_ENVIRONMENT_NAMES)
       .describe("Daemon environment variable names copied at OMP spawn time")
       .optional(),
     outputRedaction: OmpOutputRedactionSchema.describe(

package/server/provider/subsessions.ts

@@ -1,15 +1,14 @@
 import { createHash } from "node:crypto";
-import { basename, extname } from "node:path";
+import { basename, extname, isAbsolute } from "node:path";
 import type { ProviderEvent } from "@getpaseo/plugin/server/provider";
 import { z } from "zod";
+import type { OmpRuntime, OmpRuntimeSession } from "./omp-rpc";
 import type {
   OmpAgentSessionEvent,
   OmpMessage,
-  OmpRuntime,
-  OmpRuntimeSession,
   OmpSubagentEvent,
   OmpSubagentSnapshot,
-} from "./omp-rpc";
+} from "./omp-rpc-protocol";
 import {
   BoundedStringSet,
   boundedJsonBytes,
@@ -882,10 +881,32 @@ export class OmpSubsessionProjector {
       signal.throwIfAborted();
       if (this.sessionIdByNativeId.has(snapshot.id)) continue;
       try {
-        const history = await waitForReplay(
-          runtimeSession.getSubagentMessages({ subagentId: snapshot.id }),
-          signal,
-        );
+        let history: ReplayHistory;
+        if (snapshot.sessionFile && isAbsolute(snapshot.sessionFile) && this.rootSessionFile) {
+          try {
+            history = await waitForReplay(
+              runtime.readPersistedSubagentTranscript({
+                parentSessionFile: this.rootSessionFile,
+                childTranscriptId: snapshot.id,
+                sessionFile: snapshot.sessionFile,
+                cwd: this.cwd,
+                signal,
+              }),
+              signal,
+            );
+          } catch (error) {
+            if (signal.aborted) throw error;
+            history = await waitForReplay(
+              runtimeSession.getSubagentMessages({ subagentId: snapshot.id }),
+              signal,
+            );
+          }
+        } else {
+          history = await waitForReplay(
+            runtimeSession.getSubagentMessages({ subagentId: snapshot.id }),
+            signal,
+          );
+        }
         try {
           this.accountReplay(history.messages, budget, signal);
           collected.push({
@@ -899,7 +920,7 @@ export class OmpSubsessionProjector {
         }
       } catch (error) {
         if (signal.aborted) throw error;
-        collected.push({ snapshot });
+        collected.push({ snapshot, sessionFile: snapshot.sessionFile });
       }
     }
     collected.sort((left, right) => {

package/server/provider/timeline-projector.ts

@@ -6,7 +6,12 @@ import type {
 } from "@getpaseo/plugin/server/provider";
 import { OMP_MCP_AUTH_TIMELINE_KIND } from "../../shared/mcp";
 import { isOmpImageMimeType, isValidImagePayload, type OmpImageMimeType } from "./image";
-import { OMP_MAX_CONTENT_PARTS, type OmpMessage, type OmpRpcEvent } from "./omp-rpc";
+import {
+  OMP_MAX_CONTENT_PARTS,
+  OMP_MESSAGE_REPLAY_POLICIES,
+  type OmpMessage,
+  type OmpRpcEvent,
+} from "./omp-rpc-protocol";
 import {
   boundedJsonBytes,
   type JsonValue,
@@ -75,6 +80,10 @@ type ToolSnapshot = {
   specializedRendered: boolean;
   silent: boolean;
 };
+type PendingToolStream = {
+  output: JsonValue;
+  retainedBytes: number;
+};
 
 export interface OmpTimelineScheduler {
   set(callback: () => void | Promise<void>, delayMs: number): unknown;
@@ -134,6 +143,10 @@ function imageBlock(data: string, mimeType: string): StreamBlockSnapshot | undef
 }
 
 type OmpAssistantMessage = Extract<OmpMessage, { role: "assistant" }>;
+type OmpCustomDisplayMessage = Extract<
+  OmpMessage,
+  { role: "bashExecution" | "pythonExecution" | "custom" | "hookMessage" }
+>;
 
 function blockText(
   message: OmpAssistantMessage,
@@ -345,6 +358,8 @@ type CompactionSlot = {
 
 export class OmpTimelineProjector {
   private readonly tools = new Map<string, ToolSnapshot>();
+  private readonly pendingToolStreams = new Map<string, PendingToolStream>();
+  private pendingToolStreamBytes = 0;
   private stream: StreamSnapshot | null = null;
   private flushTimer: unknown;
   private currentTurnId: string | null = null;
@@ -417,16 +432,35 @@ export class OmpTimelineProjector {
         return;
       }
     }
+    if (
+      (event.type === "message_start" ||
+        event.type === "message_update" ||
+        event.type === "message_end") &&
+      OMP_MESSAGE_REPLAY_POLICIES[event.message.role] === "ignore"
+    ) {
+      return;
+    }
     if (
       event.type === "todo_reminder" ||
       event.type === "todo_auto_clear" ||
+      event.type === "goal_updated" ||
+      event.type === "auto_retry_start" ||
+      event.type === "auto_retry_end" ||
+      event.type === "retry_fallback_applied" ||
+      event.type === "retry_fallback_succeeded" ||
       event.type === "notice" ||
       event.type === "extension_ui_request" ||
       event.type === "auto_compaction_start" ||
       event.type === "auto_compaction_end" ||
       event.type === "compaction_start" ||
       event.type === "compaction_end" ||
-      event.type === "advisor_yielded"
+      event.type === "advisor_yielded" ||
+      event.type === "config_warnings_changed" ||
+      event.type === "advisor_cost_changed" ||
+      event.type === "ttsr_triggered" ||
+      event.type === "irc_message" ||
+      event.type === "model_changed" ||
+      event.type === "thinking_level_changed"
     ) {
       this.projectPassive(event);
       return;
@@ -449,7 +483,12 @@ export class OmpTimelineProjector {
         this.scheduleFlush();
         return;
       case "message_end":
-        if (event.message.role === "custom" || event.message.role === "bashExecution") {
+        if (
+          event.message.role === "custom" ||
+          event.message.role === "hookMessage" ||
+          event.message.role === "bashExecution" ||
+          event.message.role === "pythonExecution"
+        ) {
           this.publishCustomMessage(event.message);
           return;
         }
@@ -460,6 +499,11 @@ export class OmpTimelineProjector {
         return;
       case "tool_execution_start": {
         this.flush(true);
+        const pendingStream = this.pendingToolStreams.get(event.toolCallId);
+        if (pendingStream) {
+          this.pendingToolStreams.delete(event.toolCallId);
+          this.pendingToolStreamBytes -= pendingStream.retainedBytes;
+        }
         if (this.toolIdentitySaturated || this.retiredToolCallIds.has(event.toolCallId)) return;
         const previous = this.tools.get(event.toolCallId);
         if (!previous && this.tools.size >= MAX_ACTIVE_TOOLS) return;
@@ -468,7 +512,17 @@ export class OmpTimelineProjector {
           MAX_PUBLIC_TOOL_PAYLOAD_BYTES,
           MAX_PUBLIC_TOOL_PAYLOAD_BYTES,
         );
-        const retainedBytes = boundedJsonBytes(input, MAX_PUBLIC_TOOL_PAYLOAD_BYTES);
+        const inputBytes = boundedJsonBytes(input, MAX_PUBLIC_TOOL_PAYLOAD_BYTES);
+        let output = pendingStream?.output ?? null;
+        let retainedBytes = inputBytes + (pendingStream?.retainedBytes ?? 0);
+        if (
+          pendingStream &&
+          this.activeToolBytes - (previous?.retainedBytes ?? 0) + retainedBytes >
+            MAX_ACTIVE_TOOL_BYTES
+        ) {
+          output = null;
+          retainedBytes = inputBytes;
+        }
         if (
           this.activeToolBytes - (previous?.retainedBytes ?? 0) + retainedBytes >
           MAX_ACTIVE_TOOL_BYTES
@@ -487,7 +541,7 @@ export class OmpTimelineProjector {
           nativeName: event.toolName,
           name: this.dataFilter.text(displayName, 256),
           input,
-          output: null,
+          output,
           retainedBytes,
           turnId,
           generation: this.runtimeGeneration,
@@ -499,16 +553,30 @@ export class OmpTimelineProjector {
         if (!snapshot.silent) this.publishTool(snapshot, "running");
         return;
       }
-      case "tool_execution_update": {
-        const previous = this.tools.get(event.toolCallId);
-        if (!previous) return;
-        if (previous.turnId !== turnId || previous.generation !== this.runtimeGeneration) return;
+      case "tool_execution_update":
+      case "tool_stream_update": {
         const output = this.dataFilter.json(
-          event.partialResult,
+          event.type === "tool_execution_update" ? event.partialResult : event.update,
           MAX_PUBLIC_TOOL_PAYLOAD_BYTES,
           MAX_PUBLIC_TOOL_PAYLOAD_BYTES,
         );
         const outputBytes = boundedJsonBytes(output, MAX_PUBLIC_TOOL_PAYLOAD_BYTES);
+        const previous = this.tools.get(event.toolCallId);
+        if (!previous) {
+          if (event.type !== "tool_stream_update") return;
+          const pending = this.pendingToolStreams.get(event.toolCallId);
+          if (!pending && this.pendingToolStreams.size >= MAX_ACTIVE_TOOLS) return;
+          if (
+            this.pendingToolStreamBytes - (pending?.retainedBytes ?? 0) + outputBytes >
+            MAX_ACTIVE_TOOL_BYTES
+          ) {
+            return;
+          }
+          this.pendingToolStreamBytes += outputBytes - (pending?.retainedBytes ?? 0);
+          this.pendingToolStreams.set(event.toolCallId, { output, retainedBytes: outputBytes });
+          return;
+        }
+        if (previous.turnId !== turnId || previous.generation !== this.runtimeGeneration) return;
         const inputBytes = boundedJsonBytes(previous.input, MAX_PUBLIC_TOOL_PAYLOAD_BYTES);
         const retainedBytes = inputBytes + outputBytes;
         if (this.activeToolBytes - previous.retainedBytes + retainedBytes > MAX_ACTIVE_TOOL_BYTES)
@@ -600,6 +668,10 @@ export class OmpTimelineProjector {
       this.publishRetryFallback(event);
       return;
     }
+    if (event.type === "irc_message") {
+      this.publishCustomMessage(event.message as OmpCustomDisplayMessage);
+      return;
+    }
     if (event.type === "notice") {
       this.noticeSequence += 1;
       this.publish({
@@ -831,6 +903,7 @@ export class OmpTimelineProjector {
     this.activeToolBytes = 0;
     this.replayToolCalls.clear();
     this.tools.clear();
+    this.clearPendingToolStreams();
     this.commandText = "";
     this.commandPublishedText = "";
     this.revertEntryByToken.clear();
@@ -839,8 +912,9 @@ export class OmpTimelineProjector {
 
   projectReplayMessage(message: OmpMessage): void {
     if (this.closed) return;
-    const nativeIdentity = assistantIdentity(message);
     this.replaySequence += 1;
+    if (OMP_MESSAGE_REPLAY_POLICIES[message.role] === "ignore") return;
+
     if (message.role === "user") {
       this.replayToolCalls.clear();
       if (this.replayTurnId) this.finishTurn(this.replayTurnId);
@@ -861,7 +935,9 @@ export class OmpTimelineProjector {
       }
       return;
     }
+
     if (message.role === "assistant") {
+      const nativeIdentity = assistantIdentity(message);
       this.replayTurnId ??= `omp:replay-turn:${this.replaySequence}`;
       this.projectingReplay = true;
       try {
@@ -880,6 +956,7 @@ export class OmpTimelineProjector {
       if (nativeIdentity) this.rememberReplayOccurrence(nativeIdentity, message);
       return;
     }
+
     this.replayTurnId ??= `omp:replay-turn:${this.replaySequence}`;
     if (message.role === "toolResult") {
       const replayCall = this.replayToolCalls.get(message.toolCallId);
@@ -910,10 +987,18 @@ export class OmpTimelineProjector {
       );
       return;
     }
-    if (message.role === "bashExecution") {
+
+    if (
+      message.role === "bashExecution" ||
+      message.role === "pythonExecution" ||
+      message.role === "custom" ||
+      message.role === "hookMessage"
+    ) {
       this.publishCustomMessage(message);
-      this.finishTurn(this.replayTurnId);
-      this.replayTurnId = null;
+      if (message.role === "bashExecution" || message.role === "pythonExecution") {
+        this.finishTurn(this.replayTurnId);
+        this.replayTurnId = null;
+      }
     }
   }
 
@@ -1086,6 +1171,7 @@ export class OmpTimelineProjector {
     this.clearFlushTimer();
     this.stream = null;
     this.tools.clear();
+    this.clearPendingToolStreams();
     this.replayToolCalls.clear();
     this.activeToolBytes = 0;
     this.replayCandidates.clear();
@@ -1126,6 +1212,11 @@ export class OmpTimelineProjector {
     }
     this.activeToolBytes = 0;
     this.tools.clear();
+    this.clearPendingToolStreams();
+  }
+  private clearPendingToolStreams(): void {
+    this.pendingToolStreams.clear();
+    this.pendingToolStreamBytes = 0;
   }
   private ensureTurn(turnId: string): void {
     if (this.currentTurnId === turnId) return;
@@ -1350,9 +1441,17 @@ export class OmpTimelineProjector {
     return undefined;
   }
 
-  private publishCustomMessage(message: OmpMessage): void {
-    if (message.display === false) return;
-    const rawType = message.customType ?? message.role;
+  private publishCustomMessage(message: OmpCustomDisplayMessage): void {
+    if (
+      (message.role === "custom" || message.role === "hookMessage") &&
+      message.display === false
+    ) {
+      return;
+    }
+    const rawType =
+      message.role === "custom" || message.role === "hookMessage"
+        ? (message.customType ?? message.role)
+        : message.role;
     const publicType = this.dataFilter.text(rawType, 256);
     const lowerType = rawType.toLowerCase();
     const details = jsonRecord(this.dataFilter.json(message.details ?? null));
@@ -1361,7 +1460,9 @@ export class OmpTimelineProjector {
     const id = nativeIdentity
       ? `omp:custom:${createHash("sha256").update(nativeIdentity).digest("base64url").slice(0, 12)}`
       : `omp:custom:${this.customSequence}`;
-    const contentParts = Array.isArray(message.content) ? message.content : [];
+    const messageContent =
+      message.role === "custom" || message.role === "hookMessage" ? message.content : undefined;
+    const contentParts = Array.isArray(messageContent) ? messageContent : [];
     const imageResult = nativeImageResult(
       {
         content:
@@ -1373,16 +1474,26 @@ export class OmpTimelineProjector {
       this.dataFilter,
     );
     const content =
-      typeof message.content === "string"
-        ? message.content
+      typeof messageContent === "string"
+        ? messageContent
         : contentParts
             .flatMap((part) => (part.type === "text" && part.text ? [part.text] : []))
             .join("\n\n");
-    if (message.role === "bashExecution" || /bash|shell|python/u.test(lowerType)) {
+    const execution = message.role === "bashExecution" || message.role === "pythonExecution";
+    if (execution || /bash|shell|python/u.test(lowerType)) {
+      const nativeCommand =
+        message.role === "bashExecution"
+          ? message.command
+          : message.role === "pythonExecution"
+            ? message.code
+            : undefined;
       const command = this.dataFilter.text(
-        message.command ?? firstString(details, "command", "input") ?? publicType,
+        nativeCommand ?? firstString(details, "command", "input") ?? publicType,
       );
-      const output = message.output ?? content;
+      const output = execution ? (message.output ?? content) : content;
+      const exitCode = execution ? message.exitCode : undefined;
+      const cancelled = execution ? message.cancelled : undefined;
+      const truncated = execution ? message.truncated : undefined;
       this.publish({
         type: "tool_call",
         id,
@@ -1393,21 +1504,21 @@ export class OmpTimelineProjector {
           command,
           ...(firstString(details, "cwd") ? { cwd: firstString(details, "cwd") } : {}),
           ...(output ? { output: this.dataFilter.text(output, MAX_STREAM_TEXT_LENGTH) } : {}),
-          ...(typeof message.exitCode === "number" || message.exitCode === null
-            ? { exitCode: message.exitCode }
+          ...(typeof exitCode === "number" || exitCode === null
+            ? { exitCode }
             : typeof details?.exitCode === "number"
               ? { exitCode: details.exitCode }
               : {}),
         },
-        ...(message.cancelled !== undefined || message.truncated !== undefined
+        ...(cancelled !== undefined || truncated !== undefined
           ? {
               metadata: {
-                ...(message.cancelled !== undefined ? { cancelled: message.cancelled } : {}),
-                ...(message.truncated !== undefined ? { truncated: message.truncated } : {}),
+                ...(cancelled !== undefined ? { cancelled } : {}),
+                ...(truncated !== undefined ? { truncated } : {}),
               },
             }
           : {}),
-        status: message.cancelled ? "canceled" : "completed",
+        status: cancelled ? "canceled" : "completed",
         error: null,
       });
       if (imageResult) this.publishImages(id, publicType, imageResult.image);

package/shared/external-url.ts

@@ -1,12 +1,3 @@
-export type ExternalUrlOpener = (url: string) => Promise<void>;
-
-export function selectExternalUrlOpener(
-  paseoOpener: ExternalUrlOpener | undefined,
-  fallback: ExternalUrlOpener,
-): ExternalUrlOpener {
-  return paseoOpener ?? fallback;
-}
-
 export function validatedHttpUrl(value: string): string {
   let url: URL;
   try {

package/shared/provider-launch-settings.ts

@@ -0,0 +1,18 @@
+import { defineSettings } from "@getpaseo/plugin";
+import { z } from "zod";
+
+export const MAX_INHERITED_ENVIRONMENT_NAMES = 256;
+export const environmentNameSchema = z.string().regex(/^[A-Za-z_][A-Za-z0-9_]{0,127}$/u);
+
+export const providerLaunchSettingsSchema = z.object({
+  inheritEnv: z.array(environmentNameSchema).max(MAX_INHERITED_ENVIRONMENT_NAMES).default([]),
+});
+
+export type ProviderLaunchSettings = z.infer<typeof providerLaunchSettingsSchema>;
+
+export const providerLaunchSettings = defineSettings({
+  id: "provider-launch",
+  scope: "host",
+  version: 1,
+  schema: providerLaunchSettingsSchema,
+});