sed limits

Author: cramforce

src/commands/sed/sed.limits.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { Bash } from "../../Bash.js";
+import { ExecutionLimitError } from "../../interpreter/errors.js";
 
 /**
  * SED Execution Limits Tests
@@ -17,9 +18,9 @@ describe("SED Execution Limits", () => {
       // :label followed by b label creates infinite loop
       const result = await env.exec(`echo "test" | sed ':loop; b loop'`);
 
-      // Should not hang - sed should have iteration limits
-      expect(result.stderr.length).toBeGreaterThan(0);
-      expect(result.exitCode).not.toBe(0);
+      // Must hit our internal limit with correct exit code
+      expect(result.stderr).toContain("exceeded maximum iterations");
+      expect(result.exitCode).toBe(ExecutionLimitError.EXIT_CODE);
     });
 
     // TODO: t command with loop needs better substitution tracking
@@ -32,8 +33,8 @@ describe("SED Execution Limits", () => {
         `echo "test" | sed ':loop; s/./&/; t loop'`,
       );
 
-      expect(result.stderr.length).toBeGreaterThan(0);
-      expect(result.exitCode).not.toBe(0);
+      expect(result.stderr).toContain("exceeded maximum iterations");
+      expect(result.exitCode).toBe(ExecutionLimitError.EXIT_CODE);
     });
 
     it("should protect against unconditional branch at start", async () => {

src/commands/sed/sed.ts

@@ -1,3 +1,4 @@
+import { ExecutionLimitError } from "../../interpreter/errors.js";
 import type { ExecutionLimits } from "../../limits.js";
 import type { Command, CommandContext, ExecResult } from "../../types.js";
 import { hasHelpFlag, showHelp, unknownOption } from "../help.js";
@@ -365,16 +366,27 @@ export const sedCommand: Command = {
     // Read from files or stdin
     if (files.length === 0) {
       content = ctx.stdin;
-      const result = await processContent(content, commands, silent, {
-        limits: ctx.limits,
-        fs: ctx.fs,
-        cwd: ctx.cwd,
-      });
-      return {
-        stdout: result.output,
-        stderr: "",
-        exitCode: result.exitCode ?? 0,
-      };
+      try {
+        const result = await processContent(content, commands, silent, {
+          limits: ctx.limits,
+          fs: ctx.fs,
+          cwd: ctx.cwd,
+        });
+        return {
+          stdout: result.output,
+          stderr: "",
+          exitCode: result.exitCode ?? 0,
+        };
+      } catch (e) {
+        if (e instanceof ExecutionLimitError) {
+          return {
+            stdout: "",
+            stderr: `sed: ${e.message}\n`,
+            exitCode: ExecutionLimitError.EXIT_CODE,
+          };
+        }
+        throw e;
+      }
     }
 
     // Handle in-place editing
@@ -390,7 +402,14 @@ export const sedCommand: Command = {
             cwd: ctx.cwd,
           });
           await ctx.fs.writeFile(filePath, result.output);
-        } catch {
+        } catch (e) {
+          if (e instanceof ExecutionLimitError) {
+            return {
+              stdout: "",
+              stderr: `sed: ${e.message}\n`,
+              exitCode: ExecutionLimitError.EXIT_CODE,
+            };
+          }
           return {
             stdout: "",
             stderr: `sed: ${file}: No such file or directory\n`,
@@ -406,7 +425,14 @@ export const sedCommand: Command = {
       const filePath = ctx.fs.resolvePath(ctx.cwd, file);
       try {
         content += await ctx.fs.readFile(filePath);
-      } catch {
+      } catch (e) {
+        if (e instanceof ExecutionLimitError) {
+          return {
+            stdout: "",
+            stderr: `sed: ${e.message}\n`,
+            exitCode: ExecutionLimitError.EXIT_CODE,
+          };
+        }
         return {
           stdout: "",
           stderr: `sed: ${file}: No such file or directory\n`,
@@ -415,16 +441,27 @@ export const sedCommand: Command = {
       }
     }
 
-    const result = await processContent(content, commands, silent, {
-      limits: ctx.limits,
-      filename: files.length === 1 ? files[0] : undefined,
-      fs: ctx.fs,
-      cwd: ctx.cwd,
-    });
-    return {
-      stdout: result.output,
-      stderr: "",
-      exitCode: result.exitCode ?? 0,
-    };
+    try {
+      const result = await processContent(content, commands, silent, {
+        limits: ctx.limits,
+        filename: files.length === 1 ? files[0] : undefined,
+        fs: ctx.fs,
+        cwd: ctx.cwd,
+      });
+      return {
+        stdout: result.output,
+        stderr: "",
+        exitCode: result.exitCode ?? 0,
+      };
+    } catch (e) {
+      if (e instanceof ExecutionLimitError) {
+        return {
+          stdout: "",
+          stderr: `sed: ${e.message}\n`,
+          exitCode: ExecutionLimitError.EXIT_CODE,
+        };
+      }
+      throw e;
+    }
   },
 };