@the-open-engine/zeroshot 6.2.0 → 6.4.0

package/src/preflight.js

@@ -21,6 +21,7 @@ const {
 const { loadSettings, getClaudeCommand } = require('../lib/settings.js');
 const { normalizeProviderName } = require('../lib/provider-names');
 const { detectGitContext } = require('../lib/git-remote-utils');
+const { readKeychainCredentials } = require('./claude-credentials');
 
 /**
  * Validation result
@@ -133,17 +134,12 @@ function checkMacOsKeychain() {
     return { authenticated: false, error: 'Not macOS' };
   }
 
-  try {
-    // Check if Claude Code credentials exist in Keychain
-    execSync('security find-generic-password -s "Claude Code-credentials"', {
-      encoding: 'utf8',
-      stdio: 'pipe',
-      timeout: 2000,
-    });
+  // Reuses the same Keychain read that provisions isolated agent configs, so a
+  // green preflight here genuinely predicts runtime auth availability.
+  if (readKeychainCredentials()) {
     return { authenticated: true, error: null };
-  } catch {
-    return { authenticated: false, error: 'No credentials in Keychain' };
   }
+  return { authenticated: false, error: 'No credentials in Keychain' };
 }
 
 /**
@@ -523,7 +519,7 @@ function validateGitRequirement() {
  * @param {string} options.provider - Provider override
  * @returns {ValidationResult}
  */
-function runPreflight(options = {}) {
+async function runPreflight(options = {}) {
   const errors = [];
   const warnings = [];
 
@@ -562,8 +558,8 @@ function runPreflight(options = {}) {
     if (ProviderClass) {
       const tool = ProviderClass.getRequiredTool();
 
-      // Check if tool is installed
-      if (!commandExists(tool.name)) {
+      // Check if tool is installed (providers with no CLI binary set tool.name to null)
+      if (tool.name && !commandExists(tool.name)) {
         errors.push(
           formatError(
             `${ProviderClass.displayName} CLI (${tool.name}) not installed`,
@@ -577,7 +573,7 @@ function runPreflight(options = {}) {
         // This ensures we check auth for the actual target, not the current repo
         const targetHost =
           options.targetHost || detectGitContext(options.cwd || process.cwd())?.host;
-        const authResult = ProviderClass.checkAuth(targetHost);
+        const authResult = await ProviderClass.checkAuth(targetHost);
         if (!authResult.authenticated) {
           errors.push(
             formatError(
@@ -628,7 +624,7 @@ function runPreflight(options = {}) {
       } else if (tool && ProviderClass) {
         // Check provider authentication (abstracted per provider)
         // Pass hostname for multi-instance providers (e.g., GitLab with self-hosted)
-        const authResult = ProviderClass.checkAuth(prGitContext?.host);
+        const authResult = await ProviderClass.checkAuth(prGitContext?.host);
         if (!authResult.authenticated) {
           errors.push(
             formatError(
@@ -673,8 +669,8 @@ function runPreflight(options = {}) {
  * @param {boolean} options.quiet - Suppress success messages
  * @param {string} options.provider - Provider override
  */
-function requirePreflight(options = {}) {
-  const result = runPreflight(options);
+async function requirePreflight(options = {}) {
+  const result = await runPreflight(options);
 
   // Print warnings regardless of success
   if (result.warnings.length > 0) {

package/src/providers/base-provider.js

@@ -248,16 +248,17 @@ class BaseProvider {
       );
     }
 
+    // minLevel/maxLevel are the user's floor/ceiling cost guardrails, not a hard
+    // constraint on template-pinned levels. Clamp an out-of-range level into range
+    // rather than throwing: rejecting made a single-level clamp (min === max)
+    // unusable with any template that pins a different level, and broke read-only
+    // commands like `zeroshot logs` that resolve model specs for display (#162).
     if (maxLevel && rank(level) > rank(maxLevel)) {
-      throw new Error(
-        `Level "${level}" exceeds maxLevel "${maxLevel}" for provider "${this.name}"`
-      );
+      return maxLevel;
     }
 
     if (minLevel && rank(level) < rank(minLevel)) {
-      throw new Error(
-        `Level "${level}" is below minLevel "${minLevel}" for provider "${this.name}"`
-      );
+      return minLevel;
     }
 
     return level;

package/src/status-footer.js

@@ -118,6 +118,7 @@ class StatusFooter {
     this.scrollRegionSet = false;
     this.clusterId = null;
     this.clusterState = 'initializing';
+    this.runMode = null;
     this.startTime = Date.now();
     this.messageBus = null; // MessageBus for token usage tracking
 
@@ -392,6 +393,14 @@ class StatusFooter {
     this.clusterState = state;
   }
 
+  /**
+   * Set the armed run mode (e.g. 'ship', 'pr', 'worktree', 'docker')
+   * @param {string|null} mode
+   */
+  setRunMode(mode) {
+    this.runMode = mode;
+  }
+
   /**
    * Register an agent for monitoring
    * @param {AgentState} agentState
@@ -677,6 +686,10 @@ class StatusFooter {
       content += ` ${COLORS.cyan}${COLORS.bold}${shortId}${COLORS.reset} `;
     }
 
+    if (this.runMode) {
+      content += `${COLORS.dim}[${this.runMode}]${COLORS.reset} `;
+    }
+
     // Fill with border
     const contentLen = this.stripAnsi(content).length;
     const padding = Math.max(0, width - contentLen - 1);
@@ -879,7 +892,6 @@ class StatusFooter {
    * @returns {string}
    */
   stripAnsi(str) {
-    // eslint-disable-next-line no-control-regex
     return str.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
   }
 

package/src/template-validation/index.js

@@ -332,7 +332,10 @@ function ensureCompletionHandler(config, options = {}) {
   };
 }
 
+const { formatValidationReport } = require('./report-formatter');
+
 module.exports = {
   validateTemplates,
   validateTemplateConfig,
+  formatValidationReport,
 };

package/src/template-validation/report-formatter.js

@@ -0,0 +1,55 @@
+const path = require('node:path');
+
+function formatEntry({ relativePath, result, changedFiles, lines, suppressed }) {
+  if (!result.valid) {
+    lines.push(`\n❌ ${relativePath}`);
+    for (const error of result.errors) {
+      lines.push(`   ERROR: ${error}`);
+    }
+    return true;
+  }
+
+  if (result.warnings.length > 0) {
+    if (changedFiles === null || changedFiles.has(relativePath)) {
+      lines.push(`\n⚠️  ${relativePath}`);
+      for (const warning of result.warnings) {
+        lines.push(`   WARN: ${warning}`);
+      }
+    } else {
+      suppressed.count += result.warnings.length;
+      suppressed.fileCount += 1;
+    }
+    return false;
+  }
+
+  lines.push(`✓ ${relativePath}`);
+  return false;
+}
+
+function formatValidationReport(report, { changedFiles = null, cwd = process.cwd() } = {}) {
+  const lines = [];
+  const suppressed = { count: 0, fileCount: 0 };
+  let hasErrors = false;
+
+  for (const { filePath, result } of report.results) {
+    const relativePath = path.relative(cwd, filePath);
+    if (formatEntry({ relativePath, result, changedFiles, lines, suppressed })) {
+      hasErrors = true;
+    }
+  }
+
+  if (suppressed.count > 0) {
+    lines.push(
+      `\n${suppressed.count} pre-existing warning(s) across ${suppressed.fileCount} unrelated template(s) — run \`npm run validate:templates\` for detail`
+    );
+  }
+
+  lines.push(`\n${'='.repeat(60)}`);
+  lines.push(`Validated: ${report.validated} templates, Skipped: ${report.skipped} files`);
+
+  return { lines, hasErrors };
+}
+
+module.exports = {
+  formatValidationReport,
+};

package/src/worktree-claude-config.js

@@ -3,6 +3,7 @@ const os = require('os');
 const path = require('path');
 
 const { resolveWorktreeRoot } = require('./worktree-tooling-env');
+const { provisionClaudeCredentials } = require('./claude-credentials');
 
 const CLAUDE_DIRNAME = '.claude';
 const SETTINGS_BASENAME = 'settings.json';
@@ -60,15 +61,6 @@ function ensureDir(dirPath) {
   fs.mkdirSync(dirPath, { recursive: true });
 }
 
-function copyIfExists(sourcePath, destPath) {
-  if (!fs.existsSync(sourcePath)) {
-    return;
-  }
-
-  ensureDir(path.dirname(destPath));
-  fs.copyFileSync(sourcePath, destPath);
-}
-
 function resolveRepoClaudeConfig(worktreeRoot) {
   const configDir = path.join(worktreeRoot, CLAUDE_DIRNAME);
   const settingsPath = path.join(configDir, SETTINGS_BASENAME);
@@ -105,10 +97,7 @@ function prepareClaudeConfigDir(options = {}) {
   ensureDir(path.join(overlayDir, 'hooks'));
   ensureDir(path.join(overlayDir, 'projects'));
 
-  copyIfExists(
-    path.join(sourceDir, '.credentials.json'),
-    path.join(overlayDir, '.credentials.json')
-  );
+  provisionClaudeCredentials({ sourceDir, destDir: overlayDir });
 
   const sourceSettings = readJsonIfExists(path.join(sourceDir, SETTINGS_BASENAME)) || {};
   const repoSettings = readJsonIfExists(repoConfig.settingsPath) || {};

package/task-lib/runner.js

@@ -162,6 +162,7 @@ function spawnWatcher({ watcherScript, id, cwd, logFile, finalArgs, watcherConfi
     {
       detached: true,
       stdio: 'ignore',
+      windowsHide: true,
     }
   );
 

package/task-lib/watcher.js

@@ -45,6 +45,7 @@ const child = spawn(command, finalArgs, {
   cwd: commandSpec.cwd || cwd,
   env,
   stdio: ['ignore', 'pipe', 'pipe'],
+  windowsHide: true,
 });
 
 updateTask(taskId, { pid: child.pid });