@ash-cloud/ash-ai 0.1.15 → 0.1.17

package/dist/index.cjs

@@ -2,6 +2,7 @@
 
 var zod = require('zod');
 var child_process = require('child_process');
+var events = require('events');
 var nanoid = require('nanoid');
 var fs = require('fs/promises');
 var path4 = require('path');
@@ -384,6 +385,85 @@ var init_errors = __esm({
   }
 });
 
+// src/relay/stream-event-writer.ts
+exports.StreamEventWriter = void 0;
+var init_stream_event_writer = __esm({
+  "src/relay/stream-event-writer.ts"() {
+    exports.StreamEventWriter = class {
+      storage;
+      sessionId;
+      emitter;
+      flushIntervalMs;
+      maxBatchChars;
+      // Text delta batching state
+      pendingDelta = "";
+      pendingDeltaCount = 0;
+      flushTimer = null;
+      closed = false;
+      constructor(options) {
+        this.storage = options.storage;
+        this.sessionId = options.sessionId;
+        this.emitter = options.emitter;
+        this.flushIntervalMs = options.flushIntervalMs ?? 100;
+        this.maxBatchChars = options.maxBatchChars ?? 500;
+      }
+      /**
+       * Write a stream event. Text deltas are batched; all other events are written immediately.
+       */
+      async write(event) {
+        if (this.closed) return;
+        if (this.emitter) {
+          this.emitter.emit("event", event);
+        }
+        if (event.type === "text_delta") {
+          this.pendingDelta += event.delta;
+          this.pendingDeltaCount++;
+          if (!this.flushTimer) {
+            this.flushTimer = setTimeout(() => this.flush(), this.flushIntervalMs);
+          }
+          if (this.pendingDelta.length >= this.maxBatchChars) {
+            await this.flush();
+          }
+        } else {
+          await this.flush();
+          await this.writeToStorage([{ eventType: event.type, payload: event, batchCount: 1 }]);
+        }
+      }
+      /**
+       * Flush any pending text_delta events to storage as a single batched event.
+       */
+      async flush() {
+        if (this.flushTimer) {
+          clearTimeout(this.flushTimer);
+          this.flushTimer = null;
+        }
+        if (this.pendingDelta.length === 0) return;
+        const batchedEvent = {
+          type: "text_delta",
+          delta: this.pendingDelta
+        };
+        const batchCount = this.pendingDeltaCount;
+        this.pendingDelta = "";
+        this.pendingDeltaCount = 0;
+        await this.writeToStorage([{ eventType: "text_delta", payload: batchedEvent, batchCount }]);
+      }
+      /**
+       * Close the writer, flushing any remaining events.
+       */
+      async close() {
+        await this.flush();
+        this.closed = true;
+        if (this.emitter) {
+          this.emitter.emit("done");
+        }
+      }
+      async writeToStorage(events) {
+        return this.storage.appendEvents(this.sessionId, events);
+      }
+    };
+  }
+});
+
 // src/session/manager.ts
 exports.SessionManager = void 0;
 var init_manager = __esm({
@@ -1788,11 +1868,10 @@ var init_sandbox_logger = __esm({
     };
   }
 });
