@howlil/ez-agents 3.4.1 → 3.4.2

package/ez-agents/bin/lib/test-temp-file.cjs

@@ -1,125 +1,125 @@
-#!/usr/bin/env node
-
-/**
- * Test script for EZ Temp File Handler
- * Run: node ez-agents/bin/lib/test-temp-file.cjs
- */
-
-const os = require('os');
-const path = require('path');
-const fs = require('fs');
-
-const {
-  createTempDir,
-  createTempFile,
-  writeToTemp,
-  readFromTemp,
-  cleanupTemp,
-  cleanupAll,
-  getTrackedTemps,
-  isPathSafe
-} = require('./temp-file.cjs');
-
-async function testCreateTempDir() {
-  console.log('\n=== Test 1: Create Temp Directory ===');
-  
-  const tempDir = await createTempDir('ez-test-');
-  console.log('Created temp dir:', tempDir);
-  
-  const exists = require('fs').existsSync(tempDir);
-  console.log('Directory exists:', exists);
-  
-  if (!exists) throw new Error('Temp dir was not created');
-  console.log('✓ Temp directory created successfully');
-  
-  return tempDir;
-}
-
-async function testCreateTempFile(tempDir) {
-  console.log('\n=== Test 2: Create Temp File ===');
-  
-  const tempFile = await createTempFile('test-', tempDir, 'Initial content');
-  console.log('Created temp file:', tempFile);
-  
-  const content = await readFromTemp(tempFile, { validateBase: tempDir });
-  console.log('File content:', content);
-  
-  if (content !== 'Initial content') {
-    throw new Error('File content mismatch');
-  }
-  console.log('✓ Temp file created and read successfully');
-  
-  return tempFile;
-}
-
-async function testWriteToTemp(tempFile, tempDir) {
-  console.log('\n=== Test 3: Write to Temp File ===');
-  
-  await writeToTemp(tempFile, 'Updated content', { validateBase: tempDir });
-  const content = await readFromTemp(tempFile, { validateBase: tempDir });
-  
-  console.log('Updated content:', content);
-  
-  if (content !== 'Updated content') {
-    throw new Error('Write failed');
-  }
-  console.log('✓ Temp file write successful');
-}
-
-async function testPathSafety() {
-  console.log('\n=== Test 4: Path Safety Validation ===');
-  
-  const baseDir = os.tmpdir();
-  
-  // Safe paths
-  console.log('Safe path (same dir):', isPathSafe(baseDir, path.join(baseDir, 'file.txt')));
-  console.log('Safe path (subdir):', isPathSafe(baseDir, path.join(baseDir, 'sub', 'file.txt')));
-  
-  // Unsafe paths (should be false)
-  const unsafePath = path.resolve(baseDir, '..', '..', 'etc', 'passwd');
-  console.log('Unsafe path (/etc/passwd):', isPathSafe(baseDir, unsafePath));
-  
-  console.log('✓ Path safety validation working');
-}
-
-async function testCleanup(tempFile, tempDir) {
-  console.log('\n=== Test 5: Cleanup ===');
-  
-  console.log('Tracked temps before cleanup:', getTrackedTemps().length);
-  
-  await cleanupTemp(tempFile);
-  console.log('Cleaned up temp file');
-  
-  const fileExists = require('fs').existsSync(tempFile);
-  console.log('Temp file exists after cleanup:', fileExists);
-  
-  await cleanupAll();
-  console.log('Cleaned up all temps');
-  
-  const dirExists = require('fs').existsSync(tempDir);
-  console.log('Temp dir exists after cleanup:', dirExists);
-  
-  console.log('✓ Cleanup successful');
-}
-
-async function runTests() {
-  const os = require('os');
-  const path = require('path');
-  
-  try {
-    const tempDir = await testCreateTempDir();
-    const tempFile = await testCreateTempFile(tempDir);
-    await testWriteToTemp(tempFile, tempDir);
-    await testPathSafety();
-    await testCleanup(tempFile, tempDir);
-    
-    console.log('\n' + '='.repeat(50));
-    console.log('Temp File Handler test COMPLETE ✓');
-    console.log('='.repeat(50));
-  } catch (err) {
-    console.error('Test failed:', err);
-    process.exit(1);
-  }
-}
-
-runTests();
+#!/usr/bin/env node
+
+/**
+ * Test script for EZ Temp File Handler
+ * Run: node ez-agents/bin/lib/test-temp-file.cjs
+ */
+
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+
+const {
+  createTempDir,
+  createTempFile,
+  writeToTemp,
+  readFromTemp,
+  cleanupTemp,
+  cleanupAll,
+  getTrackedTemps,
+  isPathSafe
+} = require('./temp-file.cjs');
+
+async function testCreateTempDir() {
+  console.log('\n=== Test 1: Create Temp Directory ===');
+  
+  const tempDir = await createTempDir('ez-test-');
+  console.log('Created temp dir:', tempDir);
+  
+  const exists = require('fs').existsSync(tempDir);
+  console.log('Directory exists:', exists);
+  
+  if (!exists) throw new Error('Temp dir was not created');
+  console.log('✓ Temp directory created successfully');
+  
+  return tempDir;
+}
+
+async function testCreateTempFile(tempDir) {
+  console.log('\n=== Test 2: Create Temp File ===');
+  
+  const tempFile = await createTempFile('test-', tempDir, 'Initial content');
+  console.log('Created temp file:', tempFile);
+  
+  const content = await readFromTemp(tempFile, { validateBase: tempDir });
+  console.log('File content:', content);
+  
+  if (content !== 'Initial content') {
+    throw new Error('File content mismatch');
+  }
+  console.log('✓ Temp file created and read successfully');
+  
+  return tempFile;
+}
+
+async function testWriteToTemp(tempFile, tempDir) {
+  console.log('\n=== Test 3: Write to Temp File ===');
+  
+  await writeToTemp(tempFile, 'Updated content', { validateBase: tempDir });
+  const content = await readFromTemp(tempFile, { validateBase: tempDir });
+  
+  console.log('Updated content:', content);
+  
+  if (content !== 'Updated content') {
+    throw new Error('Write failed');
+  }
+  console.log('✓ Temp file write successful');
+}
+
+async function testPathSafety() {
+  console.log('\n=== Test 4: Path Safety Validation ===');
+  
+  const baseDir = os.tmpdir();
+  
+  // Safe paths
+  console.log('Safe path (same dir):', isPathSafe(baseDir, path.join(baseDir, 'file.txt')));
+  console.log('Safe path (subdir):', isPathSafe(baseDir, path.join(baseDir, 'sub', 'file.txt')));
+  
+  // Unsafe paths (should be false)
+  const unsafePath = path.resolve(baseDir, '..', '..', 'etc', 'passwd');
+  console.log('Unsafe path (/etc/passwd):', isPathSafe(baseDir, unsafePath));
+  
+  console.log('✓ Path safety validation working');
+}
+
+async function testCleanup(tempFile, tempDir) {
+  console.log('\n=== Test 5: Cleanup ===');
+  
+  console.log('Tracked temps before cleanup:', getTrackedTemps().length);
+  
+  await cleanupTemp(tempFile);
+  console.log('Cleaned up temp file');
+  
+  const fileExists = require('fs').existsSync(tempFile);
+  console.log('Temp file exists after cleanup:', fileExists);
+  
+  await cleanupAll();
+  console.log('Cleaned up all temps');
+  
+  const dirExists = require('fs').existsSync(tempDir);
+  console.log('Temp dir exists after cleanup:', dirExists);
+  
+  console.log('✓ Cleanup successful');
+}
+
+async function runTests() {
+  const os = require('os');
+  const path = require('path');
+  
+  try {
+    const tempDir = await testCreateTempDir();
+    const tempFile = await testCreateTempFile(tempDir);
+    await testWriteToTemp(tempFile, tempDir);
+    await testPathSafety();
+    await testCleanup(tempFile, tempDir);
+    
+    console.log('\n' + '='.repeat(50));
+    console.log('Temp File Handler test COMPLETE ✓');
+    console.log('='.repeat(50));
+  } catch (err) {
+    console.error('Test failed:', err);
+    process.exit(1);
+  }
+}
+
+runTests();

package/ez-agents/bin/lib/timeout-exec.cjs

@@ -1,63 +1,63 @@
-#!/usr/bin/env node
-
-/**
- * EZ Timeout Exec — Command execution with timeout and fallback
- * 
- * Provides safe command execution with configurable timeout
- * Logs errors and supports fallback values
- * 
- * Usage:
- *   const { execWithTimeout } = require('./timeout-exec.cjs');
- *   const result = await execWithTimeout('node', ['script.js'], { timeout: 5000, fallback: 'default' });
- */
-
-const { execFile } = require('child_process');
-const { promisify } = require('util');
-const execFileAsync = promisify(execFile);
-const Logger = require('./logger.cjs');
-const logger = new Logger();
-
-const DEFAULT_TIMEOUT = 5000; // 5 seconds
-
-/**
- * Execute a command with timeout
- * @param {string} cmd - Command to execute
- * @param {string[]} args - Command arguments
- * @param {Object} options - Execution options
- * @param {number} options.timeout - Timeout in milliseconds (default: 5000)
- * @param {any} options.fallback - Fallback value if command fails or times out
- * @returns {Promise<string>} - Command stdout or fallback value
- */
-async function execWithTimeout(cmd, args, options = {}) {
-  const { timeout = DEFAULT_TIMEOUT, fallback = null } = options;
-  const hasFallback = Object.prototype.hasOwnProperty.call(options, 'fallback');
-  
-  return new Promise(async (resolve, reject) => {
-    const timeoutId = setTimeout(() => {
-      logger.error(`Command timed out: ${cmd} ${args.join(' ')}`, { timeout });
-      if (hasFallback) {
-        logger.info('Using fallback value', { fallback });
-        resolve(fallback);
-      } else {
-        reject(new Error(`Command timed out after ${timeout}ms: ${cmd}`));
-      }
-    }, timeout);
-
-    try {
-      const result = await execFileAsync(cmd, args, { timeout });
-      clearTimeout(timeoutId);
-      resolve(result.stdout.trim());
-    } catch (err) {
-      clearTimeout(timeoutId);
-      logger.error(`Command failed: ${cmd}`, { error: err.message, args });
-      if (hasFallback) {
-        logger.info('Using fallback value', { fallback });
-        resolve(fallback);
-      } else {
-        reject(err);
-      }
-    }
-  });
-}
-
-module.exports = { execWithTimeout };
+#!/usr/bin/env node
+
+/**
+ * EZ Timeout Exec — Command execution with timeout and fallback
+ * 
+ * Provides safe command execution with configurable timeout
+ * Logs errors and supports fallback values
+ * 
+ * Usage:
+ *   const { execWithTimeout } = require('./timeout-exec.cjs');
+ *   const result = await execWithTimeout('node', ['script.js'], { timeout: 5000, fallback: 'default' });
+ */
+
+const { execFile } = require('child_process');
+const { promisify } = require('util');
+const execFileAsync = promisify(execFile);
+const Logger = require('./logger.cjs');
+const logger = new Logger();
+
+const DEFAULT_TIMEOUT = 5000; // 5 seconds
+
+/**
+ * Execute a command with timeout
+ * @param {string} cmd - Command to execute
+ * @param {string[]} args - Command arguments
+ * @param {Object} options - Execution options
+ * @param {number} options.timeout - Timeout in milliseconds (default: 5000)
+ * @param {any} options.fallback - Fallback value if command fails or times out
+ * @returns {Promise<string>} - Command stdout or fallback value
+ */
+async function execWithTimeout(cmd, args, options = {}) {
+  const { timeout = DEFAULT_TIMEOUT, fallback = null } = options;
+  const hasFallback = Object.prototype.hasOwnProperty.call(options, 'fallback');
+  
+  return new Promise(async (resolve, reject) => {
+    const timeoutId = setTimeout(() => {
+      logger.error(`Command timed out: ${cmd} ${args.join(' ')}`, { timeout });
+      if (hasFallback) {
+        logger.info('Using fallback value', { fallback });
+        resolve(fallback);
+      } else {
+        reject(new Error(`Command timed out after ${timeout}ms: ${cmd}`));
+      }
+    }, timeout);
+
+    try {
+      const result = await execFileAsync(cmd, args, { timeout });
+      clearTimeout(timeoutId);
+      resolve(result.stdout.trim());
+    } catch (err) {
+      clearTimeout(timeoutId);
+      logger.error(`Command failed: ${cmd}`, { error: err.message, args });
+      if (hasFallback) {
+        logger.info('Using fallback value', { fallback });
+        resolve(fallback);
+      } else {
+        reject(err);
+      }
+    }
+  });
+}
+
+module.exports = { execWithTimeout };

package/ez-agents/bin/lib/verify.cjs

@@ -270,11 +270,25 @@ async function cmdVerifyCommits(cwd, hashes, raw) {
   const valid = [];
   const invalid = [];
   for (const hash of hashes) {
+    // Use git cat-file -t which supports both short and full hashes
+    // First try with the hash as-is (works for both short and full)
     const result = await execGit(cwd, ['cat-file', '-t', hash]);
     if (result.exitCode === 0 && result.stdout.trim() === 'commit') {
       valid.push(hash);
     } else {
-      invalid.push(hash);
+      // If that fails, try to resolve to full hash first
+      const resolveResult = await execGit(cwd, ['rev-parse', hash]);
+      if (resolveResult.exitCode === 0) {
+        const fullHash = resolveResult.stdout.trim();
+        const result2 = await execGit(cwd, ['cat-file', '-t', fullHash]);
+        if (result2.exitCode === 0 && result2.stdout.trim() === 'commit') {
+          valid.push(hash);
+        } else {
+          invalid.push(hash);
+        }
+      } else {
+        invalid.push(hash);
+      }
     }
   }