@polos/sdk 0.2.0 → 0.2.2

package/dist/index.cjs

@@ -318,7 +318,7 @@ var OrchestratorClient = class {
         }
         if (attempt < retries) {
           const delay = Math.min(1e3 * Math.pow(2, attempt), 16e3);
-          await new Promise((resolve8) => setTimeout(resolve8, delay));
+          await new Promise((resolve10) => setTimeout(resolve10, delay));
         }
       }
     }
@@ -770,7 +770,7 @@ var OrchestratorClient = class {
       if (execution.status === "completed" || execution.status === "failed" || execution.status === "cancelled") {
         return execution;
       }
-      await new Promise((resolve8) => setTimeout(resolve8, pollInterval));
+      await new Promise((resolve10) => setTimeout(resolve10, pollInterval));
     }
     throw new Error(`Execution ${executionId} timed out after ${String(timeout)}ms`);
   }
@@ -1696,7 +1696,7 @@ function calculateDelay(attempt, options) {
   return Math.round(delay);
 }
 function sleep(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve10) => setTimeout(resolve10, ms));
 }
 async function retry(fn, options = {}) {
   const opts = { ...DEFAULT_OPTIONS, ...options };
@@ -1882,7 +1882,7 @@ function createStepHelper(options) {
       if (options2.days) totalSeconds += options2.days * 86400;
       if (options2.weeks) totalSeconds += options2.weeks * 604800;
       const totalMs = totalSeconds * 1e3;
-      await new Promise((resolve8) => setTimeout(resolve8, totalMs));
+      await new Promise((resolve10) => setTimeout(resolve10, totalMs));
       store.set(key, { wait_until: new Date(Date.now() + totalMs).toISOString() });
     },
     async waitUntil(key, date) {
@@ -1890,7 +1890,7 @@ function createStepHelper(options) {
       if (cached) return;
       const now = Date.now();
       const waitMs = Math.max(0, date.getTime() - now);
-      await new Promise((resolve8) => setTimeout(resolve8, waitMs));
+      await new Promise((resolve10) => setTimeout(resolve10, waitMs));
       store.set(key, { wait_until: date.toISOString() });
     },
     // eslint-disable-next-line @typescript-eslint/require-await -- stub implementation
@@ -4530,7 +4530,7 @@ function createOrchestratorStepHelper(orchestratorClient, cachedSteps, execCtx,
       });
       const waitThreshold = Number(process.env["POLOS_WAIT_THRESHOLD_SECONDS"] ?? "10");
       if (totalSeconds <= waitThreshold) {
-        await new Promise((resolve8) => setTimeout(resolve8, totalSeconds * 1e3));
+        await new Promise((resolve10) => setTimeout(resolve10, totalSeconds * 1e3));
         await saveStepOutput(key, { wait_until: waitUntil.toISOString() });
         return;
       }
@@ -4566,7 +4566,7 @@ function createOrchestratorStepHelper(orchestratorClient, cachedSteps, execCtx,
       });
       const waitThreshold = Number(process.env["POLOS_WAIT_THRESHOLD_SECONDS"] ?? "10");
       if (waitSeconds <= waitThreshold) {
-        await new Promise((resolve8) => setTimeout(resolve8, waitSeconds * 1e3));
+        await new Promise((resolve10) => setTimeout(resolve10, waitSeconds * 1e3));
         await saveStepOutput(key, { wait_until: date.toISOString() });
         return;
       }
