@omercnet/paseo-omp 0.4.0-next.114.1 → 0.4.0-next.120.1

package/server/provider/session.ts

@@ -1,7 +1,6 @@
 import { createHash, randomUUID } from "node:crypto";
 import type {
   ProviderConfigState,
-  ProviderContent,
   ProviderError,
   ProviderEvent,
   ProviderInput,
@@ -10,7 +9,6 @@ import type {
   ProviderToolCallDetail,
   ProviderUsage,
 } from "@getpaseo/plugin/server/provider";
-import { getForgeDefinitionOrNeutral } from "@getpaseo/protocol/forge-manifest";
 import type {
   OmpOperationalFailure,
   OmpOperationalFailureReporter,
@@ -30,13 +28,12 @@ import {
   withCommittedOmpSelection,
 } from "./config-normalization";
 import { OmpHostToolsBridge, type OmpMcpConnector, validateOmpHostToolConfig } from "./host-tools";
-import { isOmpImageMimeType, isValidImagePayload, OmpImageMaterializer } from "./image";
+import { isOmpImageMimeType, OmpImageMaterializer } from "./image";
 import type {
   OmpAvailableCommand,
   OmpBranchResult,
   OmpCompactionResult,
   OmpExtensionUiResponse,
-  OmpImage,
   OmpMessage,
   OmpModel,
   OmpRpcEvent,
@@ -44,11 +41,19 @@ import type {
   OmpRuntimeSession,
   OmpSessionState,
   OmpSessionStats,
-  OmpStartOptions,
   OmpToolApprovalCancel,
   OmpToolApprovalRequest,
 } from "./omp-rpc";
-import { buildOmpSpawnRequest, OmpRpcRequestRejectedError } from "./omp-rpc";
+import { OmpRpcRequestRejectedError } from "./omp-rpc";
+import { buildOmpSpawnRequest, type OmpStartOptions } from "./omp-rpc-environment";
+import {
+  inlinePromptFrameBytes,
+  isSafeCommandName,
+  MAX_PROMPT_TEXT_LENGTH,
+  type OmpPromptPayload,
+  promptPayload,
+  slashCommandName,
+} from "./prompt-payload";
 import {
   BoundedStringSet,
   boundedJsonBytes,
@@ -94,9 +99,6 @@ const USAGE_REFRESH_MS = 100;
 const FINAL_USAGE_WAIT_MS = 250;
 const COMPACTION_MAX_WAIT_MS = 5 * 60_000;
 const AGENT_END_SETTLE_MS = 5_000;
-const MAX_PROMPT_PARTS = 64;
-const MAX_PROMPT_TEXT_LENGTH = 1024 * 1024;
-const RPC_REQUEST_ID_BYTES = 36;
 const MAX_AGENT_END_CORRELATION_MESSAGES = 512;
 const MAX_TRACKED_ENTRY_IDS = 1_024;
 const MAX_UNCLAIMED_BRANCH_ENTRIES = 1_024;
@@ -407,240 +409,6 @@ async function settleSessionCleanup(promises: readonly Promise<void>[]): Promise
     throw new AggregateError(failures, "OMP session initialization cleanup failed");
   }
 }
-function isSafeCommandName(name: string): boolean {
-  return /^[A-Za-z0-9][A-Za-z0-9._-]*(?::[A-Za-z0-9][A-Za-z0-9._-]*)*$/u.test(name);
-}
-
-type OmpPromptPayload = { text: string; images: OmpImage[]; commandName?: string };
-
-const REVIEW_LINE_MARKERS = { add: "+", remove: "-", context: " " } as const;
-
-function renderPromptAttachmentAsText(part: Exclude<ProviderContent, { type: "image" }>): string {
-  switch (part.type) {
-    case "forge_change_request": {
-      return renderChangeRequestAttachment({
-        forge: part.forge ?? "github",
-        number: part.number,
-        title: part.title,
-        url: part.url,
-        body: part.body,
-        projectPath: part.projectPath,
-        baseRefName: part.baseRefName,
-        headRefName: part.headRefName,
-      });
-    }
-    case "github_pr": {
-      return renderChangeRequestAttachment({
-        forge: "github",
-        number: part.number,
-        title: part.title,
-        url: part.url,
-        body: part.body,
-        baseRefName: part.baseRefName,
-        headRefName: part.headRefName,
-      });
-    }
-    case "forge_issue": {
-      return renderIssueAttachment({
-        forge: part.forge ?? "github",
-        number: part.number,
-        title: part.title,
-        url: part.url,
-        body: part.body,
-        projectPath: part.projectPath,
-      });
-    }
-    case "github_issue": {
-      return renderIssueAttachment({
-        forge: "github",
-        number: part.number,
-        title: part.title,
-        url: part.url,
-        body: part.body,
-      });
-    }
-    case "text": {
-      return part.text;
-    }
-    case "review": {
-      const lines = [`Paseo review attachment (${part.mode})`, `CWD: ${part.cwd}`];
-      if (part.baseRef) {
-        lines.push(`Base: ${part.baseRef}`);
-      }
-      part.comments.forEach((comment, index) => {
-        lines.push(
-          "",
-          `Comment ${index + 1}: ${comment.filePath}:${comment.side}:${comment.lineNumber}`,
-          comment.body,
-          comment.context.hunkHeader,
-        );
-        const target = comment.context.targetLine;
-        for (const line of comment.context.lines) {
-          const isTarget =
-            line.oldLineNumber === target.oldLineNumber &&
-            line.newLineNumber === target.newLineNumber &&
-            line.type === target.type &&
-            line.content === target.content;
-          const prefix = isTarget ? "> " : "  ";
-          const oldLn = padLineNumber(line.oldLineNumber);
-          const newLn = padLineNumber(line.newLineNumber);
-          lines.push(`${prefix}${oldLn} ${newLn} ${REVIEW_LINE_MARKERS[line.type]}${line.content}`);
-        }
-      });
-      return lines.join("\n");
-    }
-    case "uploaded_file": {
-      return [
-        `Uploaded file: ${part.fileName}`,
-        `Path: ${part.path}`,
-        `MIME: ${part.mimeType}`,
-        `Size: ${part.size} bytes`,
-      ].join("\n");
-    }
-    default:
-      throw new Error("unreachable");
-  }
-}
-
-function renderChangeRequestAttachment(input: {
-  forge: string;
-  number: number;
-  title: string;
-  url: string;
-  body?: string | null;
-  projectPath?: string;
-  baseRefName?: string | null;
-  headRefName?: string | null;
-}): string {
-  const lines = [
-    `${formatForgeLabel(input.forge)} ${formatChangeRequestAbbrev(input.forge)} ${formatChangeRequestNumber(input.forge, input.number)}: ${input.title}`,
-    input.url,
-  ];
-  if (input.projectPath) {
-    lines.push(`Project: ${input.projectPath}`);
-  }
-  if (input.baseRefName) {
-    lines.push(`Base: ${input.baseRefName}`);
-  }
-  if (input.headRefName) {
-    lines.push(`Head: ${input.headRefName}`);
-  }
-  if (input.body) {
-    lines.push("", input.body);
-  }
-  return lines.join("\n");
-}
-
-function renderIssueAttachment(input: {
-  forge: string;
-  number: number;
-  title: string;
-  url: string;
-  body?: string | null;
-  projectPath?: string;
-}): string {
-  const lines = [
-    `${formatForgeLabel(input.forge)} Issue ${formatIssueNumber(input.forge, input.number)}: ${input.title}`,
-    input.url,
-  ];
-  if (input.projectPath) {
-    lines.push(`Project: ${input.projectPath}`);
-  }
-  if (input.body) {
-    lines.push("", input.body);
-  }
-  return lines.join("\n");
-}
-
-function formatForgeLabel(forge: string): string {
-  return getForgeDefinitionOrNeutral(forge).displayName;
-}
-
-function formatChangeRequestAbbrev(forge: string): string {
-  return getForgeDefinitionOrNeutral(forge).changeRequestAbbrev;
-}
-
-function formatChangeRequestNumber(forge: string, number: number): string {
-  return `${getForgeDefinitionOrNeutral(forge).changeRequestNumberPrefix}${number}`;
-}
-
-function formatIssueNumber(forge: string, number: number): string {
-  return `${getForgeDefinitionOrNeutral(forge).issueNumberPrefix}${number}`;
-}
-
-function padLineNumber(lineNumber: number | null): string {
-  return (lineNumber?.toString() ?? "-").padStart(2);
-}
-
-function promptPayload(input: SessionPromptInput): OmpPromptPayload {
-  if (input.prompt.outputSchema !== undefined || input.prompt.clearPendingPermissions) {
-    throw new OmpPublicError("OMP does not support structured output or permission controls");
-  }
-  if (input.prompt.input.type === "command") {
-    const name = input.prompt.input.name.trim();
-    if (!isSafeCommandName(name)) throw new OmpPublicError("Invalid OMP command name");
-    const argumentsText = input.prompt.input.arguments.trim();
-    const text = `/${name}${argumentsText ? ` ${argumentsText}` : ""}`;
-    if (utf8Bytes(text) > MAX_PROMPT_TEXT_LENGTH)
-      throw new OmpPublicError("OMP command is too large");
-    return { text, images: [], commandName: name };
-  }
-  if (input.prompt.input.content.length > MAX_PROMPT_PARTS) {
-    throw new OmpPublicError("OMP prompt has too many content parts");
-  }
-  const parts: string[] = [];
-  const images: OmpImage[] = [];
-  let length = 0;
-  const appendText = (text: string) => {
-    length += utf8Bytes(text) + (parts.length > 0 ? 2 : 0);
-    if (length > MAX_PROMPT_TEXT_LENGTH) throw new OmpPublicError("OMP prompt is too large");
-    parts.push(text);
-  };
-  for (const part of input.prompt.input.content) {
-    if (part.type === "text") {
-      appendText(part.text);
-      continue;
-    }
-    if (part.type === "image") {
-      if (!isValidImagePayload(part.data, part.mimeType, 8 * 1024 * 1024)) {
-        throw new OmpPublicError("OMP prompt image is invalid");
-      }
-      images.push({ type: "image", data: part.data, mimeType: part.mimeType });
-      continue;
-    }
-    appendText(renderPromptAttachmentAsText(part));
-  }
-  const text = parts.join("\n\n").trim();
-  if (!text && images.length === 0) throw new OmpPublicError("OMP prompt cannot be empty");
-  return { text, images };
-}
-
-function inlinePromptFrameBytes(payload: OmpPromptPayload, delivery: "prompt" | "steer"): number {
-  const images = payload.images.map(({ type, mimeType }) => ({ type, data: "", mimeType }));
-  const frame = {
-    type: delivery,
-    message: payload.text,
-    ...(images.length > 0 ? { images } : {}),
-    ...(delivery === "prompt" ? { id: "" } : {}),
-  };
-  const requestIdBytes = delivery === "prompt" ? RPC_REQUEST_ID_BYTES : 0;
-  return (
-    utf8Bytes(JSON.stringify(frame)) +
-    requestIdBytes +
-    payload.images.reduce((total, image) => total + image.data.length, 0) +
-    1
-  );
-}
-
-function slashCommandName(text: string): string | undefined {
-  if (!text.startsWith("/")) return undefined;
-  const body = text.slice(1);
-  if (!body) return undefined;
-  const firstWhitespace = body.search(/\s/u);
-  const name = firstWhitespace === -1 ? body : body.slice(0, firstWhitespace);
-  return name || undefined;
-}
-
 function nativeEntryId(message: OmpMessage): string | undefined {
   return message.entryId;
 }
@@ -1685,7 +1453,7 @@ export class OmpProviderSession {
           });
         }
       }
