agents-inc 0.153.0 → 0.155.0

package/dist/{chunk-HEBPKK5L.js → chunk-F5T6TV4Z.js}

@@ -7,16 +7,17 @@ import {
   getUnmetRequiredBy,
   isActiveAt,
   isGlobalTombstone,
+  isLocalOnlySkill,
   isProjectOwned
-} from "./chunk-NXQAY5U7.js";
+} from "./chunk-WCAUUBHO.js";
 import {
   warn
-} from "./chunk-U2YSGBHA.js";
+} from "./chunk-XAXJWXI4.js";
 import {
   getCategoryDomain,
   getSkillById,
   matrix
-} from "./chunk-35VOK7XE.js";
+} from "./chunk-RWOYPOMR.js";
 import {
   typedEntries,
   typedFromEntries,
@@ -24,12 +25,14 @@ import {
   typedValues
 } from "./chunk-VASLW636.js";
 import {
+  CLI_INVOKE_COMMAND,
   DEFAULT_PUBLIC_SOURCE_NAME,
   DEFAULT_SCRATCH_DOMAINS,
   EJECT_SOURCE,
   FALLBACK_DOMAIN,
-  INSTALL_MODES
-} from "./chunk-R54KIGN2.js";
+  INSTALL_MODES,
+  SKILL_CATEGORIES_PATH
+} from "./chunk-IO5YBKHV.js";
 
 // src/cli/stores/wizard-store.ts
 import { create } from "zustand";
@@ -48,7 +51,7 @@ function computeScopeDiff(input) {
   const excludedGlobalAgents = currentAgents.filter((a) => a.scope === "global" && !!a.excluded);
   const prevSkillKeySet = installedSkillConfigs ? new Set(installedSkillConfigs.map((s) => skillSlotKey(s.id, s.scope))) : null;
   const prevSourceMap = installedSkillConfigs ? new Map(
-    installedSkillConfigs.filter((s) => !s.excluded).map((s) => [skillSlotKey(s.id, s.scope), s.source])
+    installedSkillConfigs.filter((s) => !s.excluded).map((s) => [skillSlotKey(s.id, s.scope), s.origin])
   ) : null;
   const prevAgentKeySet = installedAgentConfigs ? new Set(installedAgentConfigs.map((a) => agentSlotKey(a.name, a.scope))) : null;
   const activeSkillBaseline = installedSkillConfigs ? installedSkillConfigs.filter((s) => !s.excluded) : [];
@@ -59,12 +62,12 @@ function computeScopeDiff(input) {
   const inheritedGlobalAgents = activeAgentBaseline.filter(
     (a) => a.scope === "global" && !globalAgents.some((g) => g.name === a.name) && !excludedGlobalAgents.some((e) => e.name === a.name) && projectAgents.some((p) => p.name === a.name)
   );
-  const removedSkills = installedSkillConfigs ? installedSkillConfigs.filter(
+  const removedSkills = activeSkillBaseline.filter(
     (s) => !currentSkills.some((c) => c.id === s.id && c.scope === s.scope)
-  ) : [];
-  const removedAgents = installedAgentConfigs ? installedAgentConfigs.filter(
+  );
+  const removedAgents = activeAgentBaseline.filter(
     (a) => !currentAgents.some((c) => c.name === a.name && c.scope === a.scope)
-  ) : [];
+  );
   const inheritedSkillIdSet = new Set(inheritedGlobalSkills.map((s) => s.id));
   const uniqueExcludedGlobalSkills = excludedGlobalSkills.filter(
     (s) => !inheritedSkillIdSet.has(s.id)
@@ -83,9 +86,9 @@ function computeScopeDiff(input) {
     ...inheritedGlobalAgents,
     ...uniqueExcludedGlobalAgents
   ];
-  const removedGlobalSkills = isInitMode ? [] : removedSkills.filter((s) => s.scope === "global");
+  const removedGlobalSkills = isInitMode ? [] : removedSkills.filter((s) => s.scope === "global" && !inheritedSkillIdSet.has(s.id));
   const removedProjectSkills = removedSkills.filter((s) => s.scope === "project");
-  const removedGlobalAgents = isInitMode ? [] : removedAgents.filter((a) => a.scope === "global");
+  const removedGlobalAgents = isInitMode ? [] : removedAgents.filter((a) => a.scope === "global" && !inheritedAgentNameSet.has(a.name));
   const removedProjectAgents = removedAgents.filter((a) => a.scope === "project");
   const projectSkillRows = [
     ...projectSkills.map((s) => classifyDiffRow(s, prevSkillKeySet, prevSourceMap)),
@@ -123,18 +126,18 @@ function classifyDiffRow(skill, prevKeySet, prevSourceMap) {
   const key = skillSlotKey(skill.id, skill.scope);
   const isNew = prevKeySet === null || !prevKeySet.has(key);
   const prevSource = prevSourceMap?.get(key);
-  const modeChanged = !isNew && prevSource != null && prevSource !== skill.source;
+  const modeChanged = !isNew && prevSource != null && prevSource !== skill.origin;
   if (modeChanged) {
-    return { id: skill.id, source: skill.source, status: "mode-changed" };
+    return { id: skill.id, source: skill.origin, status: "mode-changed" };
   }
-  return { id: skill.id, source: skill.source, status: isNew ? "added" : "unchanged" };
+  return { id: skill.id, source: skill.origin, status: isNew ? "added" : "unchanged" };
 }
 function classifyAgentDiffRow(agent, prevKeySet) {
   const isNew = prevKeySet === null || !prevKeySet.has(agentSlotKey(agent.name, agent.scope));
   return { name: agent.name, status: isNew ? "added" : "unchanged" };
 }
 function toRemovedSkillRow(skill) {
-  return { id: skill.id, source: skill.source, status: "removed" };
+  return { id: skill.id, source: skill.origin, status: "removed" };
 }
 function toRemovedAgentRow(agent) {
   return { name: agent.name, status: "removed" };
@@ -144,8 +147,7 @@ function toRemovedAgentRow(agent) {
 function buildCategoriesForDomain(domain, allSelections, installedSkillIds, skillConfigs) {
   const categories = sortBy(
     typedValues(matrix.categories).filter((cat) => cat.domain === domain),
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- CategoryDefinition declares this required, but an auto-synthesized category for a custom skill can arrive without it — the type is stricter than the data
-    (cat) => cat.order ?? 0
+    (cat) => cat.order
   );
   const categoryRows = categories.map((cat) => {
     const skillOptions = getAvailableSkills(cat.id, allSelections);
@@ -169,7 +171,7 @@ function buildCategoriesForDomain(domain, allSelections, installedSkillIds, skil
         installed: installedSkillIds?.includes(skill.id) || false,
         ...activeConfig?.scope !== void 0 && { scope: activeConfig.scope },
         ...secondaryScope !== void 0 && { secondaryScope },
-        ...activeConfig?.source !== void 0 && { source: activeConfig.source },
+        ...activeConfig?.origin !== void 0 && { source: activeConfig.origin },
         hasUnmetRequirements: skill.hasUnmetRequirements,
         ...skill.unmetRequirementsReason !== void 0 && {
           unmetRequirementsReason: skill.unmetRequirementsReason
@@ -180,10 +182,8 @@ function buildCategoriesForDomain(domain, allSelections, installedSkillIds, skil
     return {
       id: cat.id,
       displayName: cat.displayName,
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- CategoryDefinition declares this required, but an auto-synthesized category for a custom skill can arrive without it — the type is stricter than the data
-      required: cat.required ?? false,
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- CategoryDefinition declares this required, but an auto-synthesized category for a custom skill can arrive without it — the type is stricter than the data
-      exclusive: cat.exclusive ?? true,
+      required: cat.required,
+      exclusive: cat.exclusive,
       options
     };
   });
@@ -199,7 +199,110 @@ function orderDomains(domains) {
   ];
 }
 
+// src/cli/lib/wizard/agent-roster.ts
+var BUILT_IN_AGENT_GROUPS = [
+  {
+    label: "Web",
+    items: [
+      {
+        id: "web-developer",
+        label: "Web Developer",
+        description: "Frontend features, components, TypeScript"
+      },
+      { id: "web-researcher", label: "Web Researcher", description: "Frontend pattern discovery" },
+      {
+        id: "web-tester",
+        label: "Web Tester",
+        description: "Frontend tests, E2E, component tests"
+      }
+    ]
+  },
+  {
+    label: "API",
+    items: [
+      {
+        id: "api-developer",
+        label: "API Developer",
+        description: "Backend routes, database, middleware"
+      },
+      { id: "api-researcher", label: "API Researcher", description: "Backend pattern discovery" },
+      {
+        id: "api-tester",
+        label: "API Tester",
+        description: "Endpoint, database, and auth flow tests"
+      }
+    ]
+  },
+  {
+    label: "AI",
+    items: [
+      {
+        id: "ai-developer",
+        label: "AI Developer",
+        description: "RAG pipelines, agent loops, tool calling"
+      },
+      {
+        id: "ai-researcher",
+        label: "AI Researcher",
+        description: "Prompt, model, and RAG pipeline discovery"
+      },
+      {
+        id: "ai-tester",
+        label: "AI Tester",
+        description: "LLM mocking, prompt regression, eval harnesses"
+      }
+    ]
+  },
+  {
+    label: "CLI",
+    items: [
+      {
+        id: "cli-developer",
+        label: "CLI Developer",
+        description: "CLI commands, interactive prompts"
+      },
+      { id: "cli-tester", label: "CLI Tester", description: "CLI application tests" },
+      {
+        id: "cli-researcher",
+        label: "CLI Researcher",
+        description: "CLI command and config pattern discovery"
+      }
+    ]
+  },
+  {
+    label: "Meta",
+    items: [
+      {
+        id: "pm",
+        label: "PM",
+        description: "Cross-domain implementation specs; domain frameworks via skills"
+      },
+      {
+        id: "reviewer",
+        label: "Reviewer",
+        description: "Cross-domain code review; domain knowledge via skills"
+      },
+      { id: "agent-summoner", label: "Agent Summoner", description: "Create and improve agents" },
+      {
+        id: "skill-summoner",
+        label: "Skill Summoner",
+        description: "Create technology-specific skills"
+      },
+      { id: "codex-keeper", label: "Codex Keeper", description: "AI-focused documentation" }
+    ]
+  }
+];
+var BUILT_IN_AGENT_IDS = new Set(
+  BUILT_IN_AGENT_GROUPS.flatMap((group) => group.items.map((agent) => agent.id))
+);
+function firstFocusableAgent() {
+  const first = BUILT_IN_AGENT_GROUPS[0]?.items[0];
+  if (first === void 0) throw new Error("The built-in agent roster is empty");
+  return first.id;
+}
+
 // src/cli/stores/wizard-store.ts
+var LOCAL_ONLY_INSTALL_MODES = ["eject"];
 var TOAST_MESSAGES = {
   GLOBAL_SKILLS_LOCKED: "Global skills cannot be changed from project scope",
   ONLY_SKILL_IN_CATEGORY: "Cannot deselect the only skill in this category",
@@ -212,10 +315,15 @@ function resolveEffectiveSource(...candidates) {
 function primarySourceName(skill) {
   return skill?.availableSources?.find((s) => s.primary)?.name;
 }
+function marketplaceSourceName(skill) {
+  return skill?.availableSources?.find((source) => source.type !== "local")?.name;
+}
+function defaultOriginFor(skill) {
+  if (isLocalOnlySkill(skill)) return EJECT_SOURCE;
+  return primarySourceName(skill) ?? DEFAULT_PUBLIC_SOURCE_NAME;
+}
 function createDefaultSkillConfig(id) {
-  const skill = matrix.skills[id];
-  const primarySource = primarySourceName(skill);
-  return { id, scope: "global", source: primarySource ?? DEFAULT_PUBLIC_SOURCE_NAME };
+  return { id, scope: "global", origin: defaultOriginFor(matrix.skills[id]) };
 }
 function hasProjectActive(configs, id) {
   return configs.some((sc) => sc.id === id && isActiveAt(sc, "project"));
@@ -239,16 +347,20 @@ function blocksExclusiveSwap(installed, liveConfigs, id) {
   return isGloballyLockedSkill(installed, liveConfigs, id) || isDualScopePair(liveConfigs, id);
 }
 function wouldOverwriteGlobalEject(config, liveConfigs, installedSkillConfigs) {
-  if (config.scope !== "project" || config.source !== EJECT_SOURCE) return false;
+  if (config.scope !== "project" || config.origin !== EJECT_SOURCE) return false;
   const globalEjectInstalled = installedSkillConfigs?.some(
-    (sc) => sc.id === config.id && sc.scope === "global" && sc.source === EJECT_SOURCE && !sc.excluded
+    (sc) => sc.id === config.id && sc.scope === "global" && sc.origin === EJECT_SOURCE && !sc.excluded
   );
   if (!globalEjectInstalled) return false;
   return !liveConfigs.some((sc) => sc.id === config.id && sc.excluded);
 }
-function withActiveEntrySource(configs, id, scope, source) {
+function isInheritedGlobalSlot(installed, id, scope) {
+  if (installed === null) return false;
+  return scope === "global" && hasGlobalActive(installed, id);
+}
+function withActiveEntryOrigin(configs, id, scope, origin) {
   return configs.map(
-    (sc) => sc.id === id && !sc.excluded && sc.scope === scope ? { ...sc, source } : sc
+    (sc) => sc.id === id && !sc.excluded && sc.scope === scope ? { ...sc, origin } : sc
   );
 }
 function applySkillRemoval(configs, removedIds, installedSkillConfigs) {
@@ -259,7 +371,7 @@ function applySkillRemoval(configs, removedIds, installedSkillConfigs) {
   const resurfacedInheritedGlobals = [...removed].filter((id) => isDualScopePair(configs, id)).map((id) => ({
     id,
     scope: "global",
-    source: configs.find((sc) => sc.id === id && sc.scope === "global")?.source ?? DEFAULT_PUBLIC_SOURCE_NAME
+    origin: configs.find((sc) => sc.id === id && sc.scope === "global")?.origin ?? DEFAULT_PUBLIC_SOURCE_NAME
   }));
   return [...retained, ...resurfacedInheritedGlobals];
 }
@@ -275,11 +387,11 @@ function reconcileSkillConfigs(configs, added, removed, installedSkillConfigs, i
   for (const id of added) {
     if (!isEditingFromGlobalScope && hasGlobalTombstone(installedSkillConfigs ?? [], id) && !hasProjectActive(result, id)) {
       const globalEntry = (installedSkillConfigs ?? []).find((sc) => sc.id === id && sc.scope === "global") ?? result.find((sc) => sc.id === id && sc.scope === "global");
-      const source = globalEntry?.source ?? DEFAULT_PUBLIC_SOURCE_NAME;
+      const origin = globalEntry?.origin ?? DEFAULT_PUBLIC_SOURCE_NAME;
       result = [
         ...result.filter((sc) => sc.id !== id),
-        { id, scope: "project", source },
-        { id, scope: "global", excluded: true, source }
+        { id, scope: "project", origin },
+        { id, scope: "global", excluded: true, origin }
       ];
       continue;
     }
@@ -311,6 +423,17 @@ function isDualScopeAgentPair(configs, name) {
 function collectTombstones(configs) {
   return configs.filter((entry) => entry.excluded);
 }
+function filledAgentSlots(configs) {
+  return new Set(configs.map((ac) => agentSlotKey(ac.name, ac.scope)));
+}
+function agentTombstonesOutsideRebuild(saved, rebuilt) {
+  const filled = filledAgentSlots(rebuilt);
+  return collectTombstones(saved).filter((ac) => !filled.has(agentSlotKey(ac.name, ac.scope)));
+}
+function skillTombstonesOutsideRebuild(saved, rebuilt) {
+  const filled = new Set(rebuilt.map((sc) => skillSlotKey(sc.id, sc.scope)));
+  return collectTombstones(saved).filter((sc) => !filled.has(skillSlotKey(sc.id, sc.scope)));
+}
 function applyAgentToggle(configs, agent, isSelected) {
   if (isSelected) {
     return configs.filter((ac) => ac.name !== agent);
@@ -325,8 +448,10 @@ function applyAgentToggle(configs, agent, isSelected) {
   }
   return [...configs, { name: agent, scope: "global" }];
 }
-function survivesRosterRebuild(agentConfig, roster) {
-  if (agentConfig.excluded) return true;
+function survivesRosterRebuild(agentConfig, roster, rebuiltSlots) {
+  if (agentConfig.excluded) {
+    return !rebuiltSlots.has(agentSlotKey(agentConfig.name, agentConfig.scope));
+  }
   return !isProjectOwned(agentConfig) && !roster.has(agentConfig.name);
 }
 function restoreDualScopeAgent(selectedAgents, agentConfigs, agent) {
@@ -346,12 +471,10 @@ function nextSelectedAgents(selectedAgents, agent, flags) {
 }
 function buildSkillConfigForId(id, savedConfigs) {
   const saved = savedConfigs?.find((sc) => sc.id === id && !sc.excluded && sc.scope === "project") ?? savedConfigs?.find((sc) => sc.id === id && !sc.excluded);
-  const skill = matrix.skills[id];
-  const primarySource = primarySourceName(skill);
   return {
     id,
     scope: saved?.scope ?? "global",
-    source: resolveEffectiveSource(saved?.source, primarySource)
+    origin: saved?.origin ?? defaultOriginFor(matrix.skills[id])
   };
 }
 function buildAgentConfigForName(name, savedConfigs) {
@@ -382,18 +505,22 @@ var DOMAIN_AGENTS = {
   cli: ["cli-developer", "cli-tester", "cli-researcher", "pm", "reviewer"],
   ai: ["ai-developer", "ai-researcher", "ai-tester", "pm", "reviewer"]
 };
+function absentFromSourceWarning(skillId) {
+  return `Installed skill '${skillId}' is not present in the loaded source \u2014 it may have been removed or renamed. It is left out of this session's selection. Run '${CLI_INVOKE_COMMAND} update' to refresh the marketplace if you expect it to still be carried there.`;
+}
+function unplaceableCategoryWarning(skillId, category) {
+  return `Installed skill '${skillId}' has unknown category '${category}' \u2014 skipping. No domain in this source claims that category, so the wizard has no screen to place the skill on. Declare it with a 'domain' in the source's '${SKILL_CATEGORIES_PATH}', or run '${CLI_INVOKE_COMMAND} update' to refresh the marketplace.`;
+}
 function resolveSkillForPopulation(skillId) {
   const { skills } = matrix;
   const skill = skills[skillId];
   if (!skill?.category) {
-    warn(
-      `Installed skill '${skillId}' is not present in the loaded source \u2014 it may have been removed or renamed`
-    );
+    warn(absentFromSourceWarning(skillId));
     return null;
   }
   const domain = getCategoryDomain(skill.category);
   if (!domain) {
-    warn(`Installed skill '${skillId}' has unknown category '${skill.category}' \u2014 skipping`);
+    warn(unplaceableCategoryWarning(skillId, skill.category));
     return null;
   }
   const subcat = skill.category;
@@ -406,17 +533,16 @@ function addToDomainSelections(selections, domain, category, skillId) {
   skillList.push(skillId);
   return true;
 }
-function marketplaceSourceName(skill) {
-  return skill.availableSources?.find((source) => source.type !== "local")?.name ?? DEFAULT_PUBLIC_SOURCE_NAME;
-}
 function sourceForInstallMode(skill, mode) {
-  return mode === "eject" ? EJECT_SOURCE : marketplaceSourceName(skill);
+  if (mode === "eject") return EJECT_SOURCE;
+  return marketplaceSourceName(skill) ?? DEFAULT_PUBLIC_SOURCE_NAME;
 }
-function installModeOfSource(source) {
-  return source === EJECT_SOURCE ? "eject" : "plugin";
+function installModeOfSource(origin) {
+  return origin === EJECT_SOURCE ? "eject" : "plugin";
 }
-function buildInstallModeOptions(selectedMode) {
-  return INSTALL_MODES.map((mode) => ({ mode, selected: mode === selectedMode }));
+function buildInstallModeOptions(skill, selectedMode) {
+  const modes = isLocalOnlySkill(skill) ? LOCAL_ONLY_INSTALL_MODES : INSTALL_MODES;
+  return modes.map((mode) => ({ mode, selected: mode === selectedMode }));
 }
 function collectRemovedInstalledEntries(installedSkillConfigs, skillConfigs) {
   if (!installedSkillConfigs) return [];
@@ -442,20 +568,20 @@ function resolveSkillRowInputs(id, skillConfigs) {
   const skill = getSkillById(id);
   const configEntry = skillConfigs.find((sc) => sc.id === skill.id);
   const selectedSource = resolveEffectiveSource(
-    configEntry?.source,
+    configEntry?.origin,
     skill.activeSource?.name,
     primarySourceName(skill)
   );
   return {
     skillId: skill.id,
     configEntry,
-    options: buildInstallModeOptions(installModeOfSource(selectedSource))
+    options: buildInstallModeOptions(skill, installModeOfSource(selectedSource))
   };
 }
 function toPendingRemovalRow(skillId, options, removedInstalledEntry) {
   return {
     skillId,
-    options: withSelectedMode(options, removedInstalledEntry.source),
+    options: withSelectedMode(options, removedInstalledEntry.origin),
     scope: removedInstalledEntry.scope,
     disabled: true
   };
@@ -482,14 +608,14 @@ function classifySkillSourceRows(skillId, options, context) {
       toLockedGlobalRow(
         skillId,
         options,
-        installedGlobalConfig?.source ?? configEntry.source,
+        installedGlobalConfig?.origin ?? configEntry.origin,
         installedSkillSlots
       )
     ];
   }
   if (!isEditingFromGlobalScope && installedGlobalConfig && configEntry?.scope === "project") {
     return [
-      toLockedGlobalRow(skillId, options, installedGlobalConfig.source, installedSkillSlots),
+      toLockedGlobalRow(skillId, options, installedGlobalConfig.origin, installedSkillSlots),
       {
         skillId,
         options,
@@ -561,6 +687,10 @@ var createInitialState = (overrides) => ({
   history: [],
   ...overrides
 });
+function seedFocusForStep(step, actions) {
+  if (step === "build") actions.seedFocusedSkillForActiveDomain();
+  if (step === "agents") actions.seedFocusedAgent();
+}
 var useWizardStore = create((set, get) => ({
   ...createInitialState(),
   setStep: (step) => {
@@ -568,7 +698,7 @@ var useWizardStore = create((set, get) => ({
       step,
       history: [...state.history, state.step]
     }));
-    if (step === "build") get().seedFocusedSkillForActiveDomain();
+    seedFocusForStep(step, get());
   },
   setApproach: (approach) => set({ approach }),
   selectStack: (stackId) => set({
@@ -622,7 +752,7 @@ var useWizardStore = create((set, get) => ({
     const skillConfigs = resolvedSkillIds.map(
       (id) => buildSkillConfigForId(id, savedConfigs)
     );
-    const excludedConfigs = collectTombstones(savedConfigs ?? []);
+    const excludedConfigs = skillTombstonesOutsideRebuild(savedConfigs ?? [], skillConfigs);
     return {
       domainSelections,
       _stackDomainSelections: structuredClone(domainSelections),
@@ -770,7 +900,7 @@ var useWizardStore = create((set, get) => ({
       return {
         skillConfigs: needsTombstone ? [
           ...rescoped,
-          { id: skillId, scope: "global", excluded: true, source: config.source }
+          { id: skillId, scope: "global", excluded: true, origin: config.origin }
         ] : rescoped
       };
     }
@@ -793,22 +923,22 @@ var useWizardStore = create((set, get) => ({
       warn("Ignoring setInstallMode call with empty skillId");
       return state;
     }
-    const source = sourceForInstallMode(getSkillById(skillId), mode);
+    if (isInheritedGlobalSlot(state.installedSkillConfigs, skillId, scope) && !state.isEditingFromGlobalScope) {
+      return state;
+    }
+    const origin = sourceForInstallMode(getSkillById(skillId), mode);
     return {
-      skillConfigs: withActiveEntrySource(state.skillConfigs, skillId, scope, source)
+      skillConfigs: withActiveEntryOrigin(state.skillConfigs, skillId, scope, origin)
     };
   }),
   toggleInfo: () => set((state) => ({ showInfo: !state.showInfo })),
   setToastMessage: (message) => set({ toastMessage: message }),
-  goBack: () => set((state) => {
-    if (state.history.length === 0) return state;
-    const history = [...state.history];
-    const previousStep = history.pop();
-    return {
-      step: previousStep,
-      history
-    };
-  }),
+  goBack: () => {
+    const previousStep = get().history.at(-1);
+    if (previousStep === void 0) return;
+    set((state) => ({ step: previousStep, history: state.history.slice(0, -1) }));
+    seedFocusForStep(previousStep, get());
+  },
   toggleAgent: (agent) => set((state) => {
     const installed = state.installedAgentConfigs ?? [];
     const isDualScopePairRow = !state.isEditingFromGlobalScope && isDualScopeAgentPair(state.agentConfigs, agent);
@@ -851,6 +981,10 @@ var useWizardStore = create((set, get) => ({
     return { agentConfigs: rescoped.filter((ac) => !(ac.name === agentName && ac.excluded)) };
   }),
   setFocusedAgentId: (id) => set({ focusedAgentId: id }),
+  seedFocusedAgent: () => {
+    if (get().focusedAgentId !== null) return;
+    set({ focusedAgentId: firstFocusableAgent() });
+  },
   preselectAgentsFromDomains: () => set((state) => {
     if (state.selectedStackId) return state;
     const sorted = [
@@ -858,7 +992,10 @@ var useWizardStore = create((set, get) => ({
     ].sort();
     const roster = new Set(sorted);
     const merged = sorted.map((name) => buildAgentConfigForName(name, state.agentConfigs));
-    const retained = state.agentConfigs.filter((ac) => survivesRosterRebuild(ac, roster));
+    const rebuiltSlots = filledAgentSlots(merged);
+    const retained = state.agentConfigs.filter(
+      (ac) => survivesRosterRebuild(ac, roster, rebuiltSlots)
+    );
     return {
       selectedAgents: sorted,
       agentConfigs: [...merged, ...retained]
@@ -869,7 +1006,7 @@ var useWizardStore = create((set, get) => ({
     const globalAgents = state.globalAgentPreselections?.agents ?? [];
     const mergedAgents = [.../* @__PURE__ */ new Set([...stackAgents, ...globalAgents])].sort();
     const merged = mergedAgents.map((name) => buildAgentConfigForName(name, savedConfigs));
-    const excludedConfigs = collectTombstones(savedConfigs);
+    const excludedConfigs = agentTombstonesOutsideRebuild(savedConfigs, merged);
     return {
       selectedAgents: mergedAgents,
       agentConfigs: [...merged, ...excludedConfigs]
@@ -906,25 +1043,6 @@ var useWizardStore = create((set, get) => ({
     const state = get();
     return state.currentDomainIndex > 0;
   },
-  setAllSourcesEject: () => {
-    set((state) => ({
-      // Never touch tombstones — a dual-scope skill's excluded global tombstone keeps describing
-      // the masked global install. The bulk set-all applies only to active entries, mirroring the
-      // D-262 per-skill setSkillSource/setSourceSelection guard (D-265).
-      skillConfigs: state.skillConfigs.map(
-        (sc) => sc.excluded ? sc : { ...sc, source: EJECT_SOURCE }
-      )
-    }));
-  },
-  setAllSourcesPlugin: () => {
-    set((state) => ({
-      // Never touch tombstones (see setAllSourcesEject) — the excluded global tombstone keeps its
-      // marketplace source describing the masked global install (D-265).
-      skillConfigs: state.skillConfigs.map(
-        (sc) => sc.excluded ? sc : { ...sc, source: marketplaceSourceName(getSkillById(sc.id)) }
-      )
-    }));
-  },
   buildSourceRows: () => {
     const state = get();
     const selectedTechnologies = get().getAllSelectedTechnologies();
@@ -1040,10 +1158,13 @@ export {
   deriveScopeBadges,
   buildCategoriesForDomain,
   orderDomains,
+  BUILT_IN_AGENT_GROUPS,
+  BUILT_IN_AGENT_IDS,
+  DOMAIN_AGENTS,
   WIZARD_STEP_ORDER,
   getActiveStepFlow,
   createInitialState,
   useWizardStore,
   hydrateWizardStore
 };
-//# sourceMappingURL=chunk-HEBPKK5L.js.map
+//# sourceMappingURL=chunk-F5T6TV4Z.js.map