create-quiver 0.14.1 → 0.15.1

package/src/create-quiver/lib/ai/execution-plan.js

@@ -1,11 +1,18 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { resolveProfileProvider } = require('../agent-profiles');
+const {
+  getAgentProfile,
+  getAgentProfileById,
+  resolveAgentProfileDisplayName,
+  resolveProfileProvider,
+} = require('../agent-profiles');
+const { createUx } = require('../cli/ux');
 const { branchDelete, runGit, statusPorcelain, worktreeAdd, worktreePrune, worktreeRemove } = require('../git');
 const { withLock } = require('../locks');
 const { safeBranchName, worktreesRootForRepo } = require('../slice');
 const { buildGraph, computeLevels, detectFileConflicts, isFoundationSliceId, readAllSlices, topoSort, SliceGraphError } = require('../slice-graph');
+const { resolveProviderModelSelection } = require('./providers');
 const { runExecuteSlice } = require('./executor');
 
 const EXCLUDED_STATUSES = new Set(['completed', 'skipped', 'cancelled']);
@@ -19,6 +26,71 @@ function toRelativePath(repoRoot, filePath) {
   return path.relative(repoRoot, filePath).split(path.sep).join('/');
 }
 
+function resolveExecutorRuntimeProfile(repoRoot, options = {}) {
+  const explicitProvider = options.providerExplicit === true || (options.provider && options.providerExplicit !== false);
+  const explicitModel = String(options.model || '').trim();
+
+  if (explicitProvider) {
+    const provider = String(options.provider || 'codex').trim().toLowerCase();
+    return {
+      provider,
+      model: explicitModel,
+      displayName: explicitModel || provider,
+      profile: null,
+    };
+  }
+
+  const profile = options.executorProfile
+    ? getAgentProfileById(repoRoot, 'executor', options.executorProfile)
+    : getAgentProfile(repoRoot, 'executor');
+  const provider = profile?.provider || resolveProfileProvider(repoRoot, options.role || 'executor', 'codex');
+  const model = explicitModel || profile?.model || '';
+
+  return {
+    provider,
+    model,
+    displayName: profile ? resolveAgentProfileDisplayName(profile) : (model || provider),
+    profile,
+  };
+}
+
+function createCommandUx(options = {}) {
+  if (options.ux) {
+    return options.ux;
+  }
+
+  return createUx({
+    env: options.env || process.env,
+    interactive: options.interactive,
+    json: options.json,
+    noColor: options.noColor,
+    prompts: options.prompts,
+    spinner: options.spinner,
+    stdinIsTTY: options.stdinIsTTY,
+    stdoutIsTTY: options.stdoutIsTTY,
+    stderrIsTTY: options.stderrIsTTY,
+    write: options.write,
+  });
+}
+
+function shouldShowHumanProgress(ux, options = {}) {
+  return options.progress !== false
+    && options.dryRun !== true
+    && options.json !== true
+    && ux?.mode?.decoration === true;
+}
+
+async function runWithProgress({ ux, enabled, message, successMessage, failureMessage, run }) {
+  if (!enabled) {
+    return run();
+  }
+
+  return ux.withSpinner(message, run, {
+    successMessage,
+    failureMessage,
+  });
+}
+
 function normalizeExecutionMode(mode) {
   const value = String(mode || 'auto').trim().toLowerCase() || 'auto';
   if (!EXECUTION_MODES.has(value)) {
@@ -316,12 +388,14 @@ function formatHumanExecutionPlan(report) {
 
 function formatExecutePlanDryRun(report, options = {}) {
   const provider = options.resolvedProvider || options.provider || 'codex';
+  const model = options.resolvedModel || options.model || '';
   const commitEnabled = options.commit === true;
   const executionMode = normalizeExecutionMode(options.mode || options.executionMode);
   const lines = [
     'AI execute-plan dry-run',
     `Execution mode: ${executionMode}`,
     `Provider: ${provider}`,
+    model ? `Model: ${model}` : '',
     `Commit after each slice: ${commitEnabled ? 'enabled' : 'disabled'}`,
     `Total slices: ${report.summary.total_slices}`,
     '',
@@ -334,6 +408,9 @@ function formatExecutePlanDryRun(report, options = {}) {
       `--slice ${JSON.stringify(slice.slice_path)}`,
       `--provider ${provider}`,
     ];
+    if (model) {
+      parts.push(`--model ${JSON.stringify(model)}`);
+    }
     if (commitEnabled) {
       parts.push('--commit');
     }
@@ -363,7 +440,7 @@ function formatExecutePlanDryRun(report, options = {}) {
     }
   }
 
-  return `${lines.join('\n')}\n`;
+  return `${lines.filter(Boolean).join('\n')}\n`;
 }
 
 function buildRecoveryGuidance(ref, workspaces = []) {
@@ -455,8 +532,11 @@ async function runSequentialGroup(repoRoot, level, group, options = {}) {
         commit: true,
         context: options.context,
         dryRun: false,
+        executorProfile: options.executorProfile,
         provider: options.provider,
         providerExplicit: options.providerExplicit,
+        progress: false,
+        model: options.model,
         role: options.role,
         slice: slice.slice_path,
         skipWorktreeBranchCheck: true,
@@ -507,8 +587,11 @@ async function runParallelGroupInWorktrees(repoRoot, level, group, options = {})
         commit: true,
         context: options.context,
         dryRun: false,
+        executorProfile: options.executorProfile,
         provider: options.provider,
         providerExplicit: options.providerExplicit,
+        progress: false,
+        model: options.model,
         role: options.role,
         slice: workspace.slice.slice_path,
         skipWorktreeBranchCheck: true,
@@ -557,13 +640,19 @@ async function runExecutePlan(repoRoot, options = {}) {
   const report = collectExecutionPlan(repoRoot, options);
   const execute = options.execute === true;
   const executionMode = normalizeExecutionMode(options.mode || options.executionMode);
-  const provider = options.providerExplicit === true || (options.provider && options.providerExplicit !== false)
-    ? options.provider
-    : resolveProfileProvider(repoRoot, options.role || 'executor', 'codex');
+  const runtimeProfile = resolveExecutorRuntimeProfile(repoRoot, options);
+  const provider = runtimeProfile.provider;
+  const explicitModel = String(options.model || '').trim();
+  const resolvedModel = runtimeProfile.model
+    ? resolveProviderModelSelection(provider, runtimeProfile.model).model
+    : '';
   const resolvedOptions = {
     ...options,
     mode: executionMode,
+    model: explicitModel ? resolvedModel : undefined,
     provider,
+    profile: runtimeProfile,
+    resolvedModel,
     resolvedProvider: provider,
   };
 
@@ -586,13 +675,27 @@ async function runExecutePlan(repoRoot, options = {}) {
   }
 
   const results = [];
+  const ux = createCommandUx(options);
+  const showProgress = shouldShowHumanProgress(ux, options);
+  if (showProgress) {
+    ux.heading(`Ejecutando plan de slices con ${runtimeProfile.displayName}`);
+    ux.check(`Plan cargado: ${report.summary.total_slices} slice${report.summary.total_slices === 1 ? '' : 's'}`);
+    ux.check(`Modo: ${executionMode}`);
+  }
 
   for (const level of report.ready_levels) {
     for (const group of level.execution_groups) {
       try {
-        const groupResults = executionMode === 'delegated' && group.mode === 'parallel' && group.slice_refs.length > 1
-          ? await runParallelGroupInWorktrees(repoRoot, level, group, resolvedOptions)
-          : await runSequentialGroup(repoRoot, level, group, resolvedOptions);
+        const groupResults = await runWithProgress({
+          ux,
+          enabled: showProgress,
+          message: `Ejecutando wave ${level.index}: ${group.slice_refs.join(', ')}`,
+          successMessage: `Wave ${level.index} completada`,
+          failureMessage: `Falló wave ${level.index}`,
+          run: () => (executionMode === 'delegated' && group.mode === 'parallel' && group.slice_refs.length > 1
+            ? runParallelGroupInWorktrees(repoRoot, level, group, resolvedOptions)
+            : runSequentialGroup(repoRoot, level, group, resolvedOptions)),
+        });
         results.push(...groupResults);
       } catch (error) {
         const wrapped = new Error(formatError(`ai execute-plan stopped at wave ${level.index} group ${group.slice_refs.join(', ')}: ${error.message || error}`));

package/src/create-quiver/lib/ai/executor.js

@@ -4,11 +4,20 @@ const cp = require('node:child_process');
 
 const { buildContextPackMetadata, normalizeRole } = require('./context-packs');
 const { buildProviderInvocation, runProvider } = require('./providers');
-const { resolveProfileProvider } = require('../agent-profiles');
+const {
+  getAgentProfile,
+  getAgentProfileById,
+  getAgentProfilesForRole,
+  resolveAgentProfileDisplayName,
+  resolveProfileProvider,
+} = require('../agent-profiles');
+const { selectOption } = require('../cli/selectors');
+const { createUx } = require('../cli/ux');
 const { currentBranch, runGit } = require('../git');
 const { redactSecrets, truncateText } = require('../evidence');
 const { captureWorktreeSnapshot, validateScopeSnapshot } = require('../scope');
 const { resolveSliceContext } = require('../slice');
+const { buildGraph, readAllSlices, topoSort } = require('../slice-graph');
 const { validateProjectRelativePaths } = require('../paths');
 
 const DEFAULT_EXECUTE_PROVIDER = 'codex';
@@ -49,6 +58,215 @@ function normalizeTimeout(timeoutMs) {
   return parsed;
 }
 
+function resolveExecutorRuntimeProfile(repoRoot, role, options = {}) {
+  const explicitProvider = options.providerExplicit === true || (options.provider && options.providerExplicit !== false);
+  const explicitModel = String(options.model || '').trim();
+
+  if (explicitProvider) {
+    const provider = String(options.provider || DEFAULT_EXECUTE_PROVIDER).trim().toLowerCase();
+    return {
+      provider,
+      model: explicitModel,
+      displayName: explicitModel || provider,
+      profile: null,
+    };
+  }
+
+  const profile = options.executorProfile
+    ? getAgentProfileById(repoRoot, role, options.executorProfile)
+    : getAgentProfile(repoRoot, role);
+  const provider = profile?.provider || resolveProfileProvider(repoRoot, role, DEFAULT_EXECUTE_PROVIDER);
+  const model = explicitModel || profile?.model || '';
+
+  return {
+    provider,
+    model,
+    displayName: profile ? resolveAgentProfileDisplayName(profile) : (model || provider),
+    profile,
+  };
+}
+
+function runtimeModelExecutionOptions(runtimeProfile, options = {}) {
+  return {
+    model: runtimeProfile.model,
+    blockModelAlias: Boolean(runtimeProfile.profile && !String(options.model || '').trim()),
+  };
+}
+
+function createCommandUx(options = {}) {
+  if (options.ux) {
+    return options.ux;
+  }
+
+  return createUx({
+    env: options.env || process.env,
+    interactive: options.interactive,
+    json: options.json,
+    noColor: options.noColor,
+    prompts: options.prompts,
+    spinner: options.spinner,
+    stdinIsTTY: options.stdinIsTTY,
+    stdoutIsTTY: options.stdoutIsTTY,
+    stderrIsTTY: options.stderrIsTTY,
+    write: options.write,
+  });
+}
+
+function selectorOptions(options = {}) {
+  return {
+    defaultValue: options.defaultValue,
+    env: options.env || process.env,
+    flag: options.flag,
+    interactive: options.interactive,
+    promptSelect: options.promptSelect,
+    prompts: options.prompts,
+    stdinIsTTY: options.stdinIsTTY,
+    stdoutIsTTY: options.stdoutIsTTY,
+    stderrIsTTY: options.stderrIsTTY,
+  };
+}
+
+async function resolveInteractiveExecutorProfile(repoRoot, role, options = {}) {
+  if (options.providerExplicit === true || options.provider || options.executorProfile || options.interactive !== true) {
+    return options.executorProfile || '';
+  }
+
+  const profiles = getAgentProfilesForRole(repoRoot, role);
+  if (profiles.length <= 1) {
+    return options.executorProfile || '';
+  }
+
+  const selected = await selectOption(
+    '¿Qué Executor querés usar?',
+    profiles.map((profile) => ({
+      label: resolveAgentProfileDisplayName(profile),
+      value: profile.id,
+      hint: `${profile.provider}${profile.model ? ` / ${profile.model}` : ''}`,
+    })),
+    selectorOptions({
+      ...options,
+      defaultValue: profiles.find((profile) => profile.default)?.id || profiles[0].id,
+      flag: '--executor',
+    }),
+  );
+
+  return selected.value;
+}
+
+function isCompletedStatus(status) {
+  return ['completed', 'done', 'skipped', 'cancelled'].includes(String(status || '').trim().toLowerCase());
+}
+
+function readySliceOptions(repoRoot) {
+  const allSlices = readAllSlices(repoRoot);
+  const graph = buildGraph(allSlices);
+  topoSort(graph);
+  const pending = graph.nodes.filter((node) => !isCompletedStatus(node.status));
+  const pendingRefs = new Set(pending.map((node) => node.ref));
+  const completedRefs = new Set(graph.nodes.filter((node) => isCompletedStatus(node.status)).map((node) => node.ref));
+  const pendingFoundationBySpec = new Set(pending
+    .filter((node) => node.sliceId === 'slice-00' || String(node.sliceId || '').startsWith('slice-00-'))
+    .map((node) => node.specSlug));
+  const incomingByRef = new Map();
+
+  for (const edge of graph.edges) {
+    if (!incomingByRef.has(edge.to)) {
+      incomingByRef.set(edge.to, []);
+    }
+    incomingByRef.get(edge.to).push(edge.from);
+  }
+
+  return pending
+    .filter((node) => {
+      if (pendingFoundationBySpec.has(node.specSlug) && !(node.sliceId === 'slice-00' || String(node.sliceId || '').startsWith('slice-00-'))) {
+        return false;
+      }
+      const incoming = incomingByRef.get(node.ref) || [];
+      return incoming.every((depRef) => completedRefs.has(depRef) || !pendingRefs.has(depRef));
+    })
+    .sort((left, right) => String(left.ref).localeCompare(String(right.ref)))
+    .map((node) => ({
+      label: `${node.ref} [${node.status || 'draft'}]`,
+      value: toRelativePath(repoRoot, node.slicePath),
+      hint: node.title || node.sliceId,
+    }));
+}
+
+async function resolveInteractiveSliceInput(repoRoot, options = {}) {
+  if (options.slice) {
+    return options.slice;
+  }
+
+  if (options.interactive !== true) {
+    throw new Error(formatError('missing required --slice path for ai execute-slice'));
+  }
+
+  const optionsForSlices = readySliceOptions(repoRoot);
+  if (optionsForSlices.length === 0) {
+    throw new Error(formatError('no ready slices found for interactive execution. Run `npx create-quiver ai execute-plan --dry-run` to inspect dependencies and blockers.'));
+  }
+
+  const selected = await selectOption(
+    '¿Qué slice querés ejecutar?',
+    optionsForSlices,
+    selectorOptions({
+      ...options,
+      defaultValue: optionsForSlices.length === 1 ? optionsForSlices[0].value : undefined,
+      flag: '--slice',
+    }),
+  );
+  return selected.value;
+}
+
+function shouldShowHumanProgress(ux, options = {}) {
+  return options.progress !== false
+    && options.dryRun !== true
+    && ux?.mode?.decoration === true;
+}
+
+function writeProgressChecks(ux, enabled, title, checks = []) {
+  if (!enabled) {
+    return;
+  }
+  ux.heading(title);
+  for (const check of checks) {
+    ux.check(check);
+  }
+}
+
+async function runWithProgress({ ux, enabled, message, successMessage, failureMessage, run }) {
+  if (!enabled) {
+    return run();
+  }
+
+  return ux.withSpinner(message, run, {
+    successMessage,
+    failureMessage,
+  });
+}
+
+async function runProviderWithProgress({ ux, enabled, run }) {
+  async function runAndFailOnProviderResult() {
+    const result = await run();
+    if (result && result.ok === false) {
+      const error = new Error(result.error?.message || 'provider run failed');
+      error.code = result.error?.code || 'AI_PROVIDER_RUN_FAILED';
+      error.providerResult = result;
+      throw error;
+    }
+    return result;
+  }
+
+  return runWithProgress({
+    ux,
+    enabled,
+    message: 'Ejecutando agente...',
+    successMessage: 'Agente finalizado',
+    failureMessage: 'Fallo ejecutando agente',
+    run: runAndFailOnProviderResult,
+  });
+}
+
 function toRelativePath(repoRoot, absolutePath) {
   return path.relative(repoRoot, absolutePath).split(path.sep).join('/');
 }
@@ -378,11 +596,17 @@ function formatExecuteSliceDryRunReport({ provider, role, contextPack, slice, br
     `Prompt transport: ${invocation.promptTransport.mode}`,
     `Prompt length: ${invocation.promptLength} bytes`,
     `Commit after validation: ${commitEnabled ? 'enabled' : 'disabled'}`,
+  ];
+  if (invocation.modelSelection && invocation.modelSelection.model) {
+    lines.push(`Model: ${invocation.modelSelection.model}`);
+    lines.push(`Model support: ${invocation.modelSelection.supported ? 'supported' : 'unsupported'} (${invocation.modelSelection.reason})`);
+  }
+  lines.push(
     'Allowed files:',
     ...formatList(allowedFiles),
     'Validation commands:',
     ...formatList(validationCommands),
-  ];
+  );
 
   return `${lines.join('\n')}\n`;
 }
@@ -711,19 +935,21 @@ function writeExecutionArtifacts(repoRoot, executorContext, details) {
 async function runExecuteSlice(repoRoot, options = {}) {
   const canonicalRepoRoot = canonicalizeRepoRoot(repoRoot);
   const role = normalizeRole(options.role || DEFAULT_EXECUTE_ROLE);
-  const provider = options.providerExplicit === true || (options.provider && options.providerExplicit !== false)
-    ? String(options.provider || DEFAULT_EXECUTE_PROVIDER).trim().toLowerCase()
-    : resolveProfileProvider(canonicalRepoRoot, role, DEFAULT_EXECUTE_PROVIDER);
+  const selectedSlice = await resolveInteractiveSliceInput(canonicalRepoRoot, options);
+  const selectedExecutorProfile = await resolveInteractiveExecutorProfile(canonicalRepoRoot, role, options);
+  const resolvedOptions = {
+    ...options,
+    executorProfile: selectedExecutorProfile || options.executorProfile,
+    slice: selectedSlice,
+  };
+  const runtimeProfile = resolveExecutorRuntimeProfile(canonicalRepoRoot, role, resolvedOptions);
+  const provider = runtimeProfile.provider;
   const context = options.context || DEFAULT_EXECUTE_CONTEXT;
   const timeoutMs = normalizeTimeout(options.timeout);
 
-  if (!options.slice) {
-    throw new Error(formatError('missing required --slice path for ai execute-slice'));
-  }
-
   const executorContext = buildExecuteSliceContext({
     repoRoot: canonicalRepoRoot,
-    slicePath: options.slice,
+    slicePath: resolvedOptions.slice,
     role,
     context,
   });
@@ -736,6 +962,8 @@ async function runExecuteSlice(repoRoot, options = {}) {
       prompt,
       cwd: canonicalRepoRoot,
       timeoutMs,
+      ...runtimeModelExecutionOptions(runtimeProfile, options),
+      enforceModelSelection: false,
     });
   } catch (error) {
     throw annotateProviderError(error, 'execute-slice');
@@ -753,6 +981,7 @@ async function runExecuteSlice(repoRoot, options = {}) {
       allowedFiles: executorContext.allowedFiles,
       validationCommands: executorContext.validationCommands,
       commitEnabled: options.commit === true,
+      profile: runtimeProfile,
     };
     process.stdout.write(formatExecuteSliceDryRunReport({
       provider,
@@ -782,21 +1011,40 @@ async function runExecuteSlice(repoRoot, options = {}) {
     throw appendRecovery(new Error(formatError(`ai execute-slice requires a clean worktree before running. Commit or stash first: ${beforeSnapshot.files.join(', ')}`)), executorContext.slice);
   }
 
+  const ux = createCommandUx(options);
+  const showProgress = shouldShowHumanProgress(ux, options);
+  writeProgressChecks(
+    ux,
+    showProgress,
+    `Ejecutando slice con ${runtimeProfile.displayName}`,
+    ['Leyendo slice', 'Validando worktree', 'Preparando prompt'],
+  );
+
   let result;
   try {
-    result = await (options.runProviderFn || runProvider)(provider, {
-      prompt,
-      cwd: canonicalRepoRoot,
-      timeoutMs,
-      dryRun: false,
-      probe: options.probe,
-      spawn: options.spawn,
-      tempRoot: options.tempRoot,
-      tempFileName: options.tempFileName,
-      tempFilePrefix: options.tempFilePrefix,
+    result = await runProviderWithProgress({
+      ux,
+      enabled: showProgress,
+      run: () => (options.runProviderFn || runProvider)(provider, {
+        prompt,
+        cwd: canonicalRepoRoot,
+        timeoutMs,
+        dryRun: false,
+        probe: options.probe,
+        spawn: options.spawn,
+        tempRoot: options.tempRoot,
+        tempFileName: options.tempFileName,
+        tempFilePrefix: options.tempFilePrefix,
+      ...runtimeModelExecutionOptions(runtimeProfile, options),
+        enforceModelSelection: Boolean(runtimeProfile.model),
+      }),
     });
   } catch (error) {
-    throw appendRecovery(annotateProviderError(error, 'execute-slice'), executorContext.slice);
+    if (error.providerResult) {
+      result = error.providerResult;
+    } else {
+      throw appendRecovery(annotateProviderError(error, 'execute-slice'), executorContext.slice);
+    }
   }
 
   if (result.stdout) {
@@ -840,11 +1088,18 @@ async function runExecuteSlice(repoRoot, options = {}) {
 
   let validationResults = [];
   try {
-    validationResults = runValidationCommands(
-      canonicalRepoRoot,
-      executorContext.validationCommands,
-      options.runValidationCommandFn,
-    );
+    validationResults = await runWithProgress({
+      ux,
+      enabled: showProgress && executorContext.validationCommands.length > 0,
+      message: 'Ejecutando validaciones...',
+      successMessage: 'Validaciones completadas',
+      failureMessage: 'Fallaron las validaciones',
+      run: () => runValidationCommands(
+        canonicalRepoRoot,
+        executorContext.validationCommands,
+        options.runValidationCommandFn,
+      ),
+    });
   } catch (error) {
     throw appendRecovery(error, executorContext.slice);
   }
@@ -872,8 +1127,15 @@ async function runExecuteSlice(repoRoot, options = {}) {
   let commitResult = null;
   if (options.commit === true) {
     try {
-      commitResult = commitSliceChanges(canonicalRepoRoot, executorContext.slice, finalScopeResult.changedFiles, {
-        message: options.commitMessage,
+      commitResult = await runWithProgress({
+        ux,
+        enabled: showProgress,
+        message: 'Creando commit del slice...',
+        successMessage: 'Commit del slice creado',
+        failureMessage: 'Fallo creando commit del slice',
+        run: () => commitSliceChanges(canonicalRepoRoot, executorContext.slice, finalScopeResult.changedFiles, {
+          message: options.commitMessage,
+        }),
       });
     } catch (error) {
       throw appendRecovery(error, executorContext.slice);
@@ -894,6 +1156,7 @@ async function runExecuteSlice(repoRoot, options = {}) {
     provider,
     role,
     contextPack: executorContext.context.packName,
+    profile: runtimeProfile,
     slice: executorContext.slice.sliceId,
     specSlug: executorContext.slice.specSlug,
     invocation,