@covibes/zeroshot 5.0.0 → 5.2.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [5.2.0](https://github.com/covibes/zeroshot/compare/v5.1.0...v5.2.0) (2026-01-07)
+
+
+### Bug Fixes
+
+* **test:** add retry logic to e2e-claude-command tests ([ed52c86](https://github.com/covibes/zeroshot/commit/ed52c86f86180da02a37616018797acaa58aa764))
+
+
+### Features
+
+* add claudeCommand setting for custom Claude CLI ([#38](https://github.com/covibes/zeroshot/issues/38)) ([6e1a140](https://github.com/covibes/zeroshot/commit/6e1a140e75b2c37d2a071b8afd853656ba5e12f7)), closes [#37](https://github.com/covibes/zeroshot/issues/37)
+
+# [5.1.0](https://github.com/covibes/zeroshot/compare/v5.0.0...v5.1.0) (2026-01-07)
+
+
+### Features
+
+* add preflight check for root user ([802f0f4](https://github.com/covibes/zeroshot/commit/802f0f41e27c1aa585dec31217fa2aeb3c9ba3db))
+
 # [5.0.0](https://github.com/covibes/zeroshot/compare/v4.2.0...v5.0.0) (2026-01-07)
 
 

package/lib/settings.js

@@ -66,6 +66,9 @@ const DEFAULT_SETTINGS = {
   autoCheckUpdates: true, // Check npm registry for newer versions
   lastUpdateCheckAt: null, // Unix timestamp of last check (null = never checked)
   lastSeenVersion: null, // Don't re-prompt for same version
+  // Claude command - customize how to invoke Claude CLI (default: 'claude')
+  // Example: 'ccr code' for claude-code-router integration
+  claudeCommand: 'claude',
   // Docker isolation mounts - preset names or {host, container, readonly?} objects
   // Valid presets: gh, git, ssh, aws, azure, kube, terraform, gcloud
   dockerMounts: ['gh', 'git', 'ssh'],
@@ -123,6 +126,15 @@ function validateSetting(key, value) {
     return `Invalid log level: ${value}. Valid levels: quiet, normal, verbose`;
   }
 
+  if (key === 'claudeCommand') {
+    if (typeof value !== 'string') {
+      return 'claudeCommand must be a string';
+    }
+    if (value.trim().length === 0) {
+      return 'claudeCommand cannot be empty';
+    }
+  }
+
   if (key === 'dockerMounts') {
     return validateMountConfig(value);
   }
@@ -174,6 +186,21 @@ function coerceValue(key, value) {
   return value;
 }
 
+/**
+ * Get parsed Claude command from settings/env
+ * Supports space-separated commands like 'ccr code'
+ * @returns {{ command: string, args: string[] }}
+ */
+function getClaudeCommand() {
+  const settings = loadSettings();
+  const raw = process.env.ZEROSHOT_CLAUDE_COMMAND || settings.claudeCommand || 'claude';
+  const parts = raw.trim().split(/\s+/);
+  return {
+    command: parts[0],
+    args: parts.slice(1),
+  };
+}
+
 module.exports = {
   loadSettings,
   saveSettings,
@@ -181,6 +208,7 @@ module.exports = {
   coerceValue,
   DEFAULT_SETTINGS,
   getSettingsFile,
+  getClaudeCommand,
   // Model validation exports
   MODEL_HIERARCHY,
   VALID_MODELS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@covibes/zeroshot",
-  "version": "5.0.0",
+  "version": "5.2.0",
   "description": "Multi-agent orchestration engine for Claude - cluster coordinator and CLI",
   "main": "src/orchestrator.js",
   "bin": {

package/src/claude-task-runner.js

@@ -8,6 +8,7 @@
 const { spawn, exec, execSync } = require('child_process');
 const fs = require('fs');
 const TaskRunner = require('./task-runner');
+const { getClaudeCommand } = require('../lib/settings');
 
 class ClaudeTaskRunner extends TaskRunner {
   /**
@@ -383,8 +384,12 @@ class ClaudeTaskRunner extends TaskRunner {
         ? 'stream-json'
         : desiredOutputFormat;
 
+    // Get configured Claude command (supports custom commands like 'ccr code')
+    const { command: claudeCmd, args: claudeExtraArgs } = getClaudeCommand();
+
     const command = [
-      'claude',
+      claudeCmd,
+      ...claudeExtraArgs,
       '--print',
       '--dangerously-skip-permissions',
       '--output-format',

package/src/preflight.js

@@ -57,11 +57,19 @@ function commandExists(cmd) {
 
 /**
  * Get Claude CLI version
+ * @param {string} claudeCommand - Optional custom Claude command (e.g., 'ccr code')
  * @returns {{ installed: boolean, version: string | null, error: string | null }}
  */
-function getClaudeVersion() {
+function getClaudeVersion(claudeCommand = 'claude') {
+  // Parse command parts
+  const parts = claudeCommand.trim().split(/\s+/);
+  const command = parts[0];
+  const extraArgs = parts.slice(1);
+
   try {
-    const output = execSync('claude --version', { encoding: 'utf8', stdio: 'pipe' });
+    const versionArgs = [...extraArgs, '--version'];
+    const versionCmd = [command, ...versionArgs].join(' ');
+    const output = execSync(versionCmd, { encoding: 'utf8', stdio: 'pipe' });
     const match = output.match(/(\d+\.\d+\.\d+)/);
     return {
       installed: true,
@@ -73,7 +81,7 @@ function getClaudeVersion() {
       return {
         installed: false,
         version: null,
-        error: 'Claude CLI not installed',
+        error: `Command '${command}' not installed`,
       };
     }
     return {
@@ -271,24 +279,37 @@ function checkDocker() {
  * @param {boolean} options.requireDocker - Whether Docker is required (true if using --docker)
  * @param {boolean} options.requireGit - Whether git repo is required (true if using --worktree)
  * @param {boolean} options.quiet - Suppress success messages
+ * @param {string} options.claudeCommand - Custom Claude command (from settings)
  * @returns {ValidationResult}
  */
 function runPreflight(options = {}) {
   const errors = [];
   const warnings = [];
 
+  // Get configured Claude command (supports custom commands like 'ccr code')
+  const { getClaudeCommand } = require('../lib/settings.js');
+  const { command, args } = getClaudeCommand();
+  const claudeCommand = options.claudeCommand || [command, ...args].join(' ');
+
   // 1. Check Claude CLI installation
-  const claude = getClaudeVersion();
+  const claude = getClaudeVersion(claudeCommand);
   if (!claude.installed) {
     errors.push(
       formatError(
-        'Claude CLI not installed',
+        'Claude command not available',
         claude.error,
-        [
-          'Install Claude CLI: npm install -g @anthropic-ai/claude-code',
-          'Or: brew install claude (macOS)',
-          'Then run: claude --version',
-        ]
+        claudeCommand === 'claude'
+          ? [
+              'Install Claude CLI: npm install -g @anthropic-ai/claude-code',
+              'Or: brew install claude (macOS)',
+              'Then run: claude --version',
+            ]
+          : [
+              `Command '${claudeCommand}' not found`,
+              'Check settings: zeroshot settings',
+              'Update claudeCommand: zeroshot settings set claudeCommand "your-command"',
+              'Or install the missing command',
+            ]
       )
     );
   } else {
@@ -319,7 +340,23 @@ function runPreflight(options = {}) {
     }
   }
 
-  // 3. Check gh CLI (if required)
+  // 3. Check if running as root (blocks --dangerously-skip-permissions)
+  if (process.getuid && process.getuid() === 0) {
+    errors.push(
+      formatError(
+        'Running as root',
+        'Claude CLI refuses --dangerously-skip-permissions flag when running as root (UID 0)',
+        [
+          'Run as non-root user in Docker: docker run --user 1000:1000 ...',
+          'Or create non-root user: adduser testuser && su - testuser',
+          'Or use existing node user: docker run --user node ...',
+          'Security: Claude CLI blocks this flag as root to prevent privilege escalation',
+        ]
+      )
+    );
+  }
+
+  // 4. Check gh CLI (if required)
   if (options.requireGh) {
     const gh = checkGhAuth();
     if (!gh.installed) {
@@ -348,7 +385,7 @@ function runPreflight(options = {}) {
     }
   }
 
-  // 4. Check Docker (if required)
+  // 5. Check Docker (if required)
   if (options.requireDocker) {
     const docker = checkDocker();
     if (!docker.available) {
@@ -367,7 +404,7 @@ function runPreflight(options = {}) {
     }
   }
 
-  // 5. Check git repo (if required for worktree isolation)
+  // 6. Check git repo (if required for worktree isolation)
   if (options.requireGit) {
     let isGitRepo = false;
     try {

package/task-lib/attachable-watcher.js

@@ -84,6 +84,7 @@ process.on('unhandledRejection', (reason) => {
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 const { AttachServer } = require('../src/attach');
+const { getClaudeCommand } = require('../lib/settings.js');
 
 // Use the args parsed earlier (during error handler setup)
 const taskId = taskIdArg;
@@ -115,6 +116,10 @@ if (model && !claudeArgs.includes('--model')) {
   claudeArgs.unshift('--model', model);
 }
 
+// Get configured Claude command (supports custom commands like 'ccr code')
+const { command: claudeCommand, args: claudeExtraArgs } = getClaudeCommand();
+const finalArgs = [...claudeExtraArgs, ...claudeArgs];
+
 // For JSON schema output with silent mode, track final result
 const silentJsonMode =
   config.outputFormat === 'json' && config.jsonSchema && config.silentJsonOutput;
@@ -127,8 +132,8 @@ let outputBuffer = '';
 const server = new AttachServer({
   id: taskId,
   socketPath,
-  command: 'claude',
-  args: claudeArgs,
+  command: claudeCommand,
+  args: finalArgs,
   cwd,
   env,
   cols: 120,

package/task-lib/watcher.js

@@ -13,6 +13,10 @@ import { appendFileSync } from 'fs';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { updateTask } from './store.js';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const { getClaudeCommand } = require('../lib/settings.js');
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -34,9 +38,13 @@ if (model && !claudeArgs.includes('--model')) {
   claudeArgs.unshift('--model', model);
 }
 
+// Get configured Claude command (supports custom commands like 'ccr code')
+const { command: claudeCommand, args: claudeExtraArgs } = getClaudeCommand();
+const finalArgs = [...claudeExtraArgs, ...claudeArgs];
+
 // Spawn claude using regular child_process (not PTY)
 // --print mode is non-interactive, PTY adds overhead and causes EIO on OOM
-const child = spawn('claude', claudeArgs, {
+const child = spawn(claudeCommand, finalArgs, {
   cwd,
   env,
   stdio: ['ignore', 'pipe', 'pipe'],