@unbrained/pm-cli 2026.7.11 → 2026.7.12

package/dist/cli-bundle/chunks/{register-setup-HSVJDV3R.js → register-setup-KB5U3RES.js}

@@ -3,38 +3,38 @@
 import {
   runConfig,
   runUpgrade
-} from "./chunk-5URFS7C4.js";
+} from "./chunk-PUMGO764.js";
 import {
   SCAFFOLD_CAPABILITIES,
   renderExtensionDescribeMarkdown,
   runExtension,
   runInit,
   summarizeInitResult
-} from "./chunk-MORRAQXQ.js";
-import "./chunk-XGUXU4IQ.js";
-import "./chunk-DBV6QRYT.js";
-import "./chunk-RA2LPP6E.js";
+} from "./chunk-UAZ6W3H3.js";
+import "./chunk-Y44B5FBE.js";
+import "./chunk-3KJ3FG5O.js";
+import "./chunk-JM4Z53DN.js";
 import "./chunk-DJAGYYCQ.js";
-import "./chunk-L7C6RTGH.js";
-import "./chunk-VTOQH22Y.js";
+import "./chunk-ACDIA6NP.js";
+import "./chunk-A2HZUSEA.js";
 import {
   collect,
   getGlobalOptions
-} from "./chunk-WBKZAO3P.js";
-import "./chunk-RAC2UXLT.js";
-import "./chunk-JR6FIX53.js";
-import "./chunk-EEUIIDWF.js";
+} from "./chunk-A6AVSYRJ.js";
+import "./chunk-QPWXNK56.js";
+import "./chunk-JNNPTGXR.js";
+import "./chunk-UGQENMKM.js";
 import "./chunk-NETP4DY4.js";
 import {
   printError,
   printResult,
   writeStdout
-} from "./chunk-KHQYX2QB.js";
-import "./chunk-NAGOH4YJ.js";
+} from "./chunk-NN57FRRN.js";
+import "./chunk-VXUWCJS7.js";
 import {
   EXIT_CODE,
   PmCliError
-} from "./chunk-QCKPSFII.js";
+} from "./chunk-AHIEDSW2.js";
 
 // dist/cli/register-setup.js
 import fs from "node:fs/promises";
@@ -433,6 +433,6 @@ function registerSetupCommands(program) {
 export {
   registerSetupCommands
 };
-//# sourceMappingURL=register-setup-HSVJDV3R.js.map
+//# sourceMappingURL=register-setup-KB5U3RES.js.map
 
 //# debugId=2f6a1bb1-9f83-5ef9-87d3-e73373b9ab92

package/dist/cli-bundle/chunks/{register-setup-KE5L3H7U.js → register-setup-ZG7YXPHJ.js}

@@ -1,38 +1,38 @@
 import {
   runConfig,
   runUpgrade
-} from "./chunk-X7ZXLB3C.js";
+} from "./chunk-PDOJRPYR.js";
 import {
   SCAFFOLD_CAPABILITIES,
   renderExtensionDescribeMarkdown,
   runExtension,
   runInit,
   summarizeInitResult
-} from "./chunk-E72ZO34Z.js";
-import "./chunk-ZLWBLI5R.js";
-import "./chunk-MN2YMU55.js";
-import "./chunk-RTG2LHQ7.js";
+} from "./chunk-G6B5XGNV.js";
+import "./chunk-OOK6V7BF.js";
+import "./chunk-HOE3UV3G.js";
+import "./chunk-HLZXQKGZ.js";
 import "./chunk-Q3K5XPAQ.js";
-import "./chunk-L6C62S4V.js";
-import "./chunk-X6HT3FP3.js";
+import "./chunk-WZDABROA.js";
+import "./chunk-VMGK6ESD.js";
 import {
   collect,
   getGlobalOptions
-} from "./chunk-TB6364F7.js";
-import "./chunk-GZNB5V5J.js";
-import "./chunk-RLOWK5EQ.js";
-import "./chunk-NR7PTIR7.js";
+} from "./chunk-Z7XTVIN5.js";
+import "./chunk-J2ZDZG4A.js";
+import "./chunk-5754C5XS.js";
+import "./chunk-L23NAJHL.js";
 import "./chunk-D6HZN36B.js";
 import {
   printError,
   printResult,
   writeStdout
-} from "./chunk-5OBMSBWX.js";
-import "./chunk-Y476SA4V.js";
+} from "./chunk-FIZUJWXQ.js";
+import "./chunk-NEJKKTCG.js";
 import {
   EXIT_CODE,
   PmCliError
-} from "./chunk-7324AI5M.js";
+} from "./chunk-66YL6RR5.js";
 
 // dist/cli/register-setup.js
 import fs from "node:fs/promises";
@@ -438,4 +438,4 @@ function registerSetupCommands(program) {
 export {
   registerSetupCommands
 };
-//# sourceMappingURL=register-setup-KE5L3H7U.js.map
+//# sourceMappingURL=register-setup-ZG7YXPHJ.js.map

package/dist/cli-bundle/chunks/{restore-MDNVYUDD.js → restore-F5HPTRBR.js}

@@ -3,16 +3,16 @@
 import {
   _testOnlyRestoreCommand,
   runRestore
-} from "./chunk-2JWIRG4V.js";
+} from "./chunk-VF24O6TV.js";
 import "./chunk-CUFW7ITY.js";
-import "./chunk-PZBRTJ3Y.js";
-import "./chunk-FCZ6WYSR.js";
-import "./chunk-NAGOH4YJ.js";
-import "./chunk-QCKPSFII.js";
+import "./chunk-VLVTXEGG.js";
+import "./chunk-LEXFDABF.js";
+import "./chunk-VXUWCJS7.js";
+import "./chunk-AHIEDSW2.js";
 export {
   _testOnlyRestoreCommand,
   runRestore
 };
-//# sourceMappingURL=restore-MDNVYUDD.js.map
+//# sourceMappingURL=restore-F5HPTRBR.js.map
 
 //# debugId=45eac7fa-f181-5cca-93b7-cfb58909dbb3

package/dist/cli-bundle/chunks/restore-LN57EB5H.js

@@ -0,0 +1,14 @@
+import {
+  _testOnlyRestoreCommand,
+  runRestore
+} from "./chunk-PHQPQNAT.js";
+import "./chunk-YRYYFGV3.js";
+import "./chunk-AS62PEJE.js";
+import "./chunk-TWELUDDF.js";
+import "./chunk-NEJKKTCG.js";
+import "./chunk-66YL6RR5.js";
+export {
+  _testOnlyRestoreCommand,
+  runRestore
+};
+//# sourceMappingURL=restore-LN57EB5H.js.map

package/dist/cli-bundle/chunks/{schema-AJCAANMB.js → schema-3DKXA4KR.js}

@@ -28,13 +28,13 @@ import {
   runSchemaShow,
   runSchemaShowField,
   runSchemaShowStatus
-} from "./chunk-L6C62S4V.js";
-import "./chunk-X6HT3FP3.js";
+} from "./chunk-WZDABROA.js";
+import "./chunk-VMGK6ESD.js";
 import {
   buildInvalidTypeHint
-} from "./chunk-NR7PTIR7.js";
-import "./chunk-Y476SA4V.js";
-import "./chunk-7324AI5M.js";
+} from "./chunk-L23NAJHL.js";
+import "./chunk-NEJKKTCG.js";
+import "./chunk-66YL6RR5.js";
 export {
   SCHEMA_SUBCOMMANDS,
   _testOnlySchemaCommand,
@@ -67,4 +67,4 @@ export {
   runSchemaShowField,
   runSchemaShowStatus
 };
-//# sourceMappingURL=schema-AJCAANMB.js.map
+//# sourceMappingURL=schema-3DKXA4KR.js.map

package/dist/cli-bundle/chunks/{schema-2B37DMM2.js → schema-QLTOK23S.js}

@@ -30,13 +30,13 @@ import {
   runSchemaShow,
   runSchemaShowField,
   runSchemaShowStatus
-} from "./chunk-L7C6RTGH.js";
-import "./chunk-VTOQH22Y.js";
+} from "./chunk-ACDIA6NP.js";
+import "./chunk-A2HZUSEA.js";
 import {
   buildInvalidTypeHint
-} from "./chunk-EEUIIDWF.js";
-import "./chunk-NAGOH4YJ.js";
-import "./chunk-QCKPSFII.js";
+} from "./chunk-UGQENMKM.js";
+import "./chunk-VXUWCJS7.js";
+import "./chunk-AHIEDSW2.js";
 export {
   SCHEMA_SUBCOMMANDS,
   _testOnlySchemaCommand,
@@ -69,6 +69,6 @@ export {
   runSchemaShowField,
   runSchemaShowStatus
 };
-//# sourceMappingURL=schema-2B37DMM2.js.map
+//# sourceMappingURL=schema-QLTOK23S.js.map
 
 //# debugId=45eac7fa-f181-5cca-93b7-cfb58909dbb3

package/dist/cli-bundle/chunks/update-2T5EWMXD.js

@@ -0,0 +1,21 @@
+import {
+  _testOnlyUpdateCommand,
+  runUpdate
+} from "./chunk-O5ELBOEJ.js";
+import "./chunk-DNH44IKP.js";
+import "./chunk-KAE727L2.js";
+import "./chunk-TMNQV4EK.js";
+import "./chunk-TYCM65DJ.js";
+import "./chunk-LNAGQRIL.js";
+import "./chunk-OKUFGORG.js";
+import "./chunk-5754C5XS.js";
+import "./chunk-L23NAJHL.js";
+import "./chunk-D6HZN36B.js";
+import "./chunk-FIZUJWXQ.js";
+import "./chunk-NEJKKTCG.js";
+import "./chunk-66YL6RR5.js";
+export {
+  _testOnlyUpdateCommand,
+  runUpdate
+};
+//# sourceMappingURL=update-2T5EWMXD.js.map

package/dist/cli-bundle/chunks/{update-ZCDGTSNL.js → update-IKMNH3W4.js}

@@ -3,23 +3,23 @@
 import {
   _testOnlyUpdateCommand,
   runUpdate
-} from "./chunk-KDNZSVCK.js";
-import "./chunk-I535LTZ2.js";
+} from "./chunk-CDR2A3VI.js";
+import "./chunk-IS6M4ETF.js";
 import "./chunk-IDUTGRDM.js";
-import "./chunk-KZQHMDS6.js";
-import "./chunk-ROH64TST.js";
-import "./chunk-AX3BJLPV.js";
-import "./chunk-K2PDZYUF.js";
-import "./chunk-JR6FIX53.js";
-import "./chunk-EEUIIDWF.js";
+import "./chunk-NOIIRLCO.js";
+import "./chunk-6XNMSLBT.js";
+import "./chunk-ACRC3HI4.js";
+import "./chunk-OC2CLNMS.js";
+import "./chunk-JNNPTGXR.js";
+import "./chunk-UGQENMKM.js";
 import "./chunk-NETP4DY4.js";
-import "./chunk-KHQYX2QB.js";
-import "./chunk-NAGOH4YJ.js";
-import "./chunk-QCKPSFII.js";
+import "./chunk-NN57FRRN.js";
+import "./chunk-VXUWCJS7.js";
+import "./chunk-AHIEDSW2.js";
 export {
   _testOnlyUpdateCommand,
   runUpdate
 };
