@cnrai/pave 0.3.32 → 0.3.34

package/test/sandbox-redirect.test.js

@@ -0,0 +1,202 @@
+/**
+ * Tests for sandbox shell redirection stripping (Issue #127).
+ *
+ * Verifies that shell redirections (2>&1, >/dev/null, etc.) are stripped
+ * from node command args before parsing, preventing them from being
+ * mistaken for script filenames.
+ *
+ * Uses checkmark/X format so run-all.js correctly counts results.
+ */
+
+let passed = 0;
+let failed = 0;
+
+function assert(cond, msg) {
+  if (cond) {
+    passed++;
+    console.log('\u2705 ' + msg);
+  } else {
+    failed++;
+    console.log('\u274c ' + msg);
+  }
+}
+
+const fs = require('fs');
+const path = require('path');
+
+// ---- Load stripShellRedirections ----
+// Try require() first (works in CI where deps are installed).
+// Fall back to source extraction when deps like js-yaml are missing.
+const sandboxPath = path.resolve(__dirname, '../../opencode-lite/src/sandbox/SandboxRunner.js');
+let stripShellRedirections = null;
+try {
+  const sandboxModule = require(sandboxPath);
+  if (sandboxModule && typeof sandboxModule.stripShellRedirections === 'function') {
+    stripShellRedirections = sandboxModule.stripShellRedirections;
+  }
+} catch (_requireErr) {
+  // Module has dependencies (js-yaml etc.) that may not be available.
+  // Extract just the standalone function from source as a fallback.
+  try {
+    const src = fs.readFileSync(sandboxPath, 'utf8');
+    // Match the function including its full body (handles nested braces
+    // by finding the function start and scanning for balanced braces).
+    const startIdx = src.indexOf('function stripShellRedirections(str)');
+    if (startIdx !== -1) {
+      let depth = 0;
+      let endIdx = startIdx;
+      let foundOpen = false;
+      for (let ci = startIdx; ci < src.length; ci++) {
+        if (src[ci] === '{') { depth++; foundOpen = true; }
+        if (src[ci] === '}') { depth--; }
+        if (foundOpen && depth === 0) { endIdx = ci + 1; break; }
+      }
+      const fnSrc = src.substring(startIdx, endIdx);
+      eval(fnSrc); // defines stripShellRedirections in this scope
+    }
+  } catch (_extractErr) {
+    stripShellRedirections = null;
+  }
+}
+
+if (!stripShellRedirections) {
+  throw new Error('Unable to load stripShellRedirections from ' + sandboxPath);
+}
+
+// ---- 1. Unit tests for stripShellRedirections ----
+
+// Basic redirections (no space between operator and target)
+assert(stripShellRedirections('--version 2>&1') === '--version',
+  'strip: --version 2>&1 -> --version');
+assert(stripShellRedirections('--version') === '--version',
+  'strip: --version (no redirect) unchanged');
+assert(stripShellRedirections('script.js 2>&1') === 'script.js',
+  'strip: script.js 2>&1 -> script.js');
+assert(stripShellRedirections('script.js 2>/dev/null') === 'script.js',
+  'strip: script.js 2>/dev/null -> script.js');
+assert(stripShellRedirections('script.js >/dev/null') === 'script.js',
+  'strip: script.js >/dev/null -> script.js');
+assert(stripShellRedirections('script.js >output.txt') === 'script.js',
+  'strip: script.js >output.txt -> script.js');
+assert(stripShellRedirections('script.js >>output.txt') === 'script.js',
+  'strip: script.js >>output.txt -> script.js');
+assert(stripShellRedirections('script.js 2>>error.log') === 'script.js',
+  'strip: script.js 2>>error.log -> script.js');
+assert(stripShellRedirections('script.js <input.txt') === 'script.js',
+  'strip: script.js <input.txt -> script.js');
+assert(stripShellRedirections('script.js &>/dev/null') === 'script.js',
+  'strip: script.js &>/dev/null -> script.js');
+assert(stripShellRedirections('script.js &>>output.txt') === 'script.js',
+  'strip: script.js &>>output.txt -> script.js');
+
+// Whitespace-separated targets (Copilot review feedback)
+assert(stripShellRedirections('script.js > out.txt') === 'script.js',
+  'strip: script.js > out.txt -> script.js (space-separated)');
+assert(stripShellRedirections('script.js 2> /dev/null') === 'script.js',
+  'strip: script.js 2> /dev/null -> script.js (space-separated)');
+assert(stripShellRedirections('script.js < input.txt') === 'script.js',
+  'strip: script.js < input.txt -> script.js (space-separated)');
+assert(stripShellRedirections('script.js >> out.txt') === 'script.js',
+  'strip: script.js >> out.txt -> script.js (space-separated)');
+assert(stripShellRedirections('script.js 2>> error.log') === 'script.js',
+  'strip: script.js 2>> error.log -> script.js (space-separated)');
+assert(stripShellRedirections('script.js &> /dev/null') === 'script.js',
+  'strip: script.js &> /dev/null -> script.js (space-separated)');
+assert(stripShellRedirections('script.js &>> out.txt') === 'script.js',
+  'strip: script.js &>> out.txt -> script.js (space-separated)');
+
+// Multiple redirections
+assert(stripShellRedirections('script.js 2>&1 >/dev/null') === 'script.js',
+  'strip: multiple redirections');
+assert(stripShellRedirections('script.js >out.txt 2>&1') === 'script.js',
+  'strip: >out.txt 2>&1');
+assert(stripShellRedirections('script.js > out.txt 2>&1') === 'script.js',
+  'strip: > out.txt 2>&1 (space-separated + fd redirect)');
+
+// With script arguments
+assert(stripShellRedirections('script.js --flag value 2>&1') === 'script.js --flag value',
+  'strip: preserves script args');
+assert(stripShellRedirections('-e "console.log(1)" 2>&1') === '-e "console.log(1)"',
+  'strip: preserves -e inline code');
+
+// Edge cases
+assert(stripShellRedirections('2>&1') === '',
+  'strip: only redirection -> empty');
+assert(stripShellRedirections('') === '',
+  'strip: empty string -> empty');
+assert(stripShellRedirections('script.js') === 'script.js',
+  'strip: no redirection -> unchanged');
+
+// FD numbers
+assert(stripShellRedirections('script.js 1>&2') === 'script.js',
+  'strip: 1>&2');
+assert(stripShellRedirections('script.js >&2') === 'script.js',
+  'strip: >&2');
+
+// Quoted redirections must be preserved (Copilot review round 4)
+assert(stripShellRedirections('-e "console.log(\'2>&1\')" 2>&1') === '-e "console.log(\'2>&1\')"',
+  'strip: preserves 2>&1 inside double quotes');
+assert(stripShellRedirections("-e 'echo 2>/dev/null' 2>&1") === "-e 'echo 2>/dev/null'",
+  'strip: preserves 2>/dev/null inside single quotes');
+assert(stripShellRedirections('-e "a < b" >/dev/null') === '-e "a < b"',
+  'strip: preserves < inside double quotes');
+assert(stripShellRedirections("-e 'a > b' 2>&1") === "-e 'a > b'",
+  'strip: preserves > inside single quotes');
+assert(stripShellRedirections('script.js "arg with 2>&1" 2>/dev/null') === 'script.js "arg with 2>&1"',
+  'strip: preserves 2>&1 in quoted script arg');
+
+// Non-redirection uses of >/< in arguments must be preserved (Copilot review round 5)
+assert(stripShellRedirections('-e "console.log(1>2)"') === '-e "console.log(1>2)"',
+  'strip: preserves > in quoted expression');
+assert(stripShellRedirections("-e 'x=a<b'") === "-e 'x=a<b'",
+  'strip: preserves < in quoted expression');
+
+// Backslash-escaped quotes inside double quotes (Copilot review round 6)
+assert(stripShellRedirections('-e "console.log(\\"2>&1\\")" 2>&1') === '-e "console.log(\\"2>&1\\")"',
+  'strip: preserves escaped quotes with redirection inside');
+
+// Digit-prefixed args should not lose digits (Copilot review round 6)
+assert(stripShellRedirections('script.js --port 3000 2>&1') === 'script.js --port 3000',
+  'strip: preserves numeric arg followed by redirection');
+
+// Bare & and && must not be treated as redirections (Copilot review round 7)
+assert(stripShellRedirections('script.js && echo done') === 'script.js && echo done',
+  'strip: preserves && operator');
+assert(stripShellRedirections('script.js &') === 'script.js &',
+  'strip: preserves background &');
+
+// ---- 2. Integration flow tests ----
+// Verify end-to-end that redirections don't pollute scriptPath detection.
+function findScriptPath(fullArgs) {
+  const cleaned = stripShellRedirections(fullArgs);
+  const args = cleaned ? cleaned.split(/\s+/) : [];
+  let scriptPath = null;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i].charAt(0) !== '-') {
+      scriptPath = args[i];
+      break;
+    }
+  }
+  return scriptPath;
+}
+
+assert(findScriptPath('--version 2>&1') === null,
+  'flow: --version 2>&1 -> scriptPath is null');
+assert(findScriptPath('script.js 2>&1') === 'script.js',
+  'flow: script.js 2>&1 -> scriptPath is script.js');
+assert(findScriptPath('script.js 2>/dev/null') === 'script.js',
+  'flow: script.js 2>/dev/null -> scriptPath is script.js');
+assert(findScriptPath('2>&1') === null,
+  'flow: just 2>&1 -> scriptPath is null');
+assert(findScriptPath('-e 2>&1') === null,
+  'flow: -e 2>&1 -> scriptPath is null (-e is an option)');
+assert(findScriptPath('--version') === null,
+  'flow: --version -> scriptPath is null');
+assert(findScriptPath('--version > out.txt') === null,
+  'flow: --version > out.txt -> scriptPath is null');
+assert(findScriptPath('--version 2> /dev/null') === null,
+  'flow: --version 2> /dev/null -> scriptPath is null');
+
+console.log('');
+console.log(passed + ' passed, ' + failed + ' failed');
+if (failed > 0) throw new Error(failed + ' test(s) failed');

