@delete101020/aidlc 4.0.22 → 4.0.24

package/README.md

@@ -192,7 +192,7 @@ description of each.
 
 ```
 aidlc agent add --id <id> --name <n> --skill <skillId>
-                [--model claude-sonnet-4-5]
+                [--model sonnet]
                 [--capabilities files,github,jira]
                 [--description "…"]
                 [--runner default|codex|custom] [--runner-path .aidlc/runners/foo.js]
@@ -227,8 +227,20 @@ providers:
 ```
 
 `model_aliases` translates a `model:` value for one runner. Without it, a Claude
-tier alias (`opus` / `sonnet` / `haiku`) resolves to no `--model` at all and the
-provider CLI applies its own default. AIDLC ships **no** built-in tier map: saying
+tier alias (`opus` / `sonnet` / `haiku`) resolves to no `--model` at all on a
+provider runner, and the provider CLI applies its own default.
+
+The `default` runner passes the agent's `model:` to Claude Code as `--model`, so
+each step runs on the model its agent asks for rather than your session's
+default. Tier aliases go through as-is and follow the current generation; to pin
+one, declare it under `providers.default.model_aliases`:
+
+```yaml
+providers:
+  default:
+    model_aliases:
+      opus: claude-opus-5-5
+``` AIDLC ships **no** built-in tier map: saying
 `sonnet` equals some other vendor's model is a claim about your work that only you
 can make, and a guessed model id fails the run outright.
 

package/dist/bundle.js

@@ -19765,6 +19765,8 @@ var require_WorkspaceSchema = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.WorkspaceValidationError = exports2.WorkspaceSchema = void 0;
     exports2.normalizeStep = normalizeStep4;
+    exports2.stepSkillAlternatives = stepSkillAlternatives;
+    exports2.resolveStepSkills = resolveStepSkills;
     exports2.producesEntries = producesEntries;
     exports2.stepAgentId = stepAgentId3;
     exports2.stepDagId = stepDagId;
@@ -19891,6 +19893,18 @@ var require_WorkspaceSchema = __commonJS({
        * string); the normalizer coerces it into a single-entry array.
        */
       skills: zod_1.z.array(zod_1.z.string().min(1)).optional(),
+      /**
+       * Turns `skills` from "all of these" into "one of these": the person
+       * picks which skill runs before launching the step, and this one is
+       * preselected — and is what the unattended runner uses when nobody
+       * picked. For interchangeable implementations of one step (two review
+       * skills that differ only in the tool they drive), where loading both
+       * would have the model run both procedures, or blend them.
+       *
+       * Must be one of `skills`. Omitted = every listed skill is available at
+       * once, as before.
+       */
+      default_skill: zod_1.z.string().min(1).optional(),
       /** Artifact paths required from upstream. Gate-checked before work AND on Mark step done. */
       requires: zod_1.z.array(zod_1.z.string().min(1)).default([]),
       /**
@@ -19938,6 +19952,9 @@ var require_WorkspaceSchema = __commonJS({
         /** Open a PR after pushing (only valid when push=true). */
         open_pr: zod_1.z.boolean().default(true)
       }).optional()