-
-// src/agent/harness.ts
 exports.AgentHarness = void 0;
 var init_harness = __esm({
   "src/agent/harness.ts"() {
+    init_stream_event_writer();
     init_manager();
     init_claude_sdk();
     init_backend();
@@ -1809,6 +1888,8 @@ var init_harness = __esm({
       sessionSkillDirs = /* @__PURE__ */ new Map();
       /** Tracks active executions by session ID for stop/interrupt capability */
       activeExecutions = /* @__PURE__ */ new Map();
+      /** EventEmitters for same-process SSE relay fast-path, keyed by session ID */
+      sessionEmitters = /* @__PURE__ */ new Map();
       constructor(config) {
         this.name = config.name;
         this.config = config;
@@ -1956,6 +2037,20 @@ var init_harness = __esm({
       getSessionManager() {
         return this.sessionManager;
       }
+      /**
+       * Get the stream event storage (if configured)
+       */
+      getStreamEventStorage() {
+        return this.config.streamEventStorage;
+      }
+      /**
+       * Get the EventEmitter for a session's stream events.
+       * Used by the relay endpoint for same-process fast-path.
+       * Returns undefined if no active execution or no streamEventStorage configured.
+       */
+      getSessionEmitter(sessionId) {
+        return this.sessionEmitters.get(sessionId);
+      }
       async ensureInitialized() {
         if (!this.initialized) {
           await this.initialize();
@@ -1970,9 +2065,24 @@ var init_harness = __esm({
           async *send(prompt, options = {}) {
             const controller = new AbortController();
             self.activeExecutions.set(session.id, controller);
+            let writer;
+            let emitter;
+            if (self.config.streamEventStorage) {
+              emitter = new events.EventEmitter();
+              self.sessionEmitters.set(session.id, emitter);
+              writer = new exports.StreamEventWriter({
+                storage: self.config.streamEventStorage,
+                sessionId: session.id,
+                emitter
+              });
+            }
             if (options.signal) {
               options.signal.addEventListener("abort", () => controller.abort(), { once: true });
             }
+            const writeEvent = writer ? (event) => {
+              writer.write(event).catch(() => {
+              });
+            } : void 0;
             let partialTextContent = "";
             const sandboxLogs = [];
             const logQueue = [];
@@ -1986,7 +2096,9 @@ var init_harness = __esm({
             const yieldQueuedLogs = async function* () {
               while (logQueue.length > 0) {
                 const entry = logQueue.shift();
-                yield { type: "sandbox_log", entry };
+                const event = { type: "sandbox_log", entry };
+                writeEvent?.(event);
+                yield event;
               }
             };
             logger3.info("execution", `Starting execution for session ${session.id}`);
@@ -2003,11 +2115,13 @@ var init_harness = __esm({
             if (self.hooks.onMessage && savedUserMessage) {
               await self.hooks.onMessage(savedUserMessage);
             }
-            yield {
+            const sessionStartEvent = {
               type: "session_start",
               sessionId: session.id,
               sdkSessionId: session.sdkSessionId ?? ""
             };
+            writeEvent?.(sessionStartEvent);
+            yield sessionStartEvent;
             yield* yieldQueuedLogs();
             const assistantContent = [];
             let wasAborted = false;
@@ -2028,22 +2142,26 @@ var init_harness = __esm({
                 }
                 if (event.type === "text_delta" && event.delta) {
                   partialTextContent += event.delta;
-                  yield {
+                  const textDeltaEvent = {
                     type: "text_delta",
                     delta: event.delta
                   };
+                  writeEvent?.(textDeltaEvent);
+                  yield textDeltaEvent;
                 } else if (event.type === "thinking_delta" && event.delta) {
-                  yield {
+                  const thinkingEvent = {
                     type: "thinking_delta",
                     delta: event.delta
                   };
+                  writeEvent?.(thinkingEvent);
+                  yield thinkingEvent;
                 } else if (event.type === "text") {
                   const textContent = {
                     type: "text",
                     text: event.text
                   };
                   assistantContent.push(textContent);
-                  yield {
+                  const messageEvent = {
                     type: "message",
                     message: {
                       id: "",
@@ -2053,6 +2171,8 @@ var init_harness = __esm({
                       createdAt: /* @__PURE__ */ new Date()
                     }
                   };
+                  writeEvent?.(messageEvent);
+                  yield messageEvent;
                 } else if (event.type === "tool_use") {
                   logger3.debug("execution", `Tool use: ${event.name}`, { toolId: event.id });
                   const toolContent = {
@@ -2062,12 +2182,14 @@ var init_harness = __esm({
                     input: event.input
                   };
                   assistantContent.push(toolContent);
-                  yield {
+                  const toolUseEvent = {
                     type: "tool_use",
                     id: event.id,
                     name: event.name,
                     input: event.input
                   };
+                  writeEvent?.(toolUseEvent);
+                  yield toolUseEvent;
                   yield* yieldQueuedLogs();
                   if (self.hooks.onToolUse) {
                     await self.hooks.onToolUse(event.name, event.input, null);
@@ -2084,12 +2206,14 @@ var init_harness = __esm({
                     isError: event.isError
                   };
                   assistantContent.push(resultContent);
-                  yield {
+                  const toolResultEvent = {
                     type: "tool_result",
                     toolUseId: event.toolUseId,
                     content: event.content,
                     isError: event.isError
                   };
+                  writeEvent?.(toolResultEvent);
+                  yield toolResultEvent;
                 }
               }
               if (wasAborted || controller.signal.aborted) {
@@ -2118,19 +2242,23 @@ var init_harness = __esm({
                   }
                 });
                 yield* yieldQueuedLogs();
-                yield {
+                const stoppedEvent = {
                   type: "session_stopped",
                   sessionId: session.id,
                   reason: "user_requested",
                   partialContent: partialTextContent || void 0
                 };
+                writeEvent?.(stoppedEvent);
+                yield stoppedEvent;
                 return;
               }
               logger3.info("execution", "Execution completed successfully");
-              yield {
+              const turnCompleteEvent = {
                 type: "turn_complete",
                 sessionId: session.id
               };
+              writeEvent?.(turnCompleteEvent);
+              yield turnCompleteEvent;
               if (assistantContent.length > 0) {
                 const savedAssistantMessages = await self.sessionManager.saveMessages(
                   session.id,
@@ -2154,11 +2282,13 @@ var init_harness = __esm({
                 }
               });
               yield* yieldQueuedLogs();
-              yield {
+              const sessionEndEvent = {
                 type: "session_end",
                 sessionId: session.id,
                 status: "completed"
               };
+              writeEvent?.(sessionEndEvent);
+              yield sessionEndEvent;
               if (self.hooks.onSessionEnd) {
                 const updatedSession = await self.sessionManager.getSession(session.id);
                 if (updatedSession) {
@@ -2189,12 +2319,14 @@ var init_harness = __esm({
                   }
                 });
                 yield* yieldQueuedLogs();
-                yield {
+                const catchStoppedEvent = {
                   type: "session_stopped",
                   sessionId: session.id,
                   reason: "user_requested",
                   partialContent: partialTextContent || void 0
                 };
+                writeEvent?.(catchStoppedEvent);
+                yield catchStoppedEvent;
               } else {
                 logger3.error("execution", `Execution error: ${errorMessage}`);
                 await self.sessionManager.updateSession(session.id, {
@@ -2212,13 +2344,19 @@ var init_harness = __esm({
                     await self.hooks.onError(error, updatedSession);
                   }
                 }
-                yield {
+                const errorEvent = {
                   type: "error",
                   error: errorMessage
                 };
+                writeEvent?.(errorEvent);
+                yield errorEvent;
               }
             } finally {
               self.activeExecutions.delete(session.id);
+              if (writer) {
+                await writer.close();
+              }
+              self.sessionEmitters.delete(session.id);
             }
           },
           async getSession() {
@@ -2722,12 +2860,88 @@ var init_queue_memory = __esm({
     };
   }
 });
+exports.MemoryStreamEventStorage = void 0;
+var init_stream_event_memory = __esm({
+  "src/storage/stream-event-memory.ts"() {
+    exports.MemoryStreamEventStorage = class {
+      events = /* @__PURE__ */ new Map();
+      nextSequence = /* @__PURE__ */ new Map();
+      async initialize() {
+      }
+      async close() {
+        this.events.clear();
+        this.nextSequence.clear();
+      }
+      async appendEvents(sessionId, events) {
+        if (!this.events.has(sessionId)) {
+          this.events.set(sessionId, []);
+        }
+        const sessionEvents2 = this.events.get(sessionId);
+        let seq = this.nextSequence.get(sessionId) ?? 0;
+        const stored = [];
+        for (const event of events) {
+          seq += 1;
+          const storedEvent = {
+            id: nanoid.nanoid(),
+            sessionId,
+            sequence: seq,
+            eventType: event.eventType,
+            payload: event.payload,
+            batchCount: event.batchCount ?? 1,
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          sessionEvents2.push(storedEvent);
+          stored.push(storedEvent);
+        }
+        this.nextSequence.set(sessionId, seq);
+        return stored;
+      }
+      async readEvents(sessionId, options) {
+        const sessionEvents2 = this.events.get(sessionId) ?? [];
+        let result = sessionEvents2;
+        if (options?.afterSequence !== void 0) {
+          result = result.filter((e) => e.sequence > options.afterSequence);
+        }
+        if (options?.limit !== void 0) {
+          result = result.slice(0, options.limit);
+        }
+        return result;
+      }
+      async getLatestSequence(sessionId) {
+        return this.nextSequence.get(sessionId) ?? 0;
+      }
+      async deleteSessionEvents(sessionId) {
+        this.events.delete(sessionId);
+        this.nextSequence.delete(sessionId);
+      }
+      async cleanupOldEvents(maxAgeMs) {
+        const cutoff = Date.now() - maxAgeMs;
+        let deleted = 0;
+        for (const [sessionId, sessionEvents2] of this.events) {
+          const before = sessionEvents2.length;
+          const remaining = sessionEvents2.filter(
+            (e) => e.createdAt.getTime() >= cutoff
+          );
+          deleted += before - remaining.length;
+          if (remaining.length === 0) {
+            this.events.delete(sessionId);
+            this.nextSequence.delete(sessionId);
+          } else {
+            this.events.set(sessionId, remaining);
+          }
+        }
+        return deleted;
+      }
+    };
+  }
+});
 
 // src/storage/index.ts
 var init_storage = __esm({
   "src/storage/index.ts"() {
     init_memory();
     init_queue_memory();
+    init_stream_event_memory();
   }
 });
 
@@ -4233,6 +4447,50 @@ VERCEL_EOF`);
   }
 });
 
+// src/runtime/providers/firecracker/types.ts
+var init_types3 = __esm({
+  "src/runtime/providers/firecracker/types.ts"() {
+  }
+});
+
+// src/runtime/providers/firecracker/image-manager.ts
+var init_image_manager = __esm({
+  "src/runtime/providers/firecracker/image-manager.ts"() {
+  }
+});
+
+// src/runtime/providers/firecracker/network-manager.ts
+var init_network_manager = __esm({
+  "src/runtime/providers/firecracker/network-manager.ts"() {
+  }
+});
+
+// src/runtime/providers/firecracker/ssh-executor.ts
+var init_ssh_executor = __esm({
+  "src/runtime/providers/firecracker/ssh-executor.ts"() {
+  }
+});
+
+// src/runtime/providers/firecracker/vm-manager.ts
+var init_vm_manager = __esm({
+  "src/runtime/providers/firecracker/vm-manager.ts"() {
+    init_types3();
+  }
+});
+
+// src/runtime/providers/firecracker.ts
+var init_firecracker = __esm({
+  "src/runtime/providers/firecracker.ts"() {
+    init_types2();
+    init_types3();
+    init_image_manager();
+    init_network_manager();
+    init_ssh_executor();
+    init_vm_manager();
+    init_types3();
+  }
+});
+
 // src/runtime/providers/index.ts
 var init_providers = __esm({
   "src/runtime/providers/index.ts"() {
@@ -4244,6 +4502,7 @@ var init_providers = __esm({
     init_fly();
     init_daytona();
     init_vercel();
+    init_firecracker();
     init_local();
     init_modal();
     init_e2b();
@@ -4251,6 +4510,7 @@ var init_providers = __esm({
     init_fly();
     init_daytona();
     init_vercel();
+    init_firecracker();
   }
 });
 
@@ -5136,10 +5396,11 @@ async function getOrCreateSandbox(options) {
           startupScriptRan: true,
           // Assume ran for reconnected sandboxes
           startupScriptHash: void 0,
+          // Unknown — caller should not re-run based on hash mismatch alone
           isNew: false,
           configFileUrl: void 0,
-          configInstalledAt: void 0
-          // We don't know when config was installed on reconnected sandboxes
+          configInstalledAt: now2
+          // Assume config was installed — prevents unnecessary re-install on reconnection
         };
       } else {
         console.log("[SANDBOX] Reconnected sandbox failed health check, will create new");
@@ -5525,7 +5786,8 @@ async function* executeInSandbox(prompt, apiKey, options) {
       markSdkInstalled(sessionId);
     }
     const currentScriptHash = hashStartupScript(options.startupScript);
-    const needsStartupScript = options.startupScript && (!startupScriptRan || currentScriptHash !== cachedScriptHash);
+    const scriptHashChanged = cachedScriptHash !== void 0 && currentScriptHash !== cachedScriptHash;
+    const needsStartupScript = options.startupScript && (!startupScriptRan || scriptHashChanged);
     if (needsStartupScript) {
       console.log("[SANDBOX] Running startup script...");
       const startupStartTime = Date.now();
@@ -5659,11 +5921,18 @@ const { query } = require('@anthropic-ai/claude-agent-sdk');
 const prompt = ${JSON.stringify(prompt)};
 const options = ${JSON.stringify(sdkOptions)};
 
+let queryCompleted = false;
+
 async function run() {
   try {
     for await (const message of query({ prompt, options })) {
       console.log(JSON.stringify(message));
     }
+    queryCompleted = true;
+    // Exit cleanly immediately after query completes.
+    // MCP server cleanup (e.g. Playwright browser shutdown) can trigger
+    // unhandled rejections after the query is done, causing spurious exit code 1.
+    process.exit(0);
   } catch (error) {
     const errorInfo = {
       type: 'error',
@@ -5679,6 +5948,11 @@ async function run() {
 }
 
 process.on('unhandledRejection', (reason) => {
+  // Ignore rejections from MCP server cleanup after query has completed
+  if (queryCompleted) {
+    process.exit(0);
+    return;
+  }
   const errorInfo = {
     type: 'error',
     error: reason instanceof Error ? reason.message : String(reason),
@@ -5689,6 +5963,11 @@ process.on('unhandledRejection', (reason) => {
 });
 
 process.on('uncaughtException', (error) => {
+  // Ignore exceptions from MCP server cleanup after query has completed
+  if (queryCompleted) {
+    process.exit(0);
+    return;
+  }
   const errorInfo = {
     type: 'error',
     error: error.message || 'Unknown error',
@@ -5927,7 +6206,18 @@ var init_sandbox_file_watcher = __esm({
         this.watchPath = options.watchPath;
         this.debounceMs = options.debounceMs ?? 300;
         this.patterns = options.patterns ?? ["**/*"];
-        this.ignored = options.ignored ?? ["**/node_modules/**", "**/.git/**", "**/*.log"];
+        this.ignored = options.ignored ?? [
+          "**/node_modules/**",
+          "**/.git/**",
+          "**/*.log",
+          // Temporary files from atomic saves and editors
+          "**/*.tmp",
+          "**/*.tmp.*",
+          "**/*~",
+          "**/*.swp",
+          "**/*.swo",
+          "**/.DS_Store"
+        ];
         this.emitInitialEvents = options.emitInitialEvents ?? false;
         this.followSymlinks = options.followSymlinks ?? false;
         this.usePolling = options.usePolling ?? false;
@@ -6168,7 +6458,7 @@ const fs = require('fs');
 const path = require('path');
 
 const watchPath = process.argv[2] || '.';
-const ignored = new Set(['node_modules', '.git', '.cache', '__pycache__']);
+const ignoredDirs = new Set(['node_modules', '.git', '.cache', '__pycache__']);
 
 // Track all watchers for cleanup
 const watchers = new Map();
@@ -6187,7 +6477,23 @@ function emit(type, filePath) {
 }
 
 function shouldIgnore(name) {
-  return ignored.has(name) || name.startsWith('.');
+  // Ignore hidden files/dirs (starting with .)
+  if (name.startsWith('.')) return true;
+
+  // Ignore known directories
+  if (ignoredDirs.has(name)) return true;
+
+  // Ignore temporary files from atomic saves and editors:
+  // - filename.tmp (ends with .tmp)
+  // - filename.tmp.123456789 (has .tmp. in middle - atomic write pattern)
+  // - filename~ (editor backup files)
+  // - filename.swp / filename.swo (Vim swap files)
+  if (name.endsWith('.tmp')) return true;
+  if (name.includes('.tmp.')) return true;
+  if (name.endsWith('~')) return true;
+  if (name.endsWith('.swp') || name.endsWith('.swo')) return true;
+
+  return false;
 }
 
 function watchDir(dir) {
@@ -6734,15 +7040,35 @@ var init_sandbox_file_sync = __esm({
         }
       }
       /**
-       * Send a file sync event webhook
+       * Send a file sync event webhook.
+       * Strips raw Buffer content (previousContent/newContent) and replaces with a
+       * pre-signed S3 download URL when the file exists in storage.
        */
       async sendFileSyncWebhook(sessionId, event) {
+        let downloadUrl;
+        if (event.success && event.canonicalPath && !event.operation.startsWith("deleted")) {
+          try {
+            downloadUrl = await this.fileStore.getSignedUrl(sessionId, event.canonicalPath);
+          } catch {
+          }
+        }
+        const webhookEvent = {
+          operation: event.operation,
+          source: event.source,
+          canonicalPath: event.canonicalPath,
+          basePath: event.basePath,
+          sandboxPath: event.sandboxPath,
+          fileSize: event.fileSize,
+          success: event.success,
+          error: event.error,
+          downloadUrl
+        };
         const payload = {
           event: "file_sync",
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           sessionId,
           metadata: this.webhookConfig?.metadata,
-          fileSyncEvent: event
+          fileSyncEvent: webhookEvent
         };
         await this.sendWebhook(payload, sessionId);
       }
@@ -7871,7 +8197,7 @@ var init_credentials = __esm({
   }
 });
 exports.gitHubSkillSourceSchema = void 0; exports.localSkillSourceSchema = void 0; exports.skillSourceSchema = void 0; exports.skillConfigSchema = void 0; exports.fileEntrySchema = void 0;
-var init_types3 = __esm({
+var init_types4 = __esm({
   "src/skills/types.ts"() {
     exports.gitHubSkillSourceSchema = zod.z.object({
       type: zod.z.literal("github"),
@@ -8415,7 +8741,7 @@ var init_manager2 = __esm({
 // src/skills/index.ts
 var init_skills = __esm({
   "src/skills/index.ts"() {
-    init_types3();
+    init_types4();
     init_local_provider();
     init_github_provider();
     init_manager2();
@@ -9030,6 +9356,135 @@ var init_utils = __esm({
     init_sandbox_logger();
   }
 });
+
+// src/relay/stream-event-relay.ts
+async function* streamEventRelay(options) {
+  const {
+    storage,
+    sessionId,
+    afterSequence = 0,
+    emitter,
+    pollIntervalMs = 100,
+    heartbeatIntervalMs = 15e3,
+    signal
+  } = options;
+  let lastSequence = afterSequence;
+  let done = false;
+  const catchUpEvents = await storage.readEvents(sessionId, {
+    afterSequence: lastSequence,
+    limit: 1e4
+  });
+  for (const stored of catchUpEvents) {
+    if (signal?.aborted || done) return;
+    lastSequence = stored.sequence;
+    yield stored.payload;
+    if (TERMINAL_EVENT_TYPES.has(stored.eventType)) {
+      done = true;
+      return;
+    }
+  }
+  if (signal?.aborted) return;
+  if (emitter) {
+    yield* relayFromEmitter(emitter, signal, heartbeatIntervalMs);
+  } else {
+    yield* relayByPolling(storage, sessionId, lastSequence, pollIntervalMs, heartbeatIntervalMs, signal);
+  }
+}
+async function* relayFromEmitter(emitter, signal, heartbeatIntervalMs = 15e3) {
+  const queue = [];
+  let resolve3 = null;
+  const onEvent = (event) => {
+    queue.push(event);
+    if (resolve3) {
+      resolve3();
+      resolve3 = null;
+    }
+  };
+  const onDone = () => {
+    queue.push("done");
+    if (resolve3) {
+      resolve3();
+      resolve3 = null;
+    }
+  };
+  emitter.on("event", onEvent);
+  emitter.on("done", onDone);
+  const heartbeatTimer = setInterval(() => {
+    if (resolve3) {
+      resolve3();
+      resolve3 = null;
+    }
+  }, heartbeatIntervalMs);
+  try {
+    while (!signal?.aborted) {
+      while (queue.length > 0) {
+        const item = queue.shift();
+        if (item === "done") return;
+        yield item;
+        if (TERMINAL_EVENT_TYPES.has(item.type)) return;
+      }
+      await new Promise((r) => {
+        resolve3 = r;
+        if (signal) {
+          signal.addEventListener("abort", () => {
+            resolve3 = null;
+            r();
+          }, { once: true });
+        }
+      });
+    }
+  } finally {
+    clearInterval(heartbeatTimer);
+    emitter.off("event", onEvent);
+    emitter.off("done", onDone);
+  }
+}
+async function* relayByPolling(storage, sessionId, startSequence, pollIntervalMs, heartbeatIntervalMs, signal) {
+  let lastSequence = startSequence;
+  while (!signal?.aborted) {
+    const events = await storage.readEvents(sessionId, {
+      afterSequence: lastSequence,
+      limit: 100
+    });
+    for (const stored of events) {
+      if (signal?.aborted) return;
+      lastSequence = stored.sequence;
+      yield stored.payload;
+      if (TERMINAL_EVENT_TYPES.has(stored.eventType)) {
+        return;
+      }
+    }
+    if (events.length === 0) {
+      await new Promise((r) => {
+        const timer = setTimeout(r, pollIntervalMs);
+        if (signal) {
+          signal.addEventListener("abort", () => {
+            clearTimeout(timer);
+            r();
+          }, { once: true });
+        }
+      });
+    }
+  }
+}
+var TERMINAL_EVENT_TYPES;
+var init_stream_event_relay = __esm({
+  "src/relay/stream-event-relay.ts"() {
+    TERMINAL_EVENT_TYPES = /* @__PURE__ */ new Set([
+      "session_end",
+      "error",
+      "session_stopped"
+    ]);
+  }
+});
+
+// src/relay/index.ts
+var init_relay = __esm({
+  "src/relay/index.ts"() {
+    init_stream_event_writer();
+    init_stream_event_relay();
+  }
+});
 function broadcastToSession(sessionId, event) {
   const subscribers = sessionSubscribers.get(sessionId);
   if (subscribers && subscribers.size > 0) {
@@ -9162,6 +9617,8 @@ function createSessionsRouter(options) {
       agentName: session.agentName,
       startedAt: /* @__PURE__ */ new Date()
     });
+    const hasStreamEventStorage = !!agent.getStreamEventStorage();
+    let sendSequenceCounter = 0;
     return streaming.streamSSE(c, async (stream) => {
       try {
         for await (const event of activeSession.send(data.prompt, {
@@ -9173,7 +9630,9 @@ function createSessionsRouter(options) {
           if (controller.signal.aborted) {
             break;
           }
+          sendSequenceCounter++;
           await stream.writeSSE({
+            ...hasStreamEventStorage ? { id: String(sendSequenceCounter) } : {},
             event: event.type,
             data: JSON.stringify(event)
           });
@@ -9356,11 +9815,77 @@ function createSessionsRouter(options) {
       }
     });
   });
+  router.get("/:sessionId/stream", async (c) => {
+    const sessionId = c.req.param("sessionId");
+    const afterParam = c.req.query("after");
+    const afterSequence = afterParam ? parseInt(afterParam, 10) : 0;
+    const session = await sessionManager.getSession(sessionId);
+    if (!session) {
+      return c.json({ error: "Session not found" }, 404);
+    }
+    const agent = agents2.get(session.agentName);
+    if (!agent) {
+      return c.json({ error: `Agent not found: ${session.agentName}` }, 404);
+    }
+    const streamEventStorage = agent.getStreamEventStorage();
+    if (!streamEventStorage) {
+      return c.json({ error: "Stream event storage not configured" }, 501);
+    }
+    return streaming.streamSSE(c, async (stream) => {
+      const abortController = new AbortController();
+      c.req.raw.signal.addEventListener("abort", () => {
+        abortController.abort();
+      });
+      const heartbeatInterval = setInterval(async () => {
+        try {
+          await stream.writeSSE({
+            event: "heartbeat",
+            data: JSON.stringify({ type: "heartbeat", timestamp: Date.now() })
+          });
+        } catch {
+          clearInterval(heartbeatInterval);
+        }
+      }, 15e3);
+      let sequenceCounter = afterSequence;
+      try {
+        const sessionEmitter = agent.getSessionEmitter(sessionId);
+        const relay = streamEventRelay({
+          storage: streamEventStorage,
+          sessionId,
+          afterSequence,
+          emitter: sessionEmitter,
+          signal: abortController.signal
+        });
+        for await (const event of relay) {
+          if (abortController.signal.aborted) break;
+          sequenceCounter++;
+          await stream.writeSSE({
+            id: String(sequenceCounter),
+            event: event.type,
+            data: JSON.stringify(event)
+          });
+        }
+      } catch (error) {
+        if (!abortController.signal.aborted) {
+          await stream.writeSSE({
+            event: "error",
+            data: JSON.stringify({
+              type: "error",
+              error: error instanceof Error ? error.message : "Unknown error"
+            })
+          });
+        }
+      } finally {
+        clearInterval(heartbeatInterval);
+      }
+    });
+  });
   return router;
 }
 var createSessionSchema, fileAttachmentSchema, sendMessageSchema, updateEnvSchema, listSessionsSchema, activeStreams, sessionSubscribers;
 var init_sessions = __esm({
   "src/server/routes/sessions.ts"() {
+    init_stream_event_relay();
     createSessionSchema = zod.z.object({
       agentName: zod.z.string(),
       metadata: zod.z.record(zod.z.unknown()).optional(),
@@ -16081,9 +16606,11 @@ __export(schema_exports, {
   sessionEventsRelations: () => sessionEventsRelations,
   sessionStatusEnum: () => sessionStatusEnum,
   sessions: () => sessions,
-  sessionsRelations: () => sessionsRelations
+  sessionsRelations: () => sessionsRelations,
+  streamEvents: () => streamEvents,
+  streamEventsRelations: () => streamEventsRelations
 });
-var sessionStatusEnum, messageRoleEnum, agentStatusEnum, agentBackendEnum, queueItemStatusEnum, configDeploymentStatusEnum, configDeploymentTriggerEnum, eventCategoryEnum, sessions, messages, attachments, agents, queueItems, configDeployments, sessionEvents, sessionsRelations, sessionEventsRelations, messagesRelations, attachmentsRelations, configDeploymentsRelations, agentsRelations;
+var sessionStatusEnum, messageRoleEnum, agentStatusEnum, agentBackendEnum, queueItemStatusEnum, configDeploymentStatusEnum, configDeploymentTriggerEnum, eventCategoryEnum, sessions, messages, attachments, agents, queueItems, configDeployments, sessionEvents, streamEvents, sessionsRelations, sessionEventsRelations, messagesRelations, attachmentsRelations, configDeploymentsRelations, streamEventsRelations, agentsRelations;
 var init_schema = __esm({
   "src/storage-postgres/schema.ts"() {
     sessionStatusEnum = pgCore.pgEnum("session_status", [
@@ -16324,6 +16851,21 @@ var init_schema = __esm({
         pgCore.index("idx_session_events_category").on(table.sessionId, table.category)
       ]
     );
+    streamEvents = pgCore.pgTable(
+      "stream_events",
+      {
+        id: pgCore.uuid("id").defaultRandom().primaryKey(),
+        sessionId: pgCore.uuid("session_id").notNull().references(() => sessions.id, { onDelete: "cascade" }),
+        sequence: pgCore.integer("sequence").notNull(),
+        eventType: pgCore.text("event_type").notNull(),
+        payload: pgCore.jsonb("payload").notNull().$type(),
+        batchCount: pgCore.integer("batch_count").default(1).notNull(),
+        createdAt: pgCore.timestamp("created_at", { withTimezone: true }).defaultNow().notNull()
+      },
+      (table) => [
+        pgCore.index("idx_stream_events_session_seq").on(table.sessionId, table.sequence)
+      ]
+    );
     sessionsRelations = drizzleOrm.relations(sessions, ({ one, many }) => ({
       parentSession: one(sessions, {
         fields: [sessions.parentSessionId],
@@ -16334,7 +16876,8 @@ var init_schema = __esm({
         relationName: "parentSession"
       }),
       messages: many(messages),
-      events: many(sessionEvents)
+      events: many(sessionEvents),
+      streamEvents: many(streamEvents)
     }));
     sessionEventsRelations = drizzleOrm.relations(sessionEvents, ({ one }) => ({
       session: one(sessions, {
@@ -16361,6 +16904,12 @@ var init_schema = __esm({
         references: [agents.id]
       })
     }));
+    streamEventsRelations = drizzleOrm.relations(streamEvents, ({ one }) => ({
+      session: one(sessions, {
+        fields: [streamEvents.sessionId],
+        references: [sessions.id]
+      })
+    }));
     agentsRelations = drizzleOrm.relations(agents, ({ many }) => ({
       configDeployments: many(configDeployments)
     }));
@@ -16548,6 +17097,20 @@ var init_storage2 = __esm({
     `);
         await this.db.execute(drizzleOrm.sql`
       ALTER TABLE agents ADD COLUMN IF NOT EXISTS backend agent_backend DEFAULT 'claude' NOT NULL;
+    `);
+        await this.db.execute(drizzleOrm.sql`
+      CREATE TABLE IF NOT EXISTS stream_events (
+        id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+        session_id UUID NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+        sequence INTEGER NOT NULL,
+        event_type TEXT NOT NULL,
+        payload JSONB NOT NULL,
+        batch_count INTEGER NOT NULL DEFAULT 1,
+        created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+      );
+    `);
+        await this.db.execute(drizzleOrm.sql`
+      CREATE INDEX IF NOT EXISTS idx_stream_events_session_seq ON stream_events(session_id, sequence);
     `);
       }
       /**
@@ -16740,6 +17303,20 @@ var init_storage2 = __esm({
     `);
         await this.db.execute(drizzleOrm.sql`
       CREATE INDEX IF NOT EXISTS idx_queue_items_pending ON queue_items(agent_name, session_id, status, priority, created_at);
+    `);
+        await this.db.execute(drizzleOrm.sql`
+      CREATE TABLE IF NOT EXISTS stream_events (
+        id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+        session_id UUID NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+        sequence INTEGER NOT NULL,
+        event_type TEXT NOT NULL,
+        payload JSONB NOT NULL,
+        batch_count INTEGER NOT NULL DEFAULT 1,
+        created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+      );
+    `);
+        await this.db.execute(drizzleOrm.sql`
+      CREATE INDEX IF NOT EXISTS idx_stream_events_session_seq ON stream_events(session_id, sequence);
     `);
         await this.db.execute(drizzleOrm.sql`
       DO $$ BEGIN
@@ -17130,6 +17707,56 @@ var init_storage2 = __esm({
         return rows.map((row) => this.rowToAgent(row));
       }
       // ============================================================================
+      // Stream Events (SSE Relay)
+      // ============================================================================
+      async appendEvents(sessionId, events) {
+        if (events.length === 0) return [];
+        const [maxSeqResult] = await this.db.select({ maxSeq: drizzleOrm.sql`COALESCE(MAX(${streamEvents.sequence}), 0)` }).from(streamEvents).where(drizzleOrm.eq(streamEvents.sessionId, sessionId));
+        let nextSeq = (maxSeqResult?.maxSeq ?? 0) + 1;
+        const rows = await this.db.insert(streamEvents).values(
+          events.map((event) => ({
+            sessionId,
+            sequence: nextSeq++,
+            eventType: event.eventType,
+            payload: event.payload,
+            batchCount: event.batchCount ?? 1
+          }))
+        ).returning();
+        return rows.map((row) => this.rowToStoredStreamEvent(row));
+      }
+      async readEvents(sessionId, options) {
+        const conditions = [drizzleOrm.eq(streamEvents.sessionId, sessionId)];
+        if (options?.afterSequence !== void 0) {
+          conditions.push(drizzleOrm.sql`${streamEvents.sequence} > ${options.afterSequence}`);
+        }
+        const limit = options?.limit ?? 1e3;
+        const rows = await this.db.select().from(streamEvents).where(drizzleOrm.and(...conditions)).orderBy(drizzleOrm.asc(streamEvents.sequence)).limit(limit);
+        return rows.map((row) => this.rowToStoredStreamEvent(row));
+      }
+      async getLatestSequence(sessionId) {
+        const [result] = await this.db.select({ maxSeq: drizzleOrm.sql`COALESCE(MAX(${streamEvents.sequence}), 0)` }).from(streamEvents).where(drizzleOrm.eq(streamEvents.sessionId, sessionId));
+        return result?.maxSeq ?? 0;
+      }
+      async deleteSessionEvents(sessionId) {
+        await this.db.delete(streamEvents).where(drizzleOrm.eq(streamEvents.sessionId, sessionId));
+      }
+      async cleanupOldEvents(maxAgeMs) {
+        const cutoff = new Date(Date.now() - maxAgeMs);
+        const result = await this.db.delete(streamEvents).where(drizzleOrm.sql`${streamEvents.createdAt} < ${cutoff.toISOString()}`);
+        return result.rowCount ?? 0;
+      }
+      rowToStoredStreamEvent(row) {
+        return {
+          id: row.id,
+          sessionId: row.sessionId,
+          sequence: row.sequence,
+          eventType: row.eventType,
+          payload: row.payload,
+          batchCount: row.batchCount,
+          createdAt: row.createdAt
+        };
+      }
+      // ============================================================================
       // Database Access (for extensions)
       // ============================================================================
       /**
@@ -17935,7 +18562,7 @@ var init_storage3 = __esm({
         }
         if (options.filePath) {
           query = query.or(
-            `event_data->>filePath.eq.${options.filePath},and(category.eq.tool,tool_name.in.(Read,Write,Edit),event_data->input->>file_path.eq.${options.filePath})`
+            `event_data->>filePath.eq.${options.filePath},event_data->>canonicalPath.eq.${options.filePath},and(category.eq.tool,tool_name.in.(Read,Write,Edit),event_data->input->>file_path.eq.${options.filePath})`
           );
         }
         const ascending = options.order !== "desc";
@@ -17965,6 +18592,72 @@ var init_storage3 = __esm({
         }
         return data ? data.sequence_number + 1 : 1;
       }
+      // ============================================================================
+      // Stream Events (SSE Relay)
+      // ============================================================================
+      async appendEvents(sessionId, events) {
+        if (events.length === 0) return [];
+        const { data: maxSeqData } = await this.client.from("stream_events").select("sequence").eq("session_id", sessionId).order("sequence", { ascending: false }).limit(1).single();
+        let nextSeq = maxSeqData ? maxSeqData.sequence + 1 : 1;
+        const { data, error } = await this.client.from("stream_events").insert(
+          events.map((event) => ({
+            session_id: sessionId,
+            sequence: nextSeq++,
+            event_type: event.eventType,
+            payload: event.payload,
+            batch_count: event.batchCount ?? 1
+          }))
+        ).select();
+        if (error) {
+          throw new Error(`Failed to append stream events: ${error.message}`);
+        }
+        return data.map((row) => this.rowToStoredStreamEvent(row));
+      }
+      async readEvents(sessionId, options) {
+        let query = this.client.from("stream_events").select("*").eq("session_id", sessionId);
+        if (options?.afterSequence !== void 0) {
+          query = query.gt("sequence", options.afterSequence);
+        }
+        const limit = options?.limit ?? 1e3;
+        query = query.order("sequence", { ascending: true }).limit(limit);
+        const { data, error } = await query;
+        if (error) {
+          throw new Error(`Failed to read stream events: ${error.message}`);
+        }
+        return data.map((row) => this.rowToStoredStreamEvent(row));
+      }
+      async getLatestSequence(sessionId) {
+        const { data, error } = await this.client.from("stream_events").select("sequence").eq("session_id", sessionId).order("sequence", { ascending: false }).limit(1).single();
+        if (error && error.code !== "PGRST116") {
+          throw new Error(`Failed to get latest sequence: ${error.message}`);
+        }
+        return data ? data.sequence : 0;
+      }
+      async deleteStreamEvents(sessionId) {
+        const { error } = await this.client.from("stream_events").delete().eq("session_id", sessionId);
+        if (error) {
+          throw new Error(`Failed to delete stream events: ${error.message}`);
+        }
+      }
+      async cleanupOldEvents(maxAgeMs) {
+        const cutoff = new Date(Date.now() - maxAgeMs).toISOString();
+        const { data, error } = await this.client.from("stream_events").delete().lt("created_at", cutoff).select("id");
+        if (error) {
+          throw new Error(`Failed to cleanup old stream events: ${error.message}`);
+        }
+        return data?.length ?? 0;
+      }
+      rowToStoredStreamEvent(row) {
+        return {
+          id: row.id,
+          sessionId: row.session_id,
+          sequence: row.sequence,
+          eventType: row.event_type,
+          payload: row.payload,
+          batchCount: row.batch_count,
+          createdAt: new Date(row.created_at)
+        };
+      }
     };
   }
 });
@@ -18797,6 +19490,7 @@ var init_src = __esm({
     init_credentials();
     init_skills();
     init_utils();
+    init_relay();
     init_server();
     init_server2();
     init_schemas();
@@ -18973,6 +19667,7 @@ exports.shouldUseSandbox = shouldUseSandbox;
 exports.shutdownSandboxPool = shutdownSandboxPool;
 exports.sseMcpWithAuth = sseMcpWithAuth;
 exports.startServer = startServer;
+exports.streamEventRelay = streamEventRelay;
 exports.updateToolCallWithResult = updateToolCallWithResult;
 exports.writeFileToSandbox = writeFileToSandbox;
 //# sourceMappingURL=index.cjs.map