package/test/session-path.test.js

@@ -0,0 +1,132 @@
+/**
+ * Tests for agent session file path (issues #108, #174)
+ *
+ * Verifies that both chat and agent commands use resolveSessionFile()
+ * to get the session file path, which resolves to .pave/session.json
+ * (migrating from .pave-session.json if needed).
+ */
+
+const path = require('path');
+const fs = require('fs');
+
+// Helper: extract a named function body from source using brace matching.
+function extractFunctionBody(src, funcName) {
+  let idx = src.indexOf('async function ' + funcName);
+  if (idx === -1) idx = src.indexOf('function ' + funcName);
+  if (idx === -1) throw new Error('function ' + funcName + ' not found');
+
+  const braceStart = src.indexOf('{', idx);
+  if (braceStart === -1) throw new Error('Opening brace not found for ' + funcName);
+
+  let braceCount = 0;
+  let endIndex = braceStart;
+  for (let i = braceStart; i < src.length; i++) {
+    if (src[i] === '{') braceCount++;
+    else if (src[i] === '}') {
+      braceCount--;
+      if (braceCount === 0) { endIndex = i + 1; break; }
+    }
+  }
+  return src.slice(braceStart, endIndex);
+}
+
+describe('Session file path (issues #108, #174)', () => {
+  const srcPath = path.join(__dirname, '..', 'index.js');
+  const src = fs.readFileSync(srcPath, 'utf8');
+  const agentBody = extractFunctionBody(src, 'handleAgentCommand');
+  const chatBody = extractFunctionBody(src, 'handleChatCommand');
+
+  // =========================================================================
+  // Test: resolveSessionFile helper exists
+  // =========================================================================
+
+  test('resolveSessionFile helper function exists', () => {
+    expect(src).toContain('function resolveSessionFile(');
+  });
+
+  // =========================================================================
+  // Test: SESSION_FILE in handleAgentCommand uses resolveSessionFile
+  // =========================================================================
+
+  test('agent SESSION_FILE uses resolveSessionFile', () => {
+    expect(agentBody).toContain('resolveSessionFile(configDir)');
+    expect(agentBody).not.toContain('path.join(process.cwd(), \'.pave-session.json\')');
+  });
+
+  // =========================================================================
+  // Test: SESSION_FILE in handleChatCommand uses resolveSessionFile
+  // =========================================================================
+
+  test('chat SESSION_FILE uses resolveSessionFile', () => {
+    expect(chatBody).toContain('resolveSessionFile(configDir)');
+    expect(chatBody).not.toContain('path.join(process.cwd(), \'.pave-session.json\')');
+  });
+
+  // =========================================================================
+  // Test: SESSION_FILE does not reference AGENT_LOG_DIR
+  // =========================================================================
+
+  test('agent SESSION_FILE does not reference AGENT_LOG_DIR', () => {
+    const codeOnly = agentBody.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');
+    const assignRegex = /SESSION_FILE\s*=/g;
+    let m;
+    while ((m = assignRegex.exec(codeOnly)) !== null) {
+      const start = m.index;
+      let end = codeOnly.indexOf(';', start);
+      if (end === -1) end = codeOnly.length;
+      const stmt = codeOnly.slice(start, end);
+      expect(stmt).not.toContain('AGENT_LOG_DIR');
+    }
+  });
+
+  // =========================================================================
+  // Test: both chat and agent use the same resolveSessionFile pattern
+  // =========================================================================
+
+  test('chat and agent both use resolveSessionFile(configDir)', () => {
+    expect(chatBody).toContain('resolveSessionFile(configDir)');
+    expect(agentBody).toContain('resolveSessionFile(configDir)');
+  });
+
+  // =========================================================================
+  // Test: no CWD_SESSION_FILE variable in source
+  // =========================================================================
+
+  test('no CWD_SESSION_FILE variable in source code', () => {
+    expect(src.indexOf('CWD_SESSION_FILE')).toBe(-1);
+  });
+
+  // =========================================================================
+  // Test: no agent-session reference in source code
+  // =========================================================================
+
+  test('no agent-session reference in agent code', () => {
+    const codeOnly = agentBody.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');
+    expect(codeOnly.indexOf('agent-session')).toBe(-1);
+  });
+
+  // =========================================================================
+  // Test: no dual writes in handleAgentCommand
+  // =========================================================================
+
+  test('no dual writes to SESSION_FILE and CWD_SESSION_FILE', () => {
+    const hasSessionWrite = agentBody.includes('writeFileSync(SESSION_FILE');
+    const hasCwdSessionWrite = agentBody.includes('writeFileSync(CWD_SESSION_FILE');
+
+    if (hasSessionWrite && hasCwdSessionWrite) {
+      throw new Error('Found dual write to SESSION_FILE and CWD_SESSION_FILE');
+    }
+  });
+
+  // =========================================================================
+  // Test: resolveSessionFile handles migration
+  // =========================================================================
+
+  test('resolveSessionFile migrates .pave-session.json', () => {
+    const resolveBody = extractFunctionBody(src, 'resolveSessionFile');
+    expect(resolveBody).toContain('.pave-session.json');
+    expect(resolveBody).toContain('session.json');
+    expect(resolveBody).toContain('copyFileSync');
+    expect(resolveBody).toContain('unlinkSync');
+  });
+});