@@ -5319,7 +5319,7 @@ var DEFAULT_CONTAINER_WORKDIR = "/workspace";
 var DEFAULT_TIMEOUT_SECONDS = 300;
 var DEFAULT_MAX_OUTPUT_CHARS = 1e5;
 function spawnCommand(command, args, options) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const settle = (fn) => {
       if (!settled) {
@@ -5348,21 +5348,42 @@ function spawnCommand(command, args, options) {
       killed = true;
       proc.kill("SIGKILL");
     }, timeoutMs);
+    let exitGraceTimer = null;
+    let exitCode = null;
+    proc.on("exit", (code) => {
+      exitCode = code;
+      exitGraceTimer = setTimeout(() => {
+        clearTimeout(timer);
+        settle(() => {
+          if (killed) {
+            resolve10({
+              exitCode: 137,
+              stdout,
+              stderr: stderr + "\n[Process killed: timeout exceeded]"
+            });
+          } else {
+            resolve10({ exitCode: exitCode ?? 1, stdout, stderr });
+          }
+        });
+      }, 2e3);
+    });
     proc.on("close", (code) => {
+      if (exitGraceTimer) clearTimeout(exitGraceTimer);
       clearTimeout(timer);
       settle(() => {
         if (killed) {
-          resolve8({
+          resolve10({
             exitCode: 137,
             stdout,
             stderr: stderr + "\n[Process killed: timeout exceeded]"
           });
         } else {
-          resolve8({ exitCode: code ?? 1, stdout, stderr });
+          resolve10({ exitCode: code ?? exitCode ?? 1, stdout, stderr });
         }
       });
     });
     proc.on("error", (err) => {
+      if (exitGraceTimer) clearTimeout(exitGraceTimer);
       clearTimeout(timer);
       settle(() => {
         reject(err);
@@ -5575,7 +5596,7 @@ var DockerEnvironment = class {
 var DEFAULT_TIMEOUT_SECONDS2 = 300;
 var DEFAULT_MAX_OUTPUT_CHARS2 = 1e5;
 function spawnLocal(command, options) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const settle = (fn) => {
       if (!settled) {
@@ -5608,21 +5629,42 @@ function spawnLocal(command, options) {
       killed = true;
       proc.kill("SIGKILL");
     }, timeoutMs);
+    let exitGraceTimer = null;
+    let exitCode = null;
+    proc.on("exit", (code) => {
+      exitCode = code;
+      exitGraceTimer = setTimeout(() => {
+        clearTimeout(timer);
+        settle(() => {
+          if (killed) {
+            resolve10({
+              exitCode: 137,
+              stdout,
+              stderr: stderr + "\n[Process killed: timeout exceeded]"
+            });
+          } else {
+            resolve10({ exitCode: exitCode ?? 1, stdout, stderr });
+          }
+        });
+      }, 2e3);
+    });
     proc.on("close", (code) => {
+      if (exitGraceTimer) clearTimeout(exitGraceTimer);
       clearTimeout(timer);
       settle(() => {
         if (killed) {
-          resolve8({
+          resolve10({
             exitCode: 137,
             stdout,
             stderr: stderr + "\n[Process killed: timeout exceeded]"
           });
         } else {
-          resolve8({ exitCode: code ?? 1, stdout, stderr });
+          resolve10({ exitCode: code ?? exitCode ?? 1, stdout, stderr });
         }
       });
     });
     proc.on("error", (err) => {
+      if (exitGraceTimer) clearTimeout(exitGraceTimer);
       clearTimeout(timer);
       settle(() => {
         reject(err);
@@ -6026,8 +6068,8 @@ var SandboxManager = class {
       }
       let resolveLock;
       let rejectLock;
-      const lockPromise = new Promise((resolve8, reject) => {
-        resolveLock = resolve8;
+      const lockPromise = new Promise((resolve10, reject) => {
+        resolveLock = resolve10;
         rejectLock = reject;
       });
       this.sessionCreationLocks.set(ctx.sessionId, lockPromise);
@@ -6219,7 +6261,7 @@ var SandboxManager = class {
   }
 };
 function spawnSimple(command, args) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve10, reject) => {
     const proc = child_process.spawn(command, args, { stdio: ["pipe", "pipe", "pipe"] });
     let stdout = "";
     let stderr = "";
@@ -6230,7 +6272,7 @@ function spawnSimple(command, args) {
       stderr += data.toString();
     });
     proc.on("close", (code) => {
-      resolve8({ exitCode: code ?? 1, stdout, stderr });
+      resolve10({ exitCode: code ?? 1, stdout, stderr });
     });
     proc.on("error", reject);
   });
@@ -6365,10 +6407,10 @@ var Worker = class {
     process.on("SIGINT", signalHandler);
     process.on("SIGTERM", signalHandler);
     this.signalHandler = signalHandler;
-    await new Promise((resolve8) => {
+    await new Promise((resolve10) => {
       const checkState = () => {
         if (this.state === "stopping" || this.state === "stopped") {
-          resolve8();
+          resolve10();
         } else {
           setTimeout(checkState, 100);
         }
@@ -6402,7 +6444,7 @@ var Worker = class {
     const waitTimeout = 3e4;
     const waitStart = Date.now();
     while (this.activeExecutions.size > 0 && Date.now() - waitStart < waitTimeout) {
-      await new Promise((resolve8) => setTimeout(resolve8, 100));
+      await new Promise((resolve10) => setTimeout(resolve10, 100));
     }
     if (this.activeExecutions.size > 0) {
       logger9.warn(`${String(this.activeExecutions.size)} executions did not complete in time`);
@@ -7507,7 +7549,7 @@ function createReadTool(getEnv, pathConfig) {
     }
   );
 }
-function createWriteTool(getEnv, approval) {
+function createWriteTool(getEnv, config) {
   return defineTool(
     {
       id: "write",
@@ -7516,16 +7558,23 @@ function createWriteTool(getEnv, approval) {
         path: zod.z.string().describe("Path to the file to write"),
         content: zod.z.string().describe("Content to write to the file")
       }),
-      approval
+      // Only use blanket approval if explicitly set to 'always'
+      approval: config?.approval === "always" ? "always" : void 0
     },
-    async (_ctx, input) => {
+    async (ctx, input) => {
       const env = await getEnv();
+      if (!config?.approval && config?.pathConfig?.pathRestriction) {
+        const resolved = path.resolve(env.getCwd(), input.path);
+        if (!isPathAllowed(resolved, config.pathConfig.pathRestriction)) {
+          await requirePathApproval(ctx, "write", resolved, config.pathConfig.pathRestriction);
+        }
+      }
       await env.writeFile(input.path, input.content);
       return { success: true, path: input.path };
     }
   );
 }
-function createEditTool(getEnv, approval) {
+function createEditTool(getEnv, config) {
   return defineTool(
     {
       id: "edit",
@@ -7535,10 +7584,17 @@ function createEditTool(getEnv, approval) {
         old_text: zod.z.string().describe("Exact text to find and replace"),
         new_text: zod.z.string().describe("Text to replace the old_text with")
       }),
-      approval
+      // Only use blanket approval if explicitly set to 'always'
+      approval: config?.approval === "always" ? "always" : void 0
     },
-    async (_ctx, input) => {
+    async (ctx, input) => {
       const env = await getEnv();
+      if (!config?.approval && config?.pathConfig?.pathRestriction) {
+        const resolved = path.resolve(env.getCwd(), input.path);
+        if (!isPathAllowed(resolved, config.pathConfig.pathRestriction)) {
+          await requirePathApproval(ctx, "edit", resolved, config.pathConfig.pathRestriction);
+        }
+      }
       const content = await env.readFile(input.path);
       if (!content.includes(input.old_text)) {
         throw new Error(
@@ -7643,16 +7699,17 @@ function sandboxTools(config) {
     throw new Error("E2B environment is not yet implemented.");
   }
   const effectiveExecConfig = envType === "local" && !config?.exec?.security ? { ...config?.exec, security: "approval-always" } : config?.exec;
-  const fileApproval = config?.fileApproval ?? (envType === "local" ? "always" : void 0);
   const pathConfig = config?.local?.pathRestriction ? { pathRestriction: config.local.pathRestriction } : void 0;
+  const fileApproval = config?.fileApproval;
+  const writeEditConfig = fileApproval ? { approval: fileApproval } : pathConfig ? { pathConfig } : void 0;
   const include = new Set(
     config?.tools ?? ["exec", "read", "write", "edit", "glob", "grep"]
   );
   const tools = [];
   if (include.has("exec")) tools.push(createExecTool(getEnv, effectiveExecConfig));
   if (include.has("read")) tools.push(createReadTool(getEnv, pathConfig));
-  if (include.has("write")) tools.push(createWriteTool(getEnv, fileApproval));
-  if (include.has("edit")) tools.push(createEditTool(getEnv, fileApproval));
+  if (include.has("write")) tools.push(createWriteTool(getEnv, writeEditConfig));
+  if (include.has("edit")) tools.push(createEditTool(getEnv, writeEditConfig));
   if (include.has("glob")) tools.push(createGlobTool(getEnv, pathConfig));
   if (include.has("grep")) tools.push(createGrepTool(getEnv, pathConfig));
   return tools;