@packmind/cli 0.32.0 → 0.34.1

package/main.cjs

@@ -243,9 +243,9 @@ var init_ansi_styles = __esm({
 });
 
 // node_modules/.pnpm/chalk@5.6.2/node_modules/chalk/source/vendor/supports-color/index.js
-function hasFlag(flag8, argv = globalThis.Deno ? globalThis.Deno.args : import_node_process.default.argv) {
-  const prefix = flag8.startsWith("-") ? "" : flag8.length === 1 ? "-" : "--";
-  const position = argv.indexOf(prefix + flag8);
+function hasFlag(flag9, argv = globalThis.Deno ? globalThis.Deno.args : import_node_process.default.argv) {
+  const prefix = flag9.startsWith("-") ? "" : flag9.length === 1 ? "-" : "--";
+  const position = argv.indexOf(prefix + flag9);
   const terminatorPosition = argv.indexOf("--");
   return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
 }
@@ -380,32 +380,32 @@ var init_supports_color = __esm({
 });
 
 // node_modules/.pnpm/chalk@5.6.2/node_modules/chalk/source/utilities.js
-function stringReplaceAll(string16, substring, replacer) {
-  let index = string16.indexOf(substring);
+function stringReplaceAll(string18, substring, replacer) {
+  let index = string18.indexOf(substring);
   if (index === -1) {
-    return string16;
+    return string18;
   }
   const substringLength = substring.length;
   let endIndex = 0;
   let returnValue = "";
   do {
-    returnValue += string16.slice(endIndex, index) + substring + replacer;
+    returnValue += string18.slice(endIndex, index) + substring + replacer;
     endIndex = index + substringLength;
-    index = string16.indexOf(substring, endIndex);
+    index = string18.indexOf(substring, endIndex);
   } while (index !== -1);
-  returnValue += string16.slice(endIndex);
+  returnValue += string18.slice(endIndex);
   return returnValue;
 }
-function stringEncaseCRLFWithFirstIndex(string16, prefix, postfix, index) {
+function stringEncaseCRLFWithFirstIndex(string18, prefix, postfix, index) {
   let endIndex = 0;
   let returnValue = "";
   do {
-    const gotCR = string16[index - 1] === "\r";
-    returnValue += string16.slice(endIndex, gotCR ? index - 1 : index) + prefix + (gotCR ? "\r\n" : "\n") + postfix;
+    const gotCR = string18[index - 1] === "\r";
+    returnValue += string18.slice(endIndex, gotCR ? index - 1 : index) + prefix + (gotCR ? "\r\n" : "\n") + postfix;
     endIndex = index + 1;
-    index = string16.indexOf("\n", endIndex);
+    index = string18.indexOf("\n", endIndex);
   } while (index !== -1);
-  returnValue += string16.slice(endIndex);
+  returnValue += string18.slice(endIndex);
   return returnValue;
 }
 var init_utilities = __esm({
@@ -564,26 +564,26 @@ var init_source = __esm({
       builder[IS_EMPTY] = _isEmpty;
       return builder;
     };
-    applyStyle = (self, string16) => {
-      if (self.level <= 0 || !string16) {
-        return self[IS_EMPTY] ? "" : string16;
+    applyStyle = (self, string18) => {
+      if (self.level <= 0 || !string18) {
+        return self[IS_EMPTY] ? "" : string18;
       }
       let styler = self[STYLER];
       if (styler === void 0) {
-        return string16;
+        return string18;
       }
       const { openAll, closeAll } = styler;
-      if (string16.includes("\x1B")) {
+      if (string18.includes("\x1B")) {
         while (styler !== void 0) {
-          string16 = stringReplaceAll(string16, styler.close, styler.open);
+          string18 = stringReplaceAll(string18, styler.close, styler.open);
           styler = styler.parent;
         }
       }
-      const lfIndex = string16.indexOf("\n");
+      const lfIndex = string18.indexOf("\n");
       if (lfIndex !== -1) {
-        string16 = stringEncaseCRLFWithFirstIndex(string16, closeAll, openAll, lfIndex);
+        string18 = stringEncaseCRLFWithFirstIndex(string18, closeAll, openAll, lfIndex);
       }
-      return openAll + string16 + closeAll;
+      return openAll + string18 + closeAll;
     };
     Object.defineProperties(createChalk.prototype, styles2);
     chalk = createChalk();
@@ -776,9 +776,9 @@ var require_findOption = __commonJS({
           continue;
         }
         if (node.type === "shortOptions" && opts.shortNames.length) {
-          for (const option18 of node.options) {
-            if (opts.shortNames.includes(option18.key)) {
-              result.push(option18);
+          for (const option20 of node.options) {
+            if (opts.shortNames.includes(option20.key)) {
+              result.push(option20);
             }
           }
         }
@@ -851,7 +851,7 @@ var require_types = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.boolean = exports2.string = exports2.number = void 0;
-    exports2.optional = optional13;
+    exports2.optional = optional15;
     exports2.array = array2;
     var type_1 = require_type();
     exports2.number = {
@@ -878,7 +878,7 @@ var require_types = __commonJS({
         return false;
       }
     };
-    function optional13(t) {
+    function optional15(t) {
       return {
         ...t,
         defaultValue() {
@@ -944,7 +944,7 @@ var require_flag = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.boolean = void 0;
     exports2.fullFlag = fullFlag;
-    exports2.flag = flag8;
+    exports2.flag = flag9;
     var chalk_1 = __importDefault((init_source(), __toCommonJS(source_exports)));
     var Result = __importStar(require_Result());
     var findOption_1 = require_findOption();
@@ -1093,7 +1093,7 @@ var require_flag = __commonJS({
         }
       };
     }
-    function flag8(config) {
+    function flag9(config) {
       return fullFlag({
         type: types_1.boolean,
         ...config
@@ -1264,7 +1264,7 @@ var require_positional = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.positional = positional9;
+    exports2.positional = positional8;
     var chalk_1 = __importDefault((init_source(), __toCommonJS(source_exports)));
     var Result = __importStar(require_Result());
     var types_1 = require_types();
@@ -1304,8 +1304,8 @@ var require_positional = __commonJS({
           var _a2;
           const positionals = nodes.filter((node) => node.type === "positionalArgument" && !visitedNodes.has(node));
           const defaultValueFn = (_a2 = config.defaultValue) !== null && _a2 !== void 0 ? _a2 : config.type.defaultValue;
-          const positional10 = positionals[0];
-          if (!positional10) {
+          const positional9 = positionals[0];
+          if (!positional9) {
             if (defaultValueFn) {
               return Result.ok(defaultValueFn());
             }
@@ -1318,13 +1318,13 @@ var require_positional = __commonJS({
               ]
             });
           }
-          visitedNodes.add(positional10);
-          const decoded = await Result.safeAsync(config.type.from(positional10.raw));
+          visitedNodes.add(positional9);
+          const decoded = await Result.safeAsync(config.type.from(positional9.raw));
           if (Result.isErr(decoded)) {
             return Result.err({
               errors: [
                 {
-                  nodes: [positional10],
+                  nodes: [positional9],
                   message: decoded.error.message
                 }
               ]
@@ -1334,7 +1334,7 @@ var require_positional = __commonJS({
         }
       };
     }
-    function positional9(config) {
+    function positional8(config) {
       return fullPositional({
         type: types_1.string,
         ...config
@@ -1388,13 +1388,13 @@ var require_subcommands = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.subcommands = subcommands11;
+    exports2.subcommands = subcommands12;
     var chalk_1 = __importDefault((init_source(), __toCommonJS(source_exports)));
     var didyoumean_1 = __importDefault(require_didYouMean_1_2_1());
     var Result = __importStar(require_Result());
     var circuitbreaker_1 = require_circuitbreaker();
     var positional_1 = require_positional();
-    function subcommands11(config) {
+    function subcommands12(config) {
       const circuitbreaker = (0, circuitbreaker_1.createCircuitBreaker)(!!config.version);
       const type = {
         async from(str) {
@@ -1412,9 +1412,9 @@ var require_subcommands = __commonJS({
           let errorMessage = "Not a valid subcommand name";
           const closeOptions = (0, didyoumean_1.default)(str, flatMap(commands, (x) => x.names));
           if (closeOptions) {
-            const option18 = Array.isArray(closeOptions) ? closeOptions[0] : closeOptions;
+            const option20 = Array.isArray(closeOptions) ? closeOptions[0] : closeOptions;
             errorMessage += `
-Did you mean ${chalk_1.default.italic(option18)}?`;
+Did you mean ${chalk_1.default.italic(option20)}?`;
           }
           throw new Error(errorMessage);
         }
@@ -1587,14 +1587,14 @@ var strip_ansi_exports = {};
 __export(strip_ansi_exports, {
   default: () => stripAnsi
 });
-function stripAnsi(string16) {
-  if (typeof string16 !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string16}\``);
+function stripAnsi(string18) {
+  if (typeof string18 !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string18}\``);
   }
-  if (!string16.includes("\x1B") && !string16.includes("\x9B")) {
-    return string16;
+  if (!string18.includes("\x1B") && !string18.includes("\x9B")) {
+    return string18;
   }
-  return string16.replace(regex, "");
+  return string18.replace(regex, "");
 }
 var regex;
 var init_strip_ansi = __esm({
@@ -1710,12 +1710,12 @@ var require_command = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.command = command31;
+    exports2.command = command35;
     var chalk_1 = __importDefault((init_source(), __toCommonJS(source_exports)));
     var Result = __importStar(require_Result());
     var circuitbreaker_1 = require_circuitbreaker();
     var utils_1 = require_utils();
-    function command31(config) {
+    function command35(config) {
       const argEntries = (0, utils_1.entries)(config.args);
       const circuitbreaker = (0, circuitbreaker_1.createCircuitBreaker)(!!config.version);
       return {
@@ -1793,11 +1793,11 @@ var require_command = __commonJS({
             }
             if (node.type === "forcePositional") {
             } else if (node.type === "shortOptions") {
-              for (const option18 of node.options) {
-                if (context.visitedNodes.has(option18)) {
+              for (const option20 of node.options) {
+                if (context.visitedNodes.has(option20)) {
                   continue;
                 }
-                unknownArguments.push(option18);
+                unknownArguments.push(option20);
               }
             } else {
               unknownArguments.push(node);
@@ -1876,7 +1876,7 @@ var require_option = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.option = option18;
+    exports2.option = option20;
     var chalk_1 = __importDefault((init_source(), __toCommonJS(source_exports)));
     var Result = __importStar(require_Result());
     var findOption_1 = require_findOption();
@@ -1952,11 +1952,11 @@ var require_option = __commonJS({
           const valueFromEnv = config.env ? process.env[config.env] : void 0;
           const defaultValueFn = config.defaultValue || config.type.defaultValue;
           const onMissingFn = config.onMissing || config.type.onMissing;
-          const option19 = options[0];
+          const option21 = options[0];
           let rawValue;
           let envPrefix = "";
-          if (option19 === null || option19 === void 0 ? void 0 : option19.value) {
-            rawValue = option19.value.node.raw;
+          if (option21 === null || option21 === void 0 ? void 0 : option21.value) {
+            rawValue = option21.value.node.raw;
           } else if (valueFromEnv !== void 0) {
             rawValue = valueFromEnv;
             envPrefix = `env[${chalk_1.default.italic(config.env)}]: `;
@@ -1991,7 +1991,7 @@ var require_option = __commonJS({
               });
             }
           } else {
-            const raw = (option19 === null || option19 === void 0 ? void 0 : option19.type) === "shortOption" ? `-${option19 === null || option19 === void 0 ? void 0 : option19.key}` : `--${config.long}`;
+            const raw = (option21 === null || option21 === void 0 ? void 0 : option21.type) === "shortOption" ? `-${option21 === null || option21 === void 0 ? void 0 : option21.key}` : `--${config.long}`;
             return Result.err({
               errors: [
                 {
@@ -2013,7 +2013,7 @@ var require_option = __commonJS({
         }
       };
     }
-    function option18(config) {
+    function option20(config) {
       return fullOption({
         type: types_1.string,
         ...config
@@ -2052,12 +2052,12 @@ var require_errorBox = __commonJS({
         if (node.type === "shortOptions") {
           let failed = false;
           let s = "";
-          for (const option18 of node.options) {
-            if (error.nodes.includes(option18)) {
-              s += chalk_1.default.red(option18.raw);
+          for (const option20 of node.options) {
+            if (error.nodes.includes(option20)) {
+              s += chalk_1.default.red(option20.raw);
               failed = true;
             } else {
-              s += chalk_1.default.dim(option18.raw);
+              s += chalk_1.default.dim(option20.raw);
             }
           }
           const prefix = failed ? chalk_1.default.red("-") : chalk_1.default.dim("-");
@@ -2586,10 +2586,10 @@ var require_browser = __commonJS({
 var require_has_flag = __commonJS({
   "node_modules/.pnpm/has-flag@3.0.0/node_modules/has-flag/index.js"(exports2, module2) {
     "use strict";
-    module2.exports = (flag8, argv) => {
+    module2.exports = (flag9, argv) => {
       argv = argv || process.argv;
-      const prefix = flag8.startsWith("-") ? "" : flag8.length === 1 ? "-" : "--";
-      const pos = argv.indexOf(prefix + flag8);
+      const prefix = flag9.startsWith("-") ? "" : flag9.length === 1 ? "-" : "--";
+      const pos = argv.indexOf(prefix + flag9);
       const terminatorPos = argv.indexOf("--");
       return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
     };
@@ -3090,8 +3090,8 @@ var require_tokenizer = __commonJS({
         tokens.push(token);
         overallIndex += token.raw.length;
       };
-      for (const [stringIndex, string16] of (0, utils_1.enumerate)(strings)) {
-        const chars = [...string16];
+      for (const [stringIndex, string18] of (0, utils_1.enumerate)(strings)) {
+        const chars = [...string18];
         for (let i = 0; i < chars.length; i++) {
           if (chars[i] === "-" && chars[i + 1] === "-") {
             push({ type: "longPrefix", raw: "--", index: overallIndex });
@@ -3224,7 +3224,7 @@ var require_restPositionals = __commonJS({
       };
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.restPositionals = restPositionals4;
+    exports2.restPositionals = restPositionals5;
     var Result = __importStar(require_Result());
     var types_1 = require_types();
     function fullRestPositionals(config) {
@@ -3247,14 +3247,14 @@ var require_restPositionals = __commonJS({
           const positionals = nodes.filter((node) => node.type === "positionalArgument" && !visitedNodes.has(node));
           const results = [];
           const errors = [];
-          for (const positional9 of positionals) {
-            visitedNodes.add(positional9);
-            const decoded = await Result.safeAsync(config.type.from(positional9.raw));
+          for (const positional8 of positionals) {
+            visitedNodes.add(positional8);
+            const decoded = await Result.safeAsync(config.type.from(positional8.raw));
             if (Result.isOk(decoded)) {
               results.push(decoded.value);
             } else {
               errors.push({
-                nodes: [positional9],
+                nodes: [positional8],
                 message: decoded.error.message
               });
             }
@@ -3268,7 +3268,7 @@ var require_restPositionals = __commonJS({
         }
       };
     }
-    function restPositionals4(config) {
+    function restPositionals5(config) {
       return fullRestPositionals({
         type: types_1.string,
         ...config
@@ -3352,15 +3352,15 @@ var require_multiflag = __commonJS({
             longNames: [config.long],
             shortNames: config.short ? [config.short] : []
           }).filter((x) => !visitedNodes.has(x));
-          for (const option18 of options) {
-            visitedNodes.add(option18);
+          for (const option20 of options) {
+            visitedNodes.add(option20);
           }
           const optionValues = [];
           const errors = [];
-          for (const option18 of options) {
-            const decoded = await Result.safeAsync(flag_1.boolean.from((_b = (_a = option18.value) === null || _a === void 0 ? void 0 : _a.node.raw) !== null && _b !== void 0 ? _b : "true"));
+          for (const option20 of options) {
+            const decoded = await Result.safeAsync(flag_1.boolean.from((_b = (_a = option20.value) === null || _a === void 0 ? void 0 : _a.node.raw) !== null && _b !== void 0 ? _b : "true"));
             if (Result.isErr(decoded)) {
-              errors.push({ nodes: [option18], message: decoded.error.message });
+              errors.push({ nodes: [option20], message: decoded.error.message });
             } else {
               optionValues.push(decoded.value);
             }
@@ -3524,16 +3524,16 @@ var require_multioption = __commonJS({
               });
             }
           }
-          for (const option18 of options) {
-            visitedNodes.add(option18);
+          for (const option20 of options) {
+            visitedNodes.add(option20);
           }
           const optionValues = [];
           const errors = [];
           const flagNodes = [];
-          for (const option18 of options) {
-            const providedValue = (_a = option18.value) === null || _a === void 0 ? void 0 : _a.node.raw;
+          for (const option20 of options) {
+            const providedValue = (_a = option20.value) === null || _a === void 0 ? void 0 : _a.node.raw;
             if (providedValue === void 0) {
-              flagNodes.push(option18);
+              flagNodes.push(option20);
               continue;
             }
             optionValues.push(providedValue);
@@ -3858,7 +3858,7 @@ var require_package = __commonJS({
   "apps/cli/package.json"(exports2, module2) {
     module2.exports = {
       name: "@packmind/cli",
-      version: "0.32.0",
+      version: "0.34.1",
       description: "A command-line interface for Packmind linting and code quality checks",
       private: false,
       bin: {
@@ -3899,11 +3899,11 @@ var require_package = __commonJS({
         dotenv: "^16",
         inquirer: "^13.0.2",
         "log-update": "^8.0.0",
-        minimatch: "^10",
+        minimatch: "^10.2.6",
         open: "^11.0.0",
         semver: "^7.7.4",
         slug: "^11.0.0",
-        undici: "^7.28.0",
+        undici: "^7.29.0",
         which: "^4.0.0",
         yaml: "^2.8.3"
       },
@@ -3915,7 +3915,7 @@ var require_package = __commonJS({
 });
 
 // apps/cli/src/main.ts
-var import_cmd_ts41 = __toESM(require_cjs());
+var import_cmd_ts46 = __toESM(require_cjs());
 
 // apps/cli/src/infra/commands/LinterCommand.ts
 var import_cmd_ts = __toESM(require_cjs());
@@ -4044,6 +4044,10 @@ var PackmindEvent = class {
 var UserEvent = class extends PackmindEvent {
 };
 
+// packages/types/src/events/SystemEvent.ts
+var SystemEvent = class extends PackmindEvent {
+};
+
 // packages/types/src/accounts/events/UserSignedUpEvent.ts
 var UserSignedUpEvent = class extends UserEvent {
   static {
@@ -4386,6 +4390,7 @@ var RENDER_MODE_ORDER = [
   "GH_COPILOT" /* GH_COPILOT */,
   "CLAUDE" /* CLAUDE */,
   "CLAUDE_PLUGIN" /* CLAUDE_PLUGIN */,
+  "COPILOT_PLUGIN" /* COPILOT_PLUGIN */,
   "CURSOR" /* CURSOR */,
   "GITLAB_DUO" /* GITLAB_DUO */,
   "CONTINUE" /* CONTINUE */
@@ -4413,6 +4418,9 @@ var RENDER_MODE_TO_CODING_AGENT = {
   ["GH_COPILOT" /* GH_COPILOT */]: CodingAgents.copilot,
   ["CLAUDE" /* CLAUDE */]: CodingAgents.claude,
   ["CLAUDE_PLUGIN" /* CLAUDE_PLUGIN */]: CodingAgents.claude_plugin,
+  // No dedicated CodingAgent/deployer exists yet for the Copilot plugin
+  // format — wiring it up (and populating this entry) is a later task.
+  ["COPILOT_PLUGIN" /* COPILOT_PLUGIN */]: void 0,
   ["CURSOR" /* CURSOR */]: CodingAgents.cursor,
   ["GITLAB_DUO" /* GITLAB_DUO */]: CodingAgents.gitlab_duo,
   ["CONTINUE" /* CONTINUE */]: CodingAgents.continue,
@@ -4420,6 +4428,9 @@ var RENDER_MODE_TO_CODING_AGENT = {
 };
 var CODING_AGENT_TO_RENDER_MODE = Object.entries(RENDER_MODE_TO_CODING_AGENT).reduce(
   (acc, [renderMode, codingAgent]) => {
+    if (codingAgent === void 0) {
+      return acc;
+    }
     acc[codingAgent] = renderMode;
     return acc;
   },
@@ -4499,6 +4510,13 @@ var createGitProviderId = brandedIdFactory();
 // packages/types/src/git/OrganizationGitHubApp.ts
 var createOrganizationGitHubAppId = brandedIdFactory();
 
+// packages/types/src/git/events/RepositoryTrackingRemovedEvent.ts
+var RepositoryTrackingRemovedEvent = class extends UserEvent {
+  static {
+    this.eventName = "git.repository.tracking-removed";
+  }
+};
+
 // packages/types/src/git/events/RepositoryTrackingSetEvent.ts
 var RepositoryTrackingSetEvent = class extends UserEvent {
   static {
@@ -5310,6 +5328,87 @@ var LLM_PROVIDER_METADATA = {
 // packages/types/src/llm/AIProviderId.ts
 var createAIProviderId = brandedIdFactory();
 
+// packages/types/src/marketplaces/MarketplaceId.ts
+var createMarketplaceId = brandedIdFactory();
+
+// packages/types/src/marketplaces/MarketplaceDescriptorFilename.ts
+var MARKETPLACE_DESCRIPTOR_PATHS = [
+  ".claude-plugin/marketplace.json",
+  "marketplace.json",
+  ".github/plugin/marketplace.json"
+];
+var MARKETPLACE_DESCRIPTOR_FILENAME = MARKETPLACE_DESCRIPTOR_PATHS[0];
+
+// packages/types/src/marketplaces/MarketplaceDistributionId.ts
+var createMarketplaceDistributionId = brandedIdFactory();
+
+// packages/types/src/marketplaces/PluginInstallationId.ts
+var createPluginInstallationId = brandedIdFactory();
+
+// packages/types/src/marketplaces/errors/GitProviderTokenInvalidError.ts
+var GitProviderTokenInvalidError = class _GitProviderTokenInvalidError extends Error {
+  static {
+    /**
+     * Exact verbatim user-facing message defined by the feature spec.
+     * Do not modify without coordinating with the spec / docs.
+     */
+    this.USER_FACING_MESSAGE = "The package could not be published. Reason: Invalid or expired Git token.";
+  }
+  constructor() {
+    super(_GitProviderTokenInvalidError.USER_FACING_MESSAGE);
+    this.name = "GitProviderTokenInvalidError";
+  }
+};
+
+// packages/types/src/marketplaces/events/MarketplaceLinkedEvent.ts
+var MarketplaceLinkedEvent = class extends UserEvent {
+  static {
+    this.eventName = "deployments.marketplace.linked";
+  }
+};
+
+// packages/types/src/marketplaces/events/MarketplacePluginRemovalInitiatedEvent.ts
+var MarketplacePluginRemovalInitiatedEvent = class extends UserEvent {
+  static {
+    this.eventName = "deployments.distribution.retired";
+  }
+};
+
+// packages/types/src/marketplaces/events/MarketplaceUnlinkedEvent.ts
+var MarketplaceUnlinkedEvent = class extends UserEvent {
+  static {
+    this.eventName = "deployments.marketplace.unlinked";
+  }
+};
+
+// packages/types/src/marketplaces/events/PluginInstallTrackedEvent.ts
+var PluginInstallTrackedEvent = class extends SystemEvent {
+  static {
+    this.eventName = "deployments.plugin.install-tracked";
+  }
+};
+
+// packages/types/src/marketplaces/events/PluginPublishAttemptedEvent.ts
+var PluginPublishAttemptedEvent = class extends UserEvent {
+  static {
+    this.eventName = "deployments.plugin.publish-attempted";
+  }
+};
+
+// packages/types/src/marketplaces/events/PluginPublishFailedEvent.ts
+var PluginPublishFailedEvent = class extends UserEvent {
+  static {
+    this.eventName = "deployments.plugin.publish-failed";
+  }
+};
+
+// packages/types/src/marketplaces/events/PluginPublishedEvent.ts
+var PluginPublishedEvent = class extends UserEvent {
+  static {
+    this.eventName = "deployments.plugin.published";
+  }
+};
+
 // packages/types/src/playbookChangeManagement/ChangeProposalId.ts
 var createChangeProposalId = brandedIdFactory();
 
@@ -5420,8 +5519,8 @@ var ExecuteSingleFileAstUseCase = class _ExecuteSingleFileAstUseCase {
   static {
     this.fallbackRuleContent = "adhoc-rule";
   }
-  async execute(command31) {
-    const { program, fileContent, language } = command31;
+  async execute(command35) {
+    const { program, fileContent, language } = command35;
     const result = await this.linterExecutionUseCase.execute({
       filePath: "cli-single-file",
       fileContent,
@@ -5468,6 +5567,11 @@ function resolveSkillDirPath(absolutePath) {
 
 // apps/cli/src/application/services/GitService.ts
 var origin = "GitService";
+var DETACHED_HEAD = "HEAD";
+var LOCAL_REF_NAMESPACE = "refs/heads";
+var REMOTE_REF_NAMESPACE = "refs/remotes";
+var LOCAL_REF_PREFIX = `${LOCAL_REF_NAMESPACE}/`;
+var REMOTE_REF_PREFIX = `${REMOTE_REF_NAMESPACE}/`;
 var GitService = class {
   constructor(logger2 = new PackmindLogger(origin), gitRunner = (cmd, opts) => {
     const stdout = (0, import_child_process.execSync)(`git ${cmd}`, {
@@ -5480,27 +5584,37 @@ var GitService = class {
     this.gitRunner = gitRunner;
     this.logger = logger2;
   }
-  getGitRepositoryRoot(path37) {
+  /**
+   * Runs git and turns an invocation failure into a message the user can act on.
+   *
+   * The raw git stderr is deliberately dropped: every caller prints this message
+   * as-is, and `fatal: not a git repository (or any of the parent directories)`
+   * adds nothing the sentence does not already say. The command name is not
+   * mentioned either — these helpers back `lint`, `install`, `git track`,
+   * `git info` and more, so naming one is wrong for all the others.
+   */
+  runGit(gitCommand2, repoPath, failure) {
     try {
-      const { stdout } = this.gitRunner("rev-parse --show-toplevel", {
-        cwd: path37
-      });
-      const gitRoot = stdout.trim();
-      this.logger.debug("Resolved git repository root", {
-        inputPath: path37,
-        gitRoot
-      });
-      return gitRoot;
-    } catch (error) {
-      if (error instanceof Error) {
-        throw new Error(
-          `Failed to get Git repository root. The path '${path37}' does not appear to be inside a Git repository.
-${error.message}`
-        );
-      }
-      throw new Error("Failed to get Git repository root: Unknown error");
+      return this.gitRunner(gitCommand2, { cwd: repoPath }).stdout;
+    } catch {
+      throw new Error(
+        `${failure}. The path '${repoPath}' does not appear to be inside a Git repository.`
+      );
     }
   }
+  getGitRepositoryRoot(path37) {
+    const stdout = this.runGit(
+      "rev-parse --show-toplevel",
+      path37,
+      "Failed to get Git repository root"
+    );
+    const gitRoot = stdout.trim();
+    this.logger.debug("Resolved git repository root", {
+      inputPath: path37,
+      gitRoot
+    });
+    return gitRoot;
+  }
   tryGetGitRepositoryRoot(path37) {
     try {
       return this.getGitRepositoryRoot(path37);
@@ -5521,82 +5635,117 @@ ${error.message}`
     }
   }
   getCurrentBranch(repoPath) {
-    try {
-      const { stdout } = this.gitRunner("rev-parse --abbrev-ref HEAD", {
-        cwd: repoPath
-      });
-      const branch = stdout.trim();
-      this.logger.debug("Resolved current branch", {
-        repoPath,
-        branch
-      });
-      return { branch };
-    } catch (error) {
-      if (error instanceof Error) {
-        throw new Error(
-          `Failed to get current Git branch. The path '${repoPath}' does not appear to be inside a Git repository.
-${error.message}`
-        );
-      }
-      throw new Error("Failed to get current Git branch: Unknown error");
-    }
+    const stdout = this.runGit(
+      "rev-parse --abbrev-ref HEAD",
+      repoPath,
+      "Failed to get current Git branch"
+    );
+    const branch = stdout.trim();
+    const detached = branch === DETACHED_HEAD;
+    this.logger.debug("Resolved current branch", {
+      repoPath,
+      branch,
+      detached
+    });
+    return { branch, detached };
   }
   getCurrentBranches(repoPath) {
-    try {
-      const { stdout } = this.gitRunner("branch -a --contains HEAD", {
-        cwd: repoPath
-      });
-      const branches = this.parseBranches(stdout);
-      return { branches };
-    } catch (error) {
-      if (error instanceof Error) {
-        throw new Error(
-          `Failed to get Git branches. packmind-cli lint must be run in a Git repository.
-${error.message}`
-        );
+    const stdout = this.runGit(
+      "branch -a --contains HEAD",
+      repoPath,
+      "Failed to get Git branches"
+    );
+    return { branches: this.parseBranches(stdout) };
+  }
+  getAllBranches(repoPath) {
+    const stdout = this.runGit(
+      `for-each-ref --format="%(refname)" ${LOCAL_REF_NAMESPACE} ${REMOTE_REF_NAMESPACE}`,
+      repoPath,
+      "Failed to get Git branches"
+    );
+    return { branches: this.parseRefNames(stdout) };
+  }
+  /**
+   * Local and remote-tracking branches are both accepted: `git track --branch`
+   * does not require the branch to be checked out, only to exist.
+   *
+   * `for-each-ref` is plumbing, so its output is the list of refs and nothing
+   * else. `git branch -a` renders for humans, and every decoration it adds used
+   * to be read as part of the branch name — refusing branches that do exist:
+   * `+ feature` for a branch held by a linked worktree, ANSI escapes under
+   * `color.ui = always`, and every branch on one line under `column.ui = always`
+   * (the last two are forced through a pipe, which is how the CLI runs git).
+   *
+   * The branch name is matched in-process instead of being handed to git: it
+   * comes straight from `--branch`, and interpolating it into the command line
+   * would pass user input to the shell.
+   */
+  branchExists(repoPath, branch) {
+    const { branches } = this.getAllBranches(repoPath);
+    return branches.includes(branch);
+  }
+  /**
+   * Turns full refnames into branch names.
+   *
+   * The remote name is dropped, so a branch that exists only on a remote counts
+   * as existing — what `--branch` promises, since it does not require a local
+   * checkout. `refs/remotes/<remote>/HEAD` is skipped: it is a symref to the
+   * remote's default branch, not a branch of its own.
+   */
+  parseRefNames(forEachRefOutput) {
+    const branchNames = /* @__PURE__ */ new Set();
+    for (const line of forEachRefOutput.split("\n")) {
+      const refName = line.trim();
+      if (refName.startsWith(LOCAL_REF_PREFIX)) {
+        branchNames.add(refName.substring(LOCAL_REF_PREFIX.length));
+        continue;
+      }
+      if (!refName.startsWith(REMOTE_REF_PREFIX)) {
+        continue;
+      }
+      const withoutNamespace = refName.substring(REMOTE_REF_PREFIX.length);
+      const remoteSeparator = withoutNamespace.indexOf("/");
+      if (remoteSeparator === -1) {
+        continue;
+      }
+      const branchName = withoutNamespace.substring(remoteSeparator + 1);
+      if (branchName && branchName !== DETACHED_HEAD) {
+        branchNames.add(branchName);
       }
-      throw new Error("Failed to get Git branches: Unknown error");
     }
+    return Array.from(branchNames);
   }
   getGitRemoteUrl(repoPath, origin9) {
-    try {
-      const { stdout } = this.gitRunner("remote -v", {
-        cwd: repoPath
-      });
-      const remotes = this.parseRemotes(stdout);
-      if (remotes.length === 0) {
-        throw new Error("No Git remotes found in the repository");
-      }
-      let selectedRemote;
-      if (origin9) {
-        const foundRemote = remotes.find((remote) => remote.name === origin9);
-        if (!foundRemote) {
-          throw new Error(`Remote '${origin9}' not found in repository`);
-        }
-        selectedRemote = foundRemote.url;
-      } else if (remotes.length === 1) {
-        selectedRemote = remotes[0].url;
-      } else {
-        const originRemote = remotes.find((remote) => remote.name === "origin");
-        if (!originRemote) {
-          throw new Error(
-            "Multiple remotes found but no 'origin' remote. Please specify the remote name."
-          );
-        }
-        selectedRemote = originRemote.url;
-      }
-      return {
-        gitRemoteUrl: this.normalizeGitUrl(selectedRemote)
-      };
-    } catch (error) {
-      if (error instanceof Error) {
+    const stdout = this.runGit(
+      "remote -v",
+      repoPath,
+      "Failed to get Git remote URL"
+    );
+    const remotes = this.parseRemotes(stdout);
+    if (remotes.length === 0) {
+      throw new Error("No Git remotes found in the repository");
+    }
+    let selectedRemote;
+    if (origin9) {
+      const foundRemote = remotes.find((remote) => remote.name === origin9);
+      if (!foundRemote) {
+        throw new Error(`Remote '${origin9}' not found in repository`);
+      }
+      selectedRemote = foundRemote.url;
+    } else if (remotes.length === 1) {
+      selectedRemote = remotes[0].url;
+    } else {
+      const originRemote = remotes.find((remote) => remote.name === "origin");
+      if (!originRemote) {
         throw new Error(
-          `Failed to get Git remote URL. packmind-cli lint must be run in a Git repository.
-${error.message}`
+          "Multiple remotes found but no 'origin' remote. Please specify the remote name."
         );
       }
-      throw new Error("Failed to get Git remote URL: Unknown error");
+      selectedRemote = originRemote.url;
     }
+    return {
+      gitRemoteUrl: this.normalizeGitUrl(selectedRemote)
+    };
   }
   /**
    * Gets files that have been modified (staged + unstaged) compared to HEAD.
@@ -5805,8 +5954,8 @@ var GetGitRemoteUrlUseCase = class {
   constructor(gitRemoteUrlService = new GitService()) {
     this.gitRemoteUrlService = gitRemoteUrlService;
   }
-  async execute(command31) {
-    const { path: repoPath, origin: origin9 } = command31;
+  async execute(command35) {
+    const { path: repoPath, origin: origin9 } = command35;
     return this.gitRemoteUrlService.getGitRemoteUrl(repoPath, origin9);
   }
 };
@@ -5958,8 +6107,8 @@ var ListFilesInDirectoryUseCase = class {
   constructor(listFiles = new ListFiles()) {
     this.listFiles = listFiles;
   }
-  async execute(command31) {
-    const { path: directoryPath, extensions, excludes = [] } = command31;
+  async execute(command35) {
+    const { path: directoryPath, extensions, excludes = [] } = command35;
     const files = await this.listFiles.listFilesInDirectory(
       directoryPath,
       extensions,
@@ -6074,7 +6223,7 @@ var LintFilesAgainstRuleUseCase = class {
       };
     };
   }
-  async execute(command31) {
+  async execute(command35) {
     const {
       path: userPath,
       draftMode,
@@ -6083,7 +6232,7 @@ var LintFilesAgainstRuleUseCase = class {
       language,
       diffMode,
       ignorePatterns
-    } = command31;
+    } = command35;
     this.logger.debug(
       `Starting linting: path="${userPath}", draftMode=${!!draftMode}, standardSlug="${standardSlug || "N/A"}", ruleId="${ruleId || "N/A"}", language="${language || "N/A"}", diffMode="${diffMode ?? "none"}"`
     );
@@ -6399,8 +6548,8 @@ var LintFilesAgainstRuleUseCase = class {
       return null;
     }
   }
-  async executeProgramsForFile(command31) {
-    const result = await this.services.linterExecutionUseCase.execute(command31);
+  async executeProgramsForFile(command35) {
+    const result = await this.services.linterExecutionUseCase.execute(command35);
     return result.violations;
   }
   extractExtensionFromFile(filePath) {
@@ -6423,8 +6572,8 @@ var LintFilesFromConfigUseCase = class {
     this.logger = logger2;
     this.detectionProgramsCache = /* @__PURE__ */ new Map();
   }
-  async execute(command31) {
-    const { path: userPath, diffMode, ignorePatterns } = command31;
+  async execute(command35) {
+    const { path: userPath, diffMode, ignorePatterns } = command35;
     this.logger.debug(
       `Starting local linting: path="${userPath}", diffMode="${diffMode ?? "none"}"`
     );
@@ -6684,8 +6833,8 @@ var LintFilesFromConfigUseCase = class {
       return null;
     }
   }
-  async executeProgramsForFile(command31) {
-    const result = await this.services.linterExecutionUseCase.execute(command31);
+  async executeProgramsForFile(command35) {
+    const result = await this.services.linterExecutionUseCase.execute(command35);
     return result.violations;
   }
   extractExtensionFromFile(filePath) {
@@ -6861,13 +7010,13 @@ var PackmindHttpClient = class {
 var ChangeProposalGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.batchCreate = async (command31) => {
+    this.batchCreate = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/change-proposals/batch`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/change-proposals/batch`,
         {
           method: "POST",
-          body: { proposals: command31.proposals },
+          body: { proposals: command35.proposals },
           onError: (response) => {
             if (response.status === 404) {
               throw new CommunityEditionError("change proposals");
@@ -6876,29 +7025,29 @@ var ChangeProposalGateway = class {
         }
       );
     };
-    this.batchApply = async (command31) => {
+    this.batchApply = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/playbook/apply`,
         {
           method: "POST",
           body: {
-            proposals: command31.proposals,
-            message: command31.message,
-            ...command31.directUpdate !== void 0 && {
-              directUpdate: command31.directUpdate
+            proposals: command35.proposals,
+            message: command35.message,
+            ...command35.directUpdate !== void 0 && {
+              directUpdate: command35.directUpdate
             }
           }
         }
       );
     };
-    this.check = async (command31) => {
+    this.check = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/change-proposals/check`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/change-proposals/check`,
         {
           method: "POST",
-          body: { proposals: command31.proposals },
+          body: { proposals: command35.proposals },
           onError: (response) => {
             if (response.status === 404) {
               throw new CommunityEditionError("change proposals");
@@ -6914,13 +7063,13 @@ var ChangeProposalGateway = class {
 var LinterGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.getDraftDetectionProgramsForRule = async (command31) => {
+    this.getDraftDetectionProgramsForRule = async (command35) => {
       const payload = {
-        standardSlug: command31.standardSlug,
-        ruleId: command31.ruleId
+        standardSlug: command35.standardSlug,
+        ruleId: command35.ruleId
       };
-      if (command31.language) {
-        payload.language = command31.language;
+      if (command35.language) {
+        payload.language = command35.language;
       }
       return this.httpClient.request("/api/v0/list-draft-detection-program", {
         method: "POST",
@@ -6932,13 +7081,13 @@ var LinterGateway = class {
         }
       });
     };
-    this.getActiveDetectionProgramsForRule = async (command31) => {
+    this.getActiveDetectionProgramsForRule = async (command35) => {
       const payload = {
-        standardSlug: command31.standardSlug,
-        ruleId: command31.ruleId
+        standardSlug: command35.standardSlug,
+        ruleId: command35.ruleId
       };
-      if (command31.language) {
-        payload.language = command31.language;
+      if (command35.language) {
+        payload.language = command35.language;
       }
       return this.httpClient.request("/api/v0/list-active-detection-program", {
         method: "POST",
@@ -6950,13 +7099,13 @@ var LinterGateway = class {
         }
       });
     };
-    this.getDetectionProgramsForPackages = async (command31) => {
+    this.getDetectionProgramsForPackages = async (command35) => {
       const response = await this.httpClient.request(
         "/api/v0/detection-programs-for-packages",
         {
           method: "POST",
           body: {
-            packagesSlugs: command31.packagesSlugs
+            packagesSlugs: command35.packagesSlugs
           },
           onError: (response2) => {
             if (response2.status === 404) {
@@ -6967,10 +7116,10 @@ var LinterGateway = class {
       );
       return handleScopeInTargetsResponse(response);
     };
-    this.trackLinterExecution = async (command31) => {
+    this.trackLinterExecution = async (command35) => {
       return this.httpClient.request(`/api/v0/track-execution`, {
         method: "POST",
-        body: command31
+        body: command35
       });
     };
   }
@@ -7024,27 +7173,27 @@ var SpacesGateway = class {
 var SkillsGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.upload = async (command31) => {
+    this.upload = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/skills/upload`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/skills/upload`,
         {
           method: "POST",
-          body: command31
+          body: command35
         }
       );
     };
-    this.getDefaults = async (command31) => {
+    this.getDefaults = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       const queryParams = new URLSearchParams();
-      if (command31.includeBeta) {
+      if (command35.includeBeta) {
         queryParams.set("includeBeta", "true");
-      } else if (command31.cliVersion) {
-        queryParams.set("cliVersion", command31.cliVersion);
+      } else if (command35.cliVersion) {
+        queryParams.set("cliVersion", command35.cliVersion);
       }
-      if (command31.agents !== void 0) {
+      if (command35.agents !== void 0) {
         queryParams.append("agentsConfigOverride", "true");
-        command31.agents.forEach((agent) => {
+        command35.agents.forEach((agent) => {
           queryParams.append("agent", agent);
         });
       }
@@ -7053,10 +7202,10 @@ var SkillsGateway = class {
         `/api/v0/organizations/${organizationId}/skills/default${queryString ? `?${queryString}` : ""}`
       );
     };
-    this.list = async (command31) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/skills`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/skills`
       );
     };
   }
@@ -7066,17 +7215,17 @@ var SkillsGateway = class {
 var CommandsGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.create = async (command31) => {
+    this.create = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/commands`,
-        { method: "POST", body: command31 }
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/commands`,
+        { method: "POST", body: command35 }
       );
     };
-    this.list = async (command31) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       const listCommandsResponse = await this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/commands`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/commands`
       );
       if (listCommandsResponse instanceof Array) {
         return { recipes: listCommandsResponse };
@@ -7119,10 +7268,10 @@ var StandardsGateway = class {
         }
       );
     };
-    this.list = async (command31) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/standards`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/standards`
       );
     };
   }
@@ -7133,10 +7282,10 @@ var PackagesGateway = class {
   constructor(apiKey, httpClient) {
     this.apiKey = apiKey;
     this.httpClient = httpClient;
-    this.list = async (command31) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/packages`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/packages`
       );
     };
     this.getSummary = async ({
@@ -7148,20 +7297,20 @@ var PackagesGateway = class {
         `/api/v0/organizations/${organizationId}/spaces/${spaceId}/packages/summary/${encodeURIComponent(slug6)}`
       );
     };
-    this.create = async (command31) => {
+    this.create = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
-      const { recipeIds, ...rest } = command31;
+      const { recipeIds, ...rest } = command35;
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command31.spaceId}/packages`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/packages`,
         {
           method: "POST",
           body: { ...rest, commandIds: recipeIds }
         }
       );
     };
-    this.addArtefacts = async (command31) => {
+    this.addArtefacts = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
-      const { packageId, spaceId, recipeIds, ...rest } = command31;
+      const { packageId, spaceId, recipeIds, ...rest } = command35;
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/spaces/${spaceId}/packages/${packageId}/add-artifacts`,
         {
@@ -7177,31 +7326,31 @@ var PackagesGateway = class {
 var DeploymentGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.pull = async (command31) => {
+    this.pull = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       const queryParams = new URLSearchParams();
-      if (command31.packagesSlugs && command31.packagesSlugs.length > 0) {
-        command31.packagesSlugs.forEach((slug6) => {
+      if (command35.packagesSlugs && command35.packagesSlugs.length > 0) {
+        command35.packagesSlugs.forEach((slug6) => {
           queryParams.append("packageSlug", slug6);
         });
       }
-      if (command31.previousPackagesSlugs && command31.previousPackagesSlugs.length > 0) {
-        command31.previousPackagesSlugs.forEach((slug6) => {
+      if (command35.previousPackagesSlugs && command35.previousPackagesSlugs.length > 0) {
+        command35.previousPackagesSlugs.forEach((slug6) => {
           queryParams.append("previousPackageSlug", slug6);
         });
       }
-      if (command31.gitRemoteUrl) {
-        queryParams.append("gitRemoteUrl", command31.gitRemoteUrl);
+      if (command35.gitRemoteUrl) {
+        queryParams.append("gitRemoteUrl", command35.gitRemoteUrl);
       }
-      if (command31.gitBranch) {
-        queryParams.append("gitBranch", command31.gitBranch);
+      if (command35.gitBranch) {
+        queryParams.append("gitBranch", command35.gitBranch);
       }
-      if (command31.relativePath) {
-        queryParams.append("relativePath", command31.relativePath);
+      if (command35.relativePath) {
+        queryParams.append("relativePath", command35.relativePath);
       }
-      if (command31.agents !== void 0) {
+      if (command35.agents !== void 0) {
         queryParams.append("agentsConfigOverride", "true");
-        command31.agents.forEach((agent) => {
+        command35.agents.forEach((agent) => {
           queryParams.append("agent", agent);
         });
       }
@@ -7209,101 +7358,101 @@ var DeploymentGateway = class {
         `/api/v0/organizations/${organizationId}/pull?${queryParams.toString()}`
       );
     };
-    this.install = async (command31) => {
+    this.install = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/install`,
         {
           method: "POST",
           body: {
-            packagesSlugs: command31.packagesSlugs,
-            packmindLockFile: command31.packmindLockFile,
-            ...command31.relativePath && { relativePath: command31.relativePath },
-            ...command31.agents !== void 0 && { agents: command31.agents }
+            packagesSlugs: command35.packagesSlugs,
+            packmindLockFile: command35.packmindLockFile,
+            ...command35.relativePath && { relativePath: command35.relativePath },
+            ...command35.agents !== void 0 && { agents: command35.agents }
           }
         }
       );
     };
-    this.getDeployed = async (command31) => {
+    this.getDeployed = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/deployed-content`,
         {
           method: "POST",
           body: {
-            packagesSlugs: command31.packagesSlugs,
-            gitRemoteUrl: command31.gitRemoteUrl,
-            gitBranch: command31.gitBranch,
-            relativePath: command31.relativePath,
-            ...command31.agents !== void 0 && { agents: command31.agents }
+            packagesSlugs: command35.packagesSlugs,
+            gitRemoteUrl: command35.gitRemoteUrl,
+            gitBranch: command35.gitBranch,
+            relativePath: command35.relativePath,
+            ...command35.agents !== void 0 && { agents: command35.agents }
           }
         }
       );
     };
-    this.getContentByVersions = async (command31) => {
+    this.getContentByVersions = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/content-by-versions`,
         {
           method: "POST",
           body: {
-            artifacts: command31.artifacts,
-            ...command31.agents !== void 0 && { agents: command31.agents }
+            artifacts: command35.artifacts,
+            ...command35.agents !== void 0 && { agents: command35.agents }
           }
         }
       );
     };
-    this.notifyDistribution = async (command31) => {
+    this.notifyDistribution = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/deployments`,
         {
           method: "POST",
-          body: command31
+          body: command35
         }
       );
     };
-    this.notifyArtefactsDistribution = async (command31) => {
+    this.notifyArtefactsDistribution = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/deployments/notify-artifacts-distribution`,
         {
           method: "POST",
           body: {
-            gitRemoteUrl: command31.gitRemoteUrl,
-            gitBranch: command31.gitBranch,
-            relativePath: command31.relativePath,
-            packmindLockFile: command31.packmindLockFile
+            gitRemoteUrl: command35.gitRemoteUrl,
+            gitBranch: command35.gitBranch,
+            relativePath: command35.relativePath,
+            packmindLockFile: command35.packmindLockFile
           }
         }
       );
     };
-    this.renderPlugin = async (command31) => {
+    this.renderPlugin = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/plugins/render`,
         {
           method: "POST",
           body: {
-            packageSlug: command31.packageSlug,
-            mode: command31.mode,
-            pluginRoot: command31.pluginRoot,
-            pluginName: command31.pluginName,
-            gitRemoteUrl: command31.gitRemoteUrl,
-            gitBranch: command31.gitBranch
+            packageSlug: command35.packageSlug,
+            mode: command35.mode,
+            pluginRoot: command35.pluginRoot,
+            pluginName: command35.pluginName,
+            gitRemoteUrl: command35.gitRemoteUrl,
+            gitBranch: command35.gitBranch
           }
         }
       );
     };
-    this.trackPluginDeleted = async (command31) => {
+    this.trackPluginDeleted = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/plugins/track-deleted`,
         {
           method: "POST",
           body: {
-            packageSlug: command31.packageSlug,
-            gitRemoteUrl: command31.gitRemoteUrl
+            packageSlug: command35.packageSlug,
+            gitRemoteUrl: command35.gitRemoteUrl
           }
         }
       );
@@ -7315,13 +7464,13 @@ var DeploymentGateway = class {
       );
     };
   }
-  async updateRenderModeConfiguration(command31) {
+  async updateRenderModeConfiguration(command35) {
     const { organizationId } = this.httpClient.getAuthContext();
     await this.httpClient.request(
       `/api/v0/organizations/${organizationId}/deployments/renderModeConfiguration`,
       {
         method: "POST",
-        body: { activeRenderModes: command31.activeRenderModes }
+        body: { activeRenderModes: command35.activeRenderModes }
       }
     );
   }
@@ -7378,18 +7527,26 @@ var RepositoryTrackingGateway = class {
         `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository?${query}`
       );
     };
-    this.setTrackedRepository = async (command31) => {
+    this.setTrackedRepository = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository`,
-        { method: "POST", body: command31 }
+        { method: "POST", body: command35 }
       );
     };
-    this.updateTrackedBranch = async (command31) => {
+    this.updateTrackedBranch = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository`,
-        { method: "PUT", body: command31 }
+        { method: "PUT", body: command35 }
+      );
+    };
+    this.removeTrackedRepository = async ({ owner, repo }) => {
+      const { organizationId } = this.httpClient.getAuthContext();
+      const query = new URLSearchParams({ owner, repo }).toString();
+      return this.httpClient.request(
+        `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository?${query}`,
+        { method: "DELETE" }
       );
     };
   }
@@ -9153,8 +9310,8 @@ var ExecuteLinterProgramsUseCase = class {
     this.linterAstAdapter = linterAstAdapter;
     this.logger = logger2;
   }
-  async execute(command31) {
-    const { filePath, fileContent, language, programs } = command31;
+  async execute(command35) {
+    const { filePath, fileContent, language, programs } = command35;
     if (programs.length === 0) {
       return {
         file: filePath,
@@ -9753,16 +9910,14 @@ var Cache = class _Cache {
 // packages/feature-flags/src/registry.ts
 var ADD_CHANGE_PROPOSALS_IN_WEBAPP_FEATURE_KEY = "change-proposals-in-webapp";
 var ORGA_SPACE_MANAGEMENT_FEATURE_KEY = "orga-space-management";
-var GOVERNANCE_FEATURE_KEY = "governance";
-var CLI_REPO_TRACKING_FEATURE_KEY = "cli-repo-tracking";
+var SPACE_NAV_PLUGIN_FIRST_FEATURE_KEY = "space-nav-plugin-first";
 var DEFAULT_FEATURE_DOMAIN_MAP = {
   [ADD_CHANGE_PROPOSALS_IN_WEBAPP_FEATURE_KEY]: [
     "@packmind.com",
     "@promyze.com"
   ],
   [ORGA_SPACE_MANAGEMENT_FEATURE_KEY]: ["@packmind.com", "@promyze.com"],
-  [GOVERNANCE_FEATURE_KEY]: ["joan.racenet@packmind.com"],
-  [CLI_REPO_TRACKING_FEATURE_KEY]: ["@packmind.com", "@promyze.com"]
+  [SPACE_NAV_PLUGIN_FIRST_FEATURE_KEY]: ["@packmind.com", "@promyze.com"]
 };
 
 // packages/node-utils/src/database/schemas.ts
@@ -9993,8 +10148,8 @@ var InstallPackagesUseCase = class {
   constructor(packmindGateway) {
     this.packmindGateway = packmindGateway;
   }
-  async execute(command31) {
-    const baseDirectory = command31.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     const result = {
       filesCreated: 0,
       filesUpdated: 0,
@@ -10006,12 +10161,12 @@ var InstallPackagesUseCase = class {
       skillDirectoriesDeleted: 0
     };
     const response = await this.packmindGateway.deployment.pull({
-      packagesSlugs: command31.packagesSlugs,
-      previousPackagesSlugs: command31.previousPackagesSlugs,
-      gitRemoteUrl: command31.gitRemoteUrl,
-      gitBranch: command31.gitBranch,
-      relativePath: command31.relativePath,
-      agents: command31.agents
+      packagesSlugs: command35.packagesSlugs,
+      previousPackagesSlugs: command35.previousPackagesSlugs,
+      gitRemoteUrl: command35.gitRemoteUrl,
+      gitBranch: command35.gitBranch,
+      relativePath: command35.relativePath,
+      agents: command35.agents
     });
     const filteredCreateOrUpdate = response.fileUpdates.createOrUpdate.filter(
       (file) => file.path !== "packmind.json"
@@ -10386,8 +10541,8 @@ var InstallUseCase = class {
     this.configFileRepository = configFileRepository;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    const baseDirectory = command31.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     const result = {
       filesCreated: 0,
       filesUpdated: 0,
@@ -10417,7 +10572,7 @@ var InstallUseCase = class {
       },
       resolvedAgents: []
     };
-    const hasExplicitPackages = command31.packages && command31.packages.length > 0;
+    const hasExplicitPackages = command35.packages && command35.packages.length > 0;
     const configExistedBefore = await this.configFileRepository.configExists(baseDirectory);
     const lockFile = await this.lockFileRepository.read(baseDirectory);
     const config = await this.configFileRepository.readConfig(baseDirectory);
@@ -10439,11 +10594,11 @@ var InstallUseCase = class {
       agents: [],
       artifacts: {}
     };
-    effectiveLockFile.cliVersion = command31.cliVersion;
+    effectiveLockFile.cliVersion = command35.cliVersion;
     let packagesSlugs;
     let normalizedPackages = [];
     if (hasExplicitPackages) {
-      const explicitPackageSlugs = (command31.packages ?? []).map(
+      const explicitPackageSlugs = (command35.packages ?? []).map(
         displayableParsedPackageSlug
       );
       normalizedPackages = await this.normalizePackageSlugs(explicitPackageSlugs);
@@ -10473,8 +10628,8 @@ var InstallUseCase = class {
       }
       return result;
     }
-    const installAgents = this.resolveInstallAgents(command31, config);
-    const stripPathPrefix = command31.homeAgent ? getAgentHomeDirPrefix(command31.homeAgent) ?? void 0 : void 0;
+    const installAgents = this.resolveInstallAgents(command35, config);
+    const stripPathPrefix = command35.homeAgent ? getAgentHomeDirPrefix(command35.homeAgent) ?? void 0 : void 0;
     const response = await this.packmindGateway.deployment.install({
       packagesSlugs,
       packmindLockFile: effectiveLockFile,
@@ -10614,7 +10769,7 @@ var InstallUseCase = class {
         } catch {
         }
       }
-      lockFileToPersist.cliVersion = command31.cliVersion;
+      lockFileToPersist.cliVersion = command35.cliVersion;
       if (stripPathPrefix) {
         lockFileToPersist = this.stripLockFileArtifactPaths(
           lockFileToPersist,
@@ -10643,9 +10798,9 @@ var InstallUseCase = class {
   async normalizePackageSlugs(slugs) {
     return normalizePackageSlugs(slugs, this.spaceService);
   }
-  resolveInstallAgents(command31, config) {
-    if (command31.homeAgent) {
-      return [command31.homeAgent];
+  resolveInstallAgents(command35, config) {
+    if (command35.homeAgent) {
+      return [command35.homeAgent];
     }
     return config?.agents;
   }
@@ -10959,8 +11114,8 @@ var UninstallUseCase = class {
     this.spaceService = spaceService;
     this.installUseCase = installUseCase;
   }
-  async execute(command31) {
-    const baseDirectory = command31.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     const config = await this.configFileRepository.readConfig(baseDirectory);
     if (!config) {
       const configFileExists = await this.configFileRepository.configExists(baseDirectory);
@@ -10974,7 +11129,7 @@ var UninstallUseCase = class {
       );
     }
     const normalized = await normalizePackageSlugs(
-      command31.packages,
+      command35.packages,
       this.spaceService
     );
     const notInstalled = normalized.filter((pkg) => !(pkg in config.packages));
@@ -10997,7 +11152,7 @@ ${pkgList}`
     try {
       return await this.installUseCase.execute({
         baseDirectory,
-        cliVersion: command31.cliVersion
+        cliVersion: command35.cliVersion
       });
     } catch (error) {
       await this.configFileRepository.updateConfig(
@@ -11039,8 +11194,8 @@ var InstallDefaultSkillsUseCase = class {
   constructor(repositories) {
     this.repositories = repositories;
   }
-  async execute(command31) {
-    const baseDirectory = command31.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     await this.bootstrapEmptyDirectory(baseDirectory);
     const result = {
       filesCreated: 0,
@@ -11050,24 +11205,24 @@ var InstallDefaultSkillsUseCase = class {
       skippedIncompatibleSkillNames: [],
       incompatibleInstalledSkills: []
     };
-    let agents = command31.agents;
+    let agents = command35.agents;
     if (!agents || agents.length === 0) {
       const config = await this.repositories.configFileRepository.readConfig(baseDirectory);
       agents = config?.agents;
     }
     const response = await this.repositories.packmindGateway.skills.getDefaults(
       {
-        cliVersion: command31.cliVersion,
-        includeBeta: command31.includeBeta,
+        cliVersion: command35.cliVersion,
+        includeBeta: command35.includeBeta,
         agents
       }
     );
     result.skippedSkillsCount = response.skippedSkillsCount;
     const incompatibleInstalledMap = /* @__PURE__ */ new Map();
     const incompatibleSkillDirs = /* @__PURE__ */ new Map();
-    if (command31.cliVersion) {
+    if (command35.cliVersion) {
       for (const file of response.fileUpdates.createOrUpdate) {
-        if (path9.basename(file.path) === "SKILL.md" && file.content && this.isVersionConstraintViolated(file.content, command31.cliVersion)) {
+        if (path9.basename(file.path) === "SKILL.md" && file.content && this.isVersionConstraintViolated(file.content, command35.cliVersion)) {
           const dir = path9.dirname(file.path);
           const skillName = this.getSkillName(file.content) ?? path9.basename(dir);
           incompatibleSkillDirs.set(dir, skillName);
@@ -11078,9 +11233,9 @@ var InstallDefaultSkillsUseCase = class {
       for (const file of response.fileUpdates.createOrUpdate) {
         try {
           if (!file.content) continue;
-          const isIncompatible = command31.cliVersion && (this.isVersionConstraintViolated(
+          const isIncompatible = command35.cliVersion && (this.isVersionConstraintViolated(
             file.content,
-            command31.cliVersion
+            command35.cliVersion
           ) || this.isUnderIncompatibleSkillDir(
             file.path,
             incompatibleSkillDirs
@@ -11123,7 +11278,7 @@ var InstallDefaultSkillsUseCase = class {
     await this.mergeLockFileSlice(
       baseDirectory,
       response.lockFileSlice ?? {},
-      command31.cliVersion
+      command35.cliVersion
     );
     return result;
   }
@@ -11277,8 +11432,8 @@ var EnsureCliVersionUseCase = class {
     this.lockFileRepository = lockFileRepository;
     this.installDefaultSkillsUseCase = installDefaultSkillsUseCase;
   }
-  async execute(command31) {
-    const { baseDirectory, currentCliVersion, includeBeta } = command31;
+  async execute(command35) {
+    const { baseDirectory, currentCliVersion, includeBeta } = command35;
     const lockFile = await this.lockFileRepository.read(baseDirectory);
     if (!lockFile) {
       return { kind: "no-lockfile" };
@@ -11314,10 +11469,10 @@ var ListPackagesUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    if (command31.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const response = await this.packmindGateway.packages.list({
-        spaceId: command31.spaceId
+        spaceId: command35.spaceId
       });
       return response.packages;
     }
@@ -11336,8 +11491,8 @@ var GetPackageSummaryUseCase = class {
   constructor(gateway) {
     this.gateway = gateway;
   }
-  async execute(command31) {
-    return this.gateway.packages.getSummary(command31);
+  async execute(command35) {
+    return this.gateway.packages.getSummary(command35);
   }
 };
 
@@ -11629,8 +11784,8 @@ var LoginUseCase = class {
       startCallbackServer: deps?.startCallbackServer ?? defaultStartCallbackServer
     };
   }
-  async execute(command31) {
-    const { host, code: providedCode } = command31;
+  async execute(command35) {
+    const { host, code: providedCode } = command35;
     let code;
     if (providedCode) {
       code = providedCode;
@@ -12012,10 +12167,10 @@ var CheckCliVersionUseCase = class {
       now: deps?.now ?? (() => /* @__PURE__ */ new Date())
     };
   }
-  async execute(command31) {
-    const cached = this.readFreshCache(command31.currentVersion);
+  async execute(command35) {
+    const cached = this.readFreshCache(command35.currentVersion);
     if (cached) {
-      return this.toResult(command31.currentVersion, cached.latestVersion);
+      return this.toResult(command35.currentVersion, cached.latestVersion);
     }
     const fetchPromise = this.deps.fetchLatestVersion(this.deps.fetchFn);
     fetchPromise.catch(() => void 0);
@@ -12033,7 +12188,7 @@ var CheckCliVersionUseCase = class {
         latestVersion,
         checkedAt: this.deps.now()
       });
-      return this.toResult(command31.currentVersion, latestVersion);
+      return this.toResult(command35.currentVersion, latestVersion);
     } catch {
       return null;
     }
@@ -12481,10 +12636,10 @@ var ListStandardsUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    if (command31.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const response = await this.packmindGateway.standards.list({
-        spaceId: command31.spaceId
+        spaceId: command35.spaceId
       });
       return response.standards;
     }
@@ -12504,10 +12659,10 @@ var ListCommandsUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    if (command31.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const response = await this.packmindGateway.commands.list({
-        spaceId: command31.spaceId
+        spaceId: command35.spaceId
       });
       return response.recipes;
     }
@@ -12527,10 +12682,10 @@ var ListSkillsUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    if (command31.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const skills = await this.packmindGateway.skills.list({
-        spaceId: command31.spaceId
+        spaceId: command35.spaceId
       });
       return skills.map((s) => ({
         id: s.id,
@@ -12702,8 +12857,8 @@ var UploadSkillUseCase = class {
   constructor(deps) {
     this.deps = deps;
   }
-  async execute(command31) {
-    const files = await readSkillDirectory(command31.skillPath);
+  async execute(command35) {
+    const files = await readSkillDirectory(command35.skillPath);
     if (!files.find((f) => f.relativePath === "SKILL.md")) {
       throw new Error("SKILL.md not found in skill directory");
     }
@@ -12717,7 +12872,7 @@ var UploadSkillUseCase = class {
     if (totalSize > 10 * 1024 * 1024) {
       throw new Error(`Skill size (${totalSize} bytes) exceeds 10MB limit`);
     }
-    const space = await this.getSpace(command31.spaceSlug);
+    const space = await this.getSpace(command35.spaceSlug);
     const payload = {
       files: files.map((f) => ({
         path: f.relativePath,
@@ -12729,7 +12884,7 @@ var UploadSkillUseCase = class {
     const uploadSkillResponse = await this.deps.gateway.skills.upload({
       spaceId: createSpaceId(space.id),
       files: payload.files,
-      originSkill: command31.originSkill
+      originSkill: command35.originSkill
     });
     return {
       skillId: uploadSkillResponse.skill.id,
@@ -13338,34 +13493,43 @@ function parsePackmindStandard(content) {
   if (!name) {
     return null;
   }
+  let scopeLineIndex = -1;
   let rulesLineIndex = -1;
   for (let i = nameLineIndex + 1; i < lines.length; i++) {
-    if (lines[i].trim() === "## Rules") {
+    const trimmed = lines[i].trim();
+    if (scopeLineIndex < 0 && trimmed === SCOPE_HEADING) {
+      scopeLineIndex = i;
+    } else if (rulesLineIndex < 0 && trimmed === RULES_HEADING) {
       rulesLineIndex = i;
-      break;
     }
   }
+  const scopeSection = scopeLineIndex >= 0 ? extractScopeSection(lines, scopeLineIndex + 1, rulesLineIndex < 0) : null;
+  const sectionIndexes = [scopeLineIndex, rulesLineIndex].filter(
+    (index) => index >= 0
+  );
+  const descriptionEnd = sectionIndexes.length ? Math.min(...sectionIndexes) : lines.length;
   const descriptionLines = [];
-  let rulesStartIndex = -1;
-  if (rulesLineIndex >= 0) {
-    for (let i = nameLineIndex + 1; i < rulesLineIndex; i++) {
-      descriptionLines.push(lines[i]);
+  let rulesStartIndex = rulesLineIndex >= 0 ? rulesLineIndex + 1 : -1;
+  for (let i = nameLineIndex + 1; i < descriptionEnd; i++) {
+    if (rulesStartIndex < 0 && isRuleBullet(lines[i])) {
+      rulesStartIndex = i;
+      break;
     }
-    rulesStartIndex = rulesLineIndex + 1;
-  } else {
-    for (let i = nameLineIndex + 1; i < lines.length; i++) {
-      if (lines[i].startsWith("* ") || lines[i].startsWith("- ")) {
+    descriptionLines.push(lines[i]);
+  }
+  if (rulesStartIndex < 0 && scopeSection) {
+    for (let i = scopeSection.endIndex; i < lines.length; i++) {
+      if (isRuleBullet(lines[i])) {
         rulesStartIndex = i;
         break;
       }
-      descriptionLines.push(lines[i]);
     }
   }
   const rules = extractRulesList(lines, rulesStartIndex);
   return {
     name,
     description: descriptionLines.join("\n").trim(),
-    scope: "",
+    scope: scopeSection?.value ?? "",
     rules
   };
 }
@@ -13399,12 +13563,30 @@ function parseCopilotStandard(content) {
   return parseIdeStandardBody(body, scope);
 }
 var RULES_FALLBACK = "No rules defined yet.";
+var SCOPE_HEADING = "## Scope";
+var RULES_HEADING = "## Rules";
+function isRuleBullet(line) {
+  return line.startsWith("* ") || line.startsWith("- ");
+}
+function extractScopeSection(lines, startIndex, stopAtBullet) {
+  const patterns = [];
+  let index = startIndex;
+  for (; index < lines.length; index++) {
+    const line = lines[index];
+    if (line.startsWith("## ")) break;
+    if (stopAtBullet && isRuleBullet(line)) break;
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    patterns.push(isRuleBullet(trimmed) ? trimmed.slice(2).trim() : trimmed);
+  }
+  return { value: patterns.join(", "), endIndex: index };
+}
 function extractRulesList(lines, startIndex) {
   if (startIndex < 0) return [];
   const rules = [];
   for (let i = startIndex; i < lines.length; i++) {
     const line = lines[i];
-    if (line.startsWith("* ") || line.startsWith("- ")) {
+    if (isRuleBullet(line)) {
       const content = line.slice(2).trim();
       if (content && content !== RULES_FALLBACK) {
         rules.push(content);
@@ -13455,7 +13637,7 @@ function parseIdeStandardBody(body, scope) {
   const descriptionLines = [];
   let rulesStartIndex = -1;
   for (let i = nameLineIndex + 1; i < lines.length; i++) {
-    if (lines[i].startsWith("* ") || lines[i].startsWith("- ")) {
+    if (isRuleBullet(lines[i])) {
       rulesStartIndex = i;
       break;
     }
@@ -13719,9 +13901,9 @@ var DiffArtefactsUseCase = class {
       new StandardDiffStrategy()
     ];
   }
-  async execute(command31) {
-    const baseDirectory = command31.baseDirectory || process.cwd();
-    const response = await this.fetchContent(command31, baseDirectory);
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
+    const response = await this.fetchContent(command35, baseDirectory);
     const filteredFiles = response.fileUpdates.createOrUpdate.filter(
       (file) => file.path !== "packmind.json"
     );
@@ -13734,7 +13916,7 @@ var DiffArtefactsUseCase = class {
     );
     const prefixedSkillFolders = this.prefixSkillFolders(
       response.skillFolders,
-      command31.relativePath
+      command35.relativePath
     );
     const diffs = [];
     for (const file of diffableFiles) {
@@ -13761,7 +13943,7 @@ var DiffArtefactsUseCase = class {
       targetId: response.targetId ? createTargetId(response.targetId) : void 0
     }));
   }
-  async fetchContent(command31, baseDirectory) {
+  async fetchContent(command35, baseDirectory) {
     const lockFile = await this.lockFileRepository.read(baseDirectory);
     if (lockFile) {
       try {
@@ -13781,11 +13963,11 @@ var DiffArtefactsUseCase = class {
       }
     }
     return this.packmindGateway.deployment.getDeployed({
-      packagesSlugs: command31.packagesSlugs,
-      gitRemoteUrl: command31.gitRemoteUrl,
-      gitBranch: command31.gitBranch,
-      relativePath: command31.relativePath,
-      agents: command31.agents
+      packagesSlugs: command35.packagesSlugs,
+      gitRemoteUrl: command35.gitRemoteUrl,
+      gitBranch: command35.gitBranch,
+      relativePath: command35.relativePath,
+      agents: command35.agents
     });
   }
   prefixSkillFolders(skillFolders, relativePath) {
@@ -13809,8 +13991,8 @@ var SubmitDiffsUseCase = class {
   constructor(packmindGateway) {
     this.packmindGateway = packmindGateway;
   }
-  async execute(command31) {
-    const { groupedDiffs, message } = command31;
+  async execute(command35) {
+    const { groupedDiffs, message } = command35;
     const skipped = [];
     const validDiffs = [];
     for (const group of groupedDiffs) {
@@ -13885,8 +14067,8 @@ var CheckDiffsUseCase = class {
   constructor(packmindGateway) {
     this.packmindGateway = packmindGateway;
   }
-  async execute(command31) {
-    const { groupedDiffs } = command31;
+  async execute(command35) {
+    const { groupedDiffs } = command35;
     const results = [];
     const validDiffs = [];
     const invalidDiffs = [];
@@ -13984,8 +14166,8 @@ var CliFormatter = class {
   static error(message) {
     return `${source_default.bgRed.bold(CLI_PREFIX2)} ${source_default.red(message)}`;
   }
-  static command(command31) {
-    return source_default.yellow(command31);
+  static command(command35) {
+    return source_default.yellow(command35);
   }
   static loader(text) {
     return source_default.dim.italic(text);
@@ -14130,16 +14312,61 @@ var TrackRepositoryUseCase = class {
     this.gateway = gateway;
     this.gitService = gitService;
   }
-  async execute(command31) {
-    const { repoPath, origin: origin9, update, confirm } = command31;
+  async execute(command35) {
+    const {
+      repoPath,
+      origin: origin9,
+      update,
+      remove,
+      branch: requestedBranch,
+      confirm
+    } = command35;
     const { gitRemoteUrl } = this.gitService.getGitRemoteUrl(repoPath);
-    const { branch } = this.gitService.getCurrentBranch(repoPath);
+    const { branch: currentBranch, detached } = this.gitService.getCurrentBranch(repoPath);
+    const branch = requestedBranch ?? currentBranch;
     const { owner, repo } = parseOwnerRepo(gitRemoteUrl);
     const providerVendor = parseProviderVendor(gitRemoteUrl);
+    if (detached && !requestedBranch && !remove) {
+      return { status: "detached-head", owner, repo };
+    }
+    if (requestedBranch && !this.gitService.branchExists(repoPath, requestedBranch)) {
+      return { status: "branch-not-found", owner, repo, branch };
+    }
     const { gitRepo: tracked } = await this.gateway.getTrackedRepository({
       owner,
       repo
     });
+    if (remove) {
+      if (tracked) {
+        const confirmed2 = await confirm({
+          mode: "remove",
+          owner,
+          repo,
+          branch: tracked.branch
+        });
+        if (!confirmed2) {
+          return { status: "cancelled" };
+        }
+      }
+      const response = await this.gateway.removeTrackedRepository({
+        owner,
+        repo
+      });
+      if (response.status === "not-tracked") {
+        return {
+          status: "not-tracked",
+          owner,
+          repo,
+          organizationName: response.organizationName
+        };
+      }
+      return {
+        status: "removed",
+        owner,
+        repo,
+        branch: response.gitRepo.branch
+      };
+    }
     if (update) {
       if (!tracked) {
         return { status: "nothing-tracked", owner, repo, branch };
@@ -14199,6 +14426,45 @@ var TrackRepositoryUseCase = class {
   }
 };
 
+// apps/cli/src/application/useCases/trackRepository/GetTrackingInfoUseCase.ts
+var GetTrackingInfoUseCase = class {
+  constructor(gateway, gitService) {
+    this.gateway = gateway;
+    this.gitService = gitService;
+  }
+  async execute({
+    repoPath
+  }) {
+    const { gitRemoteUrl } = this.gitService.getGitRemoteUrl(repoPath);
+    const { branch: currentBranch, detached: currentBranchDetached } = this.gitService.getCurrentBranch(repoPath);
+    const { owner, repo } = parseOwnerRepo(gitRemoteUrl);
+    const { gitRepo } = await this.gateway.getTrackedRepository({
+      owner,
+      repo
+    });
+    if (!gitRepo) {
+      return {
+        status: "not-tracked",
+        owner,
+        repo,
+        currentBranch,
+        currentBranchDetached
+      };
+    }
+    return {
+      status: "tracked",
+      owner,
+      repo,
+      trackedBranch: gitRepo.branch,
+      currentBranch,
+      currentBranchDetached,
+      // Skipped when it is the branch we are on: being on it proves it exists,
+      // and this is the common case, so it saves a git call.
+      trackedBranchExists: gitRepo.branch === currentBranch || this.gitService.branchExists(repoPath, gitRepo.branch)
+    };
+  }
+};
+
 // apps/cli/src/PackmindCliHexaFactory.ts
 var PackmindCliHexaFactory = class {
   constructor() {
@@ -14288,6 +14554,10 @@ var PackmindCliHexaFactory = class {
       trackRepository: new TrackRepositoryUseCase(
         this.repositories.packmindGateway.repositoryTracking,
         this.services.gitRemoteUrlService
+      ),
+      getTrackingInfo: new GetTrackingInfoUseCase(
+        this.repositories.packmindGateway.repositoryTracking,
+        this.services.gitRemoteUrlService
       )
     };
   }
@@ -14297,29 +14567,29 @@ var PackmindCliHexaFactory = class {
 var origin8 = "PackmindCliHexa";
 var PackmindCliHexa = class {
   constructor(logger2 = new PackmindLogger(origin8)) {
-    this.notifyDistribution = async (command31) => {
+    this.notifyDistribution = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.notifyDistribution(
-        command31
+        command35
       );
     };
-    this.notifyArtefactsDistribution = async (command31) => {
+    this.notifyArtefactsDistribution = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.notifyArtefactsDistribution(
-        command31
+        command35
       );
     };
-    this.getTrackedRepository = async (command31) => {
+    this.getTrackedRepository = async (command35) => {
       return this.hexa.repositories.packmindGateway.repositoryTracking.getTrackedRepository(
-        command31
+        command35
       );
     };
-    this.renderPlugin = async (command31) => {
+    this.renderPlugin = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.renderPlugin(
-        command31
+        command35
       );
     };
-    this.trackPluginDeleted = async (command31) => {
+    this.trackPluginDeleted = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.trackPluginDeleted(
-        command31
+        command35
       );
     };
     this.logger = logger2;
@@ -14342,29 +14612,29 @@ var PackmindCliHexa = class {
   get output() {
     return this.hexa.repositories.output;
   }
-  async getGitRemoteUrl(command31) {
-    return this.hexa.useCases.getGitRemoteUrl.execute(command31);
+  async getGitRemoteUrl(command35) {
+    return this.hexa.useCases.getGitRemoteUrl.execute(command35);
   }
-  async listFilesInDirectory(command31) {
-    return this.hexa.useCases.listFilesInDirectoryUseCase.execute(command31);
+  async listFilesInDirectory(command35) {
+    return this.hexa.useCases.listFilesInDirectoryUseCase.execute(command35);
   }
-  async lintFilesAgainstRule(command31) {
-    return this.hexa.useCases.lintFilesAgainstRule.execute(command31);
+  async lintFilesAgainstRule(command35) {
+    return this.hexa.useCases.lintFilesAgainstRule.execute(command35);
   }
-  async lintFilesFromConfig(command31) {
-    return this.hexa.useCases.lintFilesFromConfig.execute(command31);
+  async lintFilesFromConfig(command35) {
+    return this.hexa.useCases.lintFilesFromConfig.execute(command35);
   }
-  async installPackages(command31) {
-    return this.hexa.useCases.installPackages.execute(command31);
+  async installPackages(command35) {
+    return this.hexa.useCases.installPackages.execute(command35);
   }
-  async install(command31) {
-    return this.hexa.useCases.install.execute(command31);
+  async install(command35) {
+    return this.hexa.useCases.install.execute(command35);
   }
-  async uninstall(command31) {
-    return this.hexa.useCases.uninstall.execute(command31);
+  async uninstall(command35) {
+    return this.hexa.useCases.uninstall.execute(command35);
   }
-  async diffArtefacts(command31) {
-    return this.hexa.useCases.diffArtefacts.execute(command31);
+  async diffArtefacts(command35) {
+    return this.hexa.useCases.diffArtefacts.execute(command35);
   }
   async submitDiffs(groupedDiffs, message) {
     return this.hexa.useCases.submitDiffs.execute({ groupedDiffs, message });
@@ -14372,20 +14642,20 @@ var PackmindCliHexa = class {
   async checkDiffs(groupedDiffs) {
     return this.hexa.useCases.checkDiffs.execute({ groupedDiffs });
   }
-  async listPackages(command31) {
-    return this.hexa.useCases.listPackages.execute(command31);
+  async listPackages(command35) {
+    return this.hexa.useCases.listPackages.execute(command35);
   }
-  async getPackageBySlug(command31) {
-    return this.hexa.useCases.getPackageBySlug.execute(command31);
+  async getPackageBySlug(command35) {
+    return this.hexa.useCases.getPackageBySlug.execute(command35);
   }
-  async listStandards(command31) {
-    return this.hexa.useCases.listStandards.execute(command31);
+  async listStandards(command35) {
+    return this.hexa.useCases.listStandards.execute(command35);
   }
-  async listCommands(command31) {
-    return this.hexa.useCases.listCommands.execute(command31);
+  async listCommands(command35) {
+    return this.hexa.useCases.listCommands.execute(command35);
   }
-  async listSkills(command31) {
-    return this.hexa.useCases.listSkills.execute(command31);
+  async listSkills(command35) {
+    return this.hexa.useCases.listSkills.execute(command35);
   }
   async configExists(baseDirectory) {
     return await this.hexa.repositories.configFileRepository.configExists(
@@ -14472,40 +14742,52 @@ var PackmindCliHexa = class {
       directory
     );
   }
-  async login(command31) {
-    return this.hexa.useCases.login.execute(command31);
+  async login(command35) {
+    return this.hexa.useCases.login.execute(command35);
   }
-  async logout(command31) {
-    return this.hexa.useCases.logout.execute(command31);
+  async logout(command35) {
+    return this.hexa.useCases.logout.execute(command35);
   }
-  async whoami(command31) {
-    return this.hexa.useCases.whoami.execute(command31);
+  async whoami(command35) {
+    return this.hexa.useCases.whoami.execute(command35);
   }
-  async checkCliVersion(command31) {
-    return this.hexa.useCases.checkCliVersion.execute(command31);
+  async checkCliVersion(command35) {
+    return this.hexa.useCases.checkCliVersion.execute(command35);
   }
   getCurrentBranch(repoPath) {
     return this.hexa.services.gitRemoteUrlService.getCurrentBranch(repoPath).branch;
   }
+  isDetachedHead(repoPath) {
+    return this.hexa.services.gitRemoteUrlService.getCurrentBranch(repoPath).detached;
+  }
+  branchExists(repoPath, branch) {
+    return this.hexa.services.gitRemoteUrlService.branchExists(
+      repoPath,
+      branch
+    );
+  }
   getGitRemoteUrlFromPath(repoPath) {
     return this.hexa.services.gitRemoteUrlService.getGitRemoteUrl(repoPath).gitRemoteUrl;
   }
-  async uploadSkill(command31) {
-    return this.hexa.useCases.uploadSkill.execute(command31);
+  async uploadSkill(command35) {
+    return this.hexa.useCases.uploadSkill.execute(command35);
   }
-  async installDefaultSkills(command31) {
-    return this.hexa.useCases.installDefaultSkills.execute(command31);
+  async installDefaultSkills(command35) {
+    return this.hexa.useCases.installDefaultSkills.execute(command35);
   }
-  async bootstrapSkillsInitDirectory(command31) {
+  async bootstrapSkillsInitDirectory(command35) {
     return this.hexa.useCases.installDefaultSkills.bootstrapEmptyDirectory(
-      command31.baseDirectory
+      command35.baseDirectory
     );
   }
-  async ensureCliVersion(command31) {
-    return this.hexa.useCases.ensureCliVersion.execute(command31);
+  async ensureCliVersion(command35) {
+    return this.hexa.useCases.ensureCliVersion.execute(command35);
+  }
+  async trackRepository(command35) {
+    return this.hexa.useCases.trackRepository.execute(command35);
   }
-  async trackRepository(command31) {
-    return this.hexa.useCases.trackRepository.execute(command31);
+  async getTrackingInfo(command35) {
+    return this.hexa.useCases.getTrackingInfo.execute(command35);
   }
   getPackmindGateway() {
     return this.hexa.repositories.packmindGateway;
@@ -15537,6 +15819,9 @@ function buildSkillsSkippedWarning(configuredAgents) {
 // apps/cli/src/infra/commands/trackingPrompts.ts
 var inquirer2 = __toESM(require("inquirer"));
 function buildTrackConfirmationMessage(details) {
+  if (details.mode === "remove") {
+    return `Stop tracking ${details.owner}/${details.repo}? Packmind currently tracks branch ${details.branch}.`;
+  }
   if (details.mode === "update") {
     return `Change the tracked branch for ${details.owner}/${details.repo} from ${details.fromBranch} to ${details.branch}?`;
   }
@@ -15548,7 +15833,7 @@ async function defaultConfirmPrompt(message) {
       type: "confirm",
       name: "confirmed",
       message,
-      default: true
+      default: false
     }
   ]);
   return confirmed;
@@ -15668,6 +15953,7 @@ async function offerRepositoryTracking(deps) {
       repoPath: deps.baseDirectory,
       origin: "init",
       update: false,
+      remove: false,
       confirm
     });
     switch (result.status) {
@@ -15987,7 +16273,7 @@ function mergeInstallResults(results) {
   return merged;
 }
 function decideDistributionTracking(params) {
-  const { lookup, currentBranch } = params;
+  const { lookup, currentBranch, branchExists, detached } = params;
   switch (lookup.status) {
     case "flag-off":
       return { action: "record-legacy" };
@@ -15999,9 +16285,16 @@ function decideDistributionTracking(params) {
         return { action: "skip", reason: "repo_not_tracked" };
       }
       if (tracked.branch !== currentBranch) {
+        if (!branchExists(tracked.branch)) {
+          return {
+            action: "skip",
+            reason: "tracked_branch_gone",
+            trackedBranch: tracked.branch
+          };
+        }
         return {
           action: "skip",
-          reason: "wrong_branch",
+          reason: detached ? "detached_head" : "wrong_branch",
           trackedBranch: tracked.branch
         };
       }
@@ -16026,9 +16319,19 @@ function reportDistributionTrackingDecision(decision, context) {
       if (decision.reason === "repo_not_tracked") {
         logWarningConsole(
           `Distribution not recorded \u2014 ${context.owner}/${context.repo} is not tracked in Packmind. Ask an admin to run ${formatCommand(
-            "packmind track"
+            "packmind git track"
           )} to start tracking it.`
         );
+      } else if (decision.reason === "detached_head") {
+        logWarningConsole(
+          `Distribution not recorded \u2014 no branch is checked out here (HEAD is detached), and Packmind records distributions on '${decision.trackedBranch}'. Check that branch out to record this distribution.`
+        );
+      } else if (decision.reason === "tracked_branch_gone") {
+        logWarningConsole(
+          `Distribution not recorded \u2014 the tracked branch '${decision.trackedBranch}' is not in this repository, so nothing is recorded anywhere. Ask an admin to run ${formatCommand(
+            "packmind git track --update"
+          )} to move tracking to '${context.currentBranch}'.`
+        );
       } else {
         logWarningConsole(
           `Distribution not recorded \u2014 you're on '${context.currentBranch}', but the tracked branch is '${decision.trackedBranch}'. Switch to '${decision.trackedBranch}' to record this distribution.`
@@ -16066,9 +16369,11 @@ async function computeDistributionTrackingDecision(packmindCliHexa, gitRoot) {
   let owner;
   let repo;
   let gitBranch;
+  let detached;
   try {
     const gitRemoteUrl = packmindCliHexa.getGitRemoteUrlFromPath(gitRoot);
     gitBranch = packmindCliHexa.getCurrentBranch(gitRoot);
+    detached = packmindCliHexa.isDetachedHead(gitRoot);
     ({ owner, repo } = parseOwnerRepo(gitRemoteUrl));
   } catch {
     const decision2 = { action: "inform" };
@@ -16078,7 +16383,15 @@ async function computeDistributionTrackingDecision(packmindCliHexa, gitRoot) {
   const lookup = await resolveTrackingLookup(packmindCliHexa, owner, repo);
   const decision = decideDistributionTracking({
     lookup,
-    currentBranch: gitBranch
+    currentBranch: gitBranch,
+    branchExists: (branch) => {
+      try {
+        return packmindCliHexa.branchExists(gitRoot, branch);
+      } catch {
+        return true;
+      }
+    },
+    detached
   });
   reportDistributionTrackingDecision(decision, {
     owner,
@@ -17054,15 +17367,15 @@ var CreatePackageUseCase = class {
     this.gateway = gateway;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    const space = await this.getSpace(command31);
+  async execute(command35) {
+    const space = await this.getSpace(command35);
     const result = await this.gateway.packages.create({
       spaceId: space.id,
-      name: command31.name,
-      description: command31.description ?? "",
+      name: command35.name,
+      description: command35.description ?? "",
       recipeIds: [],
       standardIds: [],
-      originSkill: command31.originSkill
+      originSkill: command35.originSkill
     });
     return {
       packageId: result.package.id,
@@ -17071,12 +17384,12 @@ var CreatePackageUseCase = class {
       spaceSlug: space.slug
     };
   }
-  async getSpace(command31) {
+  async getSpace(command35) {
     const spaces = await this.spaceService.getSpaces();
-    if (command31.spaceSlug) {
-      const found = spaces.find((s) => s.slug === command31.spaceSlug);
+    if (command35.spaceSlug) {
+      const found = spaces.find((s) => s.slug === command35.spaceSlug);
       if (!found) {
-        throw new Error(`Space '${command31.spaceSlug}' not found.`);
+        throw new Error(`Space '${command35.spaceSlug}' not found.`);
       }
       return found;
     }
@@ -17194,8 +17507,8 @@ var AddToPackageUseCase = class {
     this.gateway = gateway;
     this.spaceService = spaceService;
   }
-  async execute(command31) {
-    const { packageSlug, spaceSlug, itemType, itemSlugs } = command31;
+  async execute(command35) {
+    const { packageSlug, spaceSlug, itemType, itemSlugs } = command35;
     const space = spaceSlug ? await this.resolveSpaceBySlug(spaceSlug) : await this.spaceService.getDefaultSpace();
     const packages = await this.gateway.packages.list({
       spaceId: space.id
@@ -17216,7 +17529,7 @@ var AddToPackageUseCase = class {
       standardIds: [],
       recipeIds: [],
       skillIds: [],
-      originSkill: command31.originSkill
+      originSkill: command35.originSkill
     };
     if (itemType === "standard") {
       addCommand.standardIds = ids.map(createStandardId);
@@ -17268,7 +17581,7 @@ var AddToPackageUseCase = class {
   }
   async findCommandBySlug(slug6, spaceId) {
     const commands = await this.gateway.commands.list({ spaceId });
-    return commands.recipes.find((command31) => command31.slug === slug6) ?? null;
+    return commands.recipes.find((command35) => command35.slug === slug6) ?? null;
   }
   async findSkillBySlug(slug6, spaceId) {
     const skills = await this.gateway.skills.list({ spaceId });
@@ -17344,11 +17657,11 @@ async function executeAddToPackage(pkgSlug, spaceSlug, itemType, itemSlugs, useC
     logErrorConsole(message);
     if (error instanceof ItemNotFoundError) {
       const spaceFlag = error.spaceSlug ? ` --space ${error.spaceSlug}` : "";
-      const command31 = formatCommand(
+      const command35 = formatCommand(
         `packmind-cli ${error.itemType}s list${spaceFlag}`
       );
       logInfoConsole(
-        `Run \`${command31}\` to display available ${error.itemType}s`
+        `Run \`${command35}\` to display available ${error.itemType}s`
       );
     }
     return { success: false, error: message };
@@ -17608,8 +17921,8 @@ ${pkg.name} (${fullSlug}):
     }
     if (pkg.commands && pkg.commands.length > 0) {
       logConsole("Commands:");
-      pkg.commands.forEach((command31) => {
-        logConsole(`  - ${command31.name}`);
+      pkg.commands.forEach((command35) => {
+        logConsole(`  - ${command35.name}`);
       });
       logConsole("");
     }
@@ -17680,19 +17993,34 @@ var import_path6 = require("path");
 var import_fs21 = require("fs");
 var import_path5 = require("path");
 function detectPluginMode(cwd) {
-  const marketplace = (0, import_path5.join)(cwd, ".claude-plugin/marketplace.json");
+  const claudeMarketplace = (0, import_path5.join)(cwd, ".claude-plugin/marketplace.json");
+  const copilotMarketplace = (0, import_path5.join)(cwd, ".github/plugin/marketplace.json");
   const standalone = (0, import_path5.join)(cwd, ".claude-plugin/plugin.json");
-  if ((0, import_fs21.existsSync)(marketplace)) {
-    return { mode: "marketplace", manifestPath: marketplace };
+  if ((0, import_fs21.existsSync)(claudeMarketplace)) {
+    return {
+      mode: "marketplace",
+      vendor: "claude",
+      manifestPath: claudeMarketplace
+    };
+  }
+  if ((0, import_fs21.existsSync)(copilotMarketplace)) {
+    return {
+      mode: "marketplace",
+      vendor: "copilot",
+      manifestPath: copilotMarketplace
+    };
   }
   if ((0, import_fs21.existsSync)(standalone)) {
-    return { mode: "standalone", manifestPath: standalone };
+    return { mode: "standalone", vendor: "claude", manifestPath: standalone };
   }
   return { mode: "none" };
 }
+function stripBom(content) {
+  return content.charCodeAt(0) === 65279 ? content.slice(1) : content;
+}
 function readMarketplace(path37) {
   const raw = (0, import_fs21.readFileSync)(path37, "utf8");
-  const parsed = JSON.parse(raw);
+  const parsed = JSON.parse(stripBom(raw));
   return { ...parsed, plugins: parsed.plugins ?? [] };
 }
 function writeMarketplace(path37, content) {
@@ -17746,7 +18074,7 @@ async function renderPluginHandler(args2, deps) {
   const ctx = detectPluginMode(cwd);
   if (ctx.mode === "none") {
     deps.error(
-      "No .claude-plugin/marketplace.json or .claude-plugin/plugin.json found in this directory."
+      "No .claude-plugin/marketplace.json, .github/plugin/marketplace.json, or .claude-plugin/plugin.json found in this directory."
     );
     deps.exit(1);
     return;
@@ -17759,7 +18087,17 @@ async function renderPluginHandler(args2, deps) {
   );
   if (ctx.mode === "marketplace") {
     const manifestPath = ctx.manifestPath;
-    const marketplace = readMarketplace(manifestPath);
+    const targetVendor = ctx.vendor === "copilot" ? "github" : "anthropic";
+    let marketplace;
+    try {
+      marketplace = readMarketplace(manifestPath);
+    } catch {
+      deps.error(
+        `${manifestPath} is not valid JSON. Fix the file and try again.`
+      );
+      deps.exit(1);
+      return;
+    }
     const existing = findPluginEntry(marketplace, pluginName);
     if (existing) {
       if (classifySource(existing.source) === "remote") {
@@ -17785,7 +18123,8 @@ async function renderPluginHandler(args2, deps) {
         pluginRoot: existingPluginRoot,
         pluginName,
         gitRemoteUrl,
-        gitBranch
+        gitBranch,
+        targetVendor
       });
       writeFiles(cwd, response2.files);
       const nextEntry = {
@@ -17808,7 +18147,8 @@ async function renderPluginHandler(args2, deps) {
       pluginRoot,
       pluginName,
       gitRemoteUrl,
-      gitBranch
+      gitBranch,
+      targetVendor
     });
     writeFiles(cwd, response.files);
     const updated = upsertPluginEntry(marketplace, {
@@ -17825,7 +18165,9 @@ async function renderPluginHandler(args2, deps) {
   }
   if (ctx.mode === "standalone") {
     const manifestPath = ctx.manifestPath;
-    const manifest = JSON.parse((0, import_fs22.readFileSync)(manifestPath, "utf8"));
+    const manifest = JSON.parse(
+      stripBom((0, import_fs22.readFileSync)(manifestPath, "utf8"))
+    );
     if (manifest.name !== pluginName) {
       deps.error(`The plugin '${pluginName}' is not handled in this repo.`);
       deps.exit(1);
@@ -17924,7 +18266,7 @@ async function deletePluginHandler(args2, deps) {
   const ctx = detectPluginMode(cwd);
   if (ctx.mode === "none") {
     deps.error(
-      "No .claude-plugin/marketplace.json or .claude-plugin/plugin.json found in this directory."
+      "No .claude-plugin/marketplace.json, .github/plugin/marketplace.json, or .claude-plugin/plugin.json found in this directory."
     );
     deps.exit(1);
     return;
@@ -17968,7 +18310,9 @@ async function deletePluginHandler(args2, deps) {
   }
   if (ctx.mode === "standalone") {
     const manifestPath = ctx.manifestPath;
-    const manifest = JSON.parse((0, import_fs23.readFileSync)(manifestPath, "utf8"));
+    const manifest = JSON.parse(
+      stripBom((0, import_fs23.readFileSync)(manifestPath, "utf8"))
+    );
     if (manifest.name !== pluginName) {
       deps.error(`The plugin '${pluginName}' is not handled in this repo.`);
       deps.exit(1);
@@ -18128,7 +18472,7 @@ var PlaybookLocalRepository = class {
   }
 };
 
-// apps/cli/src/infra/commands/playbook/addHandler.ts
+// apps/cli/src/infra/commands/playbook/add/stageSinglePath.ts
 var fs25 = __toESM(require("fs"));
 var path29 = __toESM(require("path"));
 var yaml2 = __toESM(require("yaml"));
@@ -18792,7 +19136,7 @@ function adoptArtifactIntoLockFile({
   };
 }
 
-// apps/cli/src/infra/commands/playbook/addHandler.ts
+// apps/cli/src/infra/commands/playbook/add/stageSinglePath.ts
 async function tryStageRemovedFromLockFile(resolvedPath, deps) {
   const fileDir = path29.dirname(resolvedPath);
   const targetDir = await findNearestConfigDir(fileDir, deps.packmindCliHexa);
@@ -18830,10 +19174,6 @@ async function tryStageRemovedFromLockFile(resolvedPath, deps) {
   logSuccessConsole(
     `Staged "${lockEntry.name}" (${lockEntry.type}, removed) to playbook${spaceInfo}`
   );
-  logInfoConsole(
-    `Run ${formatLabel("packmind playbook submit")} when you're ready to publish your changes.`
-  );
-  deps.exit(0);
   return true;
 }
 function resolveSkillDirectoryRoot(absolutePath) {
@@ -18857,25 +19197,17 @@ function resolveSkillDirectoryRoot(absolutePath) {
   }
   return absolutePath;
 }
-async function playbookAddHandler(deps) {
+async function stageSinglePath(deps) {
   const {
     packmindCliHexa,
     filePath,
     spaceSlug,
-    exit,
     cwd,
     readFile: readFile11,
     readSkillDirectory: readSkillDirectory2,
     playbookLocalRepository,
     lockFileRepository
   } = deps;
-  if (!filePath) {
-    logErrorConsole(
-      "Missing file path. Usage: packmind-cli playbook add <path>"
-    );
-    exit(1);
-    return;
-  }
   const absolutePath = path29.resolve(cwd, filePath);
   let artifactType;
   let codingAgent;
@@ -18899,11 +19231,11 @@ async function playbookAddHandler(deps) {
     } else {
       const artefactResult = resolveArtefactFromPath(absolutePath);
       if (!artefactResult) {
-        logErrorConsole(
-          `Unsupported file path: ${absolutePath}. File must be in a recognized artefact directory (command, standard, or skill).`
-        );
-        exit(1);
-        return;
+        return {
+          status: "failed",
+          filePath,
+          message: `Unsupported file path: ${absolutePath}. File must be in a recognized artefact directory (command, standard, or skill).`
+        };
       }
       artifactType = artefactResult.artifactType;
       codingAgent = artefactResult.codingAgent;
@@ -18911,11 +19243,11 @@ async function playbookAddHandler(deps) {
   } else {
     const artefactResult = resolveArtefactFromPath(absolutePath);
     if (!artefactResult) {
-      logErrorConsole(
-        `Unsupported file path: ${absolutePath}. File must be in a recognized artefact directory (command, standard, or skill).`
-      );
-      exit(1);
-      return;
+      return {
+        status: "failed",
+        filePath,
+        message: `Unsupported file path: ${absolutePath}. File must be in a recognized artefact directory (command, standard, or skill).`
+      };
     }
     artifactType = artefactResult.artifactType;
     codingAgent = artefactResult.codingAgent;
@@ -18925,9 +19257,7 @@ async function playbookAddHandler(deps) {
     artifactType
   );
   if (!formatValidation.valid) {
-    logErrorConsole(formatValidation.reason);
-    exit(1);
-    return;
+    return { status: "failed", filePath, message: formatValidation.reason };
   }
   let localContent;
   let artifactName;
@@ -18945,21 +19275,20 @@ async function playbookAddHandler(deps) {
         packmindCliHexa,
         lockFileRepository,
         playbookLocalRepository,
-        codingAgent,
-        exit
+        codingAgent
       });
-      if (staged) return;
+      if (staged) return { status: "staged", filePath, artifactType };
       const errorMessage = err instanceof Error ? err.message : String(err);
-      logErrorConsole(`Failed to read skill directory: ${errorMessage}`);
-      exit(1);
-      return;
+      return {
+        status: "failed",
+        filePath,
+        message: `Failed to read skill directory: ${errorMessage}`
+      };
     }
     skillFiles = files;
     const parseResult = parseSkillDirectory(files);
     if (!parseResult.success) {
-      logErrorConsole(parseResult.error);
-      exit(1);
-      return;
+      return { status: "failed", filePath, message: parseResult.error };
     }
     artifactName = parseResult.payload.name;
     serializedContent = yaml2.stringify(parseResult.payload);
@@ -18973,21 +19302,24 @@ async function playbookAddHandler(deps) {
         packmindCliHexa,
         lockFileRepository,
         playbookLocalRepository,
-        codingAgent,
-        exit
+        codingAgent
       });
-      if (staged) return;
+      if (staged) return { status: "staged", filePath, artifactType };
       const errorMessage = err instanceof Error ? err.message : String(err);
-      logErrorConsole(`Failed to read file: ${errorMessage}`);
-      exit(1);
-      return;
+      return {
+        status: "failed",
+        filePath,
+        message: `Failed to read file: ${errorMessage}`
+      };
     }
     if (artifactType === "command") {
       const parseResult = parseCommandFile(localContent, absolutePath);
       if (!parseResult.success) {
-        logErrorConsole(`Failed to parse command file: ${parseResult.error}`);
-        exit(1);
-        return;
+        return {
+          status: "failed",
+          filePath,
+          message: `Failed to parse command file: ${parseResult.error}`
+        };
       }
       artifactName = parseResult.parsed.name;
     } else {
@@ -18997,15 +19329,15 @@ async function playbookAddHandler(deps) {
       } else {
         const lenient = parseLenientStandard(localContent);
         if (!lenient) {
-          logErrorConsole(
-            `${filePath} is not a valid artifact. Expected format:
+          return {
+            status: "failed",
+            filePath,
+            message: `Not a valid artifact. Expected format:
 
 # My standard name
 
 Content goes here...`
-          );
-          exit(1);
-          return;
+          };
         }
         artifactName = lenient.name;
       }
@@ -19014,11 +19346,11 @@ Content goes here...`
   }
   const targetDir = earlyTargetDir;
   if (!targetDir) {
-    logErrorConsole(
-      "Not inside a Packmind project. No packmind.json found in any parent directory."
-    );
-    exit(1);
-    return;
+    return {
+      status: "failed",
+      filePath,
+      message: "Not inside a Packmind project. No packmind.json found in any parent directory."
+    };
   }
   const gitRoot = await packmindCliHexa.tryGetGitRepositoryRoot(targetDir);
   const configDir = gitRoot ? normalizePath2(path29.relative(gitRoot, targetDir)) : void 0;
@@ -19036,23 +19368,23 @@ Content goes here...`
   const allSpaces = await packmindCliHexa.getSpaces();
   const existingLockEntry = earlyLockFile && findLockFileEntryForPath(normalizedFilePath, earlyLockFile.artifacts);
   if (existingLockEntry && !spaceSlug && !allSpaces.some((s) => s.id === existingLockEntry.spaceId)) {
-    logErrorConsole(
-      `Cannot add changes to this ${artifactType}: the space it belongs to is not available to you.
+    return {
+      status: "failed",
+      filePath,
+      message: `Cannot add changes to this ${artifactType}: the space it belongs to is not available to you.
 Use --space to stage it as a new artifact in an accessible space:
 ${formatSpaceList(allSpaces)}`
-    );
-    exit(1);
-    return;
+    };
   }
   if (spaceSlug) {
     const matchedSpace = allSpaces.find((s) => s.slug === spaceSlug);
     if (!matchedSpace) {
-      logErrorConsole(
-        `Space "@${spaceSlug}" not found. Available spaces:
+      return {
+        status: "failed",
+        filePath,
+        message: `Space "@${spaceSlug}" not found. Available spaces:
 ${formatSpaceList(allSpaces)}`
-      );
-      exit(1);
-      return;
+      };
     }
     spaceId = matchedSpace.id;
     spaceName = matchedSpace.name;
@@ -19064,14 +19396,14 @@ ${formatSpaceList(allSpaces)}`
       spaceId = existingLockEntry.spaceId;
       spaceName = allSpaces.find((s) => s.id === spaceId)?.name;
     } else {
-      logErrorConsole(
-        `Multiple spaces found. Use --space to specify the target space:
+      return {
+        status: "failed",
+        filePath,
+        message: `Multiple spaces found. Use --space to specify the target space:
 ${formatSpaceList(allSpaces)}
 
 Example: packmind-cli playbook add --space ${allSpaces[0].slug} <path>`
-      );
-      exit(1);
-      return;
+      };
     }
   }
   let changeType = "created";
@@ -19085,12 +19417,12 @@ Example: packmind-cli playbook add --space ${allSpaces[0].slug} <path>`
     }
   }
   if (changeType === "created" && earlyLockFile && earlyLockFile.agents.length > 0 && !earlyLockFile.agents.includes(codingAgent)) {
-    logErrorConsole(
-      `Cannot add this ${artifactType}: it is rendered for the "${codingAgent}" agent, which is not in your configured agents (${earlyLockFile.agents.join(", ")}).
+    return {
+      status: "failed",
+      filePath,
+      message: `Cannot add this ${artifactType}: it is rendered for the "${codingAgent}" agent, which is not in your configured agents (${earlyLockFile.agents.join(", ")}).
 This file is no longer managed by Packmind. Re-add "${codingAgent}" to your agents and run ${formatLabel("packmind-cli install")} to manage it again, or delete the file if it is no longer needed.`
-    );
-    exit(1);
-    return;
+    };
   }
   if (changeType === "updated" && existingLockEntry) {
     try {
@@ -19101,18 +19433,20 @@ This file is no longer managed by Packmind. Re-add "${codingAgent}" to your agen
         existingLockEntry.spaceId
       );
       if (existingLockEntry.version < remoteVersion) {
-        logErrorConsole(
-          `"${artifactName}" is outdated (local: v${existingLockEntry.version}, remote: v${remoteVersion}).
+        return {
+          status: "failed",
+          filePath,
+          message: `"${artifactName}" is outdated (local: v${existingLockEntry.version}, remote: v${remoteVersion}).
 Run ${formatLabel("packmind-cli install")} to update before making changes.`
-        );
-        exit(1);
-        return;
+        };
       }
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
-      logErrorConsole(`Failed to check artifact version: ${errorMessage}`);
-      exit(1);
-      return;
+      return {
+        status: "failed",
+        filePath,
+        message: `Failed to check artifact version: ${errorMessage}`
+      };
     }
   }
   if (changeType === "created") {
@@ -19126,11 +19460,11 @@ Run ${formatLabel("packmind-cli install")} to update before making changes.`
       );
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
-      logErrorConsole(
-        `Failed to check for existing ${artifactType}s: ${errorMessage}`
-      );
-      exit(1);
-      return;
+      return {
+        status: "failed",
+        filePath,
+        message: `Failed to check for existing ${artifactType}s: ${errorMessage}`
+      };
     }
     if (existingArtifact) {
       let remoteVersion;
@@ -19143,11 +19477,11 @@ Run ${formatLabel("packmind-cli install")} to update before making changes.`
         ));
       } catch (err) {
         const errorMessage = err instanceof Error ? err.message : String(err);
-        logErrorConsole(
-          `Failed to link "${existingArtifact.name}" to the existing ${artifactType}: ${errorMessage}`
-        );
-        exit(1);
-        return;
+        return {
+          status: "failed",
+          filePath,
+          message: `Failed to link "${existingArtifact.name}" to the existing ${artifactType}: ${errorMessage}`
+        };
       }
       const adoptedFilePath = artifactType === "skill" ? `${normalizedFilePath}/SKILL.md` : normalizedFilePath;
       activeLockFile = adoptArtifactIntoLockFile({
@@ -19187,8 +19521,7 @@ Run ${formatLabel("packmind-cli install")} to update before making changes.`
       });
       if (allMatch) {
         logInfoConsole("Already up to date \u2014 local content matches deployed.");
-        exit(0);
-        return;
+        return { status: "skipped", filePath, artifactType };
       }
     } else {
       const deployedFile = deployedFiles.find(
@@ -19196,8 +19529,7 @@ Run ${formatLabel("packmind-cli install")} to update before making changes.`
       );
       if (deployedFile && deployedFile.content?.trim() === localContent.trim()) {
         logInfoConsole("Already up to date \u2014 local content matches deployed.");
-        exit(0);
-        return;
+        return { status: "skipped", filePath, artifactType };
       }
     }
   }
@@ -19218,25 +19550,55 @@ Run ${formatLabel("packmind-cli install")} to update before making changes.`
   logSuccessConsole(
     `Staged "${artifactName}" (${artifactType}, ${changeType}) to playbook${spaceInfo}. ${formatLabel(codingAgent)}`
   );
-  logInfoConsole(
-    `Run ${formatLabel("packmind playbook submit")} when you're ready to publish your changes.`
-  );
-  exit(0);
+  return { status: "staged", filePath, artifactType };
 }
 function formatSpaceList(spaces) {
   const maxSlugLength = Math.max(...spaces.map((s) => s.slug.length));
   return spaces.map((s) => `  ${s.slug.padEnd(maxSlugLength)}  (${s.name})`).join("\n");
 }
 
+// apps/cli/src/infra/commands/playbook/addHandler.ts
+async function playbookAddHandler(deps) {
+  const { filePaths, exit, ...rest } = deps;
+  if (filePaths.length === 0) {
+    logErrorConsole(
+      "No path provided. Usage: packmind-cli playbook add <paths...>"
+    );
+    exit(1);
+    return;
+  }
+  const outcomes = [];
+  for (const filePath of filePaths) {
+    const outcome = await stageSinglePath({ ...rest, filePath });
+    outcomes.push(outcome);
+    if (outcome.status === "failed") {
+      logErrorConsole(`${filePath}: ${outcome.message ?? "failed to stage"}`);
+    }
+  }
+  const failedCount = outcomes.filter((o) => o.status === "failed").length;
+  const stagedCount = outcomes.filter((o) => o.status === "staged").length;
+  if (filePaths.length > 1) {
+    logInfoConsole(
+      `${stagedCount} staged, ${failedCount} failed of ${filePaths.length}.`
+    );
+  }
+  if (stagedCount > 0) {
+    logInfoConsole(
+      `Run ${formatLabel("packmind playbook submit")} when you're ready to publish your changes.`
+    );
+  }
+  exit(failedCount > 0 ? 1 : 0);
+}
+
 // apps/cli/src/infra/commands/playbook/AddCommand.ts
 var addPlaybookCommand = (0, import_cmd_ts23.command)({
   name: "add",
-  description: "Stage a local artifact change",
+  description: "Stage one or more local artifact changes",
   args: {
-    filePath: (0, import_cmd_ts23.positional)({
+    filePaths: (0, import_cmd_ts23.restPositionals)({
       type: import_cmd_ts23.string,
-      displayName: "path",
-      description: "Path to the artifact file or directory to stage"
+      displayName: "paths",
+      description: "Paths to the artifact files or directories to stage"
     }),
     space: (0, import_cmd_ts23.option)({
       type: (0, import_cmd_ts23.optional)(SpaceSlug),
@@ -19244,7 +19606,7 @@ var addPlaybookCommand = (0, import_cmd_ts23.command)({
       description: "Target space slug"
     })
   },
-  handler: async ({ filePath, space }) => {
+  handler: async ({ filePaths, space }) => {
     const packmindLogger = new PackmindLogger("PackmindCLI", "info" /* INFO */);
     const packmindCliHexa = new PackmindCliHexa(packmindLogger);
     const gitRoot = await packmindCliHexa.tryGetGitRepositoryRoot(
@@ -19255,7 +19617,7 @@ var addPlaybookCommand = (0, import_cmd_ts23.command)({
     const lockFileRepository = new LockFileRepository();
     await playbookAddHandler({
       packmindCliHexa,
-      filePath,
+      filePaths,
       spaceSlug: space,
       exit: process.exit,
       cwd: process.cwd(),
@@ -19875,6 +20237,9 @@ var path35 = __toESM(require("path"));
 
 // apps/cli/src/infra/commands/playbook/submit/duplicateNameChecker.ts
 var import_slug5 = __toESM(require("slug"));
+function duplicateNameKey(entry) {
+  return `${entry.spaceId}:${entry.artifactType}:${(0, import_slug5.default)(entry.artifactName)}`;
+}
 async function checkForDuplicateNames(createdEntries, packmindGateway) {
   const errors = [];
   const groups = /* @__PURE__ */ new Map();
@@ -19889,9 +20254,12 @@ async function checkForDuplicateNames(createdEntries, packmindGateway) {
     for (const entry of entries) {
       const sluggedName = (0, import_slug5.default)(entry.artifactName);
       if (seen.has(sluggedName)) {
-        errors.push(
-          `A ${entry.artifactType} named "${entry.artifactName}" is staged multiple times. Remove the duplicate with "playbook unstage" or rename the artifact.`
-        );
+        errors.push({
+          spaceId: entry.spaceId,
+          artifactType: entry.artifactType,
+          artifactName: entry.artifactName,
+          message: `A ${entry.artifactType} named "${entry.artifactName}" is staged multiple times. Remove the duplicate with "playbook unstage" or rename the artifact.`
+        });
       } else {
         seen.set(sluggedName, entry.artifactName);
       }
@@ -19921,9 +20289,12 @@ async function checkForDuplicateNames(createdEntries, packmindGateway) {
       const existingNamesSlugged = new Set(existingNames.map((n) => (0, import_slug5.default)(n)));
       for (const entry of entries) {
         if (existingNamesSlugged.has((0, import_slug5.default)(entry.artifactName))) {
-          errors.push(
-            `A ${entry.artifactType} named "${entry.artifactName}" already exists in this space. Use "playbook unstage" to remove it or rename the artifact.`
-          );
+          errors.push({
+            spaceId: entry.spaceId,
+            artifactType: entry.artifactType,
+            artifactName: entry.artifactName,
+            message: `A ${entry.artifactType} named "${entry.artifactName}" already exists in this space. Use "playbook unstage" to remove it or rename the artifact.`
+          });
         }
       }
     } catch {
@@ -20743,13 +21114,42 @@ async function playbookSubmitHandler(deps) {
     exit(0);
     return;
   }
+  const createdEntries = changes.filter((c) => c.changeType === "created");
+  const conflictingKeys = /* @__PURE__ */ new Set();
+  if (createdEntries.length > 0) {
+    const duplicateErrors = await checkForDuplicateNames(
+      createdEntries,
+      packmindCliHexa.getPackmindGateway()
+    );
+    for (const error of duplicateErrors) {
+      logErrorConsole(error.message);
+      conflictingKeys.add(duplicateNameKey(error));
+    }
+  }
+  const submittableChanges = changes.filter(
+    (c) => !(c.changeType === "created" && conflictingKeys.has(duplicateNameKey(c)))
+  );
+  const conflictCount = changes.length - submittableChanges.length;
+  const reportSkippedConflicts = () => {
+    if (conflictCount === 0) return;
+    logInfoConsole(
+      `${conflictCount} change${conflictCount !== 1 ? "s were" : " was"} skipped and remain${conflictCount !== 1 ? "" : "s"} staged. Rename them and run \`packmind playbook submit\` again.`
+    );
+  };
+  if (submittableChanges.length === 0) {
+    logErrorConsole(
+      "Nothing to submit: every staged change has a name conflict."
+    );
+    exit(1);
+    return;
+  }
   let resolvedMessage;
   if (message) {
     resolvedMessage = message;
   } else if (noReview) {
     resolvedMessage = "";
   } else {
-    const prefill = buildEditorPrefill(changes);
+    const prefill = buildEditorPrefill(submittableChanges);
     const editorResult = openEditor(prefill);
     if (!editorResult) {
       logErrorConsole("Aborting: empty message.");
@@ -20764,20 +21164,6 @@ async function playbookSubmitHandler(deps) {
     }
     resolvedMessage = stripped;
   }
-  const createdEntries = changes.filter((c) => c.changeType === "created");
-  if (createdEntries.length > 0) {
-    const duplicateErrors = await checkForDuplicateNames(
-      createdEntries,
-      packmindCliHexa.getPackmindGateway()
-    );
-    if (duplicateErrors.length > 0) {
-      for (const error of duplicateErrors) {
-        logErrorConsole(error);
-      }
-      exit(1);
-      return;
-    }
-  }
   const resolver = await createTargetContextResolver({
     lockFileRepository,
     cwd,
@@ -20787,7 +21173,7 @@ async function playbookSubmitHandler(deps) {
     proposals: allProposals,
     conflicts,
     skipped
-  } = await buildProposals(changes, resolver.getTargetContext);
+  } = await buildProposals(submittableChanges, resolver.getTargetContext);
   const descriptionErrors = validateProposalSkillDescriptions(allProposals);
   if (descriptionErrors.length > 0) {
     for (const error of descriptionErrors) {
@@ -20831,10 +21217,11 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
     logConsole(
       "Nothing to submit \u2014 no changes detected compared to deployed versions."
     );
-    for (const entry of changes) {
+    for (const entry of submittableChanges) {
       playbookLocalRepository.removeChange(entry.filePath, entry.spaceId);
     }
-    exit(0);
+    reportSkippedConflicts();
+    exit(conflictCount > 0 ? 1 : 0);
     return;
   }
   const removalPackageIds = /* @__PURE__ */ new Set();
@@ -20847,7 +21234,7 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
     }
   }
   const filePathsBySpaceId = /* @__PURE__ */ new Map();
-  for (const entry of changes) {
+  for (const entry of submittableChanges) {
     const existing = filePathsBySpaceId.get(entry.spaceId) ?? /* @__PURE__ */ new Set();
     existing.add(entry.filePath);
     filePathsBySpaceId.set(entry.spaceId, existing);
@@ -20871,7 +21258,8 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
     );
     if (applyProposals.length === 0) {
       logConsole("Nothing to apply directly.");
-      exit(0);
+      reportSkippedConflicts();
+      exit(conflictCount > 0 ? 1 : 0);
       return;
     }
     let response;
@@ -20935,11 +21323,12 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
       createdSpaceIds
     );
     logPackageAddGuidance(response.created, packageSlugs);
-    exit(0);
+    reportSkippedConflicts();
+    exit(conflictCount > 0 ? 1 : 0);
     return;
   }
   const spaceNameById = /* @__PURE__ */ new Map();
-  for (const change of changes) {
+  for (const change of submittableChanges) {
     if (change.spaceName && !spaceNameById.has(change.spaceId)) {
       spaceNameById.set(change.spaceId, change.spaceName);
     }
@@ -20978,7 +21367,9 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
     totalSkipped += response.skipped;
     if (response.errors.length > 0) {
       const filePaths = filePathsBySpaceId.get(spaceId) ?? /* @__PURE__ */ new Set();
-      const spaceChanges = changes.filter((c) => filePaths.has(c.filePath));
+      const spaceChanges = submittableChanges.filter(
+        (c) => filePaths.has(c.filePath)
+      );
       const allRemovals = spaceChanges.length > 0 && spaceChanges.every((c) => c.changeType === "removed");
       const allSpaceNotFound = response.errors.every(
         (e) => e.code === "SpaceNotFoundError"
@@ -21018,7 +21409,7 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
       for (const filePath of filePaths) {
         playbookLocalRepository.removeChange(filePath, spaceId);
       }
-      const removedEntries = changes.filter(
+      const removedEntries = submittableChanges.filter(
         (c) => c.changeType === "removed" && filePaths.has(c.filePath)
       );
       for (const entry of removedEntries) {
@@ -21072,7 +21463,8 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
   if (totalCreated > 0) {
     await logReviewUrls(packmindCliHexa, succeededSpaces);
   }
-  exit(0);
+  reportSkippedConflicts();
+  exit(conflictCount > 0 ? 1 : 0);
 }
 
 // apps/cli/src/infra/utils/editorMessage.ts
@@ -22190,6 +22582,206 @@ var initCommand = (0, import_cmd_ts38.command)({
 // apps/cli/src/infra/commands/TrackCommand.ts
 var import_cmd_ts39 = __toESM(require_cjs());
 
+// apps/cli/src/infra/commands/removedCommandHandler.ts
+function reportRemovedCommand(notifyError, removedCommand, replacementCommand, carriedFlags = []) {
+  notifyError(`Command "packmind ${removedCommand}" has been removed.`, {
+    content: `Use the "${replacementCommand}" command instead:`,
+    exampleCommand: [`packmind ${replacementCommand}`, ...carriedFlags].join(
+      " "
+    )
+  });
+}
+function removedTrackHandler(deps) {
+  if (deps.remove) {
+    reportRemovedCommand(deps.notifyError, "track --remove", "git untrack");
+    process.exit(1);
+    return;
+  }
+  const carriedFlags = [];
+  if (deps.update) {
+    carriedFlags.push("--update");
+  }
+  if (deps.branch) {
+    carriedFlags.push(`--branch ${deps.branch}`);
+  }
+  reportRemovedCommand(deps.notifyError, "track", "git track", carriedFlags);
+  process.exit(1);
+}
+function removedUntrackHandler(deps) {
+  reportRemovedCommand(deps.notifyError, "untrack", "git untrack");
+  process.exit(1);
+}
+
+// apps/cli/src/infra/commands/TrackCommand.ts
+var trackCommand = (0, import_cmd_ts39.command)({
+  name: "track",
+  // Listed in --help on purpose: a stub nobody can discover cannot redirect
+  // anyone. "[Removed]" matches what running it actually says.
+  description: '[Removed] Use "git track" instead',
+  args: {
+    update: (0, import_cmd_ts39.flag)({
+      long: "update",
+      description: "Move the tracked branch to the current branch (requires an existing tracked branch)"
+    }),
+    branch: (0, import_cmd_ts39.option)({
+      type: (0, import_cmd_ts39.optional)(import_cmd_ts39.string),
+      long: "branch",
+      description: "Branch to track (defaults to the branch currently checked out)"
+    }),
+    // Accepted only so the old removal syntax gets the migration message
+    // instead of a raw "unknown arguments" parser error.
+    remove: (0, import_cmd_ts39.flag)({
+      long: "remove",
+      description: 'Removal now lives in the "git untrack" command'
+    })
+  },
+  handler: async ({ update, branch, remove }) => {
+    const packmindLogger = new PackmindLogger("PackmindCLI", "info" /* INFO */);
+    const packmindCliHexa = new PackmindCliHexa(packmindLogger);
+    removedTrackHandler({
+      update,
+      branch,
+      remove,
+      notifyError: packmindCliHexa.output.notifyError.bind(
+        packmindCliHexa.output
+      )
+    });
+  }
+});
+
+// apps/cli/src/infra/commands/UntrackCommand.ts
+var import_cmd_ts40 = __toESM(require_cjs());
+var untrackCommand = (0, import_cmd_ts40.command)({
+  name: "untrack",
+  description: '[Removed] Use "git untrack" instead',
+  args: {},
+  handler: async () => {
+    const packmindLogger = new PackmindLogger("PackmindCLI", "info" /* INFO */);
+    const packmindCliHexa = new PackmindCliHexa(packmindLogger);
+    removedUntrackHandler({
+      notifyError: packmindCliHexa.output.notifyError.bind(
+        packmindCliHexa.output
+      )
+    });
+  }
+});
+
+// apps/cli/src/infra/commands/UpdateCommand.ts
+var import_cmd_ts41 = __toESM(require_cjs());
+var { version: CLI_VERSION6 } = require_package();
+var updateCommand = (0, import_cmd_ts41.command)({
+  name: "update",
+  description: "Update packmind-cli to the latest version",
+  args: {
+    check: (0, import_cmd_ts41.flag)({
+      long: "check",
+      description: "Only check if a newer version is available without performing the update"
+    })
+  },
+  handler: async ({ check }) => {
+    await updateHandler({
+      currentVersion: CLI_VERSION6,
+      isExecutableMode: hasEmbeddedWasmFiles(),
+      executablePath: process.execPath,
+      scriptPath: require.main?.filename,
+      platform: process.platform,
+      arch: process.arch,
+      fetchFn: fetch,
+      checkOnly: check
+    });
+  }
+});
+
+// apps/cli/src/infra/commands/git/gitCommand.ts
+var import_cmd_ts45 = __toESM(require_cjs());
+
+// apps/cli/src/infra/commands/git/infoCommand.ts
+var import_cmd_ts42 = __toESM(require_cjs());
+
+// apps/cli/src/infra/commands/trackingErrors.ts
+function handleTrackingError(error) {
+  if (error instanceof NotLoggedInError) {
+    logErrorConsole(error.message);
+    process.exit(1);
+    return;
+  }
+  const statusCode = error?.statusCode;
+  if (statusCode === 404) {
+    logErrorConsole("Repository tracking is not available for your account.");
+    process.exit(1);
+    return;
+  }
+  if (statusCode === 403) {
+    logErrorConsole(
+      "Only organization admins can change which repository Packmind tracks. Ask an admin of your organization to run this command."
+    );
+    process.exit(1);
+    return;
+  }
+  const message = error instanceof Error ? error.message : String(error);
+  logErrorConsole(message);
+  process.exit(1);
+}
+
+// apps/cli/src/infra/commands/trackingInfoHandler.ts
+async function trackingInfoHandler(deps) {
+  let result;
+  try {
+    result = await deps.getTrackingInfo({ repoPath: deps.baseDirectory });
+  } catch (error) {
+    handleTrackingError(error);
+    return;
+  }
+  if (result.status === "not-tracked") {
+    logInfoConsole(
+      result.currentBranchDetached ? `${result.owner}/${result.repo} is not tracked in Packmind. No branch is checked out here \u2014 run ${formatCommand(
+        "packmind git track --branch <name>"
+      )} to track one.` : `${result.owner}/${result.repo} is not tracked in Packmind. Run ${formatCommand(
+        "packmind git track"
+      )} to track branch '${result.currentBranch}'.`
+    );
+    process.exit(0);
+    return;
+  }
+  logInfoConsole(
+    `Packmind tracks ${result.owner}/${result.repo} on branch '${result.trackedBranch}'.`
+  );
+  if (result.currentBranch !== result.trackedBranch) {
+    logWarningConsole(mismatchWarning(result));
+  }
+  process.exit(0);
+}
+function mismatchWarning(result) {
+  const moveTracking = result.currentBranchDetached ? `${formatCommand("packmind git track --update --branch <name>")} to move tracking to a branch that exists` : `${formatCommand("packmind git track --update")} to move tracking to '${result.currentBranch}'`;
+  if (!result.trackedBranchExists) {
+    return `Branch '${result.trackedBranch}' is not in this repository \u2014 deleted after a merge, or never fetched here \u2014 so no distribution is recorded anywhere. Run ${moveTracking}, or ${formatCommand(
+      "git fetch"
+    )} if the branch is still on the remote.`;
+  }
+  if (result.currentBranchDetached) {
+    return `No branch is checked out here \u2014 HEAD is detached \u2014 so distributions from here are not recorded. Check '${result.trackedBranch}' out to record them, or run ${moveTracking}.`;
+  }
+  return `You are on '${result.currentBranch}', so distributions from here are not recorded. Run ${moveTracking}.`;
+}
+
+// apps/cli/src/infra/commands/git/infoCommand.ts
+var infoCommand = (0, import_cmd_ts42.command)({
+  name: "info",
+  description: "Show whether Packmind tracks the current repository, and on which branch",
+  args: {},
+  handler: async () => {
+    const packmindLogger = new PackmindLogger("PackmindCLI", "info" /* INFO */);
+    const packmindCliHexa = new PackmindCliHexa(packmindLogger);
+    await trackingInfoHandler({
+      baseDirectory: process.cwd(),
+      getTrackingInfo: packmindCliHexa.getTrackingInfo.bind(packmindCliHexa)
+    });
+  }
+});
+
+// apps/cli/src/infra/commands/git/trackCommand.ts
+var import_cmd_ts43 = __toESM(require_cjs());
+
 // apps/cli/src/infra/commands/trackHandler.ts
 async function trackHandler(deps) {
   const isTTY = deps.isTTY ?? Boolean(process.stdin.isTTY);
@@ -22203,10 +22795,12 @@ async function trackHandler(deps) {
       repoPath: deps.baseDirectory,
       origin: "track",
       update: deps.update,
+      remove: false,
+      branch: deps.branch,
       confirm
     });
   } catch (error) {
-    handleTrackError(error);
+    handleTrackingError(error);
     return;
   }
   switch (result.status) {
@@ -22226,99 +22820,144 @@ async function trackHandler(deps) {
       logInfoConsole("No changes made. The tracked branch is unchanged.");
       process.exit(0);
       return;
+    // The desired state is already in place, whether or not --update was
+    // passed, so both spellings succeed. Exit codes follow one rule: 0 when
+    // the desired state holds, 1 when it cannot be reached.
     case "already-tracked-same-branch":
-      if (deps.update) {
-        logErrorConsole(
-          `Repository ${result.owner}/${result.repo} is already tracked on branch ${result.branch}.`
-        );
-        process.exit(1);
-      } else {
-        logInfoConsole(
-          `Repository ${result.owner}/${result.repo} is already tracked on branch ${result.branch}.`
-        );
-        process.exit(0);
-      }
+      logInfoConsole(
+        `Repository ${result.owner}/${result.repo} is already tracked on branch ${result.branch}.`
+      );
+      process.exit(0);
       return;
     case "already-tracked-other-branch":
       logErrorConsole(
         `Repository ${result.owner}/${result.repo} is already tracked on branch ${result.trackedBranch}. Run ${formatCommand(
-          "packmind track --update"
+          // `--update` alone moves tracking to the checked-out branch, which is
+          // not the target when a branch was named explicitly.
+          deps.branch ? `packmind git track --update --branch ${result.branch}` : "packmind git track --update"
         )} to move it to ${result.branch}.`
       );
       process.exit(1);
       return;
+    case "detached-head":
+      logErrorConsole(
+        `No branch is checked out for ${result.owner}/${result.repo} \u2014 HEAD is detached. Check a branch out, or name one with ${formatCommand("packmind git track --branch <name>")}.`
+      );
+      process.exit(1);
+      return;
+    case "branch-not-found":
+      logErrorConsole(
+        `Branch ${result.branch} does not exist in ${result.owner}/${result.repo}. Check the spelling, or run ${formatCommand("git fetch")} first if the branch only exists on the remote.`
+      );
+      process.exit(1);
+      return;
     case "nothing-tracked":
       logErrorConsole(
-        `Nothing is tracked yet \u2014 run ${formatCommand("packmind init")} or ${formatCommand("packmind track")} to start tracking.`
+        `Nothing is tracked yet \u2014 run ${formatCommand("packmind init")} or ${formatCommand("packmind git track")} to start tracking.`
       );
       process.exit(1);
       return;
+    default:
+      return;
   }
 }
-function handleTrackError(error) {
-  if (error instanceof NotLoggedInError) {
-    logErrorConsole(error.message);
-    process.exit(1);
-    return;
-  }
-  const statusCode = error?.statusCode;
-  if (statusCode === 404) {
-    logErrorConsole("Repository tracking is not available for your account.");
-    process.exit(1);
-    return;
-  }
-  const message = error instanceof Error ? error.message : String(error);
-  logErrorConsole(message);
-  process.exit(1);
-}
 
-// apps/cli/src/infra/commands/TrackCommand.ts
-var trackCommand = (0, import_cmd_ts39.command)({
+// apps/cli/src/infra/commands/git/trackCommand.ts
+var trackCommand2 = (0, import_cmd_ts43.command)({
   name: "track",
   description: "Set the repository and branch Packmind tracks for the current project",
   args: {
-    update: (0, import_cmd_ts39.flag)({
+    update: (0, import_cmd_ts43.flag)({
       long: "update",
-      description: "Move the tracked branch to the current branch (requires an existing tracked branch)"
+      description: "Move the tracked branch to the checked-out branch, or to --branch when it is given (requires an existing tracked branch)"
+    }),
+    branch: (0, import_cmd_ts43.option)({
+      type: (0, import_cmd_ts43.optional)(import_cmd_ts43.string),
+      long: "branch",
+      description: "Branch to track instead of the checked-out one; combines with --update to move tracking to it"
     })
   },
-  handler: async ({ update }) => {
+  handler: async ({ update, branch }) => {
     const packmindLogger = new PackmindLogger("PackmindCLI", "info" /* INFO */);
     const packmindCliHexa = new PackmindCliHexa(packmindLogger);
     await trackHandler({
       update,
+      branch,
       baseDirectory: process.cwd(),
       trackRepository: packmindCliHexa.trackRepository.bind(packmindCliHexa)
     });
   }
 });
 
-// apps/cli/src/infra/commands/UpdateCommand.ts
-var import_cmd_ts40 = __toESM(require_cjs());
-var { version: CLI_VERSION6 } = require_package();
-var updateCommand = (0, import_cmd_ts40.command)({
-  name: "update",
-  description: "Update packmind-cli to the latest version",
-  args: {
-    check: (0, import_cmd_ts40.flag)({
-      long: "check",
-      description: "Only check if a newer version is available without performing the update"
-    })
-  },
-  handler: async ({ check }) => {
-    await updateHandler({
-      currentVersion: CLI_VERSION6,
-      isExecutableMode: hasEmbeddedWasmFiles(),
-      executablePath: process.execPath,
-      scriptPath: require.main?.filename,
-      platform: process.platform,
-      arch: process.arch,
-      fetchFn: fetch,
-      checkOnly: check
+// apps/cli/src/infra/commands/git/untrackCommand.ts
+var import_cmd_ts44 = __toESM(require_cjs());
+
+// apps/cli/src/infra/commands/untrackHandler.ts
+async function untrackHandler(deps) {
+  const isTTY = deps.isTTY ?? Boolean(process.stdin.isTTY);
+  const confirm = createTrackConfirm({
+    isTTY,
+    confirmPrompt: deps.confirmPrompt
+  });
+  let result;
+  try {
+    result = await deps.trackRepository({
+      repoPath: deps.baseDirectory,
+      origin: "track",
+      update: false,
+      remove: true,
+      confirm
+    });
+  } catch (error) {
+    handleTrackingError(error);
+    return;
+  }
+  switch (result.status) {
+    case "removed":
+      logSuccessConsole(
+        `Packmind no longer tracks ${result.owner}/${result.repo}. Distributions recorded on branch ${result.branch} are kept and reappear if you track it again.`
+      );
+      process.exit(0);
+      return;
+    case "not-tracked":
+      logWarningConsole(
+        `Repository is not tracked in '${result.organizationName}' organization`
+      );
+      process.exit(0);
+      return;
+    default:
+      logInfoConsole("No changes made. The tracked branch is unchanged.");
+      process.exit(0);
+      return;
+  }
+}
+
+// apps/cli/src/infra/commands/git/untrackCommand.ts
+var untrackCommand2 = (0, import_cmd_ts44.command)({
+  name: "untrack",
+  description: "Remove Packmind's tracking of the current repository (keeps every recorded distribution)",
+  args: {},
+  handler: async () => {
+    const packmindLogger = new PackmindLogger("PackmindCLI", "info" /* INFO */);
+    const packmindCliHexa = new PackmindCliHexa(packmindLogger);
+    await untrackHandler({
+      baseDirectory: process.cwd(),
+      trackRepository: packmindCliHexa.trackRepository.bind(packmindCliHexa)
     });
   }
 });
 
+// apps/cli/src/infra/commands/git/gitCommand.ts
+var gitCommand = (0, import_cmd_ts45.subcommands)({
+  name: "git",
+  description: "Manage repository tracking in Packmind",
+  cmds: {
+    info: infoCommand,
+    track: trackCommand2,
+    untrack: untrackCommand2
+  }
+});
+
 // apps/cli/src/main.ts
 var { version: CLI_VERSION7 } = require_package();
 function findEnvFile() {
@@ -22358,12 +22997,13 @@ if (args.includes("--version") || args.includes("-v")) {
   logConsole(`packmind-cli version ${CLI_VERSION7}`);
   process.exit(0);
 }
-var app = (0, import_cmd_ts41.subcommands)({
+var app = (0, import_cmd_ts46.subcommands)({
   name: "packmind-cli",
   description: "Packmind CLI tool",
   cmds: {
     commands: commandsCommand,
     config: configCommand,
+    git: gitCommand,
     init: initCommand,
     install: installCommand,
     lint: lintCommand,
@@ -22377,11 +23017,12 @@ var app = (0, import_cmd_ts41.subcommands)({
     standards: standardsCommand,
     track: trackCommand,
     uninstall: uninstallCommand,
+    untrack: untrackCommand,
     update: updateCommand,
     whoami: whoamiCommand
   }
 });
-(0, import_cmd_ts41.run)(app, args).catch((error) => {
+(0, import_cmd_ts46.run)(app, args).catch((error) => {
   logErrorConsole(error.message);
   process.exit(1);
 });