-      messages ??= await waitForReplay(this.runtime.getMessages(), replay.signal);
+      messages ??= await waitForReplay(this.runtime.getMessages(replay.signal), replay.signal);
       this.quarantineBranchEntries();
       for (const message of messages) {
         replay.signal.throwIfAborted();
@@ -3234,6 +3002,17 @@ export class OmpProviderSession {
       this.handleRuntimeFailure();
       return;
     }
+    if (
+      event.type === "config_warnings_changed" ||
+      event.type === "advisor_cost_changed" ||
+      event.type === "ttsr_triggered"
+    ) {
+      return;
+    }
+    if (event.type === "irc_message") {
+      this.projector.projectPassive(event);
+      return;
+    }
     if (
       event.type === "notice" ||
       event.type === "todo_reminder" ||

package/server/provider/subsessions.ts

@@ -1,5 +1,5 @@
 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 {
@@ -882,10 +882,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 +921,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";
 import {
   boundedJsonBytes,
   type JsonValue,
@@ -134,6 +139,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,
@@ -417,16 +426,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 +477,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;
         }
@@ -499,12 +532,13 @@ export class OmpTimelineProjector {
         if (!snapshot.silent) this.publishTool(snapshot, "running");
         return;
       }
-      case "tool_execution_update": {
+      case "tool_execution_update":
+      case "tool_stream_update": {
         const previous = this.tools.get(event.toolCallId);
         if (!previous) return;
         if (previous.turnId !== turnId || previous.generation !== this.runtimeGeneration) return;
         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,
         );
@@ -600,6 +634,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({
@@ -839,8 +877,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 +900,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 +921,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 +952,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;
+      }
     }
   }
 
@@ -1350,9 +1400,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 +1419,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 +1433,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 +1463,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);