package/test/shebang-strip.test.js

@@ -0,0 +1,241 @@
+/**
+ * Tests for sandbox shebang stripping (Issue #129).
+ *
+ * Verifies that shebang lines (#!/usr/bin/env node, etc.) are stripped
+ * from module content before eval() in the sandbox's __loadModule function.
+ *
+ * Uses checkmark/X format so run-all.js correctly counts results.
+ */
+
+let passed = 0;
+let failed = 0;
+
+function assert(cond, msg) {
+  if (cond) {
+    passed++;
+    console.log('\u2705 ' + msg);
+  } else {
+    failed++;
+    console.log('\u274c ' + msg);
+  }
+}
+
+function assertEqual(actual, expected, msg) {
+  if (actual === expected) {
+    passed++;
+    console.log('\u2705 ' + msg);
+  } else {
+    failed++;
+    console.log('\u274c ' + msg);
+    console.log('    Expected: ' + JSON.stringify(expected));
+    console.log('    Actual:   ' + JSON.stringify(actual));
+  }
+}
+
+const fs = require('fs');
+const path = require('path');
+
+// ---- Verify shebang stripping code exists in generated sandbox APIs ----
+
+const sandboxPath = path.resolve(__dirname, '../../opencode-lite/src/sandbox/SandboxRunner.js');
+const src = fs.readFileSync(sandboxPath, 'utf8');
+
+// Find the __loadModule function in the template literal
+const loadModuleIdx = src.indexOf('function __loadModule(resolvedPath)');
+assert(loadModuleIdx !== -1, 'source: __loadModule function exists in SandboxRunner.js');
+
+// Verify shebang stripping code is present after __loadModule
+const afterLoadModule = src.substring(loadModuleIdx, loadModuleIdx + 2000);
+assert(afterLoadModule.indexOf('#!') !== -1,
+  'source: shebang check (#!) exists in __loadModule');
+assert(afterLoadModule.indexOf('substring(0, 2)') !== -1,
+  'source: uses substring(0, 2) to check first two chars');
+assert(afterLoadModule.indexOf('indexOf') !== -1,
+  'source: uses indexOf to find newline position');
+
+// Verify the stripping happens BEFORE the eval wrapper
+const evalIdx = afterLoadModule.indexOf('eval(wrapper)');
+const shebangIdx = afterLoadModule.indexOf('#!');
+assert(shebangIdx < evalIdx,
+  'source: shebang stripping occurs before eval(wrapper)');
+
+// ---- Unit tests for shebang stripping logic ----
+// The logic in __loadModule is:
+//   if (content.substring(0, 2) === '#!') {
+//     var nlIdx = content.indexOf('\n');
+//     content = nlIdx !== -1 ? content.substring(nlIdx + 1) : '';
+//   }
+
+function stripShebang(content) {
+  if (content.substring(0, 2) === '#!') {
+    const nlIdx = content.indexOf('\n');
+    content = nlIdx !== -1 ? content.substring(nlIdx + 1) : '';
+  }
+  return content;
+}
+
+// Basic shebang stripping
+assertEqual(
+  stripShebang('#!/usr/bin/env node\nvar x = 1;'),
+  'var x = 1;',
+  'strip: #!/usr/bin/env node shebang is removed',
+);
+
+assertEqual(
+  stripShebang('#!/usr/bin/node\nvar x = 1;'),
+  'var x = 1;',
+  'strip: #!/usr/bin/node shebang is removed',
+);
+
+assertEqual(
+  stripShebang('#!/bin/sh\necho hello'),
+  'echo hello',
+  'strip: #!/bin/sh shebang is removed',
+);
+
+// Shebang with flags
+assertEqual(
+  stripShebang('#!/usr/bin/env node --harmony\nvar x = 1;'),
+  'var x = 1;',
+  'strip: shebang with flags is removed',
+);
+
+// No shebang - content unchanged
+assertEqual(
+  stripShebang('var x = 1;'),
+  'var x = 1;',
+  'strip: no shebang - content unchanged',
+);
+
+assertEqual(
+  stripShebang('// comment\nvar x = 1;'),
+  '// comment\nvar x = 1;',
+  'strip: comment line - content unchanged',
+);
+
+assertEqual(
+  stripShebang(''),
+  '',
+  'strip: empty string - content unchanged',
+);
+
+// Single character strings
+assertEqual(
+  stripShebang('#'),
+  '#',
+  'strip: single # - content unchanged (not a shebang)',
+);
+
+assertEqual(
+  stripShebang('!'),
+  '!',
+  'strip: single ! - content unchanged',
+);
+
+// Hash but not shebang
+assertEqual(
+  stripShebang('# This is a comment\nvar x = 1;'),
+  '# This is a comment\nvar x = 1;',
+  'strip: # comment (not #!) - content unchanged',
+);
+
+// Multiline content after shebang
+assertEqual(
+  stripShebang('#!/usr/bin/env node\nvar x = 1;\nvar y = 2;\nconsole.log(x + y);'),
+  'var x = 1;\nvar y = 2;\nconsole.log(x + y);',
+  'strip: multiline content after shebang preserved',
+);
+
+// Shebang-like content NOT at start
+assertEqual(
+  stripShebang('var x = "#!/usr/bin/env node";\nvar y = 1;'),
+  'var x = "#!/usr/bin/env node";\nvar y = 1;',
+  'strip: #! not at start of file - content unchanged',
+);
+
+// Windows-style line endings (CRLF)
+assertEqual(
+  stripShebang('#!/usr/bin/env node\r\nvar x = 1;'),
+  'var x = 1;',
+  'strip: CRLF line endings - shebang (including \\r) is fully removed',
+);
+
+// Shebang only (no content after)
+assertEqual(
+  stripShebang('#!/usr/bin/env node\n'),
+  '',
+  'strip: shebang only with trailing newline - returns empty',
+);
+
+// Shebang without newline (just the shebang, no terminator)
+// With the guard, this correctly returns empty string since
+// there's no actual code after the shebang.
+const noNewline = stripShebang('#!/usr/bin/env node');
+assertEqual(
+  noNewline,
+  '',
+  'strip: shebang without newline - returns empty string',
+);
+
+// ---- Verify args-parser.js has a shebang (the original trigger) ----
+const argsParserPath = path.resolve(__dirname, '../lib/args-parser.js');
+if (fs.existsSync(argsParserPath)) {
+  const argsParserContent = fs.readFileSync(argsParserPath, 'utf8');
+  assert(argsParserContent.substring(0, 2) === '#!',
+    'args-parser.js: starts with shebang (original trigger for issue #129)');
+  const strippedContent = stripShebang(argsParserContent);
+  assert(strippedContent.substring(0, 2) !== '#!',
+    'args-parser.js: shebang removed after stripShebang');
+  assert(strippedContent.length > 0,
+    'args-parser.js: content remains after shebang removal');
+  // Verify the remaining content starts with comment or code
+  assert(strippedContent.trimStart().indexOf('/**') === 0 || strippedContent.trimStart().indexOf('//') === 0 || strippedContent.trimStart().indexOf('var ') === 0 || strippedContent.trimStart().indexOf('const ') === 0,
+    'args-parser.js: content after shebang starts with valid JS');
+} else {
+  console.log('(skipped args-parser.js verification - file not found at ' + argsParserPath + ')');
+}
+
+// ---- Verify the wrapper would be valid JS after shebang stripping ----
+// Simulates what __loadModule does: wrap content in a function and eval it
+function simulateModuleLoad(content) {
+  // Apply shebang stripping (matches __loadModule implementation)
+  if (content.substring(0, 2) === '#!') {
+    const nlIdx = content.indexOf('\n');
+    content = nlIdx !== -1 ? content.substring(nlIdx + 1) : '';
+  }
+  // Create wrapper like __loadModule does
+  const wrapper = '(function(module, exports, require, __dirname, __filename) {' + content + '\n});';
+  // Try to parse (don't execute) - use Function constructor as a syntax check
+  try {
+    new Function(wrapper);
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
+
+const result1 = simulateModuleLoad('#!/usr/bin/env node\nvar x = 1; module.exports = x;');
+assert(result1.ok, 'wrapper: module with shebang parses after stripping');
+
+const result2 = simulateModuleLoad('var x = 1; module.exports = x;');
+assert(result2.ok, 'wrapper: module without shebang parses normally');
+
+const result3 = simulateModuleLoad('#!/usr/bin/env node\n"use strict";\nvar x = 1;');
+assert(result3.ok, 'wrapper: strict mode module with shebang parses after stripping');
+
+// Shebang-only file without newline should now produce a valid (empty) wrapper
+const result4 = simulateModuleLoad('#!/usr/bin/env node');
+assert(result4.ok, 'wrapper: shebang-only file (no newline) produces valid empty wrapper');
+
+// Without stripping, a shebang would cause SyntaxError
+try {
+  const badWrapper = '(function(module, exports, require, __dirname, __filename) {#!/usr/bin/env node\nvar x = 1;\n});';
+  new Function(badWrapper);
+  assert(false, 'wrapper: unstripped shebang should cause SyntaxError');
+} catch (e) {
+  assert(e instanceof SyntaxError, 'wrapper: unstripped shebang causes SyntaxError (confirms the bug)');
+}
+
+// ---- Summary ----
+console.log('\n' + (passed + failed) + ' tests: ' + passed + ' passed, ' + failed + ' failed');
+if (failed > 0) process.exit(1);