@ash-cloud/ash-ai 0.1.12 → 0.1.13

package/dist/index.cjs

@@ -6021,6 +6021,7 @@ var init_sandbox_file_watcher = __esm({
           type,
           relativePath,
           absolutePath,
+          basePath: this.watchPath,
           sessionId: this.sessionId,
           fileSize,
           timestamp: /* @__PURE__ */ new Date()
@@ -6229,6 +6230,7 @@ var init_sandbox_file_watcher = __esm({
               type: "add",
               relativePath: filePath,
               absolutePath: `${this.basePath}/${filePath}`,
+              basePath: this.basePath,
               sessionId: this.sessionId,
               fileSize: info.size,
               timestamp: /* @__PURE__ */ new Date()
@@ -6241,6 +6243,7 @@ var init_sandbox_file_watcher = __esm({
               type: "unlink",
               relativePath: filePath,
               absolutePath: `${this.basePath}/${filePath}`,
+              basePath: this.basePath,
               sessionId: this.sessionId,
               timestamp: /* @__PURE__ */ new Date()
             });
@@ -6545,7 +6548,7 @@ var init_sandbox_file_sync = __esm({
           }
         };
         const webhookType = payload.event === "file_sync" ? "file_sync" : "file_change";
-        const filePath = payload.fileSyncEvent?.filePath ?? payload.fileChangeEvent?.relativePath;
+        const filePath = payload.fileSyncEvent?.canonicalPath ?? payload.fileChangeEvent?.relativePath;
         const operation = payload.fileSyncEvent?.operation ?? payload.fileChangeEvent?.type;
         if (isAsync) {
           sendWithRetry(0).then(async (result) => {
@@ -6675,7 +6678,9 @@ var init_sandbox_file_sync = __esm({
             const eventData = {
               operation: event.operation,
               source: event.source,
-              filePath: event.filePath,
+              canonicalPath: event.canonicalPath,
+              basePath: event.basePath,
+              sandboxPath: event.sandboxPath,
               fileSize: event.fileSize,
               success: event.success,
               error: event.error,
@@ -6706,6 +6711,13 @@ var init_sandbox_file_sync = __esm({
       setSandboxOperations(ops) {
         this.sandboxOps = ops;
       }
+      /**
+       * Get the effective base path for sandbox operations
+       * @param targetPath - Optional override for the base path
+       */
+      getBasePath(targetPath) {
+        return targetPath ?? this.sandboxBasePath;
+      }
       /**
        * Get the full sandbox path for a file
        * @param path - The relative file path
@@ -6713,12 +6725,30 @@ var init_sandbox_file_sync = __esm({
        */
       getSandboxPath(path15, targetPath) {
         const normalizedPath = path15.replace(/^\/+/, "");
-        const basePath = targetPath ?? this.sandboxBasePath;
+        const basePath = this.getBasePath(targetPath);
         if (basePath === ".") {
           return normalizedPath;
         }
         return `${basePath}/${normalizedPath}`;
       }
+      /**
+       * Build all path fields for a FileSyncEvent
+       * @param path - The canonical file path (used as S3 key)
+       * @param targetPath - Optional override for the base path
+       */
+      buildPathFields(path15, targetPath) {
+        const normalizedPath = path15.replace(/^\/+/, "");
+        const basePath = this.getBasePath(targetPath);
+        const sandboxPath = this.getSandboxPath(path15, targetPath);
+        return {
+          canonicalPath: normalizedPath,
+          // The logical path (S3 key)
+          basePath,
+          // The prefix used in sandbox
+          sandboxPath
+          // Full computed path in sandbox
+        };
+      }
       /**
        * Push a file: writes to S3, then to sandbox if running
        * @param sessionId - Session ID
@@ -6735,13 +6765,14 @@ var init_sandbox_file_sync = __esm({
         };
         const source = options?.source ?? "client_api";
         const uploadToStorageOp = source === "client_api" ? "client_uploaded_to_ash_storage" : "agent_sandbox_saved_to_ash_storage";
+        const pathFields = this.buildPathFields(path15, options?.targetPath);
         try {
           await this.fileStore.writeFile(sessionId, path15, content);
           result.s3Written = true;
           await this.emitFileEvent(sessionId, {
             operation: uploadToStorageOp,
             source,
-            filePath: path15,
+            ...pathFields,
             fileSize: content.length,
             success: true,
             previousContent,
@@ -6754,7 +6785,7 @@ var init_sandbox_file_sync = __esm({
           await this.emitFileEvent(sessionId, {
             operation: uploadToStorageOp,
             source,
-            filePath: path15,
+            ...pathFields,
             fileSize: content.length,
             success: false,
             error: errorMessage
@@ -6763,13 +6794,12 @@ var init_sandbox_file_sync = __esm({
         }
         if (this.sandboxOps?.isSandboxRunning(sessionId)) {
           try {
-            const sandboxPath = this.getSandboxPath(path15, options?.targetPath);
-            const writeResult = await this.sandboxOps.writeFile(sessionId, sandboxPath, content);
+            const writeResult = await this.sandboxOps.writeFile(sessionId, pathFields.sandboxPath, content);
             result.sandboxWritten = writeResult.success;
             await this.emitFileEvent(sessionId, {
               operation: "ash_storage_synced_to_agent_sandbox",
               source,
-              filePath: path15,
+              ...pathFields,
               fileSize: content.length,
               success: writeResult.success,
               error: writeResult.error
@@ -6783,7 +6813,7 @@ var init_sandbox_file_sync = __esm({
             await this.emitFileEvent(sessionId, {
               operation: "ash_storage_synced_to_agent_sandbox",
               source,
-              filePath: path15,
+              ...pathFields,
               fileSize: content.length,
               success: false,
               error: errorMessage
@@ -6826,15 +6856,15 @@ var init_sandbox_file_sync = __esm({
           result.error = "Sandbox is not running";
           return result;
         }
+        const pathFields = this.buildPathFields(path15, options?.targetPath);
         try {
-          const sandboxPath = this.getSandboxPath(path15, options?.targetPath);
-          const readResult = await this.sandboxOps.readFile(sessionId, sandboxPath);
+          const readResult = await this.sandboxOps.readFile(sessionId, pathFields.sandboxPath);
           if (!readResult.success || !readResult.content) {
             result.error = readResult.error ?? "File not found in sandbox";
             await this.emitFileEvent(sessionId, {
               operation: "read_from_agent_sandbox",
               source: "ash_file_sync",
-              filePath: path15,
+              ...pathFields,
               success: false,
               error: result.error
             });
@@ -6844,7 +6874,7 @@ var init_sandbox_file_sync = __esm({
           await this.emitFileEvent(sessionId, {
             operation: "read_from_agent_sandbox",
             source: "ash_file_sync",
-            filePath: path15,
+            ...pathFields,
             fileSize: readResult.content.length,
             success: true,
             newContent: readResult.content
@@ -6855,7 +6885,7 @@ var init_sandbox_file_sync = __esm({
           await this.emitFileEvent(sessionId, {
             operation: "read_from_agent_sandbox",
             source: "ash_file_sync",
-            filePath: path15,
+            ...pathFields,
             success: false,
             error: errorMessage
           });
@@ -6867,7 +6897,7 @@ var init_sandbox_file_sync = __esm({
           await this.emitFileEvent(sessionId, {
             operation: "agent_sandbox_saved_to_ash_storage",
             source: "ash_file_sync",
-            filePath: path15,
+            ...pathFields,
             fileSize: result.content.length,
             success: true,
             newContent: result.content
@@ -6879,7 +6909,7 @@ var init_sandbox_file_sync = __esm({
           await this.emitFileEvent(sessionId, {
             operation: "agent_sandbox_saved_to_ash_storage",
             source: "ash_file_sync",
-            filePath: path15,
+            ...pathFields,
             fileSize: result.content?.length,
             success: false,
             error: errorMessage
@@ -6921,13 +6951,14 @@ var init_sandbox_file_sync = __esm({
        */
       async deleteFile(sessionId, path15) {
         const result = { s3Deleted: false, sandboxDeleted: false };
+        const pathFields = this.buildPathFields(path15);
         try {
           await this.fileStore.deleteFile(sessionId, path15);
           result.s3Deleted = true;
           await this.emitFileEvent(sessionId, {
             operation: "deleted_from_ash_storage",
             source: "ash_file_sync",
-            filePath: path15,
+            ...pathFields,
             success: true
           });
         } catch (error) {
@@ -6936,20 +6967,19 @@ var init_sandbox_file_sync = __esm({
           await this.emitFileEvent(sessionId, {
             operation: "deleted_from_ash_storage",
             source: "ash_file_sync",
-            filePath: path15,
+            ...pathFields,
             success: false,
             error: errorMessage
           });
         }
         if (this.sandboxOps?.isSandboxRunning(sessionId)) {
           try {
-            const sandboxPath = this.getSandboxPath(path15);
-            console.log(`[FILE_SYNC] Would delete ${sandboxPath} from sandbox`);
+            console.log(`[FILE_SYNC] Would delete ${pathFields.sandboxPath} from sandbox`);
             result.sandboxDeleted = true;
             await this.emitFileEvent(sessionId, {
               operation: "deleted_from_agent_sandbox",
               source: "ash_file_sync",
-              filePath: path15,
+              ...pathFields,
               success: true
             });
           } catch (error) {
@@ -6957,7 +6987,7 @@ var init_sandbox_file_sync = __esm({
             await this.emitFileEvent(sessionId, {
               operation: "deleted_from_agent_sandbox",
               source: "ash_file_sync",
-              filePath: path15,
+              ...pathFields,
               success: false,
               error: errorMessage
             });
@@ -6977,6 +7007,7 @@ var init_sandbox_file_sync = __esm({
         }
         const files = await this.fileStore.listFiles(sessionId);
         for (const file of files) {
+          const pathFields = this.buildPathFields(file.path);
           try {
             const content = await this.fileStore.readFile(sessionId, file.path);
             if (!content) {
@@ -6984,20 +7015,19 @@ var init_sandbox_file_sync = __esm({
               await this.emitFileEvent(sessionId, {
                 operation: "ash_storage_synced_to_agent_sandbox",
                 source: "ash_file_sync",
-                filePath: file.path,
+                ...pathFields,
                 success: false,
                 error: "File not found in Ash storage"
               });
               continue;
             }
-            const sandboxPath = this.getSandboxPath(file.path);
-            const writeResult = await this.sandboxOps.writeFile(sessionId, sandboxPath, content);
+            const writeResult = await this.sandboxOps.writeFile(sessionId, pathFields.sandboxPath, content);
             if (writeResult.success) {
               result.fileCount++;
               await this.emitFileEvent(sessionId, {
                 operation: "ash_storage_synced_to_agent_sandbox",
                 source: "ash_file_sync",
-                filePath: file.path,
+                ...pathFields,
                 fileSize: content.length,
                 success: true
               });
@@ -7006,7 +7036,7 @@ var init_sandbox_file_sync = __esm({
               await this.emitFileEvent(sessionId, {
                 operation: "ash_storage_synced_to_agent_sandbox",
                 source: "ash_file_sync",
-                filePath: file.path,
+                ...pathFields,
                 fileSize: content.length,
                 success: false,
                 error: writeResult.error
@@ -7021,7 +7051,7 @@ var init_sandbox_file_sync = __esm({
             await this.emitFileEvent(sessionId, {
               operation: "ash_storage_synced_to_agent_sandbox",
               source: "ash_file_sync",
-              filePath: file.path,
+              ...pathFields,
               success: false,
               error: errorMessage
             });
@@ -7052,24 +7082,25 @@ var init_sandbox_file_sync = __esm({
             return result;
           }
         }
-        for (const filePath of filesToSync) {
+        for (const file of filesToSync) {
+          const pathFields = this.buildPathFields(file);
           try {
-            const pullResult = await this.pullFile(sessionId, filePath);
+            const pullResult = await this.pullFile(sessionId, file);
             if (pullResult.s3Written) {
               result.fileCount++;
             } else if (pullResult.error) {
-              result.errors.push({ path: filePath, error: pullResult.error });
+              result.errors.push({ path: file, error: pullResult.error });
             }
           } catch (error) {
             const errorMessage = extractErrorMessage(error);
             result.errors.push({
-              path: filePath,
+              path: file,
               error: errorMessage
             });
             await this.emitFileEvent(sessionId, {
               operation: "agent_sandbox_saved_to_ash_storage",
               source: "ash_file_sync",
-              filePath,
+              ...pathFields,
               success: false,
               error: errorMessage
             });
@@ -7483,6 +7514,7 @@ WATCHER_EOF`;
                 type: data.type,
                 relativePath: data.path.replace(/^\.\//, ""),
                 absolutePath: data.path,
+                basePath: this.watchPath,
                 sessionId: this.sessionId,
                 timestamp: new Date(data.timestamp)
               });