@useorgx/wizard 0.1.61 → 0.1.63

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="25afe0bb-abb4-54b0-9963-05fbafee7372")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="d41747ca-7c63-5e0b-83ef-90af38ff9921")}catch(e){}}();
 import * as clack from "@clack/prompts";
 import { spawnSync as spawnSync5 } from "child_process";
 import { readFileSync as readFileSync10 } from "fs";
@@ -6354,7 +6354,7 @@ function initializeWizardSentry() {
   Sentry.init({
     dsn,
     environment: process.env.ORGX_SENTRY_ENVIRONMENT || "production",
-    release: "useorgx-wizard@0.1.61",
+    release: "useorgx-wizard@0.1.63",
     tracesSampleRate: sampleRate(process.env.ORGX_SENTRY_TRACES_SAMPLE_RATE),
     enableLogs: true,
     sendDefaultPii: false,
@@ -14560,7 +14560,7 @@ function hasOrgxHook(raw) {
   return Boolean(raw?.includes(HOOK_MARKER));
 }
 function codexHooksEnabled(raw) {
-  return Boolean(raw && /^\s*codex_hooks\s*=\s*true\s*$/m.test(raw));
+  return Boolean(raw && /^\s*hooks\s*=\s*true\s*$/m.test(raw));
 }
 function codexHasNotify(raw) {
   return Boolean(raw && /^\s*notify\s*=/m.test(raw));
@@ -14885,11 +14885,6 @@ function mergeCodexHooks(raw, paths) {
       outboxPath: paths.outboxPath,
       sourceClient: "codex"
     });
-    const already = existing.some(
-      (entry) => isRecord(entry) && typeof entry.command === "string" && entry.command.includes(HOOK_MARKER)
-    );
-    const next = already ? [...existing] : [...existing, { command }];
-    if (!already) changed = true;
     const desiredSummaryCommand = buildSummaryHookCommand({
       deliveryCliPath: paths.deliveryCliPath,
       deliveryNodePath: paths.deliveryNodePath,
@@ -14899,20 +14894,74 @@ function mergeCodexHooks(raw, paths) {
       sourceClient: "codex",
       summaryHookScriptPath: paths.summaryHookScriptPath
     });
-    const summaryEntries = next.filter(
-      (entry) => isRecord(entry) && typeof entry.command === "string" && entry.command.includes(SUMMARY_HOOK_MARKER)
+    let universal = existing.find(
+      (entry) => isRecord(entry) && Array.isArray(entry.hooks) && (entry.matcher === void 0 || entry.matcher === "")
     );
-    const summaryCurrent = summaryEntries.length === 1 && isRecord(summaryEntries[0]) && summaryEntries[0].command === desiredSummaryCommand;
-    if (!summaryCurrent) {
-      const withoutStaleSummary = next.filter(
-        (entry) => !(isRecord(entry) && typeof entry.command === "string" && entry.command.includes(SUMMARY_HOOK_MARKER))
-      );
-      withoutStaleSummary.push({ command: desiredSummaryCommand });
-      hooks[event] = withoutStaleSummary;
+    if (!isRecord(universal)) {
+      universal = { matcher: "", hooks: [] };
+      existing.push(universal);
       changed = true;
-      continue;
     }
-    hooks[event] = next;
+    const universalGroup = universal;
+    const desired = [
+      { marker: HOOK_MARKER, command },
+      { marker: SUMMARY_HOOK_MARKER, command: desiredSummaryCommand }
+    ];
+    const kept = /* @__PURE__ */ new Set();
+    const normalized = [];
+    for (const entry of existing) {
+      if (!isRecord(entry)) {
+        normalized.push(entry);
+        continue;
+      }
+      const legacyCommand = entry.command;
+      if (typeof legacyCommand === "string") {
+        if (desired.some(({ marker }) => legacyCommand.includes(marker))) {
+          changed = true;
+          continue;
+        }
+        normalized.push(entry);
+        continue;
+      }
+      if (!Array.isArray(entry.hooks)) {
+        normalized.push(entry);
+        continue;
+      }
+      const nextHandlers = [];
+      for (const handler of entry.hooks) {
+        if (!isRecord(handler)) {
+          nextHandlers.push(handler);
+          continue;
+        }
+        const handlerCommand = handler.command;
+        if (typeof handlerCommand !== "string") {
+          nextHandlers.push(handler);
+          continue;
+        }
+        const target = desired.find(
+          ({ marker }) => handlerCommand.includes(marker)
+        );
+        if (!target) {
+          nextHandlers.push(handler);
+          continue;
+        }
+        if (entry === universalGroup && handler.type === "command" && handlerCommand === target.command && !kept.has(target.marker)) {
+          nextHandlers.push(handler);
+          kept.add(target.marker);
+        } else {
+          changed = true;
+        }
+      }
+      entry.hooks = nextHandlers;
+      normalized.push(entry);
+    }
+    const universalHandlers = universalGroup.hooks;
+    for (const target of desired) {
+      if (kept.has(target.marker)) continue;
+      universalHandlers.push({ type: "command", command: target.command });
+      changed = true;
+    }
+    hooks[event] = normalized;
   }
   value.hooks = hooks;
   return { changed: changed || !raw, value };
@@ -14970,26 +15019,40 @@ function mergeClaudeHooks(raw, paths) {
 }
 function ensureCodexHooksFeature(raw) {
   const current = raw ?? "";
-  if (codexHooksEnabled(current)) {
-    return { changed: false, value: current };
+  const withoutDeprecatedFlag = current.replace(
+    /^\s*codex_hooks\s*=\s*(?:true|false)\s*(?:\r?\n|$)/gm,
+    ""
+  );
+  const removedDeprecatedFlag = withoutDeprecatedFlag !== current;
+  if (codexHooksEnabled(withoutDeprecatedFlag)) {
+    return {
+      changed: removedDeprecatedFlag,
+      value: withoutDeprecatedFlag
+    };
   }
-  if (/^\s*codex_hooks\s*=\s*false\s*$/m.test(current)) {
+  if (/^\s*hooks\s*=\s*false\s*$/m.test(withoutDeprecatedFlag)) {
     return {
       changed: true,
-      value: current.replace(/^\s*codex_hooks\s*=\s*false\s*$/m, "codex_hooks = true")
+      value: withoutDeprecatedFlag.replace(
+        /^\s*hooks\s*=\s*false\s*$/m,
+        "hooks = true"
+      )
     };
   }
-  if (/^\s*\[features\]\s*$/m.test(current)) {
+  if (/^\s*\[features\]\s*$/m.test(withoutDeprecatedFlag)) {
     return {
       changed: true,
-      value: current.replace(/^(\s*\[features\]\s*)$/m, "$1\ncodex_hooks = true")
+      value: withoutDeprecatedFlag.replace(
+        /^(\s*\[features\]\s*)$/m,
+        "$1\nhooks = true"
+      )
     };
   }
-  const suffix = current.trimEnd().length > 0 ? "\n\n" : "";
+  const suffix = withoutDeprecatedFlag.trimEnd().length > 0 ? "\n\n" : "";
   return {
     changed: true,
-    value: `${current.trimEnd()}${suffix}[features]
-codex_hooks = true
+    value: `${withoutDeprecatedFlag.trimEnd()}${suffix}[features]
+hooks = true
 `
   };
 }
@@ -18385,7 +18448,7 @@ async function main() {
   initializeWizardSentry();
   const program = new Command();
   program.name("orgx-wizard").description("Add OrgX MCP configs, skills/rules, and companion plugins to your local AI tools.").showHelpAfterError();
-  const pkgVersion = true ? "0.1.61" : void 0;
+  const pkgVersion = true ? "0.1.63" : void 0;
   program.version(pkgVersion ?? "unknown", "-V, --version");
   program.hook("preAction", (_thisCommand, actionCommand) => {
     if (Boolean(actionCommand.optsWithGlobals().json)) return;
@@ -19429,4 +19492,4 @@ main().catch(async (error) => {
   process.exitCode = 1;
 });
 //# sourceMappingURL=cli.js.map
-//# debugId=25afe0bb-abb4-54b0-9963-05fbafee7372
+//# debugId=d41747ca-7c63-5e0b-83ef-90af38ff9921