-//# sourceMappingURL=update-ZCDGTSNL.js.map
+//# sourceMappingURL=update-IKMNH3W4.js.map
 
 //# debugId=45eac7fa-f181-5cca-93b7-cfb58909dbb3

package/dist/cli-bundle/chunks/{update-many-6E2DDBE4.js → update-many-3Q6Z2Q4Y.js}

@@ -3,32 +3,32 @@
 import {
   _testOnlyUpdateManyCommand,
   runUpdateMany
-} from "./chunk-YIWYD7TC.js";
-import "./chunk-DD2WZD6L.js";
-import "./chunk-2JWIRG4V.js";
-import "./chunk-KDNZSVCK.js";
-import "./chunk-I535LTZ2.js";
+} from "./chunk-FVZEIWTL.js";
+import "./chunk-LU4Z7POS.js";
+import "./chunk-VF24O6TV.js";
+import "./chunk-CDR2A3VI.js";
+import "./chunk-IS6M4ETF.js";
 import "./chunk-CUFW7ITY.js";
 import "./chunk-IDUTGRDM.js";
 import "./chunk-N7V7TI6J.js";
-import "./chunk-VOXOXART.js";
-import "./chunk-KZQHMDS6.js";
-import "./chunk-5F7UJHFY.js";
-import "./chunk-PZBRTJ3Y.js";
-import "./chunk-FCZ6WYSR.js";
-import "./chunk-ROH64TST.js";
-import "./chunk-AX3BJLPV.js";
-import "./chunk-K2PDZYUF.js";
-import "./chunk-JR6FIX53.js";
-import "./chunk-EEUIIDWF.js";
+import "./chunk-DLZ3RXAL.js";
+import "./chunk-NOIIRLCO.js";
+import "./chunk-HO6CDURZ.js";
+import "./chunk-VLVTXEGG.js";
+import "./chunk-LEXFDABF.js";
+import "./chunk-6XNMSLBT.js";
+import "./chunk-ACRC3HI4.js";
+import "./chunk-OC2CLNMS.js";
+import "./chunk-JNNPTGXR.js";
+import "./chunk-UGQENMKM.js";
 import "./chunk-NETP4DY4.js";
-import "./chunk-KHQYX2QB.js";
-import "./chunk-NAGOH4YJ.js";
-import "./chunk-QCKPSFII.js";
+import "./chunk-NN57FRRN.js";
+import "./chunk-VXUWCJS7.js";
+import "./chunk-AHIEDSW2.js";
 export {
   _testOnlyUpdateManyCommand,
   runUpdateMany
 };
-//# sourceMappingURL=update-many-6E2DDBE4.js.map
+//# sourceMappingURL=update-many-3Q6Z2Q4Y.js.map
 
 //# debugId=45eac7fa-f181-5cca-93b7-cfb58909dbb3

package/dist/cli-bundle/chunks/update-many-OTAS4BWH.js

@@ -0,0 +1,30 @@
+import {
+  _testOnlyUpdateManyCommand,
+  runUpdateMany
+} from "./chunk-XGCPTS6L.js";
+import "./chunk-OUQ4I6HC.js";
+import "./chunk-PHQPQNAT.js";
+import "./chunk-O5ELBOEJ.js";
+import "./chunk-DNH44IKP.js";
+import "./chunk-YRYYFGV3.js";
+import "./chunk-KAE727L2.js";
+import "./chunk-KWYX6ZIR.js";
+import "./chunk-GFBV2254.js";
+import "./chunk-TMNQV4EK.js";
+import "./chunk-QFCCN4JO.js";
+import "./chunk-AS62PEJE.js";
+import "./chunk-TWELUDDF.js";
+import "./chunk-TYCM65DJ.js";
+import "./chunk-LNAGQRIL.js";
+import "./chunk-OKUFGORG.js";
+import "./chunk-5754C5XS.js";
+import "./chunk-L23NAJHL.js";
+import "./chunk-D6HZN36B.js";
+import "./chunk-FIZUJWXQ.js";
+import "./chunk-NEJKKTCG.js";
+import "./chunk-66YL6RR5.js";
+export {
+  _testOnlyUpdateManyCommand,
+  runUpdateMany
+};
+//# sourceMappingURL=update-many-OTAS4BWH.js.map

package/dist/cli-bundle/main.js

@@ -5,10 +5,10 @@ import {
   emitTelemetryErrorEvent,
   finishTelemetryCommand,
   startTelemetryCommand
-} from "./chunks/chunk-2BKRMFGK.js";
+} from "./chunks/chunk-UFY4ETU6.js";
 import {
   migrateItemFilesToFormat
-} from "./chunks/chunk-ZLWBLI5R.js";
+} from "./chunks/chunk-OOK6V7BF.js";
 import {
   EXECUTABLE_COMMAND_ALIASES,
   applyBootstrapPagerPolicy,
@@ -23,7 +23,7 @@ import {
   parseBootstrapTypeValue,
   renderPmCommand,
   stripGlobalBootstrapTokens
-} from "./chunks/chunk-MN2YMU55.js";
+} from "./chunks/chunk-HOE3UV3G.js";
 import {
   applyDefaultOutputFormat,
   clearResolvedGlobalOptions,
@@ -33,16 +33,16 @@ import {
   getGlobalOptions,
   invalidateSearchCachesForMutation,
   setResolvedGlobalOptions
-} from "./chunks/chunk-TB6364F7.js";
+} from "./chunks/chunk-Z7XTVIN5.js";
 import {
   PM_CORE_COMMAND_NAMES,
   resolveSubcommandFlagContractsForCommand
-} from "./chunks/chunk-GZNB5V5J.js";
+} from "./chunks/chunk-J2ZDZG4A.js";
 import {
   printError,
   printResult,
   writeStdout
-} from "./chunks/chunk-5OBMSBWX.js";
+} from "./chunks/chunk-FIZUJWXQ.js";
 import {
   clearActiveExtensionHooks,
   consumeAfterCommandAffectedItems,
@@ -64,7 +64,7 @@ import {
   setActiveExtensionRenderers,
   setActiveExtensionServices,
   writeSettings
-} from "./chunks/chunk-Y476SA4V.js";
+} from "./chunks/chunk-NEJKKTCG.js";
 import {
   BUILTIN_ITEM_TYPE_VALUES,
   EXIT_CODE,
@@ -92,7 +92,7 @@ import {
   runAfterCommandHooks,
   runBeforeCommandHooks,
   toNonEmptyStringOrUndefined
-} from "./chunks/chunk-7324AI5M.js";
+} from "./chunks/chunk-66YL6RR5.js";
 
 // dist/cli/main.js
 import { Command } from "commander";
@@ -2929,13 +2929,61 @@ function createLazyModule(importer) {
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "93c1fe71-1d1e-597f-82c3-9c34089e9196");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "1e6b6cdc-855a-5090-a7bd-36d47c55295e");
   } catch (e2) {
   }
 })();
 function normalizeExtensionCommandPath(commandPath) {
   return commandPath.trim().toLowerCase().split(/\s+/).filter((part) => part.length > 0).join(" ");
 }
+function buildCanonicalExtensionAliases(handlers, definitions) {
+  const aliases = /* @__PURE__ */ new Map();
+  for (const handler of handlers) {
+    const alias = normalizeExtensionCommandPath(handler.command);
+    for (const definition of definitions) {
+      if (definition.layer !== handler.layer || definition.name !== handler.name) {
+        continue;
+      }
+      const canonical = normalizeExtensionCommandPath(definition.command);
+      const parts = canonical.split(" ");
+      const action = parts.at(-1);
+      const suffix = parts.slice(1).join(" ");
+      const expectedAlias = suffix ? `${parts[0]}-${action} ${suffix}` : `${parts[0]}-${action}`;
+      if (action && alias === expectedAlias) {
+        aliases.set(alias, canonical);
+        break;
+      }
+    }
+  }
+  return aliases;
+}
+function extensionFlagTakesValueForInvocation(invocationArgv, commandName, normalizedMissing, descriptors) {
+  if (!commandName || !normalizedMissing) {
+    return void 0;
+  }
+  let descriptor;
+  let matchedTokenCount = 0;
+  for (const [index, token] of invocationArgv.entries()) {
+    if (token !== commandName) {
+      continue;
+    }
+    const commandTokens = invocationArgv.slice(index);
+    for (const [path, candidate] of descriptors.entries()) {
+      const pathTokens = path.split(" ");
+      if (pathTokens.length > matchedTokenCount && pathTokens.every((pathToken, pathIndex) => commandTokens[pathIndex] === pathToken)) {
+        descriptor = candidate;
+        matchedTokenCount = pathTokens.length;
+      }
+    }
+  }
+  const flag = descriptor?.flags.find((candidate) => candidate.long === normalizedMissing || candidate.short === normalizedMissing);
+  if (!flag) {
+    return void 0;
+  }
+  const valueName = typeof flag.value_name === "string" && flag.value_name.trim().length > 0;
+  const valueType = typeof flag.value_type === "string" ? flag.value_type : typeof flag.type === "string" ? flag.type : void 0;
+  return flag.required === true || valueName || valueType !== void 0 && valueType !== "boolean";
+}
 function toNonEmptyFlagString(value) {
   if (typeof value !== "string") {
     return null;
@@ -3104,18 +3152,23 @@ function collectExtensionHelpCommandSet(commandHandlers, definitionsByCommand, f
   }
   return commandSet;
 }
-function collectExtensionCommandHelpDescriptors(commandHandlers, commandDefinitions, flagRegistrations) {
+function resolveFlattenedAliasDescriptor(commandPath, definitionsByCommand, canonicalAliases) {
+  const canonical = canonicalAliases.get(commandPath);
+  return canonical ? definitionsByCommand.get(canonical) : void 0;
+}
+function collectExtensionCommandHelpDescriptors(commandHandlers, commandDefinitions, flagRegistrations, canonicalAliases = /* @__PURE__ */ new Map()) {
   const definitionsByCommand = collectExtensionDefinitionsByCommand(commandDefinitions);
   const flagsByCommand = collectExtensionFlagsByCommand(flagRegistrations);
   const commandSet = collectExtensionHelpCommandSet(commandHandlers, definitionsByCommand, flagsByCommand);
   const descriptors = /* @__PURE__ */ new Map();
   const sortedCommands = [...commandSet].sort((left, right) => left.localeCompare(right));
   for (const commandPath of sortedCommands) {
-    const definition = definitionsByCommand.get(commandPath);
-    const flags = flagsByCommand.get(commandPath) ?? [];
+    const definition = definitionsByCommand.get(commandPath) ?? resolveFlattenedAliasDescriptor(commandPath, definitionsByCommand, canonicalAliases);
+    const flags = flagsByCommand.get(commandPath) ?? (definition ? flagsByCommand.get(definition.command) : void 0) ?? [];
     if (definition) {
       descriptors.set(commandPath, {
         ...definition,
+        command: commandPath,
         flags
       });
       continue;
@@ -4310,7 +4363,7 @@ function attachCreateUpdatePolicyHelpText(rootProgram, typeRegistry, argv) {
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "b20cc758-3f21-5d8e-99f4-0c85b0fabd20");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "48e267a5-172c-54c9-b398-94eb2971fb5a");
   } catch (e2) {
   }
 })();
@@ -4366,10 +4419,10 @@ var EXPECTED_HANDLED_ERROR_EXIT_CODES = /* @__PURE__ */ new Set([
   EXIT_CODE.CONFLICT
 ]);
 var TRUE_LIKE_ENV_VALUES = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
-var loadSetupRegistrationModule = createLazyModule(() => import("./chunks/register-setup-KE5L3H7U.js"));
-var loadListQueryRegistrationModule = createLazyModule(() => import("./chunks/register-list-query-ODDZVR6N.js"));
-var loadMutationRegistrationModule = createLazyModule(() => import("./chunks/register-mutation-2APBEHTJ.js"));
-var loadOperationRegistrationModule = createLazyModule(() => import("./chunks/register-operations-WKZSX4QP.js"));
+var loadSetupRegistrationModule = createLazyModule(() => import("./chunks/register-setup-ZG7YXPHJ.js"));
+var loadListQueryRegistrationModule = createLazyModule(() => import("./chunks/register-list-query-S6I73L5W.js"));
+var loadMutationRegistrationModule = createLazyModule(() => import("./chunks/register-mutation-A2SC3K5G.js"));
+var loadOperationRegistrationModule = createLazyModule(() => import("./chunks/register-operations-W6Z5LVI5.js"));
 function describeUnknownError(error) {
   if (error instanceof PmCliError) {
     return error.message;
@@ -4418,7 +4471,7 @@ function inferMissingFieldsFromErrorMessage(message) {
   return normalized.length > 0 ? normalized : void 0;
 }
 function inferMissingFieldsForRecovery(rawMessage, invocationArgv, existingRecovery) {
-  if (existingRecovery?.suggested_retry) {
+  if (existingRecovery?.suggested_retry || rawMessage.includes("failed in extension handler (")) {
     return void 0;
   }
   const providedFields = extractProvidedOptionFlags(invocationArgv);
@@ -4436,7 +4489,8 @@ function resolveRecoverySuggestedRetry(invocationArgv, attemptedCommand, inferre
   const commandName = invocationArgv.find((token) => program.commands.some((candidate) => candidate.name() === token));
   const command = commandName ? program.commands.find((candidate) => candidate.name() === commandName) : void 0;
   const missingOption = normalizedMissing ? command?.options.find((option) => option.flags.split(/[ ,|]+/).includes(normalizedMissing)) : void 0;
-  const missingTokens = normalizedMissing ? missingOption?.isBoolean() === true ? [normalizedMissing] : [normalizedMissing, "<value>"] : [];
+  const extensionFlagTakesValue = extensionFlagTakesValueForInvocation(invocationArgv, commandName, normalizedMissing, activeRuntimeExtensionCommandDescriptors);
+  const missingTokens = normalizedMissing ? missingOption?.isBoolean() === true || extensionFlagTakesValue === false ? [normalizedMissing] : [normalizedMissing, "<value>"] : [];
   const suggestedRetry = normalizedMissing ? renderAttemptedCommand3([...invocationArgv, ...missingTokens]) : attemptedCommand;
   return suggestedRetry === attemptedCommand ? void 0 : suggestedRetry;
 }
@@ -5298,7 +5352,8 @@ async function loadRuntimeExtensionSnapshot(pmRoot, probe) {
       ...new Set(activationResult.commands.handlers.map((entry) => normalizeExtensionCommandPath(entry.command)))
     ].filter((entry) => entry.length > 0).sort((left, right) => left.localeCompare(right));
     const commandFlagHelp = collectDynamicExtensionFlagHelpByCommand(activationResult.registrations.flags);
-    const commandDescriptors = collectExtensionCommandHelpDescriptors(commandHandlers, activationResult.registrations.commands, activationResult.registrations.flags);
+    const canonicalAliases = buildCanonicalExtensionAliases(activationResult.commands.handlers, activationResult.registrations.commands);
+    const commandDescriptors = collectExtensionCommandHelpDescriptors(commandHandlers, activationResult.registrations.commands, activationResult.registrations.flags, canonicalAliases);
     const snapshot = {
       hooks: activationResult.hooks,
       commands: activationResult.commands,