+    }).refine((s) => !s.default_skill || (s.skills ?? []).includes(s.default_skill), {
+      message: "`default_skill` must be one of the step's `skills`.",
+      path: ["default_skill"]
     }).refine((s) => !s.auto_review || !!s.auto_review_runner, {
       message: "Step with `auto_review: true` must set `auto_review_runner` (path to a JS/TS validator module).",
       path: ["auto_review_runner"]
@@ -20042,6 +20059,7 @@ var require_WorkspaceSchema = __commonJS({
         name: typeof obj.name === "string" ? obj.name : void 0,
         ...typeof obj.description === "string" && obj.description.trim() ? { description: obj.description.trim() } : {},
         skills,
+        ...typeof obj.default_skill === "string" && skills?.includes(obj.default_skill) ? { default_skill: obj.default_skill } : {},
         enabled: typeof obj.enabled === "boolean" ? obj.enabled : true,
         optional: obj.optional === true,
         produces,
@@ -20056,6 +20074,19 @@ var require_WorkspaceSchema = __commonJS({
         ...git && { git }
       };
     }
+    function stepSkillAlternatives(norm) {
+      if (!norm.default_skill || !norm.skills?.includes(norm.default_skill)) {
+        return void 0;
+      }
+      return { options: norm.skills, defaultSkill: norm.default_skill };
+    }
+    function resolveStepSkills(norm, agentSkills, chosen) {
+      const alt = stepSkillAlternatives(norm);
+      if (alt) {
+        return [chosen && alt.options.includes(chosen) ? chosen : alt.defaultSkill];
+      }
+      return norm.skills && norm.skills.length > 0 ? [...norm.skills] : [...agentSkills];
+    }
     function producesEntries(norm) {
       const optional = new Set(norm.produces_optional);
       return norm.produces.map((p) => optional.has(p) ? { path: p, optional: true } : p);
@@ -20406,6 +20437,9 @@ var require_PipelineAssembler = __commonJS({
         if (norm.skills && norm.skills.length > 0) {
           step.skills = norm.skills;
         }
+        if (norm.default_skill) {
+          step.default_skill = norm.default_skill;
+        }
         if (auto_review_runner) {
           step.auto_review_runner = auto_review_runner;
         }
@@ -20734,6 +20768,9 @@ ${raw.slice(0, 200)}`);
         if (norm.skills && norm.skills.length > 0) {
           step.skills = norm.skills;
         }
+        if (norm.default_skill) {
+          step.default_skill = norm.default_skill;
+        }
         if (norm.auto_review_runner) {
           step.auto_review_runner = norm.auto_review_runner;
         }
@@ -21176,6 +21213,7 @@ var require_PipelineRunner = __commonJS({
     exports2.approveStep = approveStep3;
     exports2.rejectStep = rejectStep3;
     exports2.rerunStep = rerunStep3;
+    exports2.chooseStepSkill = chooseStepSkill;
     exports2.requestStepUpdate = requestStepUpdate2;
     exports2.dirtyUpstreamOf = dirtyUpstreamOf2;
     exports2.canRerunApprovedStep = canRerunApprovedStep;
@@ -21460,7 +21498,8 @@ var require_PipelineRunner = __commonJS({
           at: verdict.at,
           revision: nextStep.revision,
           reason: verdict.reason,
-          sentBackToIdx: idx
+          sentBackToIdx: idx,
+          ...nextStep.skill ? { skill: nextStep.skill } : {}
         });
         next.status = "running";
         settleOptionalRejection(next, idx, pipeline);
@@ -21537,7 +21576,8 @@ var require_PipelineRunner = __commonJS({
           at: now,
           revision: next2.steps[idx].revision,
           reason,
-          sentBackToIdx: targetIdx
+          sentBackToIdx: targetIdx,
+          ...next2.steps[idx].skill ? { skill: next2.steps[idx].skill } : {}
         });
         const usesDag = pipeline ? pipeline.steps.map(WorkspaceSchema_1.normalizeStep).some((s) => s.depends_on.length > 0) : false;
         const targetIdxN = targetIdx;
@@ -21600,7 +21640,8 @@ var require_PipelineRunner = __commonJS({
           at: now,
           revision: step.revision,
           reason,
-          sentBackToIdx: idx
+          sentBackToIdx: idx,
+          ...step.skill ? { skill: step.skill } : {}
         })
       };
       next.status = "running";
@@ -21641,6 +21682,24 @@ var require_PipelineRunner = __commonJS({
       next.status = "running";
       return next;
     }
+    function chooseStepSkill(args) {
+      const { state, pipeline, stepIdx, skill } = args;
+      if (!Number.isInteger(stepIdx) || stepIdx < 0 || stepIdx >= state.steps.length) {
+        throw new PipelineRunError3(`Invalid stepIdx ${stepIdx}`);
+      }
+      const target = state.steps[stepIdx];
+      const cfg = pipeline.steps[target.stepIdx];
+      const alt = cfg ? (0, WorkspaceSchema_1.stepSkillAlternatives)((0, WorkspaceSchema_1.normalizeStep)(cfg)) : void 0;
+      if (!alt) {
+        throw new PipelineRunError3(`Step "${target.agent}" has no alternative skills to choose from.`);
+      }
+      if (!alt.options.includes(skill)) {
+        throw new PipelineRunError3(`Skill "${skill}" is not one of step "${target.agent}"'s alternatives (${alt.options.join(", ")}).`);
+      }
+      const next = clone(state);
+      next.steps[stepIdx] = { ...target, skill };
+      return next;
+    }
     function requestStepUpdate2(args) {
       const { state, pipeline, stepIdx, feedback } = args;
       if (!Number.isInteger(stepIdx) || stepIdx < 0 || stepIdx >= state.steps.length) {
@@ -21857,7 +21916,8 @@ var require_PipelineRunner = __commonJS({
         history: pushHistory(approved.history, {
           kind: "approve",
           at: finishedAt,
-          revision: approved.revision
+          revision: approved.revision,
+          ...approved.skill ? { skill: approved.skill } : {}
         })
       };
       const normalized = pipeline.steps.map(WorkspaceSchema_1.normalizeStep);
@@ -28437,6 +28497,7 @@ var require_DefaultRunner = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.DefaultRunner = void 0;
+    exports2.claudeModelArg = claudeModelArg;
     var child_process_1 = require("child_process");
     var claudeEnv_1 = require_claudeEnv();
     var mcp_1 = require_mcp();
@@ -28470,6 +28531,7 @@ var require_DefaultRunner = __commonJS({
       async run(ctx) {
         const bin = this.opts.claudeBin ?? "claude";
         const userMessage = ctx.args.join(" ");
+        const model = claudeModelArg(ctx.model, ctx.modelAliases);
         const args = [
           "--print",
           "--output-format",
@@ -28477,6 +28539,7 @@ var require_DefaultRunner = __commonJS({
           "--verbose",
           "--append-system-prompt",
           ctx.skill,
+          ...model ? ["--model", model] : [],
           ...this.opts.extraArgs ?? [],
           userMessage
         ];
@@ -28526,6 +28589,13 @@ var require_DefaultRunner = __commonJS({
       }
     };
     exports2.DefaultRunner = DefaultRunner3;
+    function claudeModelArg(model, aliases) {
+      const trimmed = model?.trim();
+      if (!trimmed) {
+        return void 0;
+      }
+      return aliases?.[trimmed.toLowerCase()]?.trim() || trimmed;
+    }
   }
 });
 
@@ -29485,6 +29555,10 @@ var require_renameRefs = __commonJS({
         obj.skill = newId;
         moved = true;
       }
+      if (obj.default_skill === oldId) {
+        obj.default_skill = newId;
+        moved = true;
+      }
       return moved;
     }
     function declaredSkills(obj) {
@@ -30707,6 +30781,7 @@ var require_execEngine = __commonJS({
     var budget_1 = require_budget();
     var pricing_1 = require_pricing();
     var models_1 = require_models();
+    var WorkspaceSchema_1 = require_WorkspaceSchema();
     var artifactLanguage_1 = require_artifactLanguage();
     var strictMode_1 = require_strictMode();
     var promptComposer_1 = require_promptComposer();
@@ -30848,13 +30923,13 @@ var require_execEngine = __commonJS({
         }
       }
     }
-    function loadAgentSkills3(ws, agent) {
-      return agent.skills.map((id) => ws.skills.load(id)).join("\n\n---\n\n");
+    function loadSkills(ws, skillIds) {
+      return skillIds.map((id) => ws.skills.load(id)).join("\n\n---\n\n");
     }
-    function buildStepPrompt(ws, agent, runner, root, epicId) {
+    function buildStepPrompt(ws, agent, skillIds, runner, root, epicId) {
       const harness = (0, types_1.harnessCapabilities)(runner);
       return (0, promptComposer_1.composeAgentPrompt)({
-        skills: loadAgentSkills3(ws, agent),
+        skills: loadSkills(ws, skillIds),
         persona: ws.personas.load(agent.id),
         instructions: harness.projectInstructions ? null : (0, projectInstructions_1.findProjectInstructions)(root, harness.instructionFile),
         harness,
@@ -30885,6 +30960,11 @@ var require_execEngine = __commonJS({
         hooks.onStepFailed?.({ stepIdx, agent: agentId, message: `Agent "${agentId}" not found in workspace.yaml.` });
         return false;
       }
+      const stepCfg = pipeline.steps[stepIdx];
+      const norm = stepCfg ? (0, WorkspaceSchema_1.normalizeStep)(stepCfg) : void 0;
+      const alternatives = norm ? (0, WorkspaceSchema_1.stepSkillAlternatives)(norm) : void 0;
+      const chosen = opts.skill && alternatives?.options.includes(opts.skill) ? opts.skill : stepRec.skill;
+      const skillIds = norm ? (0, WorkspaceSchema_1.resolveStepSkills)(norm, agent.skills, chosen) : [...agent.skills];
       let runner;
       let prompt2;
       try {
@@ -30894,7 +30974,7 @@ var require_execEngine = __commonJS({
         return false;
       }
       try {
-        prompt2 = buildStepPrompt(ws, agent, runner, root, state.runId);
+        prompt2 = buildStepPrompt(ws, agent, skillIds, runner, root, state.runId);
       } catch (err) {
         hooks.onStepFailed?.({ stepIdx, agent: agentId, message: `Failed to load skills for agent "${agentId}": ${errMsg(err)}` });
         return false;
@@ -30905,7 +30985,7 @@ var require_execEngine = __commonJS({
       const userMessage = opts.message ?? (contextStr || `Execute step: ${agentId}`);
       if (opts.dryRun) {
         hooks.onDryRunPreview?.({
-          skills: agent.skills.join(", "),
+          skills: skillIds.join(", "),
           skillText,
           userMessage,
           env,
@@ -30917,7 +30997,7 @@ var require_execEngine = __commonJS({
         stepIdx,
         agent: agentId,
         revision: stepRec.revision,
-        skills: agent.skills,
+        skills: skillIds,
         model: agent.model,
         context: userMessage,
         dirtyUpstream: (0, PipelineRunner_1.dirtyUpstreamOf)({ state, pipeline, stepIdx }).map((d) => ({ stepIdx: d.stepIdx, step: d.step, byStep: d.dirty.byStep }))
@@ -30946,6 +31026,9 @@ var require_execEngine = __commonJS({
         const rec = freshState.steps[stepIdx];
         rec.runner = agent.runner;
         rec.model = resolvedModel;
+        if (alternatives) {
+          rec.skill = skillIds[0];
+        }
         rec.usage = result.usage;
         if (typeof result.costUsd === "number") {
           rec.costUsd = result.costUsd;
@@ -31189,13 +31272,13 @@ var require_runReport = __commonJS({
       return history.map((h) => {
         switch (h.kind) {
           case "reject":
-            return `  - \u2718 rejected (rev ${h.revision})${h.reason ? `: ${h.reason}` : ""}`;
+            return `  - \u2718 rejected (rev ${h.revision}${h.skill ? `, ${h.skill}` : ""})${h.reason ? `: ${h.reason}` : ""}`;
           case "rerun":
             return `  - \u21BA rerun \u2192 rev ${h.revision}${h.feedback ? ` (feedback: ${h.feedback})` : ""}`;
           case "auto_review":
             return `  - \u{1F916} auto-review ${h.decision} (rev ${h.revision}): ${h.reason}`;
           case "approve":
-            return `  - \u2714 approved (rev ${h.revision})`;
+            return `  - \u2714 approved (rev ${h.revision}${h.skill ? `, ${h.skill}` : ""})`;
           case "undo":
             return `  - \u21B6 mark-done undone (rev ${h.revision}, was ${h.from})`;
           default:
@@ -32678,7 +32761,7 @@ var require_commandModel = __commonJS({
     function shortcutCommandId(phaseId) {
       return phaseId;
     }
-    function resolveComposition(config, pipelineId, phaseId) {
+    function resolveComposition(config, pipelineId, phaseId, chosenSkill) {
       const pipeline = config.pipelines.find((p) => p.id === pipelineId);
       if (!pipeline) {
         return { found: false, phaseId, pipelineId };
@@ -32688,11 +32771,8 @@ var require_commandModel = __commonJS({
         return { found: false, phaseId, pipelineId };
       }
       const step = (0, WorkspaceSchema_1.normalizeStep)(stepCfg);
-      let skills = step.skills;
-      if (!skills || skills.length === 0) {
-        const agent = config.agents.find((a) => a.id === step.agent);
-        skills = agent?.skills ?? [];
-      }
+      const agent = config.agents.find((a) => a.id === step.agent);
+      const skills = (0, WorkspaceSchema_1.resolveStepSkills)(step, agent?.skills ?? [], chosenSkill);
       return {
         found: true,
         phaseId,
@@ -32786,6 +32866,9 @@ The first token is the **epic id**; an optional second token is the **phase**.
 2. In that pipeline's \`steps\`, find the step whose \`name\` (or \`agent\` when
    unnamed) === the chosen phase. That step's \`agent\` + \`skills\` are the
    wiring. If the step omits \`skills\`, use the referenced agent's \`skills:\`.
+   If the step sets \`default_skill\`, its \`skills\` are alternatives: load
+   **only one** \u2014 the step's \`skill\` in \`.aidlc/runs/<epic>.json\` when it
+   is one of them, else \`default_skill\`. Never load the others.
 3. Load the persona from \`.claude/agents/<agent>.md\` (fall back to
    \`~/.claude/agents/<agent>.md\`), and each skill from
    \`.claude/skills/<skill>.md\` (fall back to \`~/.claude/skills/<skill>.md\`).
@@ -33364,13 +33447,13 @@ var require_dist = __commonJS({
   "../core/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.renderIntentMarkdown = exports2.openFollowUpEpic = exports2.openIncidentEpic = exports2.SignalParseError = exports2.isSignal = exports2.parseSignal = exports2.SignalSchema = exports2.EpicStepEditError = exports2.resolveStepRef = exports2.describeGateEffect = exports2.commitEpicStepEdit = exports2.planSetEpicStepGates = exports2.planRemoveEpicStep = exports2.planAddEpicStep = exports2.EpicWorkflowSwitchError = exports2.canSwitchEpicWorkflow = exports2.epicWorkflowLock = exports2.applyEpicWorkflowSwitch = exports2.stageEpicWorkflowSwitch = exports2.planEpicWorkflowSwitch = exports2.EpicDescriptionError = exports2.setEpicDescription = exports2.lockedEpicDirError = exports2.EpicScaffoldError = exports2.epicsRoot = exports2.mapStepStatusToEpic = exports2.mirrorRunStateToEpic = exports2.scaffoldEpic = exports2.resolveArtifactCommitConfig = exports2.commitApprovedArtifacts = exports2.PipelineAdaptError = exports2.applyAdaptation = exports2.parseAdaptationVerdict = exports2.buildAdaptationPrompt = exports2.buildPhaseCatalog = exports2.slugEpicId = exports2.parseClassificationVerdict = exports2.buildClassificationPrompt = exports2.heuristicClassify = exports2.PipelineAssembleError = exports2.recipePipelineId = exports2.assemblePipeline = exports2.collectWorkspaceRefIssues = exports2.stepDagId = exports2.stepAgentId = exports2.producesEntries = exports2.normalizeStep = exports2.WorkspaceValidationError = exports2.validateWorkspace = exports2.WorkspaceSchema = void 0;
-    exports2.EPIC_PIPELINE_FILENAME = exports2.unusedAfterStepRemoval = exports2.skillReferences = exports2.agentReferences = exports2.renameSkillRefs = exports2.renameAgentRefs = exports2.dropRecipesForPipeline = exports2.dropRecipeStep = exports2.recipesDrawingFrom = exports2.WORKSPACE_DIR = exports2.WORKSPACE_FILENAME = exports2.WorkspaceParseError = exports2.WorkspaceNotFoundError = exports2.WorkspaceLoader = exports2.renderPlanMarkdown = exports2.generatePlan = exports2.collectContext = exports2.followUpHookFailures = exports2.pendingFollowUpDone = exports2.applyFollowUpHookRun = exports2.trackFollowUpChildren = exports2.writeFollowUpHookLedger = exports2.readFollowUpHookLedger = exports2.followUpHookLedgerPath = exports2.runFollowUpHook = exports2.fillFollowUpHookCommand = exports2.resolveFollowUpHooks = exports2.epicPipelineId = exports2.FOLLOW_UP_HOOK_TIMEOUT_MS = exports2.FOLLOW_UP_HOOKS_LEDGER = exports2.stepProducesFollowUps = exports2.collectFollowUpHookIssues = exports2.FOLLOW_UP_HOOK_PLACEHOLDERS = exports2.FOLLOW_UP_HOOK_KEYS = exports2.FOLLOW_UP_INTENT = exports2.FOLLOW_UPS_FILE = exports2.openManifestFollowUp = exports2.followUpChildId = exports2.followUpsOf = exports2.readEpicFollowUps = exports2.parseFollowUps = exports2.FollowUpsParseError = exports2.FollowUpManifestSchema = exports2.FollowUpItemSchema = exports2.SIGNAL_FILE = exports2.FOLLOW_UP_ARTIFACT = exports2.readEpicSignal = exports2.existingEpicIds = exports2.followUpIdFor = exports2.followUpEpicId = void 0;
-    exports2.readEpicTags = exports2.normalizeTags = exports2.normalizeTag = exports2.epicMatchesTags = exports2.applyTagEdit = exports2.MAX_TAG_LENGTH = exports2.EPIC_TAGS_KEY = exports2.strictModeSection = exports2.resolveEpicStrictMode = exports2.epicStrictMode = exports2.commandBodyPredatesStrictMode = exports2.STRICT_MODE_KEY = exports2.STRICT_MODE_HEADING = exports2.writeUserEpicIdPrefix = exports2.userConfigPath = exports2.readUserConfig = exports2.readGitUserName = exports2.ensureUserConfigIgnored = exports2.USER_CONFIG_RELPATH = exports2.USER_CONFIG_IGNORE_LINE = exports2.suggestEpicId = exports2.resolveEpicIdPrefixChain = exports2.resolveEpicIdPrefix = exports2.epicIdDateStamp = exports2.deriveEpicIdPrefix = exports2.EPIC_ID_PREFIX_PATTERN = exports2.EPIC_ID_PREFIX_KEY = exports2.resolveArtifactLanguage = exports2.commandBodyPredatesArtifactLanguage = exports2.artifactLanguageSection = exports2.ARTIFACT_LANGUAGE_HEADING = exports2.stripPersonaDirectives = exports2.composeAgentPrompt = exports2.PROJECT_INSTRUCTION_FILES = exports2.findProjectInstructions = exports2.stripPersonaMetadata = exports2.PersonaLoader = exports2.SkillNotFoundError = exports2.SkillLoader = exports2.EnvVarMissingError = exports2.EnvResolver = exports2.epicPipelineReport = exports2.planEpicPipelineExtraction = exports2.epicOwningPipeline = exports2.unstageEpicPipeline = exports2.stageEpicPipeline = exports2.writeEpicPipelines = exports2.splitEpicPipelines = exports2.mergeEpicPipelines = exports2.epicPipelinePath = void 0;
-    exports2.weighStepProgress = exports2.isActiveStatus = exports2.isStepOptional = exports2.isRunComplete = exports2.deriveRunProgress = exports2.PipelineRunError = exports2.retryAutoReview = exports2.submitAutoReviewVerdict = exports2.dirtyUpstreamOf = exports2.rerunApprovedStep = exports2.canRerunApprovedStep = exports2.requestStepUpdate = exports2.rerunStep = exports2.rejectStep = exports2.approveStep = exports2.undoStepDone = exports2.canUndoStepDone = exports2.markStepDone = exports2.canStartStep = exports2.startRun = exports2.activateBackendFromWorkspace = exports2.activateRunStateBackend = exports2.resolveRunStateBackend = exports2.GitRunStateStore = exports2.RUN_ID_PATTERN = exports2.FileRunStateStore = exports2.RunStateStore = exports2.harnessCapabilities = exports2.NO_HARNESS_CAPABILITIES = exports2.RunnerValidationError = exports2.validateRunnerExport = exports2.CustomRunnerLoader = exports2.buildClaudeSpawnEnv = exports2.hasClaudeLogin = exports2.isInsideClaudeCodeSession = exports2.createJsonSink = exports2.createLineSink = exports2.isCodexMcpConfigured = exports2.codexConfigPath = exports2.readProjectMcpServer = exports2.mcpRegistrarFor = exports2.codexMcpRegistrar = exports2.claudeMcpRegistrar = exports2.CodexRunner = exports2.DefaultRunner = exports2.RunnerRegistry = exports2.targetPath = exports2.scopePaths = exports2.discoverAssets = exports2.commandBodyIsStale = void 0;
-    exports2.isWorkflowGloballyInstalled = exports2.installWorkflowGlobalsByIds = exports2.installGlobalDefaults = exports2.resolveProviderModel = exports2.isClaudeTierAlias = exports2.CLAUDE_TIER_ALIASES = exports2.FAST_MODEL = exports2.CODING_MODEL = exports2.PLANNING_MODEL = exports2.isBuiltinPreset = exports2.BUILTIN_PRESET_IDS = exports2.writeBuiltinAutoReviewValidators = exports2.resolvePrimaryStack = exports2.getSdlcArtifactTemplates = exports2.getBuiltinArtifactTemplates = exports2.phaseArtifactFileName = exports2.sdlcClaudeCommand = exports2.builtinClaudeCommand = exports2.loadAllBuiltinPresets = exports2.loadBuiltinPreset = exports2.planRecipeMigration = exports2.getBuiltinRecipeSummaries = exports2.getAllBuiltinPipelineSummaries = exports2.getSdlcBuiltinPipelineSummary = exports2.getBuiltinPipelineSummary = exports2.getBuiltinWorkflowByPipelineId = exports2.getBuiltinWorkflow = exports2.workflowSlug = exports2.builtinTemplatesRoot = exports2.pipelineCommandId = exports2.PHASES = exports2.BUILTIN_WORKFLOWS = exports2.withBackfilledStepNames = exports2.describeDrift = exports2.reconcileRunSteps = exports2.RUN_STATE_SCHEMA_VERSION = exports2.migrateRunState = exports2.stepIdentity = exports2.resolvePath = exports2.AutoReviewerError = exports2.runAutoReview = exports2.renderRunReport = exports2.verifyRun = exports2.runExecLoop = exports2.estimateCostUsd = exports2.providerAliases = exports2.ratesFromConfig = exports2.mergeRates = exports2.BUILTIN_RATES = exports2.checkBudget = void 0;
-    exports2.remapClaudePath = exports2.claudeConfigEnv = exports2.claudeJsonPath = exports2.isDefaultClaudeConfigDir = exports2.claudeConfigDir = exports2.resolveClaudeConfigDir = exports2.defaultClaudeConfigDir = exports2.getClaudeConfigDirOverride = exports2.setClaudeConfigDir = exports2.resolveDeclaredPath = exports2.expandHome = exports2.ProfileLoadError = exports2.UnknownStandardError = exports2.builtinProfiles = exports2.loadActiveProfile = exports2.loadProfile = exports2.listProfileManifests = exports2.resolveStandard = exports2.workspaceStandard = exports2.isBuiltinProfileId = exports2.ProfileSchema = exports2.TRACE_RULES = exports2.PROFILES_DIR = exports2.DEFAULT_PROFILE_ID = exports2.BUILTIN_PROFILE_IDS = exports2.setEpicMemoryHook = exports2.isEpicMemoryHookEnabled = exports2.installAnnotationTools = exports2.relativeEpicRoot = exports2.provisionDeclaredWorkflows = exports2.provisionWorkflowFiles = exports2.writeWorkflowArtifactTemplates = exports2.writeWorkflowCommands = exports2.provisionShortcutDocs = exports2.writeTwoLayerCommands = exports2.shortcutCommandDoc = exports2.backboneCommandDoc = exports2.unprovisionedPhases = exports2.nextEligiblePhase = exports2.resolveComposition = exports2.shortcutCommandId = exports2.getCanonicalPhase = exports2.isCanonicalPhase = exports2.BACKBONE_COMMAND_ID = exports2.CANONICAL_PHASE_IDS = exports2.CANONICAL_PHASES = exports2.renderTemplate = exports2.DEFAULT_GLOBAL_WORKFLOW_IDS = exports2.detectGlobalBuiltinSource = exports2.uninstallWorkflowGlobalsByIds = void 0;
-    exports2.AIDLC_CORE_VERSION = exports2.AIDLC_CLI_GUIDE_TEXT = exports2.AIDLC_KNOWLEDGE = exports2.clearResolveCommandCache = exports2.resolveCommand = void 0;
+    exports2.openIncidentEpic = exports2.SignalParseError = exports2.isSignal = exports2.parseSignal = exports2.SignalSchema = exports2.EpicStepEditError = exports2.resolveStepRef = exports2.describeGateEffect = exports2.commitEpicStepEdit = exports2.planSetEpicStepGates = exports2.planRemoveEpicStep = exports2.planAddEpicStep = exports2.EpicWorkflowSwitchError = exports2.canSwitchEpicWorkflow = exports2.epicWorkflowLock = exports2.applyEpicWorkflowSwitch = exports2.stageEpicWorkflowSwitch = exports2.planEpicWorkflowSwitch = exports2.EpicDescriptionError = exports2.setEpicDescription = exports2.lockedEpicDirError = exports2.EpicScaffoldError = exports2.epicsRoot = exports2.mapStepStatusToEpic = exports2.mirrorRunStateToEpic = exports2.scaffoldEpic = exports2.resolveArtifactCommitConfig = exports2.commitApprovedArtifacts = exports2.PipelineAdaptError = exports2.applyAdaptation = exports2.parseAdaptationVerdict = exports2.buildAdaptationPrompt = exports2.buildPhaseCatalog = exports2.slugEpicId = exports2.parseClassificationVerdict = exports2.buildClassificationPrompt = exports2.heuristicClassify = exports2.PipelineAssembleError = exports2.recipePipelineId = exports2.assemblePipeline = exports2.collectWorkspaceRefIssues = exports2.resolveStepSkills = exports2.stepSkillAlternatives = exports2.stepDagId = exports2.stepAgentId = exports2.producesEntries = exports2.normalizeStep = exports2.WorkspaceValidationError = exports2.validateWorkspace = exports2.WorkspaceSchema = void 0;
+    exports2.skillReferences = exports2.agentReferences = exports2.renameSkillRefs = exports2.renameAgentRefs = exports2.dropRecipesForPipeline = exports2.dropRecipeStep = exports2.recipesDrawingFrom = exports2.WORKSPACE_DIR = exports2.WORKSPACE_FILENAME = exports2.WorkspaceParseError = exports2.WorkspaceNotFoundError = exports2.WorkspaceLoader = exports2.renderPlanMarkdown = exports2.generatePlan = exports2.collectContext = exports2.followUpHookFailures = exports2.pendingFollowUpDone = exports2.applyFollowUpHookRun = exports2.trackFollowUpChildren = exports2.writeFollowUpHookLedger = exports2.readFollowUpHookLedger = exports2.followUpHookLedgerPath = exports2.runFollowUpHook = exports2.fillFollowUpHookCommand = exports2.resolveFollowUpHooks = exports2.epicPipelineId = exports2.FOLLOW_UP_HOOK_TIMEOUT_MS = exports2.FOLLOW_UP_HOOKS_LEDGER = exports2.stepProducesFollowUps = exports2.collectFollowUpHookIssues = exports2.FOLLOW_UP_HOOK_PLACEHOLDERS = exports2.FOLLOW_UP_HOOK_KEYS = exports2.FOLLOW_UP_INTENT = exports2.FOLLOW_UPS_FILE = exports2.openManifestFollowUp = exports2.followUpChildId = exports2.followUpsOf = exports2.readEpicFollowUps = exports2.parseFollowUps = exports2.FollowUpsParseError = exports2.FollowUpManifestSchema = exports2.FollowUpItemSchema = exports2.SIGNAL_FILE = exports2.FOLLOW_UP_ARTIFACT = exports2.readEpicSignal = exports2.existingEpicIds = exports2.followUpIdFor = exports2.followUpEpicId = exports2.renderIntentMarkdown = exports2.openFollowUpEpic = void 0;
+    exports2.normalizeTag = exports2.epicMatchesTags = exports2.applyTagEdit = exports2.MAX_TAG_LENGTH = exports2.EPIC_TAGS_KEY = exports2.strictModeSection = exports2.resolveEpicStrictMode = exports2.epicStrictMode = exports2.commandBodyPredatesStrictMode = exports2.STRICT_MODE_KEY = exports2.STRICT_MODE_HEADING = exports2.writeUserEpicIdPrefix = exports2.userConfigPath = exports2.readUserConfig = exports2.readGitUserName = exports2.ensureUserConfigIgnored = exports2.USER_CONFIG_RELPATH = exports2.USER_CONFIG_IGNORE_LINE = exports2.suggestEpicId = exports2.resolveEpicIdPrefixChain = exports2.resolveEpicIdPrefix = exports2.epicIdDateStamp = exports2.deriveEpicIdPrefix = exports2.EPIC_ID_PREFIX_PATTERN = exports2.EPIC_ID_PREFIX_KEY = exports2.resolveArtifactLanguage = exports2.commandBodyPredatesArtifactLanguage = exports2.artifactLanguageSection = exports2.ARTIFACT_LANGUAGE_HEADING = exports2.stripPersonaDirectives = exports2.composeAgentPrompt = exports2.PROJECT_INSTRUCTION_FILES = exports2.findProjectInstructions = exports2.stripPersonaMetadata = exports2.PersonaLoader = exports2.SkillNotFoundError = exports2.SkillLoader = exports2.EnvVarMissingError = exports2.EnvResolver = exports2.epicPipelineReport = exports2.planEpicPipelineExtraction = exports2.epicOwningPipeline = exports2.unstageEpicPipeline = exports2.stageEpicPipeline = exports2.writeEpicPipelines = exports2.splitEpicPipelines = exports2.mergeEpicPipelines = exports2.epicPipelinePath = exports2.EPIC_PIPELINE_FILENAME = exports2.unusedAfterStepRemoval = void 0;
+    exports2.deriveRunProgress = exports2.PipelineRunError = exports2.retryAutoReview = exports2.submitAutoReviewVerdict = exports2.dirtyUpstreamOf = exports2.rerunApprovedStep = exports2.canRerunApprovedStep = exports2.chooseStepSkill = exports2.requestStepUpdate = exports2.rerunStep = exports2.rejectStep = exports2.approveStep = exports2.undoStepDone = exports2.canUndoStepDone = exports2.markStepDone = exports2.canStartStep = exports2.startRun = exports2.activateBackendFromWorkspace = exports2.activateRunStateBackend = exports2.resolveRunStateBackend = exports2.GitRunStateStore = exports2.RUN_ID_PATTERN = exports2.FileRunStateStore = exports2.RunStateStore = exports2.harnessCapabilities = exports2.NO_HARNESS_CAPABILITIES = exports2.RunnerValidationError = exports2.validateRunnerExport = exports2.CustomRunnerLoader = exports2.buildClaudeSpawnEnv = exports2.hasClaudeLogin = exports2.isInsideClaudeCodeSession = exports2.createJsonSink = exports2.createLineSink = exports2.isCodexMcpConfigured = exports2.codexConfigPath = exports2.readProjectMcpServer = exports2.mcpRegistrarFor = exports2.codexMcpRegistrar = exports2.claudeMcpRegistrar = exports2.CodexRunner = exports2.claudeModelArg = exports2.DefaultRunner = exports2.RunnerRegistry = exports2.targetPath = exports2.scopePaths = exports2.discoverAssets = exports2.commandBodyIsStale = exports2.readEpicTags = exports2.normalizeTags = void 0;
+    exports2.isClaudeTierAlias = exports2.CLAUDE_TIER_ALIASES = exports2.FAST_MODEL = exports2.CODING_MODEL = exports2.PLANNING_MODEL = exports2.isBuiltinPreset = exports2.BUILTIN_PRESET_IDS = exports2.writeBuiltinAutoReviewValidators = exports2.resolvePrimaryStack = exports2.getSdlcArtifactTemplates = exports2.getBuiltinArtifactTemplates = exports2.phaseArtifactFileName = exports2.sdlcClaudeCommand = exports2.builtinClaudeCommand = exports2.loadAllBuiltinPresets = exports2.loadBuiltinPreset = exports2.planRecipeMigration = exports2.getBuiltinRecipeSummaries = exports2.getAllBuiltinPipelineSummaries = exports2.getSdlcBuiltinPipelineSummary = exports2.getBuiltinPipelineSummary = exports2.getBuiltinWorkflowByPipelineId = exports2.getBuiltinWorkflow = exports2.workflowSlug = exports2.builtinTemplatesRoot = exports2.pipelineCommandId = exports2.PHASES = exports2.BUILTIN_WORKFLOWS = exports2.withBackfilledStepNames = exports2.describeDrift = exports2.reconcileRunSteps = exports2.RUN_STATE_SCHEMA_VERSION = exports2.migrateRunState = exports2.stepIdentity = exports2.resolvePath = exports2.AutoReviewerError = exports2.runAutoReview = exports2.renderRunReport = exports2.verifyRun = exports2.runExecLoop = exports2.estimateCostUsd = exports2.providerAliases = exports2.ratesFromConfig = exports2.mergeRates = exports2.BUILTIN_RATES = exports2.checkBudget = exports2.weighStepProgress = exports2.isActiveStatus = exports2.isStepOptional = exports2.isRunComplete = void 0;
+    exports2.claudeConfigDir = exports2.resolveClaudeConfigDir = exports2.defaultClaudeConfigDir = exports2.getClaudeConfigDirOverride = exports2.setClaudeConfigDir = exports2.resolveDeclaredPath = exports2.expandHome = exports2.ProfileLoadError = exports2.UnknownStandardError = exports2.builtinProfiles = exports2.loadActiveProfile = exports2.loadProfile = exports2.listProfileManifests = exports2.resolveStandard = exports2.workspaceStandard = exports2.isBuiltinProfileId = exports2.ProfileSchema = exports2.TRACE_RULES = exports2.PROFILES_DIR = exports2.DEFAULT_PROFILE_ID = exports2.BUILTIN_PROFILE_IDS = exports2.setEpicMemoryHook = exports2.isEpicMemoryHookEnabled = exports2.installAnnotationTools = exports2.relativeEpicRoot = exports2.provisionDeclaredWorkflows = exports2.provisionWorkflowFiles = exports2.writeWorkflowArtifactTemplates = exports2.writeWorkflowCommands = exports2.provisionShortcutDocs = exports2.writeTwoLayerCommands = exports2.shortcutCommandDoc = exports2.backboneCommandDoc = exports2.unprovisionedPhases = exports2.nextEligiblePhase = exports2.resolveComposition = exports2.shortcutCommandId = exports2.getCanonicalPhase = exports2.isCanonicalPhase = exports2.BACKBONE_COMMAND_ID = exports2.CANONICAL_PHASE_IDS = exports2.CANONICAL_PHASES = exports2.renderTemplate = exports2.DEFAULT_GLOBAL_WORKFLOW_IDS = exports2.detectGlobalBuiltinSource = exports2.uninstallWorkflowGlobalsByIds = exports2.isWorkflowGloballyInstalled = exports2.installWorkflowGlobalsByIds = exports2.installGlobalDefaults = exports2.resolveProviderModel = void 0;
+    exports2.AIDLC_CORE_VERSION = exports2.AIDLC_CLI_GUIDE_TEXT = exports2.AIDLC_KNOWLEDGE = exports2.clearResolveCommandCache = exports2.resolveCommand = exports2.remapClaudePath = exports2.claudeConfigEnv = exports2.claudeJsonPath = exports2.isDefaultClaudeConfigDir = void 0;
     var WorkspaceSchema_1 = require_WorkspaceSchema();
     Object.defineProperty(exports2, "WorkspaceSchema", { enumerable: true, get: function() {
       return WorkspaceSchema_1.WorkspaceSchema;
@@ -33393,6 +33476,12 @@ var require_dist = __commonJS({
     Object.defineProperty(exports2, "stepDagId", { enumerable: true, get: function() {
       return WorkspaceSchema_1.stepDagId;
     } });
+    Object.defineProperty(exports2, "stepSkillAlternatives", { enumerable: true, get: function() {
+      return WorkspaceSchema_1.stepSkillAlternatives;
+    } });
+    Object.defineProperty(exports2, "resolveStepSkills", { enumerable: true, get: function() {
+      return WorkspaceSchema_1.resolveStepSkills;
+    } });
     Object.defineProperty(exports2, "collectWorkspaceRefIssues", { enumerable: true, get: function() {
       return WorkspaceSchema_1.collectWorkspaceRefIssues;
     } });
@@ -33873,6 +33962,9 @@ var require_dist = __commonJS({
     Object.defineProperty(exports2, "DefaultRunner", { enumerable: true, get: function() {
       return DefaultRunner_1.DefaultRunner;
     } });
+    Object.defineProperty(exports2, "claudeModelArg", { enumerable: true, get: function() {
+      return DefaultRunner_1.claudeModelArg;
+    } });
     var CodexRunner_1 = require_CodexRunner();
     Object.defineProperty(exports2, "CodexRunner", { enumerable: true, get: function() {
       return CodexRunner_1.CodexRunner;
@@ -33982,6 +34074,9 @@ var require_dist = __commonJS({
     Object.defineProperty(exports2, "requestStepUpdate", { enumerable: true, get: function() {
       return PipelineRunner_1.requestStepUpdate;
     } });
+    Object.defineProperty(exports2, "chooseStepSkill", { enumerable: true, get: function() {
+      return PipelineRunner_1.chooseStepSkill;
+    } });
     Object.defineProperty(exports2, "canRerunApprovedStep", { enumerable: true, get: function() {
       return PipelineRunner_1.canRerunApprovedStep;
     } });
@@ -43018,7 +43113,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@delete101020/aidlc",
-      version: "4.0.22",
+      version: "4.0.24",
       description: "AIDLC Native CLI, a fork of AIDLC \u2014 drive Claude through the six-stage AI-Native SDLC Playbook: Plan \u2192 Design \u2192 Build \u2192 Test \u2192 Deploy \u2192 Maintain, with artifact gates, requirements traceability, an incident loop back to Plan, and Spec Kit support.",
       license: "MIT",
       repository: {
@@ -47964,7 +48059,7 @@ function registerRun(program3) {
   });
   cmd.command("exec <runId>").description(
     "Execute the current step by spawning the claude CLI, then auto-advance.\n  Streams output live. Stops at human_review steps unless --auto-approve.\n  Exit codes: 0 completed (or stopped at --until), 2 paused on a gate\n  (awaiting review / rejected / budget), 1 error. --require-complete maps\n  any non-completed outcome to 1 for CI gating."
-  ).option("--until <step>", "Stop after this step completes (index or agent id)").option("--auto-approve", "Also auto-approve human_review steps without pausing").option("--require-complete", "Exit 1 unless the run reaches completed (for CI gating)").option("--json", "Suppress decorative output; print a final JSON summary to stdout (claude stream goes to stderr)").option("--message <text>", "Override the user message sent to claude (default: context pairs)").option("--dry-run", "Print the assembled prompt without spawning claude").action(async (runId, opts, actionCmd) => {
+  ).option("--until <step>", "Stop after this step completes (index or agent id)").option("--auto-approve", "Also auto-approve human_review steps without pausing").option("--require-complete", "Exit 1 unless the run reaches completed (for CI gating)").option("--json", "Suppress decorative output; print a final JSON summary to stdout (claude stream goes to stderr)").option("--message <text>", "Override the user message sent to claude (default: context pairs)").option("--dry-run", "Print the assembled prompt without spawning claude").option("--skill <id>", "On steps that offer alternative skills (default_skill), run this one").action(async (runId, opts, actionCmd) => {
     const root = resolveWorkspaceRoot(actionCmd);
     if (opts.json) {
       setQuiet(true);
@@ -48073,7 +48168,7 @@ async function execLoop(root, runId, opts) {
   return (0, import_core13.runExecLoop)(
     root,
     runId,
-    { untilIdx, autoApprove: opts.autoApprove, message: opts.message, dryRun: opts.dryRun },
+    { untilIdx, autoApprove: opts.autoApprove, message: opts.message, dryRun: opts.dryRun, skill: opts.skill },
     cliExecHooks(runId, claudeOut)
   );
 }

package/dist/vendor/annotron/src/chrome.html

@@ -526,9 +526,9 @@
           <div id="model-selector-wrap">
             <select id="model-selector" title="Select model for agent">
               <option value="">Default</option>
-              <option value="claude-opus-4-8">Opus 4.8</option>
-              <option value="claude-sonnet-5">Sonnet 5</option>
-              <option value="claude-haiku-4-5-20251001">Haiku 4.5</option>
+              <option value="opus">Opus</option>
+              <option value="sonnet">Sonnet</option>
+              <option value="haiku">Haiku</option>
             </select>
           </div>
           <label id="ask-mode-wrap" title="Force Ask Mode even with comments (for Q&A over edits)" style="display: inline-flex; align-items: center; gap: 6px; font-size: 12px; color: var(--dim-6);">
@@ -709,7 +709,14 @@ let annotations = [];
 let pendingNew = [];
 
 // Agent model & metrics
+// Aliases (`opus` / `sonnet` / `haiku`) always resolve to the current
+// generation. A pinned id saved by an older build (e.g. `claude-opus-4-8`) is
+// migrated to its tier's alias so it does not stay stuck on that generation.
 let selectedModel = localStorage.getItem('annotron-model') || '';
+if (selectedModel.startsWith('claude-')) {
+  selectedModel = ['opus', 'sonnet', 'haiku'].find((t) => selectedModel.includes(t)) || '';
+  localStorage.setItem('annotron-model', selectedModel);
+}
 let forceAskMode = localStorage.getItem('annotron-ask-mode') === 'true';
 let agentMetricsData = { model: '', tokensUsed: 0, tokensMax: 200000, contextUsed: 0, contextMax: 65536 };
 
@@ -734,9 +741,9 @@ const infoTokens = document.getElementById('info-tokens');
 function updateInfoBar() {
   // Update model display
   const modelDisplay = selectedModel ?
-    (selectedModel.includes('opus') ? 'Opus 4.8' :
-     selectedModel.includes('sonnet') ? 'Sonnet 5' :
-     selectedModel.includes('haiku') ? 'Haiku 4.5' :
+    (selectedModel.includes('opus') ? 'Opus' :
+     selectedModel.includes('sonnet') ? 'Sonnet' :
+     selectedModel.includes('haiku') ? 'Haiku' :
      selectedModel) : 'Default';
   infoModel.textContent = modelDisplay;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delete101020/aidlc",
-  "version": "4.0.22",
+  "version": "4.0.24",
   "description": "AIDLC Native CLI, a fork of AIDLC — drive Claude through the six-stage AI-Native SDLC Playbook: Plan → Design → Build → Test → Deploy → Maintain, with artifact gates, requirements traceability, an incident loop back to Plan, and Spec Kit support.",
   "license": "MIT",
   "repository": {