pumuki 6.3.129 → 6.3.130

package/scripts/framework-menu-consumer-runtime-menu.ts

@@ -13,10 +13,10 @@ import {
   renderBadge,
 } from './framework-menu-ui-components-lib';
 import { isMenuUiV2Enabled } from './framework-menu-ui-version-lib';
-import type {
-  ConsumerAction,
-  ConsumerRuntimeWrite,
-} from './framework-menu-consumer-runtime-types';
+import { buildGovernanceConsoleSummaryLines } from '../integrations/lifecycle/cliGovernanceConsole';
+import type { GovernanceConsoleSnapshot } from '../integrations/lifecycle/cliGovernanceConsole';
+import type { ConsumerPreflightResult } from './framework-menu-consumer-preflight-types';
+import type { ConsumerAction, ConsumerRuntimeWrite } from './framework-menu-consumer-runtime-types';
 
 const buildConsumerRuntimeMenuStatus = (
   menuSummary: FrameworkMenuEvidenceSummary
@@ -32,24 +32,35 @@ const buildConsumerRuntimeMenuStatus = (
           : { level: 'info', label: (menuSummary.outcome ?? 'UNKNOWN').trim().toUpperCase() };
 
 export const renderConsumerRuntimeClassicMenu = (
-  actions: ReadonlyArray<ConsumerAction>,
-  useColor: () => boolean
+  params: {
+    actions: ReadonlyArray<ConsumerAction>;
+    repoRoot: string;
+    useColor: () => boolean;
+  }
 ): string => {
-  const groupedActions = resolveConsumerMenuLayout(actions);
+  const menuSummary = readEvidenceSummaryForMenu(params.repoRoot);
+  const menuStatus = buildConsumerRuntimeMenuStatus(menuSummary);
+  const tokens = buildCliDesignTokens({
+    width: resolveLegacyPanelOuterWidth(),
+    color: params.useColor(),
+  });
+  const groupedActions = resolveConsumerMenuLayout(params.actions);
   const lines = [
     'PUMUKI — Hook-System (run: npx ast-hooks)',
     'AST Intelligence System Overview',
-    'A. Switch to advanced menu',
     '',
     ...groupedActions.flatMap((group) => [
-      group.title,
-      ...group.items.map((item) => `${item.id}) ${item.action.label}`),
+      ...(group.title.trim().length > 0 ? [group.title] : []),
+      ...group.items.map((item) => renderActionRow({
+        id: item.id,
+        label: item.action.label,
+      })),
       '',
     ]),
   ];
   return renderLegacyPanel(lines, {
     width: resolveLegacyPanelOuterWidth(),
-    color: useColor(),
+    color: params.useColor(),
   });
 };
 
@@ -58,6 +69,8 @@ export const renderConsumerRuntimeModernMenu = (
     actions: ReadonlyArray<ConsumerAction>;
     repoRoot: string;
     useColor: () => boolean;
+    preflight?: ConsumerPreflightResult | null;
+    governanceConsole?: GovernanceConsoleSnapshot | null;
   }
 ): string => {
   const menuSummary = readEvidenceSummaryForMenu(params.repoRoot);
@@ -67,14 +80,33 @@ export const renderConsumerRuntimeModernMenu = (
     color: params.useColor(),
   });
   const groupedActions = resolveConsumerMenuLayout(params.actions);
+  const governanceConsole =
+    params.preflight
+      ? {
+          governanceObservation: params.preflight.governanceObservation,
+          governanceNextAction: params.preflight.governanceNextAction,
+          policyValidation: params.preflight.policyValidation,
+          experimentalFeatures: params.preflight.experimentalFeatures,
+        }
+      : params.governanceConsole;
   const lines = [
     'PUMUKI — Hook-System (run: npx ast-hooks)',
     'AST Intelligence System Overview',
-    `Status: ${renderBadge(menuStatus.label, menuStatus.level, tokens)}`,
-    'A. Switch to advanced menu',
+    ...(governanceConsole
+      ? [
+        '',
+        'Governance Console',
+        ...buildGovernanceConsoleSummaryLines({
+          governanceObservation: governanceConsole.governanceObservation,
+          governanceNextAction: governanceConsole.governanceNextAction,
+          policyValidation: governanceConsole.policyValidation,
+          experimentalFeatures: governanceConsole.experimentalFeatures,
+        }).map((line) => `  ${line}`),
+      ]
+      : []),
     '',
     ...groupedActions.flatMap((group) => [
-      group.title,
+      ...(group.title.trim().length > 0 ? [group.title] : []),
       ...group.items.map((item) => renderActionRow({
         id: item.id,
         label: item.action.label,
@@ -93,8 +125,14 @@ export const printConsumerRuntimeMenu = (params: {
   repoRoot: string;
   useColor: () => boolean;
   write: ConsumerRuntimeWrite;
+  preflight?: ConsumerPreflightResult | null;
+  governanceConsole?: GovernanceConsoleSnapshot | null;
 }): void => {
-  const classicMenu = renderConsumerRuntimeClassicMenu(params.actions, params.useColor);
+  const classicMenu = renderConsumerRuntimeClassicMenu({
+    actions: params.actions,
+    repoRoot: params.repoRoot,
+    useColor: params.useColor,
+  });
   if (!isMenuUiV2Enabled()) {
     params.write(`\n${classicMenu}\n`);
     return;
@@ -105,6 +143,8 @@ export const printConsumerRuntimeMenu = (params: {
       actions: params.actions,
       repoRoot: params.repoRoot,
       useColor: params.useColor,
+      preflight: params.preflight,
+      governanceConsole: params.governanceConsole,
     })}\n`);
   } catch {
     params.write('\n[pumuki][menu-ui-v2] Render failed. Falling back to classic menu.\n');

package/scripts/framework-menu-consumer-runtime-types.ts

@@ -1,8 +1,10 @@
 import type { FrameworkMenuEvidenceSummary } from './framework-menu-evidence-summary-lib';
+import type { ConsumerPreflightResult } from './framework-menu-consumer-preflight-types';
 import type {
   PumukiCriticalNotificationEvent,
   SystemNotificationEmitResult,
 } from './framework-menu-system-notifications-lib';
+import type { GovernanceConsoleSnapshot } from '../integrations/lifecycle/cliGovernanceConsole';
 
 export type ConsumerAction = {
   id: string;
@@ -40,6 +42,7 @@ export type ConsumerMenuRuntimeParams = {
     stage: 'PRE_COMMIT' | 'PRE_PUSH'
   ) => Promise<string | void> | string | void;
   emitSystemNotification?: ConsumerRuntimeEmitNotification;
+  readGovernanceConsole?: () => GovernanceConsoleSnapshot | null;
   write: ConsumerRuntimeWrite;
 };
 
@@ -47,6 +50,7 @@ export type ConsumerMenuRuntime = {
   actions: ReadonlyArray<ConsumerAction>;
   printMenu: () => void;
   readCurrentSummary: () => FrameworkMenuEvidenceSummary | null;
+  readLastPreflight: () => ConsumerPreflightResult | null;
 };
 
 export type ConsumerRuntimeScope = 'staged' | 'unstaged' | 'workingTree';

package/scripts/framework-menu-evidence-summary-read.ts

@@ -43,6 +43,13 @@ const sumLegacySeverityBand = (row: { by_severity?: unknown }): number => {
   return total;
 };
 
+const optionalNonNegativeInt = (value: unknown): number | undefined => {
+  if (typeof value !== 'number' || !Number.isFinite(value)) {
+    return undefined;
+  }
+  return Math.max(0, Math.trunc(value));
+};
+
 const parsePlatformAuditRows = (
   snapshot: EvidenceSnapshot
 ): ReadonlyArray<FrameworkMenuEvidencePlatformRow> => {
@@ -57,7 +64,16 @@ const parsePlatformAuditRows = (
     }
     const platform = toStringOrNull((entry as { platform?: unknown }).platform) ?? 'Other';
     const violations = sumLegacySeverityBand(entry as { by_severity?: unknown });
-    rows.push({ platform, violations });
+    const activeRules = optionalNonNegativeInt((entry as { active_rules?: unknown }).active_rules);
+    const evaluatedRules = optionalNonNegativeInt(
+      (entry as { evaluated_rules?: unknown }).evaluated_rules
+    );
+    rows.push({
+      platform,
+      violations,
+      ...(typeof activeRules === 'number' ? { activeRules } : {}),
+      ...(typeof evaluatedRules === 'number' ? { evaluatedRules } : {}),
+    });
   }
   return rows;
 };

package/scripts/framework-menu-evidence-summary-types.ts

@@ -19,6 +19,7 @@ export type EvidenceSnapshot = {
   outcome?: unknown;
   findings?: unknown;
   platforms?: unknown;
+  rules_coverage?: unknown;
 };
 
 export type EvidenceSeverityMetrics = {
@@ -28,6 +29,8 @@ export type EvidenceSeverityMetrics = {
 export type FrameworkMenuEvidencePlatformRow = {
   platform: string;
   violations: number;
+  activeRules?: number;
+  evaluatedRules?: number;
 };
 
 export type FrameworkMenuEvidenceSummary = {

package/scripts/framework-menu-layout-data.ts

@@ -2,29 +2,9 @@ import type { MenuLayoutGroup } from './framework-menu-layout-types';
 
 export const CONSUMER_MENU_LAYOUT: ReadonlyArray<MenuLayoutGroup> = [
   {
-    key: 'read-only-gates',
-    title: 'Read-Only Gate Flows',
-    itemIds: ['1', '2', '3', '4'],
-  },
-  {
-    key: 'engine-working-tree-no-preflight',
-    title: 'Engine · working tree (no preflight)',
-    itemIds: ['11', '12', '13', '14'],
-  },
-  {
-    key: 'export',
-    title: 'Legacy Read-Only Export',
-    itemIds: ['8'],
-  },
-  {
-    key: 'legacy-read-only-diagnostics',
-    title: 'Legacy Read-Only Diagnostics',
-    itemIds: ['5', '6', '7', '9'],
-  },
-  {
-    key: 'system',
-    title: 'System',
-    itemIds: ['10'],
+    key: 'ast-intelligence-legacy',
+    title: '',
+    itemIds: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
   },
 ];
 

package/scripts/framework-menu-system-notifications-macos-applescript-dialog.ts

@@ -13,6 +13,6 @@ export const buildDisplayDialogScript = (params: {
   const title = escapeAppleScriptString(params.title);
   const cause = escapeAppleScriptString(params.cause);
   const remediation = escapeAppleScriptString(params.remediation);
-  const message = escapeAppleScriptString(`Causa: ${cause}\n\nSolución: ${remediation}`);
+  const message = escapeAppleScriptString(`${cause}\n\n${remediation}`);
   return `display dialog "${message}" with title "${title}" buttons {"${BLOCKED_DIALOG_DISABLE}", "${BLOCKED_DIALOG_MUTE_30}", "${BLOCKED_DIALOG_KEEP}"} default button "${BLOCKED_DIALOG_KEEP}" with icon stop giving up after 15`;
 };

package/scripts/framework-menu-system-notifications-macos-dialog-payload.ts

@@ -1,6 +1,8 @@
 import type { PumukiCriticalNotificationEvent } from './framework-menu-system-notifications-types';
 import {
   resolveBlockedCauseSummary,
+  resolveBlockedCommand,
+  resolveBlockedImpactSummary,
   resolveBlockedRemediation,
   resolveProjectLabel,
 } from './framework-menu-system-notifications-payloads';
@@ -17,8 +19,18 @@ export const buildBlockedDialogPayload = (params: {
   env: NodeJS.ProcessEnv;
 }): BlockedDialogPayload => {
   const causeCode = params.event.causeCode ?? 'GATE_BLOCKED';
-  const cause = resolveBlockedCauseSummary(params.event, causeCode);
-  const remediation = resolveBlockedRemediation(params.event, causeCode);
+  const cause = [
+    `Causa: ${resolveBlockedCauseSummary(params.event, causeCode)}`,
+    `Impacto: ${resolveBlockedImpactSummary(params.event, causeCode)}`,
+  ].join('\n');
+  const remediation = [
+    `Comando: ${resolveBlockedCommand({
+      event: params.event,
+      repoRoot: params.repoRoot,
+      causeCode,
+    })}`,
+    `Siguiente acción: ${resolveBlockedRemediation(params.event, causeCode)}`,
+  ].join('\n');
   const projectLabel = resolveProjectLabel({
     repoRoot: params.repoRoot,
     projectLabel: params.env.PUMUKI_PROJECT_LABEL,

package/scripts/framework-menu-system-notifications-macos-swift-source.ts

@@ -41,7 +41,7 @@ final class DialogAppDelegate: NSObject, NSApplicationDelegate {
 
     let alert = NSAlert()
     alert.messageText = config.title
-    alert.informativeText = "Causa: \(config.cause)\n\nSolución: \(config.remediation)"
+    alert.informativeText = "\(config.cause)\n\n\(config.remediation)"
     alert.alertStyle = .critical
     alert.addButton(withTitle: config.keepButton)
     alert.addButton(withTitle: config.muteButton)

package/scripts/framework-menu-system-notifications-payloads-blocked.ts

@@ -2,6 +2,7 @@ import type {
   PumukiCriticalNotificationEvent,
   SystemNotificationPayload,
 } from './framework-menu-system-notifications-types';
+import { getCurrentPumukiVersion } from '../integrations/lifecycle/packageInfo';
 import { resolveBlockedCauseSummary } from './framework-menu-system-notifications-cause';
 import { resolveBlockedRemediation } from './framework-menu-system-notifications-remediation';
 import { truncateNotificationText } from './framework-menu-system-notifications-text';
@@ -13,20 +14,143 @@ export {
   resolveBlockedRemediation,
 } from './framework-menu-system-notifications-remediation';
 
+export const resolveBlockedImpactSummary = (
+  event: Extract<PumukiCriticalNotificationEvent, { kind: 'gate.blocked' }>,
+  causeCode: string
+): string => {
+  if (causeCode === 'EVIDENCE_GATE_BLOCKED') {
+    return 'El gate no deja avanzar hasta revalidar la evidencia y la gobernanza del repo.';
+  }
+  if (causeCode === 'TRACKING_CANONICAL_IN_PROGRESS_INVALID') {
+    return 'El tracking canónico bloquea el avance hasta dejar una única tarea activa real.';
+  }
+  if (causeCode === 'TRACKING_CANONICAL_SOURCE_CONFLICT') {
+    return 'Las fuentes de tracking no coinciden y el loop enterprise no puede decidir autoridad.';
+  }
+  if (causeCode === 'PRE_PUSH_UPSTREAM_MISSING') {
+    return 'No puedes publicar el cambio hasta fijar upstream en la rama actual.';
+  }
+  if (causeCode === 'EVIDENCE_STALE') {
+    return `La evidencia de ${event.stage} ya no describe el estado real del repo.`;
+  }
+  return `No se puede continuar en ${event.stage} hasta resolver el bloqueo detectado.`;
+};
+
+const buildPinnedPumukiCommand = (params: {
+  repoRoot: string;
+  executableAndArgs: string;
+}): string =>
+  `npx --yes --package pumuki@${getCurrentPumukiVersion({ repoRoot: params.repoRoot })} ${params.executableAndArgs}`;
+
+export const resolveBlockedCommand = (params: {
+  event: Extract<PumukiCriticalNotificationEvent, { kind: 'gate.blocked' }>;
+  repoRoot: string;
+  causeCode: string;
+}): string => {
+  switch (params.causeCode) {
+    case 'EVIDENCE_MISSING':
+    case 'EVIDENCE_INVALID':
+    case 'EVIDENCE_CHAIN_INVALID':
+    case 'EVIDENCE_STALE':
+      return buildPinnedPumukiCommand({
+        repoRoot: params.repoRoot,
+        executableAndArgs: `pumuki sdd validate --stage=${params.event.stage} --json`,
+      });
+    case 'EVIDENCE_ACTIVE_RULE_IDS_EMPTY_FOR_CODE_CHANGES':
+    case 'EVIDENCE_SKILLS_CONTRACT_INCOMPLETE':
+    case 'EVIDENCE_PLATFORM_SKILLS_SCOPE_INCOMPLETE':
+    case 'EVIDENCE_PLATFORM_SKILLS_BUNDLES_MISSING':
+    case 'EVIDENCE_PLATFORM_CRITICAL_SKILLS_RULES_MISSING':
+    case 'EVIDENCE_CROSS_PLATFORM_CRITICAL_ENFORCEMENT_INCOMPLETE':
+      return `${buildPinnedPumukiCommand({
+        repoRoot: params.repoRoot,
+        executableAndArgs: 'pumuki policy reconcile --strict --json',
+      })} && ${buildPinnedPumukiCommand({
+        repoRoot: params.repoRoot,
+        executableAndArgs: `pumuki sdd validate --stage=${params.event.stage} --json`,
+      })}`;
+    case 'TRACKING_CANONICAL_IN_PROGRESS_INVALID':
+    case 'TRACKING_CANONICAL_SOURCE_CONFLICT':
+      return 'Editar PUMUKI-RESET-MASTER-PLAN.md y dejar una sola tarea activa válida.';
+    case 'PRE_PUSH_UPSTREAM_MISSING':
+      return 'git push --set-upstream origin <branch>';
+    case 'GITFLOW_PROTECTED_BRANCH':
+      return 'git checkout -b feature/<descripcion-kebab-case>';
+    case 'EVIDENCE_GATE_BLOCKED':
+      return `${buildPinnedPumukiCommand({
+        repoRoot: params.repoRoot,
+        executableAndArgs: 'pumuki policy reconcile --strict --json',
+      })} && ${buildPinnedPumukiCommand({
+        repoRoot: params.repoRoot,
+        executableAndArgs: `pumuki sdd validate --stage=${params.event.stage} --json`,
+      })}`;
+    default:
+      return resolveBlockedRemediation(params.event, params.causeCode);
+  }
+};
+
+export const buildBlockedActionableMessage = (params: {
+  event: Extract<PumukiCriticalNotificationEvent, { kind: 'gate.blocked' }>;
+  repoRoot: string;
+  causeCode: string;
+}): string => {
+  const cause = resolveBlockedCauseSummary(params.event, params.causeCode);
+  const impact = resolveBlockedImpactSummary(params.event, params.causeCode);
+  const command = resolveBlockedCommand(params);
+  const nextAction = resolveBlockedRemediation(params.event, params.causeCode);
+  return [
+    `Causa: ${cause}`,
+    `Impacto: ${impact}`,
+    `Comando: ${command}`,
+    `Siguiente acción: ${nextAction}`,
+  ].join('\n');
+};
+
+type BlockedPayloadContext =
+  | string
+  | {
+      projectPrefix: string;
+      repoRoot: string;
+    };
+
+const normalizeBlockedPayloadContext = (
+  context: BlockedPayloadContext
+): {
+  projectPrefix: string;
+  repoRoot: string;
+} => {
+  if (typeof context === 'string') {
+    return {
+      projectPrefix: context,
+      repoRoot: '',
+    };
+  }
+
+  return {
+    projectPrefix: context.projectPrefix,
+    repoRoot: context.repoRoot,
+  };
+};
+
 export const buildGateBlockedPayload = (
   event: Extract<PumukiCriticalNotificationEvent, { kind: 'gate.blocked' }>,
-  projectPrefix: string
+  context: BlockedPayloadContext
 ): SystemNotificationPayload => {
+  const params = normalizeBlockedPayloadContext(context);
   const causeCode = event.causeCode ?? 'GATE_BLOCKED';
   const causeSummary = truncateNotificationText(
     resolveBlockedCauseSummary(event, causeCode),
     72
   );
-  const remediation = resolveBlockedRemediation(event, causeCode);
+  const actionableMessage = buildBlockedActionableMessage({
+    event,
+    repoRoot: params.repoRoot,
+    causeCode,
+  });
   return {
     title: '🔴 Pumuki bloqueado',
-    subtitle: `${projectPrefix}${event.stage} · ${causeSummary}`,
-    message: `Solución: ${remediation}`,
+    subtitle: `${params.projectPrefix}${event.stage} · ${causeSummary}`,
+    message: actionableMessage,
     soundName: 'Basso',
   };
 };

package/scripts/framework-menu-system-notifications-payloads.ts

@@ -10,6 +10,8 @@ import { buildAuditSummaryPayload } from './framework-menu-system-notifications-
 import {
   buildGateBlockedPayload,
   resolveBlockedCauseSummary,
+  resolveBlockedImpactSummary,
+  resolveBlockedCommand,
   resolveBlockedRemediation,
 } from './framework-menu-system-notifications-payloads-blocked';
 import {
@@ -20,6 +22,8 @@ import {
 export { resolveProjectLabel } from './framework-menu-system-notifications-payloads-context';
 export {
   resolveBlockedCauseSummary,
+  resolveBlockedImpactSummary,
+  resolveBlockedCommand,
   resolveBlockedRemediation,
 } from './framework-menu-system-notifications-payloads-blocked';
 export {
@@ -46,7 +50,10 @@ export const buildSystemNotificationPayload = (
     return buildAuditSummaryPayload(event);
   }
   if (event.kind === 'gate.blocked') {
-    return buildGateBlockedPayload(event, projectPrefix);
+    return buildGateBlockedPayload(event, {
+      projectPrefix,
+      repoRoot: context?.repoRoot ?? '',
+    });
   }
   if (event.kind === 'evidence.stale') {
     return buildEvidenceStalePayload(event);

package/scripts/framework-menu-system-notifications-text.ts

@@ -7,7 +7,13 @@ export const truncateNotificationText = (value: string, maxLength: number): stri
   if (value.length <= maxLength) {
     return value;
   }
-  return `${value.slice(0, Math.max(1, maxLength - 1)).trimEnd()}…`;
+  const limit = Math.max(1, maxLength - 1);
+  const trimmed = value.slice(0, limit).trimEnd();
+  const boundary = trimmed.lastIndexOf(' ');
+  const shortened = boundary >= Math.floor(limit * 0.6)
+    ? trimmed.slice(0, boundary).trimEnd()
+    : trimmed;
+  return `${shortened}…`;
 };
 
 export const resolveProjectLabel = (params: {

package/scripts/framework-menu.ts

@@ -25,6 +25,8 @@ import {
   loadAndFormatActiveSkillsBundles,
 } from './framework-menu-skills-lib';
 import { isMenuUiV2Enabled } from './framework-menu-ui-version-lib';
+import { readLifecycleStatus } from '../integrations/lifecycle/status';
+import type { GovernanceConsoleSnapshot } from '../integrations/lifecycle/cliGovernanceConsole';
 export * from './framework-menu-builders';
 export { formatAdvancedMenuView } from './framework-menu-advanced-view-lib';
 export { buildMenuGateParams } from './framework-menu-gate-lib';
@@ -43,6 +45,20 @@ const resolveInitialMenuMode = (): MenuMode => {
   return 'consumer';
 };
 
+const readAdvancedGovernanceConsoleSnapshot = (): GovernanceConsoleSnapshot | null => {
+  try {
+    const status = readLifecycleStatus({ cwd: process.cwd() });
+    return {
+      governanceObservation: status.governanceObservation,
+      governanceNextAction: status.governanceNextAction,
+      policyValidation: status.policyValidation,
+      experimentalFeatures: status.experimentalFeatures,
+    };
+  } catch {
+    return null;
+  }
+};
+
 const menu = async (): Promise<void> => {
   const rl = createInterface({ input, output });
 
@@ -76,10 +92,14 @@ const menu = async (): Promise<void> => {
         consumerRuntime.printMenu();
       } else {
         const currentSummary = consumerRuntime.readCurrentSummary();
+        const lastPreflight = consumerRuntime.readLastPreflight();
+        const governanceConsole = lastPreflight ? null : readAdvancedGovernanceConsoleSnapshot();
         if (!isMenuUiV2Enabled()) {
           output.write(
             `\n${formatAdvancedMenuClassicView(advancedActions, {
               evidenceSummary: currentSummary ?? undefined,
+              preflight: lastPreflight ?? undefined,
+              governanceConsole: governanceConsole ?? undefined,
             })}\n`
           );
         } else {
@@ -87,6 +107,8 @@ const menu = async (): Promise<void> => {
             output.write(
               `\n${formatAdvancedMenuView(advancedActions, {
                 evidenceSummary: currentSummary ?? undefined,
+                preflight: lastPreflight ?? undefined,
+                governanceConsole: governanceConsole ?? undefined,
               })}\n`
             );
           } catch {
@@ -94,12 +116,25 @@ const menu = async (): Promise<void> => {
             output.write(
               `\n${formatAdvancedMenuClassicView(advancedActions, {
                 evidenceSummary: currentSummary ?? undefined,
+                preflight: lastPreflight ?? undefined,
+                governanceConsole: governanceConsole ?? undefined,
               })}\n`
             );
           }
         }
       }
-      const option = (await rl.question('\nSelect option: ')).trim();
+      let option: string;
+      try {
+        option = (await rl.question('\nSelect option: ')).trim();
+      } catch (error) {
+        const code = error instanceof Error && 'code' in error
+          ? String((error as { code?: unknown }).code)
+          : '';
+        if (code === 'ABORT_ERR' || code === 'ERR_USE_AFTER_CLOSE') {
+          break;
+        }
+        throw error;
+      }
       const normalized = option.toUpperCase();
 
       if (mode === 'consumer' && normalized === 'A') {
@@ -118,7 +153,7 @@ const menu = async (): Promise<void> => {
           output.write('Invalid option.\n');
           continue;
         }
-        if (selectedConsumer.id === '10') {
+        if (selectedConsumer.id === '9') {
           break;
         }
         try {

package/scripts/package-install-smoke-consumer-git-repo-lib.ts

@@ -39,8 +39,17 @@ export const configureRemoteAndFeatureBranch = (
     workspace.tmpRoot
   );
   runGitStep(workspace, ['remote', 'add', 'origin', workspace.bareRemote], 'git remote add origin');
-  runGitStep(workspace, ['push', '-u', 'origin', 'main'], 'git push origin main');
   runGitStep(workspace, ['checkout', '-b', 'feature/package-smoke'], 'git checkout feature branch');
+  runGitStep(
+    workspace,
+    ['push', '-u', 'origin', 'feature/package-smoke'],
+    'git push origin feature branch'
+  );
+  runGitStep(
+    workspace,
+    ['push', 'origin', 'HEAD:refs/heads/main'],
+    'git push origin main from feature branch'
+  );
   runGitStep(
     workspace,
     ['branch', '--set-upstream-to=origin/main', 'feature/package-smoke'],