@the-open-engine/zeroshot 6.31.2 → 6.32.0

package/cli/message-formatters-normal.js

@@ -53,9 +53,9 @@ function formatAgentLifecycle(msg, prefix, print = console.log) {
  * @returns {boolean} True if message was handled
  */
 function formatAgentError(msg, prefix, timestamp, print = console.log) {
-  print(''); // Blank line before error
+  print('');
   print(chalk.bold.red(`${'─'.repeat(60)}`));
-  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.red('🔴 AGENT ERROR')}`);
+  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.red('Error: agent failed')}`);
 
   if (msg.content?.text) {
     print(`${prefix} ${chalk.red(msg.content.text)}`);
@@ -64,12 +64,11 @@ function formatAgentError(msg, prefix, timestamp, print = console.log) {
   if (msg.content?.data?.stack) {
     const stackLines = msg.content.data.stack.split('\n').slice(0, 5);
     for (const line of stackLines) {
-      if (line.trim()) {
-        print(`${prefix} ${chalk.dim(line)}`);
-      }
+      if (line.trim()) print(`${prefix} ${chalk.dim(line)}`);
     }
   }
 
+  print(`${prefix} Next: inspect the agent logs and retry after fixing the cause.`);
   print(chalk.bold.red(`${'─'.repeat(60)}`));
   return true;
 }
@@ -90,9 +89,9 @@ function formatIssueOpened(msg, prefix, timestamp, shownNewTaskForCluster, print
   }
   shownNewTaskForCluster.add(msg.cluster_id);
 
-  print(''); // Blank line before new task
+  print('');
   print(chalk.bold.blue(`${'─'.repeat(60)}`));
-  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.blue('📋 NEW TASK')}`);
+  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.blue('📋 New task')}`);
 
   if (msg.content?.text) {
     const lines = msg.content.text.split('\n').slice(0, 3);
@@ -140,7 +139,7 @@ function formatImplementationReady(msg, prefix, timestamp, print = console.log)
 function formatValidationResult(msg, prefix, timestamp, print = console.log) {
   const data = msg.content?.data || {};
   const approved = data.approved === true || data.approved === 'true';
-  const status = approved ? chalk.bold.green('✓ APPROVED') : chalk.bold.red('✗ REJECTED');
+  const status = approved ? chalk.bold.green('✓ Approved') : chalk.bold.red('✗ Rejected');
 
   print(`${prefix} ${chalk.gray(timestamp)} ${status}`);
 
@@ -190,9 +189,9 @@ function formatValidationResult(msg, prefix, timestamp, print = console.log) {
  * @returns {boolean} True if message was handled
  */
 function formatClusterComplete(msg, prefix, timestamp, print = console.log) {
-  print(''); // Blank line
+  print('');
   print(chalk.bold.green(`${'═'.repeat(60)}`));
-  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.green('🎉 CLUSTER COMPLETE')}`);
+  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.green('🎉 Cluster complete')}`);
   if (msg.content?.data?.reason) {
     print(`${prefix} ${chalk.green(msg.content.data.reason)}`);
   }
@@ -209,15 +208,12 @@ function formatClusterComplete(msg, prefix, timestamp, print = console.log) {
  * @returns {boolean} True if message was handled
  */
 function formatClusterFailed(msg, prefix, timestamp, print = console.log) {
-  print(''); // Blank line
+  print('');
   print(chalk.bold.red(`${'═'.repeat(60)}`));
-  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.red('❌ CLUSTER FAILED')}`);
-  if (msg.content?.text) {
-    print(`${prefix} ${chalk.red(msg.content.text)}`);
-  }
-  if (msg.content?.data?.reason) {
-    print(`${prefix} ${chalk.red(msg.content.data.reason)}`);
-  }
+  print(`${prefix} ${chalk.gray(timestamp)} ${chalk.bold.red('Error: cluster failed')}`);
+  if (msg.content?.text) print(`${prefix} ${chalk.red(msg.content.text)}`);
+  if (msg.content?.data?.reason) print(`${prefix} ${chalk.red(msg.content.data.reason)}`);
+  print(`${prefix} Next: inspect the cluster logs, then resume after fixing the cause.`);
   print(chalk.bold.red(`${'═'.repeat(60)}`));
   return true;
 }

package/cli/message-formatters-watch.js

@@ -1,8 +1,3 @@
-/**
- * Watch mode message formatters
- * Simplified, high-level event display for zeroshot watch command
- */
-
 const chalk = require('chalk');
 const {
   buildClusterPrefix,
@@ -11,177 +6,94 @@ const {
 } = require('./message-formatter-utils');
 const { EVENT_COPY, formatMergeStatus } = require('./event-copy');
 
-/**
- * Format AGENT_ERROR for watch mode
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatAgentError(msg, clusterPrefix) {
-  const errorMsg = `${msg.sender} ${chalk.bold.red('ERROR')}`;
-  console.log(`${clusterPrefix} ${errorMsg}`);
+const DEFAULT_WRITER = Object.freeze({ printLine: (text) => console.log(text) });
+
+function formatAgentError(msg, clusterPrefix, writer) {
+  writer.printLine(`${clusterPrefix} ${chalk.bold.red(`Error: ${msg.sender}`)}`);
   if (msg.content?.text) {
-    console.log(`${clusterPrefix}   ${chalk.red(msg.content.text)}`);
+    writer.printLine(`${clusterPrefix}   ${chalk.red(msg.content.text)}`);
   }
+  writer.printLine(`${clusterPrefix}   Next: zeroshot logs ${msg.cluster_id} -f`);
 }
 
-/**
- * Format ISSUE_OPENED for watch mode
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatIssueOpened(msg, clusterPrefix) {
+function formatIssueOpened(msg, clusterPrefix, writer) {
   const issueNum = msg.content?.data?.issue_number || '';
   const title = msg.content?.data?.title || '';
   const prompt = msg.content?.data?.prompt || msg.content?.text || '';
-
   const taskDesc = title === 'Manual Input' && prompt ? prompt : title;
   const truncatedDesc =
-    taskDesc && taskDesc.length > 60 ? taskDesc.substring(0, 60) + '...' : taskDesc;
-
+    taskDesc && taskDesc.length > 60 ? `${taskDesc.substring(0, 60)}...` : taskDesc;
   const eventText = `Started ${issueNum ? `#${issueNum}` : 'task'}${truncatedDesc ? chalk.dim(` - ${truncatedDesc}`) : ''}`;
-  console.log(`${clusterPrefix} ${eventText}`);
+  writer.printLine(`${clusterPrefix} ${eventText}`);
 }
 
-/**
- * Format IMPLEMENTATION_READY for watch mode
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatImplementationReady(msg, clusterPrefix) {
-  const agentColor = getColorForSender(msg.sender);
-  const agentName = agentColor(msg.sender);
-  const eventText = `${agentName} ${EVENT_COPY.IMPLEMENTATION_READY.toLowerCase()}`;
-  console.log(`${clusterPrefix} ${eventText}`);
-}
-
-/**
- * Format VALIDATION_RESULT for watch mode
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatValidationResult(msg, clusterPrefix) {
-  const agentColor = getColorForSender(msg.sender);
-  const agentName = agentColor(msg.sender);
-  const data = msg.content?.data;
-  const approved = data?.approved === 'true' || data?.approved === true;
-  const status = approved ? chalk.green('APPROVED') : chalk.red('REJECTED');
-
-  let eventText = `${agentName} ${status}`;
-  if (data?.summary && !approved) {
-    eventText += chalk.dim(` - ${data.summary}`);
-  }
-  console.log(`${clusterPrefix} ${eventText}`);
-
-  if (!approved) {
-    printRejectionDetails(data, clusterPrefix);
-  }
+function formatImplementationReady(msg, clusterPrefix, writer = DEFAULT_WRITER) {
+  const agentName = getColorForSender(msg.sender)(msg.sender);
+  writer.printLine(
+    `${clusterPrefix} ${agentName} ${EVENT_COPY.IMPLEMENTATION_READY.toLowerCase()}`
+  );
 }
 
-/**
- * Print rejection details (errors/issues)
- * @param {Object} data - Validation data
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function printRejectionDetails(data, clusterPrefix) {
+function printRejectionDetails(data, clusterPrefix, writer) {
   const errors = parseDataField(data.errors);
   const issues = parseDataField(data.issues);
-
   if (errors.length > 0) {
-    const errorsCharCount = JSON.stringify(errors).length;
-    console.log(
-      `${clusterPrefix}   ${chalk.red('•')} ${errors.length} error${errors.length > 1 ? 's' : ''} (${errorsCharCount} chars)`
+    const count = JSON.stringify(errors).length;
+    writer.printLine(
+      `${clusterPrefix}   ${chalk.red('•')} ${errors.length} error${errors.length > 1 ? 's' : ''} (${count} chars)`
     );
   }
-
   if (issues.length > 0) {
-    const issuesCharCount = JSON.stringify(issues).length;
-    console.log(
-      `${clusterPrefix}   ${chalk.yellow('•')} ${issues.length} issue${issues.length > 1 ? 's' : ''} (${issuesCharCount} chars)`
+    const count = JSON.stringify(issues).length;
+    writer.printLine(
+      `${clusterPrefix}   ${chalk.yellow('•')} ${issues.length} issue${issues.length > 1 ? 's' : ''} (${count} chars)`
     );
   }
 }
 
-/**
- * Format PR_CREATED for watch mode
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatPrCreated(msg, clusterPrefix) {
-  const agentColor = getColorForSender(msg.sender);
-  const agentName = agentColor(msg.sender);
+function formatValidationResult(msg, clusterPrefix, writer) {
+  const agentName = getColorForSender(msg.sender)(msg.sender);
+  const data = msg.content?.data;
+  const approved = data?.approved === 'true' || data?.approved === true;
+  const status = approved ? chalk.green('Approved') : chalk.red('Rejected');
+  let eventText = `${agentName} ${status}`;
+  if (data?.summary && !approved) eventText += chalk.dim(` - ${data.summary}`);
+  writer.printLine(`${clusterPrefix} ${eventText}`);
+  if (!approved) printRejectionDetails(data, clusterPrefix, writer);
+}
+
+function formatPrCreated(msg, clusterPrefix, writer = DEFAULT_WRITER) {
+  const agentName = getColorForSender(msg.sender)(msg.sender);
   const prNum = msg.content?.data?.pr_number || '';
   let eventText = `${agentName} ${EVENT_COPY.PR_CREATED.toLowerCase()}${prNum ? ` #${prNum}` : ''}`;
   const mergeStatus = formatMergeStatus(msg.content?.data?.merged);
-  if (mergeStatus) {
-    eventText += chalk.dim(` — ${mergeStatus}`);
-  }
-  console.log(`${clusterPrefix} ${eventText}`);
+  if (mergeStatus) eventText += chalk.dim(` — ${mergeStatus}`);
+  writer.printLine(`${clusterPrefix} ${eventText}`);
 }
 
-/**
- * Format PR_MERGED for watch mode
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatPrMerged(msg, clusterPrefix) {
-  const agentColor = getColorForSender(msg.sender);
-  const agentName = agentColor(msg.sender);
-  const eventText = `${agentName} merged PR`;
-  console.log(`${clusterPrefix} ${eventText}`);
+function formatPrMerged(msg, clusterPrefix, writer) {
+  const agentName = getColorForSender(msg.sender)(msg.sender);
+  writer.printLine(`${clusterPrefix} ${agentName} merged PR`);
 }
 
-/**
- * Format unknown topic for watch mode (fallback)
- * @param {Object} msg - Message object
- * @param {string} clusterPrefix - Formatted cluster prefix
- */
-function formatUnknownTopic(msg, clusterPrefix) {
-  const agentColor = getColorForSender(msg.sender);
-  const agentName = agentColor(msg.sender);
+function formatUnknownTopic(msg, clusterPrefix, writer) {
+  const agentName = getColorForSender(msg.sender)(msg.sender);
   const eventText = `${agentName} ${msg.topic.toLowerCase().replace(/_/g, ' ')}`;
-  console.log(`${clusterPrefix} ${eventText}`);
+  writer.printLine(`${clusterPrefix} ${eventText}`);
 }
 
-/**
- * Main watch mode formatter
- * @param {Object} msg - Message object
- * @param {boolean} isActive - Whether cluster is active
- * @returns {boolean} True if message was handled
- */
-function formatWatchMode(msg, isActive) {
-  // Skip low-level topics (too noisy for watch mode)
-  if (msg.topic === 'AGENT_OUTPUT' || msg.topic === 'AGENT_LIFECYCLE') {
-    return true;
-  }
-
-  // Clear status line, print message, will be redrawn by status interval
-  process.stdout.write('\r' + ' '.repeat(120) + '\r');
-
+function formatWatchMode(msg, isActive, writer = DEFAULT_WRITER) {
+  if (msg.topic === 'AGENT_OUTPUT' || msg.topic === 'AGENT_LIFECYCLE') return true;
   const clusterPrefix = buildClusterPrefix(msg.cluster_id, isActive);
-
-  switch (msg.topic) {
-    case 'AGENT_ERROR':
-      formatAgentError(msg, clusterPrefix);
-      break;
-    case 'ISSUE_OPENED':
-      formatIssueOpened(msg, clusterPrefix);
-      break;
-    case 'IMPLEMENTATION_READY':
-      formatImplementationReady(msg, clusterPrefix);
-      break;
-    case 'VALIDATION_RESULT':
-      formatValidationResult(msg, clusterPrefix);
-      break;
-    case 'PR_CREATED':
-      formatPrCreated(msg, clusterPrefix);
-      break;
-    case 'PR_MERGED':
-      formatPrMerged(msg, clusterPrefix);
-      break;
-    default:
-      formatUnknownTopic(msg, clusterPrefix);
-  }
-
+  const handlers = {
+    AGENT_ERROR: formatAgentError,
+    ISSUE_OPENED: formatIssueOpened,
+    IMPLEMENTATION_READY: formatImplementationReady,
+    VALIDATION_RESULT: formatValidationResult,
+    PR_CREATED: formatPrCreated,
+    PR_MERGED: formatPrMerged,
+  };
+  (handlers[msg.topic] || formatUnknownTopic)(msg, clusterPrefix, writer);
   return true;
 }
 

package/lib/completion.js

@@ -1,174 +1,123 @@
-const omelette = require('omelette');
-const fs = require('fs');
+const os = require('os');
 const path = require('path');
+const omelette = require('omelette');
+const { readClustersFileSync } = require('./clusters-registry');
+
+const CLUSTER_ID_COMMANDS = new Set([
+  'attach',
+  'export',
+  'finish',
+  'kill',
+  'logs',
+  'resume',
+  'status',
+  'stop',
+]);
+
+function commandNames(command) {
+  return [command.name(), ...command.aliases()];
+}
 
-function setupCompletion() {
-  const complete = omelette('zeroshot');
+function visibleCommands(command) {
+  return command.createHelp().visibleCommands(command);
+}
 
-  complete.on('start', ({ reply }) => {
-    reply(['--issue', '--text', '--config']);
-  });
+function visibleOptions(command) {
+  return command.createHelp().visibleOptions(command);
+}
 
-  complete.on('list', ({ reply }) => {
-    reply([]);
-  });
+function optionNames(option) {
+  return [option.short, option.long].filter(Boolean);
+}
 
-  complete.on('status', ({ reply }) => {
-    // Complete with cluster IDs
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply(clusterIds);
-      } else {
-        reply([]);
-      }
-    } catch {
-      reply([]);
-    }
-  });
+function findSubcommand(command, token) {
+  return visibleCommands(command).find((candidate) => commandNames(candidate).includes(token));
+}
 
-  complete.on('logs', ({ reply }) => {
-    // Complete with cluster IDs or flags
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      const completions = ['--follow', '-f', '--limit', '-n'];
-
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply([...clusterIds, ...completions]);
-      } else {
-        reply(completions);
-      }
-    } catch {
-      reply(['--follow', '-f', '--limit', '-n']);
-    }
-  });
+function findOption(command, token) {
+  const optionToken = token.split('=', 1)[0];
+  return visibleOptions(command).find((option) => optionNames(option).includes(optionToken));
+}
 
-  complete.on('stop', ({ reply }) => {
-    // Complete with active cluster IDs
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply(clusterIds);
-      } else {
-        reply([]);
-      }
-    } catch {
-      reply([]);
-    }
-  });
+function parseCompletionLine(line) {
+  const trailingSpace = /\s$/.test(line);
+  const tokens = line.trim().split(/\s+/).filter(Boolean);
+  tokens.shift();
+  const current = trailingSpace ? '' : (tokens.pop() ?? '');
+  return { completed: tokens, current };
+}
 
-  complete.on('kill', ({ reply }) => {
-    // Complete with active cluster IDs
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply(clusterIds);
-      } else {
-        reply([]);
-      }
-    } catch {
-      reply([]);
-    }
-  });
+function resolveCommandContext(program, tokens) {
+  let command = program;
+  const pathParts = [];
+  let expectsOptionValue = false;
+  let sawPositional = false;
 
-  complete.on('export', ({ reply }) => {
-    // Complete with cluster IDs
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply(clusterIds);
-      } else {
-        reply([]);
-      }
-    } catch {
-      reply([]);
+  for (const token of tokens) {
+    if (expectsOptionValue) {
+      expectsOptionValue = false;
+      continue;
     }
-  });
 
-  complete.on('finish', ({ reply }) => {
-    // Complete with cluster IDs and flags
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      const completions = ['--merge', '--pr', '--push'];
-
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply([...clusterIds, ...completions]);
-      } else {
-        reply(completions);
-      }
-    } catch {
-      reply(['--merge', '--pr', '--push']);
+    const option = findOption(command, token);
+    if (option) {
+      expectsOptionValue = !token.includes('=') && (option.required || option.optional);
+      continue;
     }
-  });
+    if (token.startsWith('-')) continue;
 
-  complete.on('resume', ({ reply }) => {
-    // Complete with cluster IDs
-    try {
-      const clustersDir = path.join(process.env.HOME, '.zeroshot', 'clusters');
-      if (fs.existsSync(clustersDir)) {
-        const clusterIds = fs
-          .readdirSync(clustersDir)
-          .filter((f) => f.endsWith('.json'))
-          .map((f) => f.replace('.json', ''));
-        reply(clusterIds);
-      } else {
-        reply([]);
-      }
-    } catch {
-      reply([]);
+    const subcommand = sawPositional ? null : findSubcommand(command, token);
+    if (subcommand) {
+      command = subcommand;
+      pathParts.push(subcommand.name());
+      continue;
     }
-  });
+    sawPositional = true;
+  }
 
-  complete.on('ui', ({ reply }) => {
-    reply(['--port']);
-  });
+  return { command, commandPath: pathParts.join(' ') };
+}
 
-  complete.on('watch', ({ reply }) => {
-    reply(['--filter', '--refresh-rate', 'running', 'stopped', 'all']);
-  });
+function defaultListClusterIds() {
+  const homeDir =
+    process.env.ZEROSHOT_HOME || process.env.HOME || process.env.USERPROFILE || os.homedir();
+  const registry = readClustersFileSync(path.join(homeDir, '.zeroshot'));
+  return Object.keys(registry);
+}
 
-  // Default completion - show commands
-  complete.on('', ({ reply }) => {
-    reply([
-      'start',
-      'list',
-      'status',
-      'logs',
-      'stop',
-      'kill',
-      'finish',
-      'resume',
-      'export',
-      'ui',
-      'watch',
-    ]);
-  });
+function safeDynamicIds(commandPath, listClusterIds) {
+  if (!CLUSTER_ID_COMMANDS.has(commandPath)) return [];
+  try {
+    const ids = listClusterIds();
+    return Array.isArray(ids) ? ids.filter((id) => typeof id === 'string' && id.length > 0) : [];
+  } catch {
+    return [];
+  }
+}
 
+function getCompletionCandidates(program, line, deps = {}) {
+  const { completed, current } = parseCompletionLine(line);
+  const { command, commandPath } = resolveCommandContext(program, completed);
+  const listClusterIds = deps.listClusterIds || defaultListClusterIds;
+  const candidates = [
+    ...visibleCommands(command).flatMap(commandNames),
+    ...visibleOptions(command).flatMap(optionNames),
+    ...safeDynamicIds(commandPath, listClusterIds),
+  ];
+
+  return [...new Set(candidates)].filter((candidate) => candidate.startsWith(current));
+}
+
+function setupCompletion(program, deps = {}) {
+  const complete = omelette('zeroshot');
+  complete.on('complete', (_fragment, data) => {
+    data.reply(getCompletionCandidates(program, data.line, deps));
+  });
   complete.init();
+  return complete;
 }
 
-module.exports = { setupCompletion };
+module.exports = {
+  getCompletionCandidates,
+  setupCompletion,
+};

package/lib/settings.js

@@ -126,8 +126,9 @@ const DEFAULT_SETTINGS_BASE = {
     return getProviderDefaults();
   },
   defaultConfig: 'conductor-bootstrap',
-  defaultDocker: false,
-  defaultDelivery: 'none', // 'none' | 'pr' | 'ship' - folded into resolveEffectiveRunPlan same as defaultDocker
+  defaultIsolation: 'none', // 'none' | 'worktree' | 'docker'
+  defaultDelivery: 'none', // 'none' | 'pr' | 'ship'
+  setupVersion: null, // Internal marker written only after guided setup succeeds.
   strictSchema: true, // true = reliable json output (default), false = live streaming (may crash - see bold-meadow-11)
   logLevel: 'normal',
   // Automatic update notification cache
@@ -270,6 +271,10 @@ function applyLegacyModelBounds(settings) {
 
 function normalizeLoadedSettings(parsed) {
   const normalized = { ...parsed };
+  if (!Object.hasOwn(parsed, 'defaultIsolation') && typeof parsed.defaultDocker === 'boolean') {
+    normalized.defaultIsolation = parsed.defaultDocker ? 'docker' : 'none';
+  }
+  delete normalized.defaultDocker;
   if (parsed.defaultProvider) {
     normalized.defaultProvider = normalizeProviderName(parsed.defaultProvider);
   }
@@ -578,6 +583,9 @@ function validateSetting(key, value) {
   if (key === 'defaultDelivery' && !['none', 'pr', 'ship'].includes(value)) {
     return `Invalid defaultDelivery: ${value}. Valid: none, pr, ship`;
   }
+  if (key === 'defaultIsolation' && !['none', 'worktree', 'docker'].includes(value)) {
+    return `Invalid defaultIsolation: ${value}. Valid: none, worktree, docker`;
+  }
 
   if (key === 'claudeCommand') {
     return validateClaudeCommand(value);