@ash-cloud/ash-ai 0.1.11 → 0.1.12

package/dist/index.js

@@ -199,8 +199,10 @@ var init_types = __esm({
       // error events
       FILE: "file",
       // file_push, file_pull, file_sync (file sync operations)
-      INPUT: "input"
+      INPUT: "input",
       // user_input (user prompts/messages)
+      WEBHOOK: "webhook"
+      // webhook_delivery, webhook_failure (outbound webhook events)
     };
   }
 });
@@ -6400,24 +6402,72 @@ var init_sandbox_file_sync = __esm({
       removeWebhook() {
         this.webhookConfig = void 0;
       }
+      /**
+       * Extract hostname from URL for display (security - don't expose full URL)
+       */
+      extractHostname(url) {
+        try {
+          const urlObj = new URL(url);
+          return urlObj.hostname;
+        } catch {
+          return "unknown";
+        }
+      }
+      /**
+       * Persist webhook delivery event to the session timeline
+       */
+      async persistWebhookDelivery(sessionId, webhookType, result, filePath, operation) {
+        if (!this.eventStorage || !this.webhookConfig) return;
+        try {
+          const now = /* @__PURE__ */ new Date();
+          const sequenceNumber = await this.getNextSequenceNumber(sessionId);
+          const eventData = {
+            webhookType,
+            targetUrl: this.extractHostname(this.webhookConfig.url),
+            success: result.success,
+            statusCode: result.statusCode,
+            error: result.error,
+            durationMs: result.durationMs,
+            retryCount: result.retryCount > 0 ? result.retryCount : void 0,
+            filePath,
+            operation
+          };
+          const eventType = result.success ? "webhook_delivery" : "webhook_failure";
+          const sessionEvent = {
+            eventType,
+            category: EventCategory.WEBHOOK,
+            startedAt: new Date(now.getTime() - result.durationMs),
+            endedAt: now,
+            durationMs: result.durationMs,
+            eventData,
+            sequenceNumber
+          };
+          await this.eventStorage.saveEvents(sessionId, [sessionEvent]);
+        } catch (error) {
+          console.error("[FILE_SYNC] Error saving webhook delivery event to storage:", error);
+        }
+      }
       /**
        * Send a webhook notification
        * @param payload - The webhook payload to send
+       * @param sessionId - Session ID for persisting delivery events
+       * @returns WebhookDeliveryResult with success/failure info
        */
-      async sendWebhook(payload) {
-        if (!this.webhookConfig) return;
+      async sendWebhook(payload, sessionId) {
+        if (!this.webhookConfig) return null;
         const config = this.webhookConfig;
         const eventType = payload.fileSyncEvent?.operation ?? "file_change";
         if (config.events && config.events.length > 0) {
           const shouldSend = config.events.some(
             (e) => e === eventType || e === "file_change" && payload.event === "file_change"
           );
-          if (!shouldSend) return;
+          if (!shouldSend) return null;
         }
         const body = JSON.stringify(payload);
         const timeoutMs = config.timeoutMs ?? 1e4;
         const retries = config.retries ?? 3;
         const isAsync = config.async !== false;
+        const startTime = Date.now();
         const headers = {
           "Content-Type": "application/json",
           "User-Agent": "Ash-FileSync/1.0",
@@ -6439,12 +6489,23 @@ var init_sandbox_file_sync = __esm({
               signal: controller.signal
             });
             clearTimeout(timeoutId);
+            const durationMs = Date.now() - startTime;
             if (!response.ok) {
-              throw new Error(`Webhook returned ${response.status}: ${response.statusText}`);
+              const error = `Webhook returned ${response.status}: ${response.statusText}`;
+              if (attempt < retries) {
+                const delay = Math.pow(2, attempt) * 1e3;
+                console.warn(`[FILE_SYNC] Webhook failed (attempt ${attempt + 1}/${retries}), retrying in ${delay}ms: ${error}`);
+                await new Promise((resolve3) => setTimeout(resolve3, delay));
+                return sendWithRetry(attempt + 1);
+              }
+              console.error(`[FILE_SYNC] Webhook failed after ${retries} attempts: ${error}`);
+              return { success: false, statusCode: response.status, error, durationMs, retryCount: attempt };
             }
             console.log(`[FILE_SYNC] Webhook sent successfully to ${config.url}`);
+            return { success: true, statusCode: response.status, durationMs, retryCount: attempt };
           } catch (error) {
             const errorMsg = error instanceof Error ? error.message : String(error);
+            const durationMs = Date.now() - startTime;
             if (attempt < retries) {
               const delay = Math.pow(2, attempt) * 1e3;
               console.warn(`[FILE_SYNC] Webhook failed (attempt ${attempt + 1}/${retries}), retrying in ${delay}ms: ${errorMsg}`);
@@ -6452,15 +6513,27 @@ var init_sandbox_file_sync = __esm({
               return sendWithRetry(attempt + 1);
             }
             console.error(`[FILE_SYNC] Webhook failed after ${retries} attempts: ${errorMsg}`);
-            throw error;
+            return { success: false, error: errorMsg, durationMs, retryCount: attempt };
           }
         };
+        const webhookType = payload.event === "file_sync" ? "file_sync" : "file_change";
+        const filePath = payload.fileSyncEvent?.filePath ?? payload.fileChangeEvent?.relativePath;
+        const operation = payload.fileSyncEvent?.operation ?? payload.fileChangeEvent?.type;
         if (isAsync) {
-          sendWithRetry(0).catch((error) => {
+          sendWithRetry(0).then(async (result) => {
+            if (sessionId) {
+              await this.persistWebhookDelivery(sessionId, webhookType, result, filePath, operation);
+            }
+          }).catch((error) => {
             console.error("[FILE_SYNC] Async webhook failed:", error);
           });
+          return null;
         } else {
-          await sendWithRetry(0);
+          const result = await sendWithRetry(0);
+          if (sessionId) {
+            await this.persistWebhookDelivery(sessionId, webhookType, result, filePath, operation);
+          }
+          return result;
         }
       }
       /**
@@ -6474,7 +6547,7 @@ var init_sandbox_file_sync = __esm({
           metadata: this.webhookConfig?.metadata,
           fileSyncEvent: event
         };
-        await this.sendWebhook(payload);
+        await this.sendWebhook(payload, sessionId);
       }
       /**
        * Send a file change event webhook (from watcher)
@@ -6487,7 +6560,7 @@ var init_sandbox_file_sync = __esm({
           metadata: this.webhookConfig?.metadata,
           fileChangeEvent: event
         };
-        await this.sendWebhook(payload);
+        await this.sendWebhook(payload, event.sessionId);
       }
       /**
        * Get the next sequence number for a session
@@ -6573,9 +6646,7 @@ var init_sandbox_file_sync = __esm({
             const isTextFile = diff !== void 0 || event.newContent && !event.newContent.slice(0, 8192).includes(0);
             const eventData = {
               operation: event.operation,
-              direction: event.direction,
-              source: "internal",
-              // File sync operations are internal
+              source: event.source,
               filePath: event.filePath,
               fileSize: event.fileSize,
               success: event.success,
@@ -6584,7 +6655,7 @@ var init_sandbox_file_sync = __esm({
               isTextFile,
               previousSize: event.previousContent?.length
             };
-            const eventType = `file_${event.operation}`;
+            const eventType = event.operation;
             const sessionEvent = {
               eventType,
               category: EventCategory.FILE,
@@ -6625,7 +6696,7 @@ var init_sandbox_file_sync = __esm({
        * @param sessionId - Session ID
        * @param path - File path (stored in S3 and used as relative path in sandbox)
        * @param content - File content
-       * @param options - Push options (e.g., targetPath to override sandbox location)
+       * @param options - Push options (e.g., targetPath, source)
        * @param previousContent - Optional previous content for diff computation
        */
       async pushFile(sessionId, path15, content, options, previousContent) {
@@ -6634,12 +6705,14 @@ var init_sandbox_file_sync = __esm({
           s3Written: false,
           sandboxWritten: false
         };
+        const source = options?.source ?? "client_api";
+        const uploadToStorageOp = source === "client_api" ? "client_uploaded_to_ash_storage" : "agent_sandbox_saved_to_ash_storage";
         try {
           await this.fileStore.writeFile(sessionId, path15, content);
           result.s3Written = true;
           await this.emitFileEvent(sessionId, {
-            operation: "push",
-            direction: "to_s3",
+            operation: uploadToStorageOp,
+            source,
             filePath: path15,
             fileSize: content.length,
             success: true,
@@ -6651,8 +6724,8 @@ var init_sandbox_file_sync = __esm({
           result.error = `S3 write failed: ${errorMessage}`;
           console.error(`[FILE_SYNC] S3 write failed for session ${sessionId}, path ${path15}:`, error);
           await this.emitFileEvent(sessionId, {
-            operation: "push",
-            direction: "to_s3",
+            operation: uploadToStorageOp,
+            source,
             filePath: path15,
             fileSize: content.length,
             success: false,
@@ -6666,8 +6739,8 @@ var init_sandbox_file_sync = __esm({
             const writeResult = await this.sandboxOps.writeFile(sessionId, sandboxPath, content);
             result.sandboxWritten = writeResult.success;
             await this.emitFileEvent(sessionId, {
-              operation: "push",
-              direction: "to_sandbox",
+              operation: "ash_storage_synced_to_agent_sandbox",
+              source,
               filePath: path15,
               fileSize: content.length,
               success: writeResult.success,
@@ -6680,8 +6753,8 @@ var init_sandbox_file_sync = __esm({
             const errorMessage = extractErrorMessage(error);
             console.warn(`[FILE_SYNC] Sandbox write error for ${path15}: ${errorMessage}`);
             await this.emitFileEvent(sessionId, {
-              operation: "push",
-              direction: "to_sandbox",
+              operation: "ash_storage_synced_to_agent_sandbox",
+              source,
               filePath: path15,
               fileSize: content.length,
               success: false,
@@ -6710,8 +6783,12 @@ var init_sandbox_file_sync = __esm({
       /**
        * Pull a file from sandbox to S3
        * Reads from sandbox and writes to S3
+       *
+       * @param sessionId - Session ID
+       * @param path - File path (relative to sandbox)
+       * @param options - Pull options (e.g., targetPath to override sandbox location)
        */
-      async pullFile(sessionId, path15) {
+      async pullFile(sessionId, path15, options) {
         const result = {
           path: path15,
           content: null,
@@ -6722,13 +6799,13 @@ var init_sandbox_file_sync = __esm({
           return result;
         }
         try {
-          const sandboxPath = this.getSandboxPath(path15);
+          const sandboxPath = this.getSandboxPath(path15, options?.targetPath);
           const readResult = await this.sandboxOps.readFile(sessionId, sandboxPath);
           if (!readResult.success || !readResult.content) {
             result.error = readResult.error ?? "File not found in sandbox";
             await this.emitFileEvent(sessionId, {
-              operation: "pull",
-              direction: "from_sandbox",
+              operation: "read_from_agent_sandbox",
+              source: "ash_file_sync",
               filePath: path15,
               success: false,
               error: result.error
@@ -6737,8 +6814,8 @@ var init_sandbox_file_sync = __esm({
           }
           result.content = readResult.content;
           await this.emitFileEvent(sessionId, {
-            operation: "pull",
-            direction: "from_sandbox",
+            operation: "read_from_agent_sandbox",
+            source: "ash_file_sync",
             filePath: path15,
             fileSize: readResult.content.length,
             success: true,
@@ -6748,8 +6825,8 @@ var init_sandbox_file_sync = __esm({
           const errorMessage = extractErrorMessage(error);
           result.error = `Sandbox read failed: ${errorMessage}`;
           await this.emitFileEvent(sessionId, {
-            operation: "pull",
-            direction: "from_sandbox",
+            operation: "read_from_agent_sandbox",
+            source: "ash_file_sync",
             filePath: path15,
             success: false,
             error: errorMessage
@@ -6760,8 +6837,8 @@ var init_sandbox_file_sync = __esm({
           await this.fileStore.writeFile(sessionId, path15, result.content);
           result.s3Written = true;
           await this.emitFileEvent(sessionId, {
-            operation: "pull",
-            direction: "to_s3",
+            operation: "agent_sandbox_saved_to_ash_storage",
+            source: "ash_file_sync",
             filePath: path15,
             fileSize: result.content.length,
             success: true,
@@ -6772,8 +6849,8 @@ var init_sandbox_file_sync = __esm({
           result.error = `S3 write failed: ${errorMessage}`;
           console.error(`[FILE_SYNC] S3 write failed in pullFile for session ${sessionId}, path ${path15}:`, error);
           await this.emitFileEvent(sessionId, {
-            operation: "pull",
-            direction: "to_s3",
+            operation: "agent_sandbox_saved_to_ash_storage",
+            source: "ash_file_sync",
             filePath: path15,
             fileSize: result.content?.length,
             success: false,
@@ -6820,8 +6897,8 @@ var init_sandbox_file_sync = __esm({
           await this.fileStore.deleteFile(sessionId, path15);
           result.s3Deleted = true;
           await this.emitFileEvent(sessionId, {
-            operation: "delete",
-            direction: "from_s3",
+            operation: "deleted_from_ash_storage",
+            source: "ash_file_sync",
             filePath: path15,
             success: true
           });
@@ -6829,8 +6906,8 @@ var init_sandbox_file_sync = __esm({
           const errorMessage = extractErrorMessage(error);
           console.warn(`[FILE_SYNC] S3 delete failed for ${path15}: ${errorMessage}`);
           await this.emitFileEvent(sessionId, {
-            operation: "delete",
-            direction: "from_s3",
+            operation: "deleted_from_ash_storage",
+            source: "ash_file_sync",
             filePath: path15,
             success: false,
             error: errorMessage
@@ -6842,16 +6919,16 @@ var init_sandbox_file_sync = __esm({
             console.log(`[FILE_SYNC] Would delete ${sandboxPath} from sandbox`);
             result.sandboxDeleted = true;
             await this.emitFileEvent(sessionId, {
-              operation: "delete",
-              direction: "from_sandbox",
+              operation: "deleted_from_agent_sandbox",
+              source: "ash_file_sync",
               filePath: path15,
               success: true
             });
           } catch (error) {
             const errorMessage = extractErrorMessage(error);
             await this.emitFileEvent(sessionId, {
-              operation: "delete",
-              direction: "from_sandbox",
+              operation: "deleted_from_agent_sandbox",
+              source: "ash_file_sync",
               filePath: path15,
               success: false,
               error: errorMessage
@@ -6877,11 +6954,11 @@ var init_sandbox_file_sync = __esm({
             if (!content) {
               result.errors.push({ path: file.path, error: "File not found in S3" });
               await this.emitFileEvent(sessionId, {
-                operation: "sync_to_sandbox",
-                direction: "from_s3",
+                operation: "ash_storage_synced_to_agent_sandbox",
+                source: "ash_file_sync",
                 filePath: file.path,
                 success: false,
-                error: "File not found in S3"
+                error: "File not found in Ash storage"
               });
               continue;
             }
@@ -6890,8 +6967,8 @@ var init_sandbox_file_sync = __esm({
             if (writeResult.success) {
               result.fileCount++;
               await this.emitFileEvent(sessionId, {
-                operation: "sync_to_sandbox",
-                direction: "to_sandbox",
+                operation: "ash_storage_synced_to_agent_sandbox",
+                source: "ash_file_sync",
                 filePath: file.path,
                 fileSize: content.length,
                 success: true
@@ -6899,8 +6976,8 @@ var init_sandbox_file_sync = __esm({
             } else {
               result.errors.push({ path: file.path, error: writeResult.error ?? "Unknown error" });
               await this.emitFileEvent(sessionId, {
-                operation: "sync_to_sandbox",
-                direction: "to_sandbox",
+                operation: "ash_storage_synced_to_agent_sandbox",
+                source: "ash_file_sync",
                 filePath: file.path,
                 fileSize: content.length,
                 success: false,
@@ -6914,8 +6991,8 @@ var init_sandbox_file_sync = __esm({
               error: errorMessage
             });
             await this.emitFileEvent(sessionId, {
-              operation: "sync_to_sandbox",
-              direction: "to_sandbox",
+              operation: "ash_storage_synced_to_agent_sandbox",
+              source: "ash_file_sync",
               filePath: file.path,
               success: false,
               error: errorMessage
@@ -6952,23 +7029,8 @@ var init_sandbox_file_sync = __esm({
             const pullResult = await this.pullFile(sessionId, filePath);
             if (pullResult.s3Written) {
               result.fileCount++;
-              await this.emitFileEvent(sessionId, {
-                operation: "sync_from_sandbox",
-                direction: "to_s3",
-                filePath,
-                fileSize: pullResult.content?.length,
-                success: true,
-                newContent: pullResult.content ?? void 0
-              });
             } else if (pullResult.error) {
               result.errors.push({ path: filePath, error: pullResult.error });
-              await this.emitFileEvent(sessionId, {
-                operation: "sync_from_sandbox",
-                direction: "to_s3",
-                filePath,
-                success: false,
-                error: pullResult.error
-              });
             }
           } catch (error) {
             const errorMessage = extractErrorMessage(error);
@@ -6977,8 +7039,8 @@ var init_sandbox_file_sync = __esm({
               error: errorMessage
             });
             await this.emitFileEvent(sessionId, {
-              operation: "sync_from_sandbox",
-              direction: "to_s3",
+              operation: "agent_sandbox_saved_to_ash_storage",
+              source: "ash_file_sync",
               filePath,
               success: false,
               error: errorMessage
@@ -7014,9 +7076,10 @@ var init_sandbox_file_sync = __esm({
        */
       async startWatching(sessionId, options) {
         const opts = { ...this.defaultWatchOptions, ...options };
+        const watchPath = opts.watchPaths?.[0] ?? ".";
         await this.stopWatching(sessionId);
         const handleFileChange = async (event) => {
-          console.log(`[FILE_SYNC] File change detected: ${event.type} ${event.relativePath}`);
+          console.log(`[FILE_SYNC] File change detected: ${event.type} ${event.relativePath} (watching from: ${watchPath})`);
           if (this.webhookConfig) {
             this.sendFileChangeWebhook(event);
           }
@@ -7029,7 +7092,7 @@ var init_sandbox_file_sync = __esm({
           }
           if (event.type === "add" || event.type === "change") {
             try {
-              const pullResult = await this.pullFile(sessionId, event.relativePath);
+              const pullResult = await this.pullFile(sessionId, event.relativePath, { targetPath: watchPath });
               if (pullResult.s3Written) {
                 console.log(`[FILE_SYNC] Auto-synced ${event.relativePath} to S3`);
               } else if (pullResult.error) {
@@ -7060,7 +7123,7 @@ var init_sandbox_file_sync = __esm({
           });
           await watcher.start();
           this.localWatchers.set(sessionId, watcher);
-          console.log(`[FILE_SYNC] Started local file watching for session ${sessionId}`);
+          console.log(`[FILE_SYNC] Started local file watching for session ${sessionId} at ${opts.localPath}`);
         } else {
           if (!this.sandboxOps) {
             throw new Error("Sandbox operations not configured. Call setSandboxOperations first.");
@@ -7068,7 +7131,8 @@ var init_sandbox_file_sync = __esm({
           const watcher = new RemoteSandboxFileWatcher({
             sessionId,
             sandboxOps: this.sandboxOps,
-            basePath: this.sandboxBasePath,
+            basePath: watchPath,
+            // Use watchPath instead of sandboxBasePath
             pollIntervalMs: opts.pollIntervalMs ?? 2e3,
             ignored: opts.ignored ?? ["**/node_modules/**", "**/.git/**"],
             onFileChange: handleFileChange,
@@ -7078,7 +7142,7 @@ var init_sandbox_file_sync = __esm({
           });
           await watcher.start();
           this.remoteWatchers.set(sessionId, watcher);
-          console.log(`[FILE_SYNC] Started remote file watching for session ${sessionId}`);
+          console.log(`[FILE_SYNC] Started remote file watching for session ${sessionId} at path: ${watchPath}`);
         }
       }
       /**
@@ -16213,8 +16277,10 @@ var init_schema = __esm({
       // error events
       "file",
       // file_push, file_pull, file_sync (file sync operations)
-      "input"
+      "input",
       // user_input (user prompts/messages)
+      "webhook"
+      // webhook_delivery, webhook_failure (outbound webhook events)
     ]);
     sessions = pgTable(
       "sessions",