@packmind/cli 0.33.0 → 0.35.0

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(string17, substring, replacer) {
-  let index = string17.indexOf(substring);
+function stringReplaceAll(string18, substring, replacer) {
+  let index = string18.indexOf(substring);
   if (index === -1) {
-    return string17;
+    return string18;
   }
   const substringLength = substring.length;
   let endIndex = 0;
   let returnValue = "";
   do {
-    returnValue += string17.slice(endIndex, index) + substring + replacer;
+    returnValue += string18.slice(endIndex, index) + substring + replacer;
     endIndex = index + substringLength;
-    index = string17.indexOf(substring, endIndex);
+    index = string18.indexOf(substring, endIndex);
   } while (index !== -1);
-  returnValue += string17.slice(endIndex);
+  returnValue += string18.slice(endIndex);
   return returnValue;
 }
-function stringEncaseCRLFWithFirstIndex(string17, prefix, postfix, index) {
+function stringEncaseCRLFWithFirstIndex(string18, prefix, postfix, index) {
   let endIndex = 0;
   let returnValue = "";
   do {
-    const gotCR = string17[index - 1] === "\r";
-    returnValue += string17.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 = string17.indexOf("\n", endIndex);
+    index = string18.indexOf("\n", endIndex);
   } while (index !== -1);
-  returnValue += string17.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, string17) => {
-      if (self.level <= 0 || !string17) {
-        return self[IS_EMPTY] ? "" : string17;
+    applyStyle = (self, string18) => {
+      if (self.level <= 0 || !string18) {
+        return self[IS_EMPTY] ? "" : string18;
       }
       let styler = self[STYLER];
       if (styler === void 0) {
-        return string17;
+        return string18;
       }
       const { openAll, closeAll } = styler;
-      if (string17.includes("\x1B")) {
+      if (string18.includes("\x1B")) {
         while (styler !== void 0) {
-          string17 = stringReplaceAll(string17, styler.close, styler.open);
+          string18 = stringReplaceAll(string18, styler.close, styler.open);
           styler = styler.parent;
         }
       }
-      const lfIndex = string17.indexOf("\n");
+      const lfIndex = string18.indexOf("\n");
       if (lfIndex !== -1) {
-        string17 = stringEncaseCRLFWithFirstIndex(string17, closeAll, openAll, lfIndex);
+        string18 = stringEncaseCRLFWithFirstIndex(string18, closeAll, openAll, lfIndex);
       }
-      return openAll + string17 + 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 option19 of node.options) {
-            if (opts.shortNames.includes(option19.key)) {
-              result.push(option19);
+          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 = optional14;
+    exports2.optional = optional15;
     exports2.array = array2;
     var type_1 = require_type();
     exports2.number = {
@@ -878,7 +878,7 @@ var require_types = __commonJS({
         return false;
       }
     };
-    function optional14(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
@@ -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 option19 = Array.isArray(closeOptions) ? closeOptions[0] : closeOptions;
+            const option20 = Array.isArray(closeOptions) ? closeOptions[0] : closeOptions;
             errorMessage += `
-Did you mean ${chalk_1.default.italic(option19)}?`;
+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(string17) {
-  if (typeof string17 !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string17}\``);
+function stripAnsi(string18) {
+  if (typeof string18 !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string18}\``);
   }
-  if (!string17.includes("\x1B") && !string17.includes("\x9B")) {
-    return string17;
+  if (!string18.includes("\x1B") && !string18.includes("\x9B")) {
+    return string18;
   }
-  return string17.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 = command32;
+    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 command32(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 option19 of node.options) {
-                if (context.visitedNodes.has(option19)) {
+              for (const option20 of node.options) {
+                if (context.visitedNodes.has(option20)) {
                   continue;
                 }
-                unknownArguments.push(option19);
+                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 = option19;
+    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 option20 = options[0];
+          const option21 = options[0];
           let rawValue;
           let envPrefix = "";
-          if (option20 === null || option20 === void 0 ? void 0 : option20.value) {
-            rawValue = option20.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 = (option20 === null || option20 === void 0 ? void 0 : option20.type) === "shortOption" ? `-${option20 === null || option20 === void 0 ? void 0 : option20.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 option19(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 option19 of node.options) {
-            if (error.nodes.includes(option19)) {
-              s += chalk_1.default.red(option19.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(option19.raw);
+              s += chalk_1.default.dim(option20.raw);
             }
           }
           const prefix = failed ? chalk_1.default.red("-") : chalk_1.default.dim("-");
@@ -2243,7 +2243,7 @@ var require_common = __commonJS({
       createDebug.coerce = coerce;
       createDebug.disable = disable;
       createDebug.enable = enable;
-      createDebug.enabled = enabled;
+      createDebug.enabled = enabled2;
       createDebug.humanize = require_ms();
       createDebug.destroy = destroy;
       Object.keys(env2).forEach((key) => {
@@ -2382,7 +2382,7 @@ var require_common = __commonJS({
         createDebug.enable("");
         return namespaces;
       }
-      function enabled(name) {
+      function enabled2(name) {
         for (const skip of createDebug.skips) {
           if (matchesTemplate(name, skip)) {
             return false;
@@ -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, string17] of (0, utils_1.enumerate)(strings)) {
-        const chars = [...string17];
+      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 });
@@ -3352,15 +3352,15 @@ var require_multiflag = __commonJS({
             longNames: [config.long],
             shortNames: config.short ? [config.short] : []
           }).filter((x) => !visitedNodes.has(x));
-          for (const option19 of options) {
-            visitedNodes.add(option19);
+          for (const option20 of options) {
+            visitedNodes.add(option20);
           }
           const optionValues = [];
           const errors = [];
-          for (const option19 of options) {
-            const decoded = await Result.safeAsync(flag_1.boolean.from((_b = (_a = option19.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: [option19], 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 option19 of options) {
-            visitedNodes.add(option19);
+          for (const option20 of options) {
+            visitedNodes.add(option20);
           }
           const optionValues = [];
           const errors = [];
           const flagNodes = [];
-          for (const option19 of options) {
-            const providedValue = (_a = option19.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(option19);
+              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.33.0",
+      version: "0.35.0",
       description: "A command-line interface for Packmind linting and code quality checks",
       private: false,
       bin: {
@@ -3915,7 +3915,7 @@ var require_package = __commonJS({
 });
 
 // apps/cli/src/main.ts
-var import_cmd_ts42 = __toESM(require_cjs());
+var import_cmd_ts46 = __toESM(require_cjs());
 
 // apps/cli/src/infra/commands/LinterCommand.ts
 var import_cmd_ts = __toESM(require_cjs());
@@ -3933,6 +3933,24 @@ var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
   LogLevel2["SILLY"] = "silly";
   return LogLevel2;
 })(LogLevel || {});
+function formatConsoleLine(info) {
+  const { timestamp, level, message, label, trace_id: traceId } = info;
+  const meta = Object.fromEntries(
+    Object.entries(info).filter(([key]) => !RENDERED_FIELDS.includes(key))
+  );
+  const metaStr = Object.keys(meta).length ? ` ${JSON.stringify(meta)}` : "";
+  const traceStr = traceId ? ` [trace=${String(traceId).slice(0, 8)}]` : "";
+  return `${timestamp} [${label}]${traceStr} ${level}: ${message}${metaStr}`;
+}
+var RENDERED_FIELDS = [
+  "timestamp",
+  "level",
+  "message",
+  "label",
+  "trace_id",
+  "span_id",
+  "trace_flags"
+];
 var PackmindLogger = class {
   constructor(name, level = "info" /* INFO */) {
     this.name = name;
@@ -3955,12 +3973,7 @@ var PackmindLogger = class {
           new import_winston.default.transports.Console({
             format: import_winston.default.format.combine(
               import_winston.default.format.colorize(),
-              import_winston.default.format.printf(
-                ({ timestamp, level: level2, message, label, ...meta }) => {
-                  const metaStr = Object.keys(meta).length ? ` ${JSON.stringify(meta)}` : "";
-                  return `${timestamp} [${label}] ${level2}: ${message}${metaStr}`;
-                }
-              )
+              import_winston.default.format.printf(formatConsoleLine)
             )
           })
         ]
@@ -4088,7 +4101,8 @@ var VALID_CODING_AGENTS = [
   "gitlab_duo",
   "continue",
   "opencode",
-  "codex"
+  "codex",
+  "kiro"
 ];
 function isValidCodingAgent(value) {
   return VALID_CODING_AGENTS.includes(value);
@@ -4141,7 +4155,8 @@ var AGENT_CAPABILITIES = {
   copilot: { skills: true, standards: true, commands: true, recipes: true },
   continue: { skills: false, standards: true, commands: true, recipes: true },
   junie: { skills: false, standards: true, commands: true, recipes: true },
-  opencode: { skills: true, standards: true, commands: true, recipes: true }
+  opencode: { skills: true, standards: true, commands: true, recipes: true },
+  kiro: { skills: true, standards: true, commands: false, recipes: false }
 };
 function hasCapableAgent(agents, capability) {
   return agents.some((agent) => AGENT_CAPABILITIES[agent][capability]);
@@ -4164,7 +4179,8 @@ var CodingAgents = {
   gitlab_duo: "gitlab_duo",
   continue: "continue",
   opencode: "opencode",
-  codex: "codex"
+  codex: "codex",
+  kiro: "kiro"
 };
 
 // packages/types/src/coding-agent/CodingAgentArtefactPaths.ts
@@ -4213,6 +4229,11 @@ var CODING_AGENT_ARTEFACT_PATHS = {
     command: "",
     standard: "",
     skill: ".agents/skills/"
+  },
+  kiro: {
+    command: "",
+    standard: ".kiro/steering/",
+    skill: ".kiro/skills/"
   }
 };
 
@@ -4390,9 +4411,11 @@ 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 */
+  "CONTINUE" /* CONTINUE */,
+  "KIRO" /* KIRO */
 ];
 var normalizeRenderModes = (modes) => {
   const uniqueModes = new Set(modes);
@@ -4417,13 +4440,20 @@ 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,
-  ["CODEX" /* CODEX */]: CodingAgents.codex
+  ["CODEX" /* CODEX */]: CodingAgents.codex,
+  ["KIRO" /* KIRO */]: CodingAgents.kiro
 };
 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;
   },
@@ -5327,7 +5357,8 @@ var createMarketplaceId = brandedIdFactory();
 // packages/types/src/marketplaces/MarketplaceDescriptorFilename.ts
 var MARKETPLACE_DESCRIPTOR_PATHS = [
   ".claude-plugin/marketplace.json",
-  "marketplace.json"
+  "marketplace.json",
+  ".github/plugin/marketplace.json"
 ];
 var MARKETPLACE_DESCRIPTOR_FILENAME = MARKETPLACE_DESCRIPTOR_PATHS[0];
 
@@ -5511,8 +5542,8 @@ var ExecuteSingleFileAstUseCase = class _ExecuteSingleFileAstUseCase {
   static {
     this.fallbackRuleContent = "adhoc-rule";
   }
-  async execute(command32) {
-    const { program, fileContent, language } = command32;
+  async execute(command35) {
+    const { program, fileContent, language } = command35;
     const result = await this.linterExecutionUseCase.execute({
       filePath: "cli-single-file",
       fileContent,
@@ -5559,6 +5590,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}`, {
@@ -5571,27 +5607,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);
@@ -5612,82 +5658,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.
@@ -5896,8 +5977,8 @@ var GetGitRemoteUrlUseCase = class {
   constructor(gitRemoteUrlService = new GitService()) {
     this.gitRemoteUrlService = gitRemoteUrlService;
   }
-  async execute(command32) {
-    const { path: repoPath, origin: origin9 } = command32;
+  async execute(command35) {
+    const { path: repoPath, origin: origin9 } = command35;
     return this.gitRemoteUrlService.getGitRemoteUrl(repoPath, origin9);
   }
 };
@@ -5908,7 +5989,45 @@ var path3 = __toESM(require("path"));
 
 // apps/cli/src/infra/utils/consoleLogger.ts
 init_source();
-var CLI_PREFIX = "packmind-cli";
+
+// apps/cli/src/infra/utils/execName.ts
+var CANONICAL_EXEC_NAME = "packmind";
+var LEGACY_EXEC_NAME = "packmind-cli";
+var KNOWN_EXEC_NAMES = [
+  LEGACY_EXEC_NAME,
+  CANONICAL_EXEC_NAME
+];
+var BUNFS_PREFIX = "/$bunfs/";
+function basenameWithoutExeExtension(candidate) {
+  const basename4 = candidate.split(/[/\\]/).pop() ?? "";
+  return basename4.replace(/\.exe$/i, "");
+}
+function matchKnownExecName(candidate) {
+  if (candidate.includes(BUNFS_PREFIX)) {
+    return void 0;
+  }
+  const name = basenameWithoutExeExtension(candidate).toLowerCase();
+  return KNOWN_EXEC_NAMES.find((known) => known === name);
+}
+function resolveExecName(argv = process.argv, argv0 = process.argv0) {
+  for (const candidate of [argv0, argv[0], argv[1]]) {
+    if (!candidate) {
+      continue;
+    }
+    const name = matchKnownExecName(candidate);
+    if (name) {
+      return name;
+    }
+  }
+  return CANONICAL_EXEC_NAME;
+}
+function isLegacyExecName(argv = process.argv, argv0 = process.argv0) {
+  return resolveExecName(argv, argv0) === LEGACY_EXEC_NAME;
+}
+var EXEC_NAME = resolveExecName();
+
+// apps/cli/src/infra/utils/consoleLogger.ts
+var CLI_PREFIX = EXEC_NAME;
 function logConsole(message, logger2 = console) {
   logger2.log(message);
 }
@@ -6049,8 +6168,8 @@ var ListFilesInDirectoryUseCase = class {
   constructor(listFiles = new ListFiles()) {
     this.listFiles = listFiles;
   }
-  async execute(command32) {
-    const { path: directoryPath, extensions, excludes = [] } = command32;
+  async execute(command35) {
+    const { path: directoryPath, extensions, excludes = [] } = command35;
     const files = await this.listFiles.listFilesInDirectory(
       directoryPath,
       extensions,
@@ -6165,7 +6284,7 @@ var LintFilesAgainstRuleUseCase = class {
       };
     };
   }
-  async execute(command32) {
+  async execute(command35) {
     const {
       path: userPath,
       draftMode,
@@ -6174,7 +6293,7 @@ var LintFilesAgainstRuleUseCase = class {
       language,
       diffMode,
       ignorePatterns
-    } = command32;
+    } = 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"}"`
     );
@@ -6490,8 +6609,8 @@ var LintFilesAgainstRuleUseCase = class {
       return null;
     }
   }
-  async executeProgramsForFile(command32) {
-    const result = await this.services.linterExecutionUseCase.execute(command32);
+  async executeProgramsForFile(command35) {
+    const result = await this.services.linterExecutionUseCase.execute(command35);
     return result.violations;
   }
   extractExtensionFromFile(filePath) {
@@ -6514,8 +6633,8 @@ var LintFilesFromConfigUseCase = class {
     this.logger = logger2;
     this.detectionProgramsCache = /* @__PURE__ */ new Map();
   }
-  async execute(command32) {
-    const { path: userPath, diffMode, ignorePatterns } = command32;
+  async execute(command35) {
+    const { path: userPath, diffMode, ignorePatterns } = command35;
     this.logger.debug(
       `Starting local linting: path="${userPath}", diffMode="${diffMode ?? "none"}"`
     );
@@ -6775,8 +6894,8 @@ var LintFilesFromConfigUseCase = class {
       return null;
     }
   }
-  async executeProgramsForFile(command32) {
-    const result = await this.services.linterExecutionUseCase.execute(command32);
+  async executeProgramsForFile(command35) {
+    const result = await this.services.linterExecutionUseCase.execute(command35);
     return result.violations;
   }
   extractExtensionFromFile(filePath) {
@@ -6952,13 +7071,13 @@ var PackmindHttpClient = class {
 var ChangeProposalGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.batchCreate = async (command32) => {
+    this.batchCreate = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/change-proposals/batch`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/change-proposals/batch`,
         {
           method: "POST",
-          body: { proposals: command32.proposals },
+          body: { proposals: command35.proposals },
           onError: (response) => {
             if (response.status === 404) {
               throw new CommunityEditionError("change proposals");
@@ -6967,29 +7086,29 @@ var ChangeProposalGateway = class {
         }
       );
     };
-    this.batchApply = async (command32) => {
+    this.batchApply = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/playbook/apply`,
         {
           method: "POST",
           body: {
-            proposals: command32.proposals,
-            message: command32.message,
-            ...command32.directUpdate !== void 0 && {
-              directUpdate: command32.directUpdate
+            proposals: command35.proposals,
+            message: command35.message,
+            ...command35.directUpdate !== void 0 && {
+              directUpdate: command35.directUpdate
             }
           }
         }
       );
     };
-    this.check = async (command32) => {
+    this.check = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/change-proposals/check`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/change-proposals/check`,
         {
           method: "POST",
-          body: { proposals: command32.proposals },
+          body: { proposals: command35.proposals },
           onError: (response) => {
             if (response.status === 404) {
               throw new CommunityEditionError("change proposals");
@@ -7005,13 +7124,13 @@ var ChangeProposalGateway = class {
 var LinterGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.getDraftDetectionProgramsForRule = async (command32) => {
+    this.getDraftDetectionProgramsForRule = async (command35) => {
       const payload = {
-        standardSlug: command32.standardSlug,
-        ruleId: command32.ruleId
+        standardSlug: command35.standardSlug,
+        ruleId: command35.ruleId
       };
-      if (command32.language) {
-        payload.language = command32.language;
+      if (command35.language) {
+        payload.language = command35.language;
       }
       return this.httpClient.request("/api/v0/list-draft-detection-program", {
         method: "POST",
@@ -7023,13 +7142,13 @@ var LinterGateway = class {
         }
       });
     };
-    this.getActiveDetectionProgramsForRule = async (command32) => {
+    this.getActiveDetectionProgramsForRule = async (command35) => {
       const payload = {
-        standardSlug: command32.standardSlug,
-        ruleId: command32.ruleId
+        standardSlug: command35.standardSlug,
+        ruleId: command35.ruleId
       };
-      if (command32.language) {
-        payload.language = command32.language;
+      if (command35.language) {
+        payload.language = command35.language;
       }
       return this.httpClient.request("/api/v0/list-active-detection-program", {
         method: "POST",
@@ -7041,13 +7160,13 @@ var LinterGateway = class {
         }
       });
     };
-    this.getDetectionProgramsForPackages = async (command32) => {
+    this.getDetectionProgramsForPackages = async (command35) => {
       const response = await this.httpClient.request(
         "/api/v0/detection-programs-for-packages",
         {
           method: "POST",
           body: {
-            packagesSlugs: command32.packagesSlugs
+            packagesSlugs: command35.packagesSlugs
           },
           onError: (response2) => {
             if (response2.status === 404) {
@@ -7058,10 +7177,10 @@ var LinterGateway = class {
       );
       return handleScopeInTargetsResponse(response);
     };
-    this.trackLinterExecution = async (command32) => {
+    this.trackLinterExecution = async (command35) => {
       return this.httpClient.request(`/api/v0/track-execution`, {
         method: "POST",
-        body: command32
+        body: command35
       });
     };
   }
@@ -7115,27 +7234,27 @@ var SpacesGateway = class {
 var SkillsGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.upload = async (command32) => {
+    this.upload = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/skills/upload`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/skills/upload`,
         {
           method: "POST",
-          body: command32
+          body: command35
         }
       );
     };
-    this.getDefaults = async (command32) => {
+    this.getDefaults = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       const queryParams = new URLSearchParams();
-      if (command32.includeBeta) {
+      if (command35.includeBeta) {
         queryParams.set("includeBeta", "true");
-      } else if (command32.cliVersion) {
-        queryParams.set("cliVersion", command32.cliVersion);
+      } else if (command35.cliVersion) {
+        queryParams.set("cliVersion", command35.cliVersion);
       }
-      if (command32.agents !== void 0) {
+      if (command35.agents !== void 0) {
         queryParams.append("agentsConfigOverride", "true");
-        command32.agents.forEach((agent) => {
+        command35.agents.forEach((agent) => {
           queryParams.append("agent", agent);
         });
       }
@@ -7144,10 +7263,10 @@ var SkillsGateway = class {
         `/api/v0/organizations/${organizationId}/skills/default${queryString ? `?${queryString}` : ""}`
       );
     };
-    this.list = async (command32) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/skills`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/skills`
       );
     };
   }
@@ -7157,17 +7276,17 @@ var SkillsGateway = class {
 var CommandsGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.create = async (command32) => {
+    this.create = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/commands`,
-        { method: "POST", body: command32 }
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/commands`,
+        { method: "POST", body: command35 }
       );
     };
-    this.list = async (command32) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       const listCommandsResponse = await this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/commands`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/commands`
       );
       if (listCommandsResponse instanceof Array) {
         return { recipes: listCommandsResponse };
@@ -7210,10 +7329,10 @@ var StandardsGateway = class {
         }
       );
     };
-    this.list = async (command32) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/standards`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/standards`
       );
     };
   }
@@ -7224,10 +7343,10 @@ var PackagesGateway = class {
   constructor(apiKey, httpClient) {
     this.apiKey = apiKey;
     this.httpClient = httpClient;
-    this.list = async (command32) => {
+    this.list = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/packages`
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/packages`
       );
     };
     this.getSummary = async ({
@@ -7239,20 +7358,20 @@ var PackagesGateway = class {
         `/api/v0/organizations/${organizationId}/spaces/${spaceId}/packages/summary/${encodeURIComponent(slug6)}`
       );
     };
-    this.create = async (command32) => {
+    this.create = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
-      const { recipeIds, ...rest } = command32;
+      const { recipeIds, ...rest } = command35;
       return this.httpClient.request(
-        `/api/v0/organizations/${organizationId}/spaces/${command32.spaceId}/packages`,
+        `/api/v0/organizations/${organizationId}/spaces/${command35.spaceId}/packages`,
         {
           method: "POST",
           body: { ...rest, commandIds: recipeIds }
         }
       );
     };
-    this.addArtefacts = async (command32) => {
+    this.addArtefacts = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
-      const { packageId, spaceId, recipeIds, ...rest } = command32;
+      const { packageId, spaceId, recipeIds, ...rest } = command35;
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/spaces/${spaceId}/packages/${packageId}/add-artifacts`,
         {
@@ -7268,31 +7387,31 @@ var PackagesGateway = class {
 var DeploymentGateway = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.pull = async (command32) => {
+    this.pull = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       const queryParams = new URLSearchParams();
-      if (command32.packagesSlugs && command32.packagesSlugs.length > 0) {
-        command32.packagesSlugs.forEach((slug6) => {
+      if (command35.packagesSlugs && command35.packagesSlugs.length > 0) {
+        command35.packagesSlugs.forEach((slug6) => {
           queryParams.append("packageSlug", slug6);
         });
       }
-      if (command32.previousPackagesSlugs && command32.previousPackagesSlugs.length > 0) {
-        command32.previousPackagesSlugs.forEach((slug6) => {
+      if (command35.previousPackagesSlugs && command35.previousPackagesSlugs.length > 0) {
+        command35.previousPackagesSlugs.forEach((slug6) => {
           queryParams.append("previousPackageSlug", slug6);
         });
       }
-      if (command32.gitRemoteUrl) {
-        queryParams.append("gitRemoteUrl", command32.gitRemoteUrl);
+      if (command35.gitRemoteUrl) {
+        queryParams.append("gitRemoteUrl", command35.gitRemoteUrl);
       }
-      if (command32.gitBranch) {
-        queryParams.append("gitBranch", command32.gitBranch);
+      if (command35.gitBranch) {
+        queryParams.append("gitBranch", command35.gitBranch);
       }
-      if (command32.relativePath) {
-        queryParams.append("relativePath", command32.relativePath);
+      if (command35.relativePath) {
+        queryParams.append("relativePath", command35.relativePath);
       }
-      if (command32.agents !== void 0) {
+      if (command35.agents !== void 0) {
         queryParams.append("agentsConfigOverride", "true");
-        command32.agents.forEach((agent) => {
+        command35.agents.forEach((agent) => {
           queryParams.append("agent", agent);
         });
       }
@@ -7300,101 +7419,102 @@ var DeploymentGateway = class {
         `/api/v0/organizations/${organizationId}/pull?${queryParams.toString()}`
       );
     };
-    this.install = async (command32) => {
+    this.install = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/install`,
         {
           method: "POST",
           body: {
-            packagesSlugs: command32.packagesSlugs,
-            packmindLockFile: command32.packmindLockFile,
-            ...command32.relativePath && { relativePath: command32.relativePath },
-            ...command32.agents !== void 0 && { agents: command32.agents }
+            packagesSlugs: command35.packagesSlugs,
+            packmindLockFile: command35.packmindLockFile,
+            ...command35.relativePath && { relativePath: command35.relativePath },
+            ...command35.agents !== void 0 && { agents: command35.agents }
           }
         }
       );
     };
-    this.getDeployed = async (command32) => {
+    this.getDeployed = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/deployed-content`,
         {
           method: "POST",
           body: {
-            packagesSlugs: command32.packagesSlugs,
-            gitRemoteUrl: command32.gitRemoteUrl,
-            gitBranch: command32.gitBranch,
-            relativePath: command32.relativePath,
-            ...command32.agents !== void 0 && { agents: command32.agents }
+            packagesSlugs: command35.packagesSlugs,
+            gitRemoteUrl: command35.gitRemoteUrl,
+            gitBranch: command35.gitBranch,
+            relativePath: command35.relativePath,
+            ...command35.agents !== void 0 && { agents: command35.agents }
           }
         }
       );
     };
-    this.getContentByVersions = async (command32) => {
+    this.getContentByVersions = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/content-by-versions`,
         {
           method: "POST",
           body: {
-            artifacts: command32.artifacts,
-            ...command32.agents !== void 0 && { agents: command32.agents }
+            artifacts: command35.artifacts,
+            ...command35.agents !== void 0 && { agents: command35.agents }
           }
         }
       );
     };
-    this.notifyDistribution = async (command32) => {
+    this.notifyDistribution = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/deployments`,
         {
           method: "POST",
-          body: command32
+          body: command35
         }
       );
     };
-    this.notifyArtefactsDistribution = async (command32) => {
+    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: command32.gitRemoteUrl,
-            gitBranch: command32.gitBranch,
-            relativePath: command32.relativePath,
-            packmindLockFile: command32.packmindLockFile
+            gitRemoteUrl: command35.gitRemoteUrl,
+            gitBranch: command35.gitBranch,
+            relativePath: command35.relativePath,
+            packmindLockFile: command35.packmindLockFile
           }
         }
       );
     };
-    this.renderPlugin = async (command32) => {
+    this.renderPlugin = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/plugins/render`,
         {
           method: "POST",
           body: {
-            packageSlug: command32.packageSlug,
-            mode: command32.mode,
-            pluginRoot: command32.pluginRoot,
-            pluginName: command32.pluginName,
-            gitRemoteUrl: command32.gitRemoteUrl,
-            gitBranch: command32.gitBranch
+            packageSlug: command35.packageSlug,
+            mode: command35.mode,
+            pluginRoot: command35.pluginRoot,
+            pluginName: command35.pluginName,
+            gitRemoteUrl: command35.gitRemoteUrl,
+            gitBranch: command35.gitBranch,
+            targetVendor: command35.targetVendor
           }
         }
       );
     };
-    this.trackPluginDeleted = async (command32) => {
+    this.trackPluginDeleted = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/plugins/track-deleted`,
         {
           method: "POST",
           body: {
-            packageSlug: command32.packageSlug,
-            gitRemoteUrl: command32.gitRemoteUrl
+            packageSlug: command35.packageSlug,
+            gitRemoteUrl: command35.gitRemoteUrl
           }
         }
       );
@@ -7406,13 +7526,13 @@ var DeploymentGateway = class {
       );
     };
   }
-  async updateRenderModeConfiguration(command32) {
+  async updateRenderModeConfiguration(command35) {
     const { organizationId } = this.httpClient.getAuthContext();
     await this.httpClient.request(
       `/api/v0/organizations/${organizationId}/deployments/renderModeConfiguration`,
       {
         method: "POST",
-        body: { activeRenderModes: command32.activeRenderModes }
+        body: { activeRenderModes: command35.activeRenderModes }
       }
     );
   }
@@ -7469,18 +7589,18 @@ var RepositoryTrackingGateway = class {
         `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository?${query}`
       );
     };
-    this.setTrackedRepository = async (command32) => {
+    this.setTrackedRepository = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository`,
-        { method: "POST", body: command32 }
+        { method: "POST", body: command35 }
       );
     };
-    this.updateTrackedBranch = async (command32) => {
+    this.updateTrackedBranch = async (command35) => {
       const { organizationId } = this.httpClient.getAuthContext();
       return this.httpClient.request(
         `/api/v0/organizations/${organizationId}/git/repositories/tracked-repository`,
-        { method: "PUT", body: command32 }
+        { method: "PUT", body: command35 }
       );
     };
     this.removeTrackedRepository = async ({ owner, repo }) => {
@@ -9252,8 +9372,8 @@ var ExecuteLinterProgramsUseCase = class {
     this.linterAstAdapter = linterAstAdapter;
     this.logger = logger2;
   }
-  async execute(command32) {
-    const { filePath, fileContent, language, programs } = command32;
+  async execute(command35) {
+    const { filePath, fileContent, language, programs } = command35;
     if (programs.length === 0) {
       return {
         file: filePath,
@@ -9852,12 +9972,16 @@ 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 SPACE_NAV_PLUGIN_FIRST_FEATURE_KEY = "space-nav-plugin-first";
+var COPILOT_MARKETPLACE_FEATURE_KEY = "copilot-marketplace";
 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"]
+  [ORGA_SPACE_MANAGEMENT_FEATURE_KEY]: ["@packmind.com", "@promyze.com"],
+  [SPACE_NAV_PLUGIN_FIRST_FEATURE_KEY]: ["@packmind.com", "@promyze.com"],
+  [COPILOT_MARKETPLACE_FEATURE_KEY]: ["@packmind.com", "@promyze.com"]
 };
 
 // packages/node-utils/src/database/schemas.ts
@@ -9902,6 +10026,15 @@ var import_bullmq = require("bullmq");
 // packages/node-utils/src/jobs/infra/DelayedJobsFactory.ts
 var logger = new PackmindLogger("DelayedJobsFactory");
 
+// packages/node-utils/src/observability/withSpan.ts
+var import_api = require("@opentelemetry/api");
+var tracer = import_api.trace.getTracer("packmind");
+
+// packages/node-utils/src/observability/instrumentMethods.ts
+var AsyncFunction = (async () => {
+}).constructor;
+var enabled = process.env["PACKMIND_OTEL_INSTRUMENT_METHODS"] !== "false";
+
 // packages/node-utils/src/mail/SmtpMailService.ts
 var import_nodemailer = __toESM(require("nodemailer"));
 
@@ -10088,8 +10221,8 @@ var InstallPackagesUseCase = class {
   constructor(packmindGateway) {
     this.packmindGateway = packmindGateway;
   }
-  async execute(command32) {
-    const baseDirectory = command32.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     const result = {
       filesCreated: 0,
       filesUpdated: 0,
@@ -10101,12 +10234,12 @@ var InstallPackagesUseCase = class {
       skillDirectoriesDeleted: 0
     };
     const response = await this.packmindGateway.deployment.pull({
-      packagesSlugs: command32.packagesSlugs,
-      previousPackagesSlugs: command32.previousPackagesSlugs,
-      gitRemoteUrl: command32.gitRemoteUrl,
-      gitBranch: command32.gitBranch,
-      relativePath: command32.relativePath,
-      agents: command32.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"
@@ -10481,8 +10614,8 @@ var InstallUseCase = class {
     this.configFileRepository = configFileRepository;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    const baseDirectory = command32.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     const result = {
       filesCreated: 0,
       filesUpdated: 0,
@@ -10512,7 +10645,7 @@ var InstallUseCase = class {
       },
       resolvedAgents: []
     };
-    const hasExplicitPackages = command32.packages && command32.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);
@@ -10525,7 +10658,7 @@ var InstallUseCase = class {
         );
       }
       throw new Error(
-        "No packmind.json found in this directory. Run `packmind-cli install <@space/package>` first to install your packages."
+        `No packmind.json found in this directory. Run \`${EXEC_NAME} install <@space/package>\` first to install your packages.`
       );
     }
     const effectiveLockFile = lockFile ?? {
@@ -10534,11 +10667,11 @@ var InstallUseCase = class {
       agents: [],
       artifacts: {}
     };
-    effectiveLockFile.cliVersion = command32.cliVersion;
+    effectiveLockFile.cliVersion = command35.cliVersion;
     let packagesSlugs;
     let normalizedPackages = [];
     if (hasExplicitPackages) {
-      const explicitPackageSlugs = (command32.packages ?? []).map(
+      const explicitPackageSlugs = (command35.packages ?? []).map(
         displayableParsedPackageSlug
       );
       normalizedPackages = await this.normalizePackageSlugs(explicitPackageSlugs);
@@ -10568,8 +10701,8 @@ var InstallUseCase = class {
       }
       return result;
     }
-    const installAgents = this.resolveInstallAgents(command32, config);
-    const stripPathPrefix = command32.homeAgent ? getAgentHomeDirPrefix(command32.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,
@@ -10709,7 +10842,7 @@ var InstallUseCase = class {
         } catch {
         }
       }
-      lockFileToPersist.cliVersion = command32.cliVersion;
+      lockFileToPersist.cliVersion = command35.cliVersion;
       if (stripPathPrefix) {
         lockFileToPersist = this.stripLockFileArtifactPaths(
           lockFileToPersist,
@@ -10738,9 +10871,9 @@ var InstallUseCase = class {
   async normalizePackageSlugs(slugs) {
     return normalizePackageSlugs(slugs, this.spaceService);
   }
-  resolveInstallAgents(command32, config) {
-    if (command32.homeAgent) {
-      return [command32.homeAgent];
+  resolveInstallAgents(command35, config) {
+    if (command35.homeAgent) {
+      return [command35.homeAgent];
     }
     return config?.agents;
   }
@@ -11054,8 +11187,8 @@ var UninstallUseCase = class {
     this.spaceService = spaceService;
     this.installUseCase = installUseCase;
   }
-  async execute(command32) {
-    const baseDirectory = command32.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);
@@ -11065,11 +11198,11 @@ var UninstallUseCase = class {
         );
       }
       throw new Error(
-        "No packmind.json found in this directory. Run `packmind-cli install <@space/package>` first to install your packages."
+        `No packmind.json found in this directory. Run \`${EXEC_NAME} install <@space/package>\` first to install your packages.`
       );
     }
     const normalized = await normalizePackageSlugs(
-      command32.packages,
+      command35.packages,
       this.spaceService
     );
     const notInstalled = normalized.filter((pkg) => !(pkg in config.packages));
@@ -11092,7 +11225,7 @@ ${pkgList}`
     try {
       return await this.installUseCase.execute({
         baseDirectory,
-        cliVersion: command32.cliVersion
+        cliVersion: command35.cliVersion
       });
     } catch (error) {
       await this.configFileRepository.updateConfig(
@@ -11119,7 +11252,7 @@ function stripPrerelease(version2) {
 var SkillsInitBootstrapError = class extends Error {
   constructor() {
     super(
-      "Couldn't determine your organization's coding agents. Run `packmind init` to configure them interactively."
+      `Couldn't determine your organization's coding agents. Run \`${EXEC_NAME} init\` to configure them interactively.`
     );
     this.isSkillsInitBootstrapError = true;
     this.name = "SkillsInitBootstrapError";
@@ -11134,8 +11267,8 @@ var InstallDefaultSkillsUseCase = class {
   constructor(repositories) {
     this.repositories = repositories;
   }
-  async execute(command32) {
-    const baseDirectory = command32.baseDirectory || process.cwd();
+  async execute(command35) {
+    const baseDirectory = command35.baseDirectory || process.cwd();
     await this.bootstrapEmptyDirectory(baseDirectory);
     const result = {
       filesCreated: 0,
@@ -11145,24 +11278,24 @@ var InstallDefaultSkillsUseCase = class {
       skippedIncompatibleSkillNames: [],
       incompatibleInstalledSkills: []
     };
-    let agents = command32.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: command32.cliVersion,
-        includeBeta: command32.includeBeta,
+        cliVersion: command35.cliVersion,
+        includeBeta: command35.includeBeta,
         agents
       }
     );
     result.skippedSkillsCount = response.skippedSkillsCount;
     const incompatibleInstalledMap = /* @__PURE__ */ new Map();
     const incompatibleSkillDirs = /* @__PURE__ */ new Map();
-    if (command32.cliVersion) {
+    if (command35.cliVersion) {
       for (const file of response.fileUpdates.createOrUpdate) {
-        if (path9.basename(file.path) === "SKILL.md" && file.content && this.isVersionConstraintViolated(file.content, command32.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);
@@ -11173,9 +11306,9 @@ var InstallDefaultSkillsUseCase = class {
       for (const file of response.fileUpdates.createOrUpdate) {
         try {
           if (!file.content) continue;
-          const isIncompatible = command32.cliVersion && (this.isVersionConstraintViolated(
+          const isIncompatible = command35.cliVersion && (this.isVersionConstraintViolated(
             file.content,
-            command32.cliVersion
+            command35.cliVersion
           ) || this.isUnderIncompatibleSkillDir(
             file.path,
             incompatibleSkillDirs
@@ -11218,7 +11351,7 @@ var InstallDefaultSkillsUseCase = class {
     await this.mergeLockFileSlice(
       baseDirectory,
       response.lockFileSlice ?? {},
-      command32.cliVersion
+      command35.cliVersion
     );
     return result;
   }
@@ -11372,8 +11505,8 @@ var EnsureCliVersionUseCase = class {
     this.lockFileRepository = lockFileRepository;
     this.installDefaultSkillsUseCase = installDefaultSkillsUseCase;
   }
-  async execute(command32) {
-    const { baseDirectory, currentCliVersion, includeBeta } = command32;
+  async execute(command35) {
+    const { baseDirectory, currentCliVersion, includeBeta } = command35;
     const lockFile = await this.lockFileRepository.read(baseDirectory);
     if (!lockFile) {
       return { kind: "no-lockfile" };
@@ -11409,10 +11542,10 @@ var ListPackagesUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    if (command32.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const response = await this.packmindGateway.packages.list({
-        spaceId: command32.spaceId
+        spaceId: command35.spaceId
       });
       return response.packages;
     }
@@ -11431,8 +11564,8 @@ var GetPackageSummaryUseCase = class {
   constructor(gateway) {
     this.gateway = gateway;
   }
-  async execute(command32) {
-    return this.gateway.packages.getSummary(command32);
+  async execute(command35) {
+    return this.gateway.packages.getSummary(command35);
   }
 };
 
@@ -11724,8 +11857,8 @@ var LoginUseCase = class {
       startCallbackServer: deps?.startCallbackServer ?? defaultStartCallbackServer
     };
   }
-  async execute(command32) {
-    const { host, code: providedCode } = command32;
+  async execute(command35) {
+    const { host, code: providedCode } = command35;
     let code;
     if (providedCode) {
       code = providedCode;
@@ -11827,6 +11960,7 @@ var import_stream = require("stream");
 var import_semver3 = __toESM(require("semver"));
 var GITHUB_REPO = "PackmindHub/packmind";
 var NPM_PACKAGE = "@packmind/cli";
+var RELEASE_ASSET_BASENAME = "packmind-cli";
 function getPlatformAssetSuffix(platform, arch) {
   const osMap = {
     linux: "linux",
@@ -11838,8 +11972,12 @@ function getPlatformAssetSuffix(platform, arch) {
     throw new Error(`Unsupported platform: ${platform}`);
   }
   const archName = platform === "darwin" && arch === "x64" ? "x64-baseline" : arch;
+  return `${osName}-${archName}`;
+}
+function getReleaseAssetName(platform, arch, version2) {
+  const platformSuffix = getPlatformAssetSuffix(platform, arch);
   const ext = platform === "win32" ? ".exe" : "";
-  return `${osName}-${archName}${ext}`;
+  return `${RELEASE_ASSET_BASENAME}-${platformSuffix}-${version2}${ext}`;
 }
 async function fetchLatestVersionFromNpm(fetchFn) {
   const res = await fetchFn(`https://registry.npmjs.org/${NPM_PACKAGE}/latest`);
@@ -11873,8 +12011,7 @@ async function fetchLatestVersionFromGitHub(fetchFn) {
   }
   return cliReleases[0].version;
 }
-async function downloadExecutable(fetchFn, version2, platformSuffix, targetPath) {
-  const assetName = `packmind-cli-${platformSuffix}-${version2}`;
+async function downloadExecutable(fetchFn, version2, assetName, targetPath) {
   const url = `https://github.com/${GITHUB_REPO}/releases/download/release-cli/${version2}/${assetName}`;
   logInfoConsole(`Downloading ${assetName}...`);
   const res = await fetchFn(url, { redirect: "follow" });
@@ -11901,27 +12038,62 @@ URL: ${url}`
     `Downloaded successfully (${(stats.size / 1048576).toFixed(1)} MB)`
   );
 }
-function createForwardCompatSymlink(currentPath, platform) {
-  const dir = import_path2.default.dirname(currentPath);
-  const ext = platform === "win32" ? ".exe" : "";
-  const primaryName = `packmind-cli${ext}`;
-  const aliasName = `packmind${ext}`;
-  const currentBasename = import_path2.default.basename(currentPath);
-  if (currentBasename !== primaryName) {
-    return;
+function basenameOf(candidate) {
+  return candidate.split(/[/\\]/).pop() ?? "";
+}
+function isManagedExecFileName(executablePath) {
+  const basename4 = basenameOf(executablePath).replace(/\.exe$/i, "");
+  return basename4 === CANONICAL_EXEC_NAME || basename4 === LEGACY_EXEC_NAME;
+}
+function resolveUpdateTargetPath(executablePath, platform) {
+  if (!isManagedExecFileName(executablePath)) {
+    return executablePath;
   }
-  const targetName = primaryName;
-  const symlinkName = aliasName;
-  const symlinkPath = import_path2.default.join(dir, symlinkName);
+  const ext = platform === "win32" ? ".exe" : "";
+  return import_path2.default.join(
+    import_path2.default.dirname(executablePath),
+    `${CANONICAL_EXEC_NAME}${ext}`
+  );
+}
+function unlinkIfSymlink(targetPath) {
   try {
-    (0, import_fs19.unlinkSync)(symlinkPath);
+    if ((0, import_fs19.lstatSync)(targetPath).isSymbolicLink()) {
+      (0, import_fs19.unlinkSync)(targetPath);
+    }
   } catch {
   }
-  try {
-    (0, import_fs19.symlinkSync)(targetName, symlinkPath);
+}
+function createLegacyExecAlias(canonicalPath, platform, runningExecutablePath) {
+  const dir = import_path2.default.dirname(canonicalPath);
+  const ext = platform === "win32" ? ".exe" : "";
+  const canonicalName = `${CANONICAL_EXEC_NAME}${ext}`;
+  const legacyName = `${LEGACY_EXEC_NAME}${ext}`;
+  const legacyPath = import_path2.default.join(dir, legacyName);
+  if (platform === "win32" && runningExecutablePath && basenameOf(runningExecutablePath).toLowerCase() === legacyName.toLowerCase()) {
     logInfoConsole(
-      `Created forward-compatible symlink: ${symlinkPath} -> ${targetName}`
+      `Kept ${legacyPath} as-is: Windows cannot replace a running executable.
+Re-run the installer, or delete ${legacyName} manually, to finish switching to ${canonicalName}.`
     );
+    return false;
+  }
+  const stagedPath = `${legacyPath}.new-alias`;
+  try {
+    removeIfPresent(stagedPath);
+    (0, import_fs19.symlinkSync)(canonicalName, stagedPath);
+    (0, import_fs19.renameSync)(stagedPath, legacyPath);
+    logInfoConsole(`Created legacy alias: ${legacyPath} -> ${canonicalName}`);
+    return true;
+  } catch {
+    removeIfPresent(stagedPath);
+    logWarningConsole(
+      `Could not create legacy alias: ${legacyPath} -> ${canonicalName} (non-critical)`
+    );
+    return false;
+  }
+}
+function removeIfPresent(targetPath) {
+  try {
+    (0, import_fs19.unlinkSync)(targetPath);
   } catch {
   }
 }
@@ -11931,17 +12103,48 @@ function updateViaNpm(version2) {
     stdio: "inherit"
   });
 }
+function checkTargetBeforeReplacing(targetPath, executablePath) {
+  if (targetPath === executablePath) {
+    return;
+  }
+  let entry;
+  try {
+    entry = (0, import_fs19.lstatSync)(targetPath);
+  } catch {
+    return;
+  }
+  if (entry.isSymbolicLink()) {
+    return;
+  }
+  if (!entry.isFile()) {
+    throw new Error(
+      `Cannot install at ${targetPath}: it already exists and is not a file.`
+    );
+  }
+  logWarningConsole(`Replacing the existing file at ${targetPath}`);
+}
 async function updateViaExecutableReplace(deps, version2) {
-  const platformSuffix = getPlatformAssetSuffix(deps.platform, deps.arch);
-  const currentPath = deps.executablePath;
-  const tempPath = currentPath + ".update-tmp";
+  const assetName = getReleaseAssetName(deps.platform, deps.arch, version2);
+  const targetPath = resolveUpdateTargetPath(
+    deps.executablePath,
+    deps.platform
+  );
+  const tempPath = targetPath + ".update-tmp";
   try {
-    await downloadExecutable(deps.fetchFn, version2, platformSuffix, tempPath);
-    (0, import_fs19.renameSync)(tempPath, currentPath);
+    checkTargetBeforeReplacing(targetPath, deps.executablePath);
+    await downloadExecutable(deps.fetchFn, version2, assetName, tempPath);
+    unlinkIfSymlink(targetPath);
+    (0, import_fs19.renameSync)(tempPath, targetPath);
     if (deps.platform !== "win32") {
-      (0, import_fs19.chmodSync)(currentPath, 493);
+      (0, import_fs19.chmodSync)(targetPath, 493);
     }
-    createForwardCompatSymlink(currentPath, deps.platform);
+    const aliasCreated = isManagedExecFileName(deps.executablePath) && createLegacyExecAlias(targetPath, deps.platform, deps.executablePath);
+    const legacyName = `${LEGACY_EXEC_NAME}${deps.platform === "win32" ? ".exe" : ""}`;
+    const invokedIsLegacyName = basenameOf(deps.executablePath).toLowerCase() === legacyName.toLowerCase();
+    return {
+      targetPath,
+      invokedExecutableUpdated: targetPath === deps.executablePath || aliasCreated && invokedIsLegacyName
+    };
   } catch (error) {
     try {
       (0, import_fs19.unlinkSync)(tempPath);
@@ -11962,6 +12165,21 @@ function isHomebrewInstall(executablePath) {
     return false;
   }
 }
+function resolveUpdateFailureMessage(message, platform) {
+  if (platform === "win32") {
+    const isReplaceBlocked = message.includes("EPERM") || message.includes("EBUSY") || message.includes("EACCES") || message.includes("permission denied");
+    if (!isReplaceBlocked) {
+      return `Update failed: ${message}`;
+    }
+    return `Update failed: ${message}
+Could not replace the executable. Close any other running ${CANONICAL_EXEC_NAME} process, then re-run '${EXEC_NAME} update' from an Administrator terminal.`;
+  }
+  if (message.includes("EACCES") || message.includes("permission denied")) {
+    return `Permission denied. Try running with sudo:
+  sudo ${EXEC_NAME} update`;
+  }
+  return `Update failed: ${message}`;
+}
 async function updateHandler(deps) {
   const execBasename = import_path2.default.basename(deps.executablePath).replace(/\.exe$/, "");
   const jsRuntimes = ["node", "bun", "deno"];
@@ -11988,6 +12206,11 @@ async function updateHandler(deps) {
   logInfoConsole(
     `Current version: ${deps.currentVersion} (${deps.isExecutableMode ? "standalone executable" : "npm package"})`
   );
+  if (isLegacyExecName()) {
+    logInfoConsole(
+      `The '${CANONICAL_EXEC_NAME}' executable is the one being updated; '${LEGACY_EXEC_NAME}' points to it.`
+    );
+  }
   let latestVersion;
   try {
     latestVersion = deps.isExecutableMode ? await fetchLatestVersionFromGitHub(deps.fetchFn) : await fetchLatestVersionFromNpm(deps.fetchFn);
@@ -12011,26 +12234,29 @@ async function updateHandler(deps) {
     return;
   }
   try {
-    if (deps.isExecutableMode) {
-      await updateViaExecutableReplace(deps, latestVersion);
-    } else {
+    if (!deps.isExecutableMode) {
       updateViaNpm(latestVersion);
+      logConsole("");
+      logSuccessConsole(`Updated to v${latestVersion}`);
+      return;
     }
+    const outcome = await updateViaExecutableReplace(deps, latestVersion);
     logConsole("");
-    logSuccessConsole(`Updated to v${latestVersion}`);
-    if (deps.isExecutableMode) {
-      logInfoConsole(`Binary location: ${deps.executablePath}`);
+    if (outcome.invokedExecutableUpdated) {
+      logSuccessConsole(`Updated to v${latestVersion}`);
+    } else {
+      const invokedName = basenameOf(deps.executablePath);
+      const targetName = basenameOf(outcome.targetPath);
+      logSuccessConsole(`Updated ${targetName} to v${latestVersion}`);
+      logWarningConsole(
+        `${invokedName} was NOT updated and still runs v${deps.currentVersion}.
+Run '${CANONICAL_EXEC_NAME}' from now on, or re-run the installer to replace ${invokedName}.`
+      );
     }
+    logInfoConsole(`Binary location: ${outcome.targetPath}`);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    if (message.includes("EACCES") || message.includes("permission denied")) {
-      logErrorConsole(
-        `Permission denied. Try running with sudo:
-  sudo packmind-cli update`
-      );
-    } else {
-      logErrorConsole(`Update failed: ${message}`);
-    }
+    logErrorConsole(resolveUpdateFailureMessage(message, deps.platform));
     process.exit(1);
   }
 }
@@ -12107,10 +12333,10 @@ var CheckCliVersionUseCase = class {
       now: deps?.now ?? (() => /* @__PURE__ */ new Date())
     };
   }
-  async execute(command32) {
-    const cached = this.readFreshCache(command32.currentVersion);
+  async execute(command35) {
+    const cached = this.readFreshCache(command35.currentVersion);
     if (cached) {
-      return this.toResult(command32.currentVersion, cached.latestVersion);
+      return this.toResult(command35.currentVersion, cached.latestVersion);
     }
     const fetchPromise = this.deps.fetchLatestVersion(this.deps.fetchFn);
     fetchPromise.catch(() => void 0);
@@ -12128,7 +12354,7 @@ var CheckCliVersionUseCase = class {
         latestVersion,
         checkedAt: this.deps.now()
       });
-      return this.toResult(command32.currentVersion, latestVersion);
+      return this.toResult(command35.currentVersion, latestVersion);
     } catch {
       return null;
     }
@@ -12200,7 +12426,7 @@ var ConfigFileRepository = class {
       );
       if (invalidAgents.length > 0) {
         logWarningConsole(
-          `Invalid agent(s) in ${configPath}: ${invalidAgents.join(", ")}. Valid agents are: packmind, junie, claude, cursor, copilot, agents_md, gitlab_duo, continue`
+          `Invalid agent(s) in ${configPath}: ${invalidAgents.join(", ")}. Valid agents are: ${VALID_CODING_AGENTS.join(", ")}`
         );
       }
       const config = {
@@ -12576,10 +12802,10 @@ var ListStandardsUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    if (command32.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const response = await this.packmindGateway.standards.list({
-        spaceId: command32.spaceId
+        spaceId: command35.spaceId
       });
       return response.standards;
     }
@@ -12599,10 +12825,10 @@ var ListCommandsUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    if (command32.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const response = await this.packmindGateway.commands.list({
-        spaceId: command32.spaceId
+        spaceId: command35.spaceId
       });
       return response.recipes;
     }
@@ -12622,10 +12848,10 @@ var ListSkillsUseCase = class {
     this.packmindGateway = packmindGateway;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    if (command32.spaceId) {
+  async execute(command35) {
+    if (command35.spaceId) {
       const skills = await this.packmindGateway.skills.list({
-        spaceId: command32.spaceId
+        spaceId: command35.spaceId
       });
       return skills.map((s) => ({
         id: s.id,
@@ -12797,8 +13023,8 @@ var UploadSkillUseCase = class {
   constructor(deps) {
     this.deps = deps;
   }
-  async execute(command32) {
-    const files = await readSkillDirectory(command32.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");
     }
@@ -12812,7 +13038,7 @@ var UploadSkillUseCase = class {
     if (totalSize > 10 * 1024 * 1024) {
       throw new Error(`Skill size (${totalSize} bytes) exceeds 10MB limit`);
     }
-    const space = await this.getSpace(command32.spaceSlug);
+    const space = await this.getSpace(command35.spaceSlug);
     const payload = {
       files: files.map((f) => ({
         path: f.relativePath,
@@ -12824,7 +13050,7 @@ var UploadSkillUseCase = class {
     const uploadSkillResponse = await this.deps.gateway.skills.upload({
       spaceId: createSpaceId(space.id),
       files: payload.files,
-      originSkill: command32.originSkill
+      originSkill: command35.originSkill
     });
     return {
       skillId: uploadSkillResponse.skill.id,
@@ -13383,6 +13609,10 @@ var DEPLOYER_PARSERS = [
     parse: parseContinueStandard
   },
   { pattern: ".github/instructions/packmind-", parse: parseCopilotStandard },
+  {
+    pattern: ".kiro/steering/packmind-standard-",
+    parse: parseKiroStandard
+  },
   // Home-install variant (e.g. `~/.claude`): the agent directory prefix is
   // stripped from on-disk and lockfile paths. Only Claude supports home-install
   // today, so an unprefixed `rules/packmind/standard-…` path is Claude-rendered.
@@ -13409,8 +13639,9 @@ var AGENT_PARSERS = {
   // single-file agent: standards can't be parsed individually
   opencode: () => null,
   // single-file agent: standards are embedded in AGENTS.md
-  codex: () => null
+  codex: () => null,
   // single-file agent: standards are embedded in AGENTS.md
+  kiro: parseKiroStandard
 };
 function parseStandardMdForAgent(content, agent) {
   return AGENT_PARSERS[agent](content);
@@ -13433,34 +13664,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
   };
 }
@@ -13483,6 +13723,11 @@ function parseContinueStandard(content) {
   if (!parsed) return null;
   return addFrontmatterFields(parsed, frontmatter);
 }
+function parseKiroStandard(content) {
+  const { frontmatter, body } = extractFrontmatter(content);
+  const scope = extractScopeFromKey(frontmatter, "fileMatchPattern");
+  return parseIdeStandardBody(body, scope);
+}
 function parseCopilotStandard(content) {
   const { frontmatter, body } = extractFrontmatter(content);
   const rawScope = extractFrontmatterValue(frontmatter, "applyTo");
@@ -13494,12 +13739,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);
@@ -13550,7 +13813,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;
     }
@@ -13611,11 +13874,36 @@ function normalizeScopeValue(rawValue) {
   if (!rawValue) return "";
   if (rawValue.startsWith("[")) {
     const inner = rawValue.slice(1, -1);
-    const items = inner.split(",").map((item) => item.trim().replace(/(?:^["'])|(?:["']$)/g, ""));
+    const items = splitOutsideBraces(inner).map(
+      (item) => item.replace(/(?:^["'])|(?:["']$)/g, "")
+    );
     return items.join(", ");
   }
   return rawValue.replace(/(?:^["'])|(?:["']$)/g, "");
 }
+function splitOutsideBraces(value) {
+  const items = [];
+  let current = "";
+  let braceDepth = 0;
+  for (const char of value) {
+    if (char === "{") {
+      braceDepth++;
+      current += char;
+    } else if (char === "}") {
+      braceDepth--;
+      current += char;
+    } else if (char === "," && braceDepth === 0) {
+      const trimmed2 = current.trim();
+      if (trimmed2) items.push(trimmed2);
+      current = "";
+    } else {
+      current += char;
+    }
+  }
+  const trimmed = current.trim();
+  if (trimmed) items.push(trimmed);
+  return items;
+}
 
 // apps/cli/src/application/utils/ruleSimilarity.ts
 var DEFAULT_SIMILARITY_THRESHOLD = 0.5;
@@ -13814,9 +14102,9 @@ var DiffArtefactsUseCase = class {
       new StandardDiffStrategy()
     ];
   }
-  async execute(command32) {
-    const baseDirectory = command32.baseDirectory || process.cwd();
-    const response = await this.fetchContent(command32, 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"
     );
@@ -13829,7 +14117,7 @@ var DiffArtefactsUseCase = class {
     );
     const prefixedSkillFolders = this.prefixSkillFolders(
       response.skillFolders,
-      command32.relativePath
+      command35.relativePath
     );
     const diffs = [];
     for (const file of diffableFiles) {
@@ -13856,7 +14144,7 @@ var DiffArtefactsUseCase = class {
       targetId: response.targetId ? createTargetId(response.targetId) : void 0
     }));
   }
-  async fetchContent(command32, baseDirectory) {
+  async fetchContent(command35, baseDirectory) {
     const lockFile = await this.lockFileRepository.read(baseDirectory);
     if (lockFile) {
       try {
@@ -13876,11 +14164,11 @@ var DiffArtefactsUseCase = class {
       }
     }
     return this.packmindGateway.deployment.getDeployed({
-      packagesSlugs: command32.packagesSlugs,
-      gitRemoteUrl: command32.gitRemoteUrl,
-      gitBranch: command32.gitBranch,
-      relativePath: command32.relativePath,
-      agents: command32.agents
+      packagesSlugs: command35.packagesSlugs,
+      gitRemoteUrl: command35.gitRemoteUrl,
+      gitBranch: command35.gitBranch,
+      relativePath: command35.relativePath,
+      agents: command35.agents
     });
   }
   prefixSkillFolders(skillFolders, relativePath) {
@@ -13904,8 +14192,8 @@ var SubmitDiffsUseCase = class {
   constructor(packmindGateway) {
     this.packmindGateway = packmindGateway;
   }
-  async execute(command32) {
-    const { groupedDiffs, message } = command32;
+  async execute(command35) {
+    const { groupedDiffs, message } = command35;
     const skipped = [];
     const validDiffs = [];
     for (const group of groupedDiffs) {
@@ -13980,8 +14268,8 @@ var CheckDiffsUseCase = class {
   constructor(packmindGateway) {
     this.packmindGateway = packmindGateway;
   }
-  async execute(command32) {
-    const { groupedDiffs } = command32;
+  async execute(command35) {
+    const { groupedDiffs } = command35;
     const results = [];
     const validDiffs = [];
     const invalidDiffs = [];
@@ -14065,7 +14353,7 @@ var SpaceService = class {
 // apps/cli/src/infra/repositories/CliOutput.ts
 init_source();
 var import_log_update = __toESM(require("log-update"));
-var CLI_PREFIX2 = "packmind-cli";
+var CLI_PREFIX2 = EXEC_NAME;
 var CliFormatter = class {
   static success(message) {
     return `${source_default.bgGreen.bold(CLI_PREFIX2)} ${source_default.green.bold(message)}`;
@@ -14079,8 +14367,8 @@ var CliFormatter = class {
   static error(message) {
     return `${source_default.bgRed.bold(CLI_PREFIX2)} ${source_default.red(message)}`;
   }
-  static command(command32) {
-    return source_default.yellow(command32);
+  static command(command35) {
+    return source_default.yellow(command35);
   }
   static loader(text) {
     return source_default.dim.italic(text);
@@ -14225,7 +14513,7 @@ var TrackRepositoryUseCase = class {
     this.gateway = gateway;
     this.gitService = gitService;
   }
-  async execute(command32) {
+  async execute(command35) {
     const {
       repoPath,
       origin: origin9,
@@ -14233,12 +14521,18 @@ var TrackRepositoryUseCase = class {
       remove,
       branch: requestedBranch,
       confirm
-    } = command32;
+    } = command35;
     const { gitRemoteUrl } = this.gitService.getGitRemoteUrl(repoPath);
-    const { branch: currentBranch } = 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
@@ -14333,6 +14627,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() {
@@ -14422,6 +14755,10 @@ var PackmindCliHexaFactory = class {
       trackRepository: new TrackRepositoryUseCase(
         this.repositories.packmindGateway.repositoryTracking,
         this.services.gitRemoteUrlService
+      ),
+      getTrackingInfo: new GetTrackingInfoUseCase(
+        this.repositories.packmindGateway.repositoryTracking,
+        this.services.gitRemoteUrlService
       )
     };
   }
@@ -14431,29 +14768,29 @@ var PackmindCliHexaFactory = class {
 var origin8 = "PackmindCliHexa";
 var PackmindCliHexa = class {
   constructor(logger2 = new PackmindLogger(origin8)) {
-    this.notifyDistribution = async (command32) => {
+    this.notifyDistribution = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.notifyDistribution(
-        command32
+        command35
       );
     };
-    this.notifyArtefactsDistribution = async (command32) => {
+    this.notifyArtefactsDistribution = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.notifyArtefactsDistribution(
-        command32
+        command35
       );
     };
-    this.getTrackedRepository = async (command32) => {
+    this.getTrackedRepository = async (command35) => {
       return this.hexa.repositories.packmindGateway.repositoryTracking.getTrackedRepository(
-        command32
+        command35
       );
     };
-    this.renderPlugin = async (command32) => {
+    this.renderPlugin = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.renderPlugin(
-        command32
+        command35
       );
     };
-    this.trackPluginDeleted = async (command32) => {
+    this.trackPluginDeleted = async (command35) => {
       return this.hexa.repositories.packmindGateway.deployment.trackPluginDeleted(
-        command32
+        command35
       );
     };
     this.logger = logger2;
@@ -14476,29 +14813,29 @@ var PackmindCliHexa = class {
   get output() {
     return this.hexa.repositories.output;
   }
-  async getGitRemoteUrl(command32) {
-    return this.hexa.useCases.getGitRemoteUrl.execute(command32);
+  async getGitRemoteUrl(command35) {
+    return this.hexa.useCases.getGitRemoteUrl.execute(command35);
   }
-  async listFilesInDirectory(command32) {
-    return this.hexa.useCases.listFilesInDirectoryUseCase.execute(command32);
+  async listFilesInDirectory(command35) {
+    return this.hexa.useCases.listFilesInDirectoryUseCase.execute(command35);
   }
-  async lintFilesAgainstRule(command32) {
-    return this.hexa.useCases.lintFilesAgainstRule.execute(command32);
+  async lintFilesAgainstRule(command35) {
+    return this.hexa.useCases.lintFilesAgainstRule.execute(command35);
   }
-  async lintFilesFromConfig(command32) {
-    return this.hexa.useCases.lintFilesFromConfig.execute(command32);
+  async lintFilesFromConfig(command35) {
+    return this.hexa.useCases.lintFilesFromConfig.execute(command35);
   }
-  async installPackages(command32) {
-    return this.hexa.useCases.installPackages.execute(command32);
+  async installPackages(command35) {
+    return this.hexa.useCases.installPackages.execute(command35);
   }
-  async install(command32) {
-    return this.hexa.useCases.install.execute(command32);
+  async install(command35) {
+    return this.hexa.useCases.install.execute(command35);
   }
-  async uninstall(command32) {
-    return this.hexa.useCases.uninstall.execute(command32);
+  async uninstall(command35) {
+    return this.hexa.useCases.uninstall.execute(command35);
   }
-  async diffArtefacts(command32) {
-    return this.hexa.useCases.diffArtefacts.execute(command32);
+  async diffArtefacts(command35) {
+    return this.hexa.useCases.diffArtefacts.execute(command35);
   }
   async submitDiffs(groupedDiffs, message) {
     return this.hexa.useCases.submitDiffs.execute({ groupedDiffs, message });
@@ -14506,20 +14843,20 @@ var PackmindCliHexa = class {
   async checkDiffs(groupedDiffs) {
     return this.hexa.useCases.checkDiffs.execute({ groupedDiffs });
   }
-  async listPackages(command32) {
-    return this.hexa.useCases.listPackages.execute(command32);
+  async listPackages(command35) {
+    return this.hexa.useCases.listPackages.execute(command35);
   }
-  async getPackageBySlug(command32) {
-    return this.hexa.useCases.getPackageBySlug.execute(command32);
+  async getPackageBySlug(command35) {
+    return this.hexa.useCases.getPackageBySlug.execute(command35);
   }
-  async listStandards(command32) {
-    return this.hexa.useCases.listStandards.execute(command32);
+  async listStandards(command35) {
+    return this.hexa.useCases.listStandards.execute(command35);
   }
-  async listCommands(command32) {
-    return this.hexa.useCases.listCommands.execute(command32);
+  async listCommands(command35) {
+    return this.hexa.useCases.listCommands.execute(command35);
   }
-  async listSkills(command32) {
-    return this.hexa.useCases.listSkills.execute(command32);
+  async listSkills(command35) {
+    return this.hexa.useCases.listSkills.execute(command35);
   }
   async configExists(baseDirectory) {
     return await this.hexa.repositories.configFileRepository.configExists(
@@ -14606,40 +14943,52 @@ var PackmindCliHexa = class {
       directory
     );
   }
-  async login(command32) {
-    return this.hexa.useCases.login.execute(command32);
+  async login(command35) {
+    return this.hexa.useCases.login.execute(command35);
   }
-  async logout(command32) {
-    return this.hexa.useCases.logout.execute(command32);
+  async logout(command35) {
+    return this.hexa.useCases.logout.execute(command35);
   }
-  async whoami(command32) {
-    return this.hexa.useCases.whoami.execute(command32);
+  async whoami(command35) {
+    return this.hexa.useCases.whoami.execute(command35);
   }
-  async checkCliVersion(command32) {
-    return this.hexa.useCases.checkCliVersion.execute(command32);
+  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(command32) {
-    return this.hexa.useCases.uploadSkill.execute(command32);
+  async uploadSkill(command35) {
+    return this.hexa.useCases.uploadSkill.execute(command35);
   }
-  async installDefaultSkills(command32) {
-    return this.hexa.useCases.installDefaultSkills.execute(command32);
+  async installDefaultSkills(command35) {
+    return this.hexa.useCases.installDefaultSkills.execute(command35);
   }
-  async bootstrapSkillsInitDirectory(command32) {
+  async bootstrapSkillsInitDirectory(command35) {
     return this.hexa.useCases.installDefaultSkills.bootstrapEmptyDirectory(
-      command32.baseDirectory
+      command35.baseDirectory
     );
   }
-  async ensureCliVersion(command32) {
-    return this.hexa.useCases.ensureCliVersion.execute(command32);
+  async ensureCliVersion(command35) {
+    return this.hexa.useCases.ensureCliVersion.execute(command35);
+  }
+  async trackRepository(command35) {
+    return this.hexa.useCases.trackRepository.execute(command35);
   }
-  async trackRepository(command32) {
-    return this.hexa.useCases.trackRepository.execute(command32);
+  async getTrackingInfo(command35) {
+    return this.hexa.useCases.getTrackingInfo.execute(command35);
   }
   getPackmindGateway() {
     return this.hexa.repositories.packmindGateway;
@@ -14665,7 +15014,7 @@ var PackmindCliHexa = class {
       spaces = await this.getSpaces();
     } catch {
       logWarningConsole(
-        "Your Packmind instance is outdated and needs to be updated. It will not be supported in the v1 release of packmind-cli."
+        "Your Packmind instance is outdated and needs to be updated. It will not be supported in the v1 release of the Packmind CLI."
       );
       return slugs;
     }
@@ -14902,7 +15251,7 @@ async function lintHandler(args2, deps) {
       );
       if (!hierarchicalConfig.hasConfigs) {
         throw new Error(
-          "No packmind.json config found. Run `packmind-cli install <some-package>` first to set up linting."
+          `No packmind.json config found. Run \`${EXEC_NAME} install <some-package>\` first to set up linting.`
         );
       }
       const result = await packmindCliHexa.lintFilesFromConfig({
@@ -14915,13 +15264,13 @@ async function lintHandler(args2, deps) {
   } catch (error) {
     if (isNotLoggedInError(error) && continueOnMissingKey) {
       logWarningConsole(
-        "Warning: Not logged in to Packmind, linting is skipped. Run `packmind-cli login` to authenticate."
+        `Warning: Not logged in to Packmind, linting is skipped. Run \`${EXEC_NAME} login\` to authenticate.`
       );
       exit(0);
       return;
     }
     if (error instanceof CommunityEditionError) {
-      logInfoConsole(`packmind-cli ${error.message}`);
+      logInfoConsole(error.message);
       logInfoConsole("Linting skipped.");
       exit(0);
       return;
@@ -15306,7 +15655,7 @@ function buildIncapableArtifactsWarning(result) {
     ...mismatches.map(
       ({ noun, count, capable }) => `   - ${count} ${pluralize(noun, count)}: try ${formatCapableList(capable)}`
     ),
-    `   Run ${formatCommand("packmind-cli config agents")} to add a capable agent.`
+    `   Run ${formatCommand(`${EXEC_NAME} config agents`)} to add a capable agent.`
   ];
   return lines.join("\n");
 }
@@ -15331,7 +15680,8 @@ var AGENT_ARTIFACT_CHECKS = [
   { agent: "agents_md", paths: ["AGENTS.md"] },
   { agent: "gitlab_duo", paths: [".gitlab/duo"] },
   { agent: "opencode", paths: [".opencode"] },
-  { agent: "codex", paths: [".agents/skills"], recursive: true }
+  { agent: "codex", paths: [".agents/skills"], recursive: true },
+  { agent: "kiro", paths: [".kiro"] }
 ];
 var AgentArtifactDetectionService = class {
   async detectAgentArtifacts(baseDirectory) {
@@ -15449,6 +15799,7 @@ var SELECTABLE_AGENTS = [
   "cursor",
   "gitlab_duo",
   "junie",
+  "kiro",
   "opencode"
 ];
 var AGENT_DISPLAY_NAMES = {
@@ -15462,7 +15813,8 @@ var AGENT_DISPLAY_NAMES = {
   agents_md: "AGENTS.md",
   gitlab_duo: "GitLab Duo",
   opencode: "OpenCode",
-  codex: "Codex"
+  codex: "Codex",
+  kiro: "Kiro"
 };
 async function configAgentsHandler(deps) {
   const { configRepository, baseDirectory } = deps;
@@ -15599,7 +15951,7 @@ async function handleIncompatibleInstalledSkillsSilently(skills, baseDirectory)
 async function handleIncompatibleInstalledSkills(skills, baseDirectory, confirm) {
   const skillNames = skills.map((s) => s.skillName).join(", ");
   logWarningConsole(
-    `The following skill(s) are installed but are not compatible with this version of packmind-cli: ${skillNames}`
+    `The following skill(s) are installed but are not compatible with this version of ${EXEC_NAME}: ${skillNames}`
   );
   logInfoConsole("These skills will be deleted.");
   const confirmed = await confirm();
@@ -15641,13 +15993,11 @@ function reportEnsureCliVersionOutcome(outcome, currentCliVersion) {
   switch (outcome.kind) {
     case "older":
       logWarningConsole(
-        `[packmind-cli] Your CLI version ${currentCliVersion} is older than the version recorded in packmind-lock.json (${outcome.lockVersion}). Please update your CLI.`
+        `Your CLI version ${currentCliVersion} is older than the version recorded in packmind-lock.json (${outcome.lockVersion}). Please update your CLI.`
       );
       break;
     case "newer":
-      logInfoConsole(
-        "[packmind-cli] CLI upgrade detected \u2014 refreshing default skills."
-      );
+      logInfoConsole("CLI upgrade detected \u2014 refreshing default skills.");
       break;
     case "match":
     case "no-lockfile":
@@ -15661,7 +16011,7 @@ function configuredAgentsSupportSkills(configuredAgents) {
   return hasCapableAgent(configuredAgents, "skills");
 }
 function buildSkillsSkippedWarning(configuredAgents) {
-  const configHint = formatCommand("packmind-cli config agents");
+  const configHint = formatCommand(`${EXEC_NAME} config agents`);
   if (configuredAgents.length === 0) {
     return `Skipping default skills \u2014 no coding agents are configured. Run ${configHint} to add one (e.g. claude).`;
   }
@@ -15760,7 +16110,7 @@ async function initHandler(deps) {
     const totalFiles = result.filesCreated + result.filesUpdated;
     if (result.skippedSkillsCount > 0) {
       logWarningConsole(
-        `${result.skippedSkillsCount} skill(s) were skipped because they require a newer version of packmind-cli. Run "${formatCommand("packmind-cli update")}" to get the latest version.`
+        `${result.skippedSkillsCount} skill(s) were skipped because they require a newer version of ${EXEC_NAME}. Run "${formatCommand(`${EXEC_NAME} update`)}" to get the latest version.`
       );
     }
     if (totalFiles === 0) {
@@ -15903,7 +16253,7 @@ async function bootstrapInstallContext(deps) {
   }
   if (!isTTY) {
     logWarningConsole(
-      "No packmind.json and no agent context detected \u2014 run `packmind-cli init` to configure."
+      `No packmind.json and no agent context detected \u2014 run \`${EXEC_NAME} init\` to configure.`
     );
     return {
       configReady: false,
@@ -16125,7 +16475,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" };
@@ -16137,9 +16487,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
         };
       }
@@ -16164,9 +16521,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"
+            `${EXEC_NAME} 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(
+            `${EXEC_NAME} 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.`
@@ -16204,9 +16571,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" };
@@ -16216,7 +16585,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,
@@ -16587,7 +16964,8 @@ If the browser doesn't open, visit: ${normalizedHost}/cli-login?callback_url=${e
       logConsole(`
 Credentials saved to: ${result.credentialsPath}`);
       logConsole(
-        "\nYou can now use packmind-cli commands with your authenticated account."
+        `
+You can now use ${EXEC_NAME} commands with your authenticated account.`
       );
     } catch (error) {
       if (error instanceof Error) {
@@ -16648,7 +17026,7 @@ function displayVersionNotice(result) {
   }
   logConsole("");
   logWarningConsole(
-    `Update available: ${result.currentVersion} \u2192 ${result.latestVersion} \u2014 run \`packmind-cli update\` to upgrade`
+    `Update available: ${result.currentVersion} \u2192 ${result.latestVersion} \u2014 run \`${EXEC_NAME} update\` to upgrade`
   );
 }
 
@@ -16686,7 +17064,8 @@ Host: ${result.host}`);
   }
   logInfoConsole(`Source: ${result.source}`);
   if (result.isExpired) {
-    logConsole("\nRun `packmind-cli login` to re-authenticate.");
+    logConsole(`
+Run \`${EXEC_NAME} login\` to re-authenticate.`);
   }
 }
 var whoamiCommand = (0, import_cmd_ts6.command)({
@@ -16704,7 +17083,7 @@ var whoamiCommand = (0, import_cmd_ts6.command)({
       logErrorConsole("Not authenticated");
       logConsole(
         `
-No credentials found. Run \`packmind-cli login\` to authenticate.`
+No credentials found. Run \`${EXEC_NAME} login\` to authenticate.`
       );
       logConsole(`
 Credentials are loaded from (in order of priority):`);
@@ -16764,12 +17143,15 @@ var installDefaultSkillsCommand = (0, import_cmd_ts7.command)({
       logInfoConsole("Installing default skills...");
       const result = await packmindCliHexa.installDefaultSkills({
         includeBeta,
-        cliVersion: includeBeta ? void 0 : CLI_VERSION4,
+        // Always report the real version: `includeBeta` already bypasses the
+        // version filter on its own, and the version is what picks the
+        // executable name the deployed skills tell the agent to run.
+        cliVersion: CLI_VERSION4,
         baseDirectory
       });
       if (result.skippedSkillsCount > 0) {
         logWarningConsole(
-          `${result.skippedSkillsCount} skill(s) were skipped because they require a newer version of packmind-cli. Run "${formatCommand("packmind-cli update")}" to get the latest version.`
+          `${result.skippedSkillsCount} skill(s) were skipped because they require a newer version of ${EXEC_NAME}. Run "${formatCommand(`${EXEC_NAME} update`)}" to get the latest version.`
         );
       }
       if (result.incompatibleInstalledSkills.length > 0) {
@@ -17192,15 +17574,15 @@ var CreatePackageUseCase = class {
     this.gateway = gateway;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    const space = await this.getSpace(command32);
+  async execute(command35) {
+    const space = await this.getSpace(command35);
     const result = await this.gateway.packages.create({
       spaceId: space.id,
-      name: command32.name,
-      description: command32.description ?? "",
+      name: command35.name,
+      description: command35.description ?? "",
       recipeIds: [],
       standardIds: [],
-      originSkill: command32.originSkill
+      originSkill: command35.originSkill
     });
     return {
       packageId: result.package.id,
@@ -17209,12 +17591,12 @@ var CreatePackageUseCase = class {
       spaceSlug: space.slug
     };
   }
-  async getSpace(command32) {
+  async getSpace(command35) {
     const spaces = await this.spaceService.getSpaces();
-    if (command32.spaceSlug) {
-      const found = spaces.find((s) => s.slug === command32.spaceSlug);
+    if (command35.spaceSlug) {
+      const found = spaces.find((s) => s.slug === command35.spaceSlug);
       if (!found) {
-        throw new Error(`Space '${command32.spaceSlug}' not found.`);
+        throw new Error(`Space '${command35.spaceSlug}' not found.`);
       }
       return found;
     }
@@ -17289,7 +17671,7 @@ var createPackageCommand = (0, import_cmd_ts15.command)({
           logConsole(`  ${formatLabel("Link:")}  ${result.webappUrl}`);
         }
         logConsole(
-          `  ${formatLabel("Install:")}  ${formatCommand(`packmind-cli install ${result.slug}`)}`
+          `  ${formatLabel("Install:")}  ${formatCommand(`${EXEC_NAME} install ${result.slug}`)}`
         );
         if (result.deduplicated) {
           logWarningConsole(
@@ -17332,8 +17714,8 @@ var AddToPackageUseCase = class {
     this.gateway = gateway;
     this.spaceService = spaceService;
   }
-  async execute(command32) {
-    const { packageSlug, spaceSlug, itemType, itemSlugs } = command32;
+  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
@@ -17354,7 +17736,7 @@ var AddToPackageUseCase = class {
       standardIds: [],
       recipeIds: [],
       skillIds: [],
-      originSkill: command32.originSkill
+      originSkill: command35.originSkill
     };
     if (itemType === "standard") {
       addCommand.standardIds = ids.map(createStandardId);
@@ -17406,7 +17788,7 @@ var AddToPackageUseCase = class {
   }
   async findCommandBySlug(slug6, spaceId) {
     const commands = await this.gateway.commands.list({ spaceId });
-    return commands.recipes.find((command32) => command32.slug === slug6) ?? null;
+    return commands.recipes.find((command35) => command35.slug === slug6) ?? null;
   }
   async findSkillBySlug(slug6, spaceId) {
     const skills = await this.gateway.skills.list({ spaceId });
@@ -17444,7 +17826,7 @@ function resolvePackageRef(to, allSpaces, exit) {
       logInfoConsole(`  --to @${s.slug}/${to.packageSlug}`);
     });
     logInfoConsole(
-      `Run \`packmind-cli packages list\` to see available packages per space.`
+      `Run \`${EXEC_NAME} packages list\` to see available packages per space.`
     );
     exit(1);
   }
@@ -17468,7 +17850,7 @@ async function executeAddToPackage(pkgSlug, spaceSlug, itemType, itemSlugs, useC
         `${formatItemType(itemType, result.added.length)} ${formatItemList(result.added)} added to "${fullPackageSlug}"`
       );
       logSuccessConsole(
-        `Run ${formatCommand(`packmind-cli install ${fullPackageSlug}`)} to install the ${pluralize2(itemType, result.added.length)}`
+        `Run ${formatCommand(`${EXEC_NAME} install ${fullPackageSlug}`)} to install the ${pluralize2(itemType, result.added.length)}`
       );
     }
     if (result.skipped.length) {
@@ -17482,11 +17864,11 @@ async function executeAddToPackage(pkgSlug, spaceSlug, itemType, itemSlugs, useC
     logErrorConsole(message);
     if (error instanceof ItemNotFoundError) {
       const spaceFlag = error.spaceSlug ? ` --space ${error.spaceSlug}` : "";
-      const command32 = formatCommand(
-        `packmind-cli ${error.itemType}s list${spaceFlag}`
+      const command35 = formatCommand(
+        `${EXEC_NAME} ${error.itemType}s list${spaceFlag}`
       );
       logInfoConsole(
-        `Run \`${command32}\` to display available ${error.itemType}s`
+        `Run \`${command35}\` to display available ${error.itemType}s`
       );
     }
     return { success: false, error: message };
@@ -17628,7 +18010,7 @@ ${availableSpaces}`
       scopedArtefacts,
       {
         content: "How to install a package:",
-        exampleCommand: `packmind-cli install ${firstSlug}`
+        exampleCommand: `${EXEC_NAME} install ${firstSlug}`
       }
     );
     exit(0);
@@ -17746,8 +18128,8 @@ ${pkg.name} (${fullSlug}):
     }
     if (pkg.commands && pkg.commands.length > 0) {
       logConsole("Commands:");
-      pkg.commands.forEach((command32) => {
-        logConsole(`  - ${command32.name}`);
+      pkg.commands.forEach((command35) => {
+        logConsole(`  - ${command35.name}`);
       });
       logConsole("");
     }
@@ -17818,19 +18200,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) {
@@ -17884,11 +18281,12 @@ 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;
   }
+  const targetVendor = ctx.vendor === "copilot" ? "github" : "anthropic";
   const pluginName = args2.packageSlug.packageSlug;
   const packageSlug = displayableParsedPackageSlug(args2.packageSlug);
   const { gitRemoteUrl, gitBranch } = await resolveGitContext(
@@ -17897,7 +18295,16 @@ async function renderPluginHandler(args2, deps) {
   );
   if (ctx.mode === "marketplace") {
     const manifestPath = ctx.manifestPath;
-    const marketplace = readMarketplace(manifestPath);
+    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") {
@@ -17923,7 +18330,8 @@ async function renderPluginHandler(args2, deps) {
         pluginRoot: existingPluginRoot,
         pluginName,
         gitRemoteUrl,
-        gitBranch
+        gitBranch,
+        targetVendor
       });
       writeFiles(cwd, response2.files);
       const nextEntry = {
@@ -17946,7 +18354,8 @@ async function renderPluginHandler(args2, deps) {
       pluginRoot,
       pluginName,
       gitRemoteUrl,
-      gitBranch
+      gitBranch,
+      targetVendor
     });
     writeFiles(cwd, response.files);
     const updated = upsertPluginEntry(marketplace, {
@@ -17957,13 +18366,15 @@ async function renderPluginHandler(args2, deps) {
     writeMarketplace(manifestPath, updated);
     deps.log(`Rendered ${response.files.length} files into ./${pluginRoot}`);
     reportSkippedStandards(deps, response.skippedStandardsCount);
-    deps.log("Updated .claude-plugin/marketplace.json");
+    deps.log(`Updated ${(0, import_path6.relative)(cwd, manifestPath)}`);
     deps.exit(0);
     return;
   }
   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);
@@ -17983,7 +18394,8 @@ async function renderPluginHandler(args2, deps) {
       pluginRoot: "/",
       pluginName,
       gitRemoteUrl,
-      gitBranch
+      gitBranch,
+      targetVendor
     });
     writeFiles(cwd, response.files);
     deps.log(`Re-rendered ${response.files.length} files into ./`);
@@ -17995,7 +18407,7 @@ async function renderPluginHandler(args2, deps) {
 function reportSkippedStandards(deps, skippedStandardsCount) {
   if (skippedStandardsCount > 0) {
     deps.log(
-      `Skipped ${skippedStandardsCount} standards (not supported in Claude plugins).`
+      `Skipped ${skippedStandardsCount} standards (not supported in plugins).`
     );
   }
 }
@@ -18026,7 +18438,7 @@ async function confirmOverwrite(message) {
 // apps/cli/src/infra/commands/plugins/RenderPluginCommand.ts
 var renderPluginCommand = (0, import_cmd_ts20.command)({
   name: "render",
-  description: "Render a Packmind package as a Claude plugin",
+  description: "Render a Packmind package as a Claude Code or GitHub Copilot plugin",
   args: {
     packageSlug: (0, import_cmd_ts20.positional)({
       type: PackageSlugArgType,
@@ -18062,7 +18474,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;
@@ -18106,7 +18518,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);
@@ -18170,7 +18584,7 @@ var deletePluginCommand = (0, import_cmd_ts21.command)({
 // apps/cli/src/infra/commands/PluginsCommand.ts
 var pluginsCommand = (0, import_cmd_ts22.subcommands)({
   name: "plugins",
-  description: "Render Packmind packages as Claude plugins",
+  description: "Render Packmind packages as Claude Code or GitHub Copilot plugins",
   cmds: {
     render: renderPluginCommand,
     delete: deletePluginCommand
@@ -19196,7 +19610,7 @@ ${formatSpaceList(allSpaces)}`
         message: `Multiple spaces found. Use --space to specify the target space:
 ${formatSpaceList(allSpaces)}
 
-Example: packmind-cli playbook add --space ${allSpaces[0].slug} <path>`
+Example: ${EXEC_NAME} playbook add --space ${allSpaces[0].slug} <path>`
       };
     }
   }
@@ -19215,7 +19629,7 @@ Example: packmind-cli playbook add --space ${allSpaces[0].slug} <path>`
       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.`
+This file is no longer managed by Packmind. Re-add "${codingAgent}" to your agents and run ${formatLabel(`${EXEC_NAME} install`)} to manage it again, or delete the file if it is no longer needed.`
     };
   }
   if (changeType === "updated" && existingLockEntry) {
@@ -19231,7 +19645,7 @@ This file is no longer managed by Packmind. Re-add "${codingAgent}" to your agen
           status: "failed",
           filePath,
           message: `"${artifactName}" is outdated (local: v${existingLockEntry.version}, remote: v${remoteVersion}).
-Run ${formatLabel("packmind-cli install")} to update before making changes.`
+Run ${formatLabel(`${EXEC_NAME} install`)} to update before making changes.`
         };
       }
     } catch (err) {
@@ -19356,7 +19770,7 @@ async function playbookAddHandler(deps) {
   const { filePaths, exit, ...rest } = deps;
   if (filePaths.length === 0) {
     logErrorConsole(
-      "No path provided. Usage: packmind-cli playbook add <paths...>"
+      `No path provided. Usage: ${EXEC_NAME} playbook add <paths...>`
     );
     exit(1);
     return;
@@ -19378,7 +19792,7 @@ async function playbookAddHandler(deps) {
   }
   if (stagedCount > 0) {
     logInfoConsole(
-      `Run ${formatLabel("packmind playbook submit")} when you're ready to publish your changes.`
+      `Run ${formatLabel(`${EXEC_NAME} playbook submit`)} when you're ready to publish your changes.`
     );
   }
   exit(failedCount > 0 ? 1 : 0);
@@ -19450,7 +19864,7 @@ async function playbookRmHandler(deps) {
   } = deps;
   if (!filePath) {
     logErrorConsole(
-      "Missing file path. Usage: packmind-cli playbook rm <path>"
+      `Missing file path. Usage: ${EXEC_NAME} playbook rm <path>`
     );
     exit(1);
     return;
@@ -19494,7 +19908,7 @@ async function playbookRmHandler(deps) {
   const codingAgent = lockResult.file.agent;
   if (artifactType === "skill" && isSkillSupportFile(absolutePath)) {
     logErrorConsole(
-      "Cannot remove an individual skill file. Point to the skill folder to remove the full skill, or manually delete the file and run `packmind playbook add <skill-folder>/` to stage the change."
+      `Cannot remove an individual skill file. Point to the skill folder to remove the full skill, or manually delete the file and run \`${EXEC_NAME} playbook add <skill-folder>/\` to stage the change.`
     );
     exit(1);
     return;
@@ -19602,7 +20016,7 @@ async function playbookUnstageHandler(deps) {
   } = deps;
   if (!filePath) {
     logErrorConsole(
-      "Missing file path. Usage: packmind playbook unstage <path>"
+      `Missing file path. Usage: ${EXEC_NAME} playbook unstage <path>`
     );
     exit(1);
     return;
@@ -19966,7 +20380,7 @@ async function playbookStatusHandler(deps) {
       );
     }
     logConsole("");
-    logConsole("Use `packmind playbook submit` to send them");
+    logConsole(`Use \`${EXEC_NAME} playbook submit\` to send them`);
   }
   if (groupedUntracked.length > 0) {
     if (groupedStaged.length > 0) {
@@ -19981,7 +20395,7 @@ async function playbookStatusHandler(deps) {
       );
     }
     logConsole("");
-    logConsole("Use `packmind playbook add <path>` to track them");
+    logConsole(`Use \`${EXEC_NAME} playbook add <path>\` to track them`);
   }
   if (groupedStaged.length === 0 && groupedUntracked.length === 0) {
     logConsole("No changes detected.");
@@ -20692,7 +21106,7 @@ async function buildProposals(changes, getTargetContext) {
       );
       if (!deployedContent && (entry.artifactType === "standard" || entry.artifactType === "command")) {
         logWarningConsole(
-          `Skipping "${entry.artifactName}" \u2014 deployed content unavailable. Run \`packmind pull\` to sync before submitting updates.`
+          `Skipping "${entry.artifactName}" \u2014 deployed content unavailable. Run \`${EXEC_NAME} pull\` to sync before submitting updates.`
         );
         skipped.push(toSkippedEntry(entry, "deployed content unavailable"));
         continue;
@@ -20796,20 +21210,20 @@ function logPackageAddGuidance(created, packageSlugs) {
     logInfoConsole("To add the created artifact to a package, run:");
     if (standards.length === 1) {
       logInfoConsole(
-        `  ${formatCommand(`\`packmind-cli packages add --to ${pkgPlaceholder} --standard ${standards[0].slug}\``)}`
+        `  ${formatCommand(`\`${EXEC_NAME} packages add --to ${pkgPlaceholder} --standard ${standards[0].slug}\``)}`
       );
     } else if (commands.length === 1) {
       logInfoConsole(
-        `  ${formatCommand(`\`packmind-cli packages add --to ${pkgPlaceholder} --command ${commands[0].slug}\``)}`
+        `  ${formatCommand(`\`${EXEC_NAME} packages add --to ${pkgPlaceholder} --command ${commands[0].slug}\``)}`
       );
     } else if (skills.length === 1) {
       logInfoConsole(
-        `  ${formatCommand(`\`packmind-cli packages add --to ${pkgPlaceholder} --skill ${skills[0].slug}\``)}`
+        `  ${formatCommand(`\`${EXEC_NAME} packages add --to ${pkgPlaceholder} --skill ${skills[0].slug}\``)}`
       );
     }
   } else {
     logInfoConsole(
-      `To add the created artifacts to a package, use ${formatCommand(`\`packmind-cli packages add --to ${pkgPlaceholder} --standard <artifact-slug>\``)} for each artifact.`
+      `To add the created artifacts to a package, use ${formatCommand(`\`${EXEC_NAME} packages add --to ${pkgPlaceholder} --standard <artifact-slug>\``)} for each artifact.`
     );
   }
   if (packageSlugs.length > 1) {
@@ -20927,7 +21341,7 @@ async function playbookSubmitHandler(deps) {
   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.`
+      `${conflictCount} change${conflictCount !== 1 ? "s were" : " was"} skipped and remain${conflictCount !== 1 ? "" : "s"} staged. Rename them and run \`${EXEC_NAME} playbook submit\` again.`
     );
   };
   if (submittableChanges.length === 0) {
@@ -21002,7 +21416,7 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
       );
     }
     logInfoConsole(
-      "Your staged changes were kept. Fix the issue above (for stale deployed content, run `packmind pull` to sync), or drop the affected change with `packmind playbook unstage <path>`, then retry."
+      `Your staged changes were kept. Fix the issue above (for stale deployed content, run \`${EXEC_NAME} pull\` to sync), or drop the affected change with \`${EXEC_NAME} playbook unstage <path>\`, then retry.`
     );
     exit(1);
     return;
@@ -21068,7 +21482,8 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
       if (err.statusCode === 422) {
         logErrorConsole("Failed to apply changes: a conflict was detected.");
         logInfoConsole(
-          "This usually means the artifact was modified since your last pull.\nRun `packmind pull` to sync your local state, then retry."
+          `This usually means the artifact was modified since your last pull.
+Run \`${EXEC_NAME} pull\` to sync your local state, then retry.`
         );
       } else {
         logErrorConsole(`Failed to apply changes: ${err.message}`);
@@ -21150,7 +21565,7 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
       if (isCommunityEditionError(error)) {
         logErrorConsole(error.message);
         logInfoConsole(
-          `Run ${formatCommand("`packmind-cli playbook submit --no-review`")} to apply changes directly.`
+          `Run ${formatCommand(`\`${EXEC_NAME} playbook submit --no-review\``)} to apply changes directly.`
         );
         exit(1);
         return;
@@ -21229,7 +21644,7 @@ Only one agent version can be submitted at a time. Use "playbook unstage" to rem
     }
     if (succeededSpaces.length > 0) {
       logWarningConsole(
-        `Submitted to: ${succeededSpaces.map(displaySpace2).join(", ")}. Run 'packmind playbook submit' again to retry failed spaces.`
+        `Submitted to: ${succeededSpaces.map(displaySpace2).join(", ")}. Run '${EXEC_NAME} playbook submit' again to retry failed spaces.`
       );
     }
     exit(1);
@@ -21532,7 +21947,7 @@ function formatSubmittedDate(isoDate) {
 function buildSubmittedFooter(submittedDiffs) {
   const proposalCount = submittedDiffs.length;
   const proposalWord = proposalCount === 1 ? "change proposal" : "change proposals";
-  return `${proposalCount} ${proposalWord} ignored, run \`packmind-cli diff --include-submitted\` to see what's waiting for validation`;
+  return `${proposalCount} ${proposalWord} ignored, run \`${EXEC_NAME} playbook diff --include-submitted\` to see what's waiting for validation`;
 }
 async function findTargetDirectories(searchPath, packmindCliHexa) {
   const targets = [];
@@ -22002,7 +22417,7 @@ for these file(s). After this change:
   - Organization-level settings will NO LONGER apply to these file(s).
   - Any future changes to organization agents will NOT affect these file(s).
 
-To restore organization settings later, remove all local agents with: packmind-cli config agents rm <agent1> <agent2> ...`;
+To restore organization settings later, remove all local agents with: ${EXEC_NAME} config agents rm <agent1> <agent2> ...`;
       logWarningConsole(message);
       const confirmed = await deps.promptConfirm("Do you want to proceed?");
       if (!confirmed) {
@@ -22032,7 +22447,7 @@ To restore organization settings later, remove all local agents with: packmind-c
   }
   if (anyUpdated) {
     logInfoConsole(
-      `Run "${formatCommand("packmind install")}" to apply changes and deploy agent artifacts.`
+      `Run "${formatCommand(`${EXEC_NAME} install`)}" to apply changes and deploy agent artifacts.`
     );
   }
   exit(0);
@@ -22258,7 +22673,7 @@ async function removeAgentsHandler(args2, deps) {
   }
   if (anyUpdated) {
     logInfoConsole(
-      `Run "${formatCommand("packmind install")}" to apply changes and remove agent artifacts.`
+      `Run "${formatCommand(`${EXEC_NAME} install`)}" to apply changes and remove agent artifacts.`
     );
   }
   exit(0);
@@ -22376,6 +22791,123 @@ 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 "${EXEC_NAME} ${removedCommand}" has been removed.`, {
+    content: `Use the "${replacementCommand}" command instead:`,
+    exampleCommand: [
+      `${EXEC_NAME} ${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 ${CANONICAL_EXEC_NAME} 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) {
@@ -22401,6 +22933,65 @@ function handleTrackingError(error) {
   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(
+        `${EXEC_NAME} git track --branch <name>`
+      )} to track one.` : `${result.owner}/${result.repo} is not tracked in Packmind. Run ${formatCommand(
+        `${EXEC_NAME} 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(`${EXEC_NAME} git track --update --branch <name>`)} to move tracking to a branch that exists` : `${formatCommand(`${EXEC_NAME} 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);
@@ -22451,14 +23042,28 @@ async function trackHandler(deps) {
     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 ? `${EXEC_NAME} git track --update --branch ${result.branch}` : `${EXEC_NAME} 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(`${EXEC_NAME} 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(`${EXEC_NAME} init`)} or ${formatCommand(`${EXEC_NAME} git track`)} to start tracking.`
       );
       process.exit(1);
       return;
@@ -22467,19 +23072,19 @@ async function trackHandler(deps) {
   }
 }
 
-// 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_ts39.option)({
-      type: (0, import_cmd_ts39.optional)(import_cmd_ts39.string),
+    branch: (0, import_cmd_ts43.option)({
+      type: (0, import_cmd_ts43.optional)(import_cmd_ts43.string),
       long: "branch",
-      description: "Branch to track (defaults to the branch currently checked out)"
+      description: "Branch to track instead of the checked-out one; combines with --update to move tracking to it"
     })
   },
   handler: async ({ update, branch }) => {
@@ -22494,8 +23099,8 @@ var trackCommand = (0, import_cmd_ts39.command)({
   }
 });
 
-// apps/cli/src/infra/commands/UntrackCommand.ts
-var import_cmd_ts40 = __toESM(require_cjs());
+// 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) {
@@ -22537,8 +23142,8 @@ async function untrackHandler(deps) {
   }
 }
 
-// apps/cli/src/infra/commands/UntrackCommand.ts
-var untrackCommand = (0, import_cmd_ts40.command)({
+// 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: {},
@@ -22552,33 +23157,28 @@ var untrackCommand = (0, import_cmd_ts40.command)({
   }
 });
 
-// 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 gitCommand = (0, import_cmd_ts45.subcommands)({
+  name: "git",
+  description: "Manage repository tracking in Packmind",
+  cmds: {
+    info: infoCommand,
+    track: trackCommand2,
+    untrack: untrackCommand2
   }
 });
 
+// apps/cli/src/infra/commands/legacyExecNameWarning.ts
+var LEGACY_EXEC_NAME_WARNING = `\`${LEGACY_EXEC_NAME}\` is deprecated and will stop receiving updates. Use \`${CANONICAL_EXEC_NAME}\` instead.`;
+function warnOnLegacyExecName(argv = process.argv, logWarning = logWarningConsole) {
+  if (!isLegacyExecName(argv)) {
+    return;
+  }
+  logWarning(LEGACY_EXEC_NAME_WARNING);
+}
+
 // apps/cli/src/main.ts
+warnOnLegacyExecName();
 var { version: CLI_VERSION7 } = require_package();
 function findEnvFile() {
   const currentDir = process.cwd();
@@ -22614,15 +23214,16 @@ if (hasEmbeddedWasmFiles()) {
 }
 var args = process.argv.slice(2);
 if (args.includes("--version") || args.includes("-v")) {
-  logConsole(`packmind-cli version ${CLI_VERSION7}`);
+  logConsole(`${EXEC_NAME} version ${CLI_VERSION7}`);
   process.exit(0);
 }
-var app = (0, import_cmd_ts42.subcommands)({
-  name: "packmind-cli",
+var app = (0, import_cmd_ts46.subcommands)({
+  name: EXEC_NAME,
   description: "Packmind CLI tool",
   cmds: {
     commands: commandsCommand,
     config: configCommand,
+    git: gitCommand,
     init: initCommand,
     install: installCommand,
     lint: lintCommand,
@@ -22641,7 +23242,7 @@ var app = (0, import_cmd_ts42.subcommands)({
     whoami: whoamiCommand
   }
 });
-(0, import_cmd_ts42.run)(app, args).catch((error) => {
+(0, import_cmd_ts46.run)(app, args).catch((error) => {
   logErrorConsole(error.message);
   process.exit(1);
 });