sam-coder-cli 1.0.67 → 1.0.69

package/bin/agi-cli.js

@@ -430,9 +430,10 @@ const agentUtils = {
   },
 
   async writeFile(input, maybeContent) {
+    let filePath;
     try {
-      const filePath = typeof input === 'string' ? input : input?.path;
-      const content = typeof input === 'string' ? maybeContent : input?.content;
+      filePath = typeof input === 'string' ? input : input?.path;
+      const content = typeof input === 'string' ? maybeContent : (input?.content ?? input?.contents ?? input?.data);
       if (!filePath) throw new Error('writeFile: missing path');
       if (typeof content !== 'string') throw new Error('writeFile: missing content');
       const dir = path.dirname(filePath);
@@ -440,7 +441,8 @@ const agentUtils = {
       await fs.writeFile(filePath, content, 'utf-8');
       return `Successfully wrote to ${filePath}`;
     } catch (error) {
-      throw new Error(`Failed to write to file ${filePath}: ${error.message}`);
+      const ctx = filePath || (typeof input === 'object' ? input?.path : undefined) || 'unknown path';
+      throw new Error(`Failed to write to file ${ctx}: ${error.message}`);
     }
   },
 
@@ -514,9 +516,54 @@ const agentUtils = {
 
   async runCommand(input) {
     try {
-      const command = typeof input === 'string' ? input : input?.command;
-      if (!command) throw new Error('runCommand: missing command');
-      const { stdout, stderr } = await execAsync(command, { cwd: process.cwd() });
+      const isObj = typeof input === 'object' && input !== null;
+      let command = !isObj ? input : (input.command ?? null);
+      const cmd = isObj ? (input.cmd ?? input.program ?? null) : null;
+      const args = isObj ? (input.args ?? input.params ?? null) : null;
+      const script = isObj ? (input.script ?? null) : null;
+      const shell = isObj ? (input.shell ?? (input.powershell ? 'powershell.exe' : (input.bash ? 'bash' : undefined))) : undefined;
+      const cwdRaw = isObj ? input.cwd : undefined;
+      const envRaw = isObj ? input.env : undefined;
+      const timeout = isObj && typeof input.timeout === 'number' ? input.timeout : undefined;
+
+      const quoteArg = (a) => {
+        if (a == null) return '';
+        const s = String(a);
+        return /\s|["']/g.test(s) ? '"' + s.replace(/"/g, '\\"') + '"' : s;
+      };
+
+      // Build command from arrays or fields if not provided directly
+      if (!command && cmd) {
+        if (Array.isArray(cmd)) {
+          command = cmd.map(quoteArg).join(' ');
+        } else if (typeof cmd === 'string') {
+          command = cmd;
+        }
+      }
+      if (Array.isArray(command)) {
+        command = command.map(quoteArg).join(' ');
+      }
+      if (command && Array.isArray(args) && args.length) {
+        command = `${command} ${args.map(quoteArg).join(' ')}`;
+      }
+      if (script && !command) {
+        // If only a script is provided, run it directly under the selected shell
+        command = String(script);
+      }
+
+      if (!command || typeof command !== 'string' || command.trim().length === 0) {
+        throw new Error('runCommand: missing command');
+      }
+
+      // Resolve cwd
+      let cwd = process.cwd();
+      if (typeof cwdRaw === 'string' && cwdRaw.trim().length > 0) {
+        cwd = path.isAbsolute(cwdRaw) ? cwdRaw : path.join(process.cwd(), cwdRaw);
+      }
+      // Merge env
+      const env = envRaw && typeof envRaw === 'object' ? { ...process.env, ...envRaw } : undefined;
+
+      const { stdout, stderr } = await execAsync(command, { cwd, env, timeout, shell });
       if (stderr) {
         console.error('Command stderr:', stderr);
       }
@@ -529,10 +576,17 @@ const agentUtils = {
   async searchFiles(input) {
     try {
       const isString = typeof input === 'string';
-      const pattern = isString ? input : input?.pattern;
-      const basePathRaw = isString ? null : (input?.path || null);
+      let pattern = isString ? input : input?.pattern;
+      let basePathRaw = isString ? null : (input?.path || null);
       const recursive = isString ? true : (input?.recursive !== false);
 
+      // Handle wildcards embedded in the path (e.g., C:\\foo\\bar\\*)
+      const hasWildcard = (p) => typeof p === 'string' && /[\*\?]/.test(p);
+      if (!pattern && hasWildcard(basePathRaw)) {
+        pattern = path.basename(basePathRaw);
+        basePathRaw = path.dirname(basePathRaw);
+      }
+
       const basePath = basePathRaw
         ? (path.isAbsolute(basePathRaw) ? basePathRaw : path.join(process.cwd(), basePathRaw))
         : process.cwd();
@@ -542,12 +596,36 @@ const agentUtils = {
       const matchByPattern = (name) => {
         if (!pattern) return true; // if no pattern, match all
         const escaped = pattern.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
-        const regex = new RegExp('^' + escaped.replace(/\*/g, '.*') + '$');
+        const regex = new RegExp('^' + escaped.replace(/\*/g, '.*').replace(/\?/g, '.') + '$');
         return regex.test(name);
       };
 
+      // If base path is a file, test it directly
+      try {
+        const stat = await fs.stat(basePath);
+        if (stat.isFile()) {
+          if (matchByPattern(path.basename(basePath))) {
+            results.push(basePath);
+          }
+          return results.length > 0
+            ? `Found ${results.length} files:\n${results.join('\n')}`
+            : 'No files found';
+        }
+      } catch (e) {
+        if (e && e.code === 'ENOENT') {
+          return 'No files found';
+        }
+        // Non-ENOENT errors are handled by traversal below
+      }
+
       const search = async (dir) => {
-        const entries = await fs.readdir(dir, { withFileTypes: true });
+        let entries;
+        try {
+          entries = await fs.readdir(dir, { withFileTypes: true });
+        } catch (e) {
+          if (e && e.code === 'ENOENT') return; // directory missing
+          throw e;
+        }
         for (const entry of entries) {
           const fullPath = path.join(dir, entry.name);
           try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sam-coder-cli",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {