bunosh 0.5.0 → 0.5.6

package/README.md

@@ -427,7 +427,6 @@ export async function checkServices() {
 
 - **[Examples](docs/examples.md)** — Real-world examples and workflows
 - **[AI Integration](docs/ai.md)** — Built-in AI support
-- **[MCP Integration](docs/mcp.md)** — Expose commands to AI assistants (Claude, Cursor, etc.)
 - **[JavaScript Execution](docs/javascript-execution.md)** — Execute JavaScript directly via CLI
 - **[Bash Migration Guide](docs/bash-migration-guide.md)** — Convert bash scripts to Bunosh
 - **[Node.js Migration Guide](docs/nodejs-migration-guide.md)** — Migrate from Node.js scripts

package/bunosh.js

@@ -124,45 +124,6 @@ async function main() {
     process.argv.splice(envFileIndex, 1);
   }
 
-  const mcpFlagIndex = process.argv.indexOf('-mcp');
-  if (mcpFlagIndex !== -1) {
-    process.argv.splice(mcpFlagIndex, 1);
-
-    process.env.BUNOSH_MCP_MODE = 'true';
-
-    const { createMcpServer, startMcpServer } = await import('./src/mcp-server.js');
-
-    let tasksFile;
-    let bunoshfileDir;
-    if (customBunoshfile) {
-      const resolvedPath = path.isAbsolute(customBunoshfile) ? customBunoshfile : path.resolve(customBunoshfile);
-      if (existsSync(resolvedPath) && statSync(resolvedPath).isDirectory()) {
-        tasksFile = path.join(resolvedPath, BUNOSHFILE);
-        bunoshfileDir = resolvedPath;
-      } else {
-        tasksFile = resolvedPath;
-        bunoshfileDir = path.dirname(resolvedPath);
-      }
-    } else {
-      tasksFile = path.join(process.cwd(), BUNOSHFILE);
-      bunoshfileDir = process.cwd();
-    }
-
-    if (!existsSync(tasksFile)) {
-      console.error('Bunoshfile not found for MCP mode');
-      process.exit(1);
-    }
-
-    loadEnvFiles(bunoshfileDir, customEnvFile);
-
-    const { tasks, sources } = await loadBunoshfiles(tasksFile);
-
-    const server = createMcpServer(tasks, sources);
-    await startMcpServer(server);
-
-    return;
-  }
-
   let tasksFile;
   let bunoshfileDir;
   if (customBunoshfile) {

package/index.js

@@ -1,5 +1,6 @@
-import exec from "./src/tasks/exec.js";
 import shell from "./src/tasks/shell.js";
+// Deprecated: `exec` is an alias for `shell`, kept for backward compatibility.
+const exec = shell;
 import fetch from "./src/tasks/fetch.js";
 import writeToFile from "./src/tasks/writeToFile.js";
 import copyFile from "./src/tasks/copyFile.js";
@@ -11,7 +12,7 @@ export { exec, shell, fetch, writeToFile, copyFile, ai, ask, yell, say, task, tr
 
 export function buildCmd(cmd) {
   return function (args) {
-    return exec`${cmd} ${args}`;
+    return shell`${cmd} ${args}`;
   };
 }
 
@@ -35,7 +36,7 @@ global.bunosh = {
   silent,
   TaskResult,
   buildCmd,
-  $: exec,
+  $: shell,
 };
 
 export default global.bunosh;

package/package.json

@@ -1,8 +1,25 @@
 {
   "name": "bunosh",
-  "version": "0.5.0",
+  "version": "0.5.6",
+  "description": "Task runner that turns JavaScript functions into CLI commands. Runs on Bun and Node.js.",
   "type": "module",
   "module": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/DavertMik/bunosh.git"
+  },
+  "homepage": "https://github.com/DavertMik/bunosh#readme",
+  "bugs": {
+    "url": "https://github.com/DavertMik/bunosh/issues"
+  },
+  "author": "davert",
+  "keywords": [
+    "task-runner",
+    "cli",
+    "bun",
+    "automation",
+    "scripts"
+  ],
   "bin": {
     "bunosh": "./bunosh.js"
   },
@@ -19,7 +36,6 @@
     "@ai-sdk/openai": "^2.0.23",
     "@babel/parser": "^7.27.5",
     "@babel/traverse": "^7.27.4",
-    "@modelcontextprotocol/sdk": "^1.19.1",
     "ai": "^5.0.29",
     "chalk": "^5.4.1",
     "commander": "^14.0.0",

package/src/formatters/console.js

@@ -12,7 +12,11 @@ const STATUS_CONFIG = {
 
 export class ConsoleFormatter extends BaseFormatter {
   shouldDelayStart() {
-    return false;
+    return true;
+  }
+
+  getStartDelay() {
+    return 1000;
   }
   format(taskName, status, taskType, extra = {}) {
     const config = STATUS_CONFIG[status];

package/src/io.js

@@ -7,11 +7,6 @@ export function say(...args) {
 }
 
 export async function ask(question, defaultValueOrOptions = {}, options = {}) {
-  // Check if we're in MCP mode and should use the interactive ask function
-  if (globalThis._mcpAskFunction) {
-    return globalThis._mcpAskFunction(question, defaultValueOrOptions, options);
-  }
-
   // Track that we're in an ask operation to prevent duplicate exit summaries
   globalThis._bunoshInAskOperation = true;
   // Smart parameter detection

package/src/printer.js

@@ -85,7 +85,10 @@ export class Printer {
     const delay = this.formatter.getStartDelay ? this.formatter.getStartDelay() : 50;
 
     if (this.formatter.shouldDelayStart && this.formatter.shouldDelayStart()) {
+      this.pendingStart = { taskName, extra };
       this.startTimeout = setTimeout(() => {
+        this.startTimeout = null;
+        this.pendingStart = null;
         this.hasStarted = true;
         this.print(taskName, 'start', extra);
       }, delay);
@@ -95,19 +98,37 @@ export class Printer {
     }
   }
 
-  finish(taskName, extra = {}) {
+  _flushPendingStart() {
+    if (!this.startTimeout) return;
+    clearTimeout(this.startTimeout);
+    this.startTimeout = null;
+    const pending = this.pendingStart;
+    this.pendingStart = null;
+    if (pending) {
+      this.hasStarted = true;
+      this.print(pending.taskName, 'start', pending.extra);
+    }
+  }
+
+  _cancelPendingStart() {
     if (this.startTimeout) {
       clearTimeout(this.startTimeout);
       this.startTimeout = null;
     }
+    this.pendingStart = null;
+  }
+
+  cancel() {
+    this._cancelPendingStart();
+  }
+
+  finish(taskName, extra = {}) {
+    this._cancelPendingStart();
     this.print(taskName, 'finish', extra);
   }
 
   error(taskName, error = null, extra = {}) {
-    if (this.startTimeout) {
-      clearTimeout(this.startTimeout);
-      this.startTimeout = null;
-    }
+    this._cancelPendingStart();
     if (error) {
       extra.error = typeof error === 'string' ? error : error.message;
     }
@@ -115,10 +136,7 @@ export class Printer {
   }
 
   warning(taskName, error = null, extra = {}) {
-    if (this.startTimeout) {
-      clearTimeout(this.startTimeout);
-      this.startTimeout = null;
-    }
+    this._cancelPendingStart();
     if (error) {
       extra.error = typeof error === 'string' ? error : error.message;
     }
@@ -128,6 +146,8 @@ export class Printer {
   output(line, isError = false) {
     if (!line.trim()) return;
 
+    this._flushPendingStart();
+
     // Add task prefix for parallel tasks on output lines
     const prefix = this.taskId ? getTaskPrefix(this.taskId) : '';
     const prefixedLine = prefix ? `${prefix} ${line}` : line;

package/src/program.js

@@ -8,7 +8,7 @@ import { yell } from './io.js';
 import { formatError } from './error-formatter.js';
 import cprint from "./font.js";
 import { handleCompletion, detectCurrentShell, installCompletion, getCompletionPaths } from './completion.js';
-import { upgradeCommand } from './upgrade.js';
+import { upgradeCommand, printUpgradeNoticeIfAvailable } from './upgrade.js';
 
 export const BUNOSHFILE = `Bunoshfile.js`;
 
@@ -265,16 +265,22 @@ export default async function bunosh(commands, sources) {
         }
       });
 
-      const optionsObj = commanderArgs[commanderArgs.length - 1];
-      if (optionsObj && typeof optionsObj === 'object') {
-        Object.keys(opts).forEach((optName) => {
-          const dasherizedOpt = optName.replace(/([A-Z])/g, '-$1').toLowerCase();
-          if (optionsObj[dasherizedOpt] !== undefined) {
-            transformedArgs.push(optionsObj[dasherizedOpt]);
+      const optNames = Object.keys(opts);
+      if (optNames.length > 0) {
+        const lastArg = commanderArgs[commanderArgs.length - 1];
+        const optionsObj = (lastArg && typeof lastArg.opts === 'function') ? lastArg.opts() : lastArg;
+        const mergedOpts = {};
+        optNames.forEach((optName) => {
+          const camelName = optName.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+          if (optionsObj && optionsObj[camelName] !== undefined) {
+            mergedOpts[camelName] = optionsObj[camelName];
+          } else if (optionsObj && optionsObj[optName] !== undefined) {
+            mergedOpts[camelName] = optionsObj[optName];
           } else {
-            transformedArgs.push(opts[optName]);
+            mergedOpts[camelName] = opts[optName];
           }
         });
+        transformedArgs.push(mergedOpts);
       }
 
       try {
@@ -385,6 +391,23 @@ export default async function bunosh(commands, sources) {
 
   internalCommands.push(setupCompletionCmd);
 
+  const SKILLS_REPO = 'DavertMik/bunosh-skills';
+
+  const installSkillsCmd = program.command('install-skills')
+    .description('Print the command to install Bunosh AI agent skills.')
+    .action(() => {
+      console.log();
+      console.log(`🤖 Install Bunosh AI agent skills (Claude Code, Cursor, Codex, ...):`);
+      console.log();
+      console.log(`   ${color.bold(`npx skills add ${SKILLS_REPO}`)}`);
+      console.log();
+      console.log(color.dim(`   Skills: bunosh-fundamentals, migrate-to-bunosh`));
+      console.log(color.dim(`   ${SKILLS_REPO} · https://buno.sh`));
+      console.log();
+    });
+
+  internalCommands.push(installSkillsCmd);
+
   const upgradeCmd = program.command('upgrade')
     .description('Upgrade bunosh to the latest version')
     .option('-f, --force', 'Force upgrade even if already on latest version')
@@ -410,7 +433,7 @@ export default async function bunosh(commands, sources) {
       }
 
       const lines = description.split('\n');
-      const firstLine = `  ${color.white.bold(paddedName)} ${lines[0]}`;
+      const firstLine = `  ${color.white.bold(paddedName)} ${color.dim(lines[0])}`;
       const indentedLines = lines.slice(1).map(line =>
         line.trim() ? `                          ${line}` : ''
       ).filter(line => line);
@@ -445,7 +468,7 @@ ${mainCommands}
       }
 
       const lines = description.split('\n');
-      const firstLine = `  ${color.white.bold(paddedName)} ${lines[0]}`;
+      const firstLine = `  ${color.white.bold(paddedName)} ${color.dim(lines[0])}`;
       const indentedLines = lines.slice(1).map(line =>
         line.trim() ? `                          ${line}` : ''
       ).filter(line => line);
@@ -471,7 +494,7 @@ ${devCommands}
         }
 
         const lines = description.split('\n');
-        const firstLine = `  ${color.white.bold(paddedName)} ${lines[0]}`;
+        const firstLine = `  ${color.white.bold(paddedName)} ${color.dim(lines[0])}`;
         const indentedLines = lines.slice(1).map(line =>
           line.trim() ? `                          ${line}` : ''
         ).filter(line => line);
@@ -485,7 +508,10 @@ ${namespaceCommands}
     }
   });
 
-  helpText += color.dim(`Special Commands:
+  const helpFlagRequested = process.argv.includes('--help') || process.argv.includes('-h');
+
+  if (helpFlagRequested) {
+    helpText += color.dim(`Special Commands:
   ${color.bold('bunosh edit')}           📝 Edit bunosh file with $EDITOR
   ${color.bold('bunosh export:scripts')} 📥 Export commands to package.json
   ${color.bold('bunosh upgrade')}        🦾 Upgrade bunosh
@@ -494,6 +520,13 @@ ${namespaceCommands}
   ${color.bold('bunosh --env-file …')}   🔧 Load custom environment file
 `);
 
+    helpText += `
+${color.bold('🤖 AI agent skills')} ${color.dim('(Claude Code, Cursor, Codex, ...)')}
+  ${color.bold('npx skills add DavertMik/bunosh-skills')}
+  ${color.dim('bunosh-fundamentals · migrate-to-bunosh — see "bunosh install-skills"')}
+`;
+  }
+
   program.addHelpText('after', helpText);
 
   program.on("command:*", (cmd) => {
@@ -505,6 +538,7 @@ ${namespaceCommands}
 
   if (process.argv.length === 2) {
     program.outputHelp();
+    await printUpgradeNoticeIfAvailable();
     return program;
   }
 

package/src/task.js

@@ -198,6 +198,8 @@ export async function task(name, fn, isSilent = false) {
 
     // Check if result is a TaskResult instance
     if (result && result.constructor && result.constructor.name === 'TaskResult') {
+      printer.cancel();
+      runningTasks.delete(taskInfo.id);
       return result;
     }
 
@@ -246,8 +248,13 @@ export async function task(name, fn, isSilent = false) {
   }
 }
 
-// Add try method to task function
+// Add methods to task function
 task.try = tryTask;
+task.stopOnFailures = stopOnFailures;
+task.ignoreFailures = ignoreFailures;
+task.silence = silence;
+task.prints = prints;
+task.silent = silent;
 
 
 export class SilentTaskWrapper {

package/src/tasks/exec.js

@@ -1,251 +1,7 @@
-import { TaskResult, createTaskInfo, finishTaskInfo, getCurrentTaskId, runningTasks } from '../task.js';
-import Printer from '../printer.js';
-
-const isBun = typeof Bun !== 'undefined';
+// Deprecated: `exec` is now an alias for `shell`.
+// Use `shell` (or `$`) instead. This module is kept for backward compatibility.
+import shell from './shell.js';
 
 export default function exec(strings, ...values) {
-  // Check if called as regular function instead of template literal
-  if (!Array.isArray(strings)) {
-    // If first argument is a string, treat it as the command
-    if (typeof strings === 'string') {
-      strings = [strings];
-      values = [];
-    } else {
-      throw new Error('exec() must be called as a template literal: exec`command` or exec("command")');
-    }
-  }
-
-  const cmd = strings.reduce((accumulator, str, i) => {
-    return accumulator + str + (values[i] || '');
-  }, '');
-
-  let envs = null;
-  let cwd = null;
-
-  const cmdPromise = new Promise(async (resolve, reject) => {
-    // Wait for the next event loop tick to ensure .env() and .cwd() have been called
-    await new Promise(resolve => setTimeout(resolve, 0));
-
-    const currentTaskId = getCurrentTaskId();
-
-    // Check if parent task is silent
-    let isParentSilent = false;
-    if (currentTaskId) {
-      const parentTask = runningTasks.get(currentTaskId);
-      if (parentTask && parentTask.isSilent) {
-        isParentSilent = true;
-      }
-    }
-
-    const extraInfo = {};
-    if (cwd) extraInfo.cwd = cwd;
-    if (envs) extraInfo.env = envs;
-
-    const taskInfo = createTaskInfo(cmd, currentTaskId, isParentSilent);
-    const printer = new Printer('exec', taskInfo.id);
-    printer.start(cmd, extraInfo);
-
-    try {
-      if (global.disableBunForTesting || !isBun) {
-        const result = await nodeExec(cmd, extraInfo, printer, taskInfo);
-        if (result.status === 'success') {
-          finishTaskInfo(taskInfo, true, null, result.output);
-          resolve(result);
-        } else {
-          finishTaskInfo(taskInfo, false, new Error(result.output), result.output);
-          resolve(result);
-        }
-        return;
-      }
-
-      // Bun implementation with real-time streaming
-      const needsShell = cmd.includes('|') || cmd.includes('>') || cmd.includes('<') || cmd.includes('&&') || cmd.includes('||') || cmd.includes("'") || cmd.includes('"') || cmd.includes(';');
-
-      const { spawn } = Bun;
-      const proc = spawn({
-        cmd: needsShell ? ['/bin/sh', '-c', cmd] : cmd.trim().split(/\s+/),
-        cwd: cwd || process.cwd(),
-        env: {
-          ...(envs ? { ...process.env, ...envs } : process.env),
-        },
-        stdout: "pipe",
-        stderr: "pipe",
-        stdin: "ignore"
-      });
-
-      const decoder = new TextDecoder();
-      let output = '';
-      let stdout = '';
-      let stderr = '';
-      let finished = false;
-
-      // Process stdout
-      const readStdout = async () => {
-        const reader = proc.stdout.getReader();
-        let buffer = '';
-
-        try {
-          while (!finished) {
-            const { done, value } = await reader.read();
-            if (done) break;
-
-            const text = decoder.decode(value, { stream: true });
-            buffer += text;
-
-            const lines = buffer.split('\n');
-            buffer = lines.pop();
-
-            for (const line of lines) {
-              if (line.trim()) {
-                printer.output(line);
-                output += line + '\n';
-                stdout += line + '\n';
-              }
-            }
-          }
-
-          if (buffer.trim()) {
-            printer.output(buffer);
-            output += buffer + '\n';
-            stdout += buffer + '\n';
-          }
-        } finally {
-          reader.releaseLock();
-        }
-      };
-
-      // Process stderr
-      const readStderr = async () => {
-        const reader = proc.stderr.getReader();
-        let buffer = '';
-
-        try {
-          while (!finished) {
-            const { done, value } = await reader.read();
-            if (done) break;
-
-            const text = decoder.decode(value, { stream: true });
-            buffer += text;
-
-            const lines = buffer.split('\n');
-            buffer = lines.pop();
-
-            for (const line of lines) {
-              if (line.trim()) {
-                printer.output(line, true);
-                output += line + '\n';
-                stderr += line + '\n';
-              }
-            }
-          }
-
-          if (buffer.trim()) {
-            printer.output(buffer, true);
-            output += buffer + '\n';
-            stderr += buffer + '\n';
-          }
-        } finally {
-          reader.releaseLock();
-        }
-      };
-
-      // Start reading both streams
-      const [, , exitResult] = await Promise.all([
-        readStdout(),
-        readStderr(),
-        proc.exited
-      ]);
-
-      finished = true;
-      const exitCode = parseInt(exitResult, 10);
-
-      const metadata = {
-        taskType: 'exec',
-        exitCode,
-        stdout: stdout.trim(),
-        stderr: stderr.trim()
-      };
-
-      if (exitCode === 0) {
-        printer.finish(cmd);
-        finishTaskInfo(taskInfo, true, null, output.trim());
-        resolve(TaskResult.success(output.trim(), metadata));
-      } else {
-        const error = new Error(`Exit code: ${exitCode}`);
-        printer.error(cmd, null, { exitCode });
-        finishTaskInfo(taskInfo, false, error, output.trim());
-        resolve(TaskResult.fail(output.trim(), metadata));
-      }
-    } catch (error) {
-      printer.error(cmd, error);
-      finishTaskInfo(taskInfo, false, error, error.message);
-      resolve(TaskResult.fail(error.message, { taskType: 'exec' }));
-    }
-  });
-
-  cmdPromise.env = (newEnvs) => {
-    envs = newEnvs;
-    return cmdPromise;
-  };
-
-  cmdPromise.cwd = (newCwd) => {
-    cwd = newCwd;
-    return cmdPromise;
-  };
-
-  return cmdPromise;
-}
-
-async function nodeExec(cmd, extraInfo, printer, taskInfo) {
-  // Node.js fallback - simple execution without real-time output
-  const { spawn } = await import('child_process');
-  
-  return new Promise((resolve) => {
-    const proc = spawn('sh', ['-c', cmd], {
-      cwd: extraInfo.cwd || process.cwd(),
-      env: extraInfo.env ? { ...process.env, ...extraInfo.env } : process.env,
-      stdio: ['ignore', 'pipe', 'pipe']
-    });
-    
-    let output = '';
-    let stdout = '';
-    let stderr = '';
-    
-    proc.stdout.on('data', (data) => {
-      const text = data.toString();
-      printer.output(text.trim());
-      output += text;
-      stdout += text;
-    });
-    
-    proc.stderr.on('data', (data) => {
-      const text = data.toString();
-      printer.output(text.trim(), true);
-      output += text;
-      stderr += text;
-    });
-    
-    proc.on('close', (code) => {
-      const combinedOutput = (output).trim();
-      const metadata = {
-        taskType: 'exec',
-        exitCode: code,
-        stdout: stdout.trim(),
-        stderr: stderr.trim()
-      };
-      
-      if (code === 0) {
-        printer.finish(cmd);
-        resolve(TaskResult.success(combinedOutput, metadata));
-      } else {
-        printer.error(cmd, new Error(`Exit code: ${code}`));
-        resolve(TaskResult.fail(combinedOutput, metadata));
-      }
-    });
-    
-    proc.on('error', (error) => {
-      printer.error(cmd, error);
-      resolve(TaskResult.fail(error.message, { taskType: 'exec' }));
-    });
-  });
+  return shell(strings, ...values);
 }

package/src/tasks/fetch.js

@@ -23,6 +23,7 @@ export default async function httpFetch() {
 
   try {
     const response = await fetch(...arguments);
+    const responseForBody = response.clone(); // Clone before streaming consumes the body
     const textDecoder = new TextDecoder();
     let output = '';
 
@@ -40,7 +41,7 @@ export default async function httpFetch() {
 
     const metadata = {
       taskType: 'fetch',
-      response: response.clone(), // Clone to allow json() to be called later
+      response: responseForBody, // Unconsumed clone so json()/text() work later
       status: response.status,
       statusText: response.statusText,
       headers: Object.fromEntries(response.headers.entries())