@khanhcan148/mk 0.1.30 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanhcan148/mk",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "CLI to install and manage MyClaudeKit (.claude/) in your projects",
   "type": "module",
   "bin": {

package/scripts/convert-skills-to-codex.js

@@ -36,6 +36,7 @@ import { fileURLToPath } from 'node:url';
 import { KIT_INTERNAL_SKILLS, COPY_FILTER_PATTERNS } from '../src/lib/constants.js';
 import { loadModelMap } from '../src/lib/runtime-codex.js';
 import { rewriteKitPaths } from '../src/lib/codex-rewrite.js';
+import { rewriteAskUserQuestionForCodex } from '../src/lib/codex-askuser-rewrite.js';
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -147,113 +148,6 @@ function transformFrontmatter(content, map) {
   return `---\n${normalizedFm}---\n${body}`;
 }
 
-// ---------------------------------------------------------------------------
-// AskUserQuestion semantic rewrite for Codex
-// ---------------------------------------------------------------------------
-
-/**
- * The gate section injected into every converted .md file that contains
- * AskUserQuestion calls. Placed after the closing `---` frontmatter delimiter
- * for SKILL.md files, or at the start of the file for reference files.
- */
-const CODEX_GATE_SECTION = `## Codex Interaction Gates
-This skill was converted from Claude Code. Treat every \`AskUserQuestion(...)\` block below as a blocking Codex prompt gate:
-- Render the question, header, and options in normal chat.
-- Stop immediately after presenting the prompt.
-- Wait for the user's next reply before continuing.
-- Do not proceed to later phases until the answer is available.
-- If running in a non-interactive or sub-agent context, use the fallback stated near the prompt.
-`;
-
-/**
- * Rewrite AskUserQuestion prose phrases outside fenced blocks.
- * Works line-by-line to track fence state, leaving content inside
- * triple-backtick fences byte-for-byte unchanged.
- *
- * Rewrites applied outside fences:
- *   "Use AskUserQuestion to"  →  "Use a Codex prompt gate to"
- *   "If AskUserQuestion unavailable"  →  "If running non-interactively (Codex sub-agent context)"
- *
- * @param {string} content  Raw Markdown content
- * @returns {string}        Rewritten content
- */
-function rewritePromptGatePhrases(content) {
-  const lines = content.split('\n');
-  let inFence = false;
-  const result = [];
-  for (const line of lines) {
-    // Detect fence boundaries: a line starting with ``` toggles fence state.
-    if (/^```/.test(line)) {
-      inFence = !inFence;
-      result.push(line);
-      continue;
-    }
-    if (inFence) {
-      result.push(line);
-      continue;
-    }
-    // Apply prose rewrites only outside fences.
-    let rewritten = line
-      .replace(/Use AskUserQuestion to/g, 'Use a Codex prompt gate to')
-      .replace(/If AskUserQuestion unavailable/g, 'If running non-interactively (Codex sub-agent context)');
-    result.push(rewritten);
-  }
-  return result.join('\n');
-}
-
-/**
- * Inject the `## Codex Interaction Gates` section exactly once.
- *
- * Injection location:
- *   - Files with YAML frontmatter (starting with `---`): injected immediately
- *     after the closing `---\n` delimiter.
- *   - Files without frontmatter (reference files): injected at the start.
- *
- * Idempotent: if the section is already present, returns content unchanged.
- *
- * @param {string} content  Raw Markdown content
- * @returns {string}        Content with gate section injected (exactly once)
- */
-function injectCodexGateSection(content) {
-  // Idempotency guard. Flat includes is safe here: '## Codex Interaction Gates' is only ever
-  // emitted by this function, never present in source .claude/skills/ files, so a fenced-block
-  // false-positive is impossible in practice.
-  if (content.includes('## Codex Interaction Gates')) {
-    return content;
-  }
-
-  // Has frontmatter: inject after closing `---`.
-  if (/^---\r?\n/.test(content)) {
-    // Find the position right after the closing `---` + newline.
-    const closingRe = /^---\r?\n([\s\S]*?)\r?\n---\r?\n/;
-    const m = content.match(closingRe);
-    if (m) {
-      const insertAt = m[0].length;
-      return content.slice(0, insertAt) + CODEX_GATE_SECTION + '\n' + content.slice(insertAt);
-    }
-  }
-
-  // No frontmatter: inject at start.
-  return CODEX_GATE_SECTION + '\n' + content;
-}
-
-/**
- * Full AskUserQuestion rewrite pipeline for a single Markdown file:
- *   1. If the content contains no `AskUserQuestion`, return unchanged.
- *   2. Inject the `## Codex Interaction Gates` section (idempotent).
- *   3. Rewrite prose phrases outside fenced blocks.
- *
- * @param {string} content  Raw Markdown content
- * @returns {string}        Transformed content
- */
-function rewriteAskUserQuestionForCodex(content) {
-  if (!content.includes('AskUserQuestion')) {
-    return content;
-  }
-  const withGate = injectCodexGateSection(content);
-  return rewritePromptGatePhrases(withGate);
-}
-
 // ---------------------------------------------------------------------------
 // Post-copy rewrite walk
 // ---------------------------------------------------------------------------

package/src/commands/codex.js

@@ -23,6 +23,22 @@ import chalk from 'chalk';
 import { TOOL_DIR_NAME, COPY_FILTER_PATTERNS } from '../lib/constants.js';
 import { convertHooksToCodex } from '../../scripts/convert-hooks-to-codex.js';
 import { rewriteKitPaths } from '../lib/codex-rewrite.js';
+import { rewriteAskUserQuestionForCodex } from '../lib/codex-askuser-rewrite.js';
+
+/**
+ * Compose the two rewriters used for `.codex/workflows/` Markdown:
+ *   1. rewriteKitPaths — swaps `.claude/<subdir>/` references to `.codex/<subdir>/`.
+ *   2. rewriteAskUserQuestionForCodex — injects `## Codex Interaction Gates` and
+ *      rewrites prose AskUserQuestion phrases for the Codex runtime.
+ *
+ * Skills are gate-injected by the skills converter; workflows historically were
+ * only path-rewritten, leaving `AskUserQuestion(` blocks in `.codex/workflows/`
+ * ungated. Codex follows workflow file references directly, so they need the
+ * same treatment.
+ */
+function rewriteWorkflowForCodex(text) {
+  return rewriteAskUserQuestionForCodex(rewriteKitPaths(text));
+}
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = resolve(__dirname, '..', '..');
@@ -331,7 +347,7 @@ export async function runCodexConversion(options = {}) {
       console.log(chalk.cyan(`Mirroring  ${workflowsDir}`));
       console.log(chalk.cyan(`        → ${workflowsOut}`));
     }
-    mirrorDirWithRewrite(workflowsDir, workflowsOut);
+    mirrorDirWithRewrite(workflowsDir, workflowsOut, { rewriter: rewriteWorkflowForCodex });
   }
 
   const hooksResult = await convertHooksToCodex({ projectRoot, outputDir: codexRoot, verbose });

package/src/lib/codex-askuser-rewrite.js

@@ -0,0 +1,128 @@
+/**
+ * codex-askuser-rewrite.js — Shared AskUserQuestion → Codex prose-gate rewriter.
+ *
+ * Used by both the skills converter (`scripts/convert-skills-to-codex.js`) and
+ * the workflows mirror (`src/commands/codex.js`) so that every converted `.md`
+ * file containing `AskUserQuestion(` gets the same gate-injection + prose-rewrite
+ * treatment.
+ *
+ * Properties guaranteed:
+ *   - Idempotent: running the pipeline twice on the same content yields a single
+ *     `## Codex Interaction Gates` section and no doubled prose tags.
+ *   - Fence-aware: prose rewrites apply only outside triple-backtick fences;
+ *     fenced AskUserQuestion schemas survive byte-for-byte.
+ *   - Suffix-absorbing: when the source contains the literal trailing
+ *     ` (sub-agent context)` after `If AskUserQuestion unavailable`, the rewrite
+ *     absorbs it so the output is `If running non-interactively (Codex sub-agent context)`
+ *     rather than the doubled form `... (Codex sub-agent context) (sub-agent context)`.
+ */
+
+/**
+ * The gate section injected into every converted .md file that contains
+ * AskUserQuestion calls. Placed after the closing `---` frontmatter delimiter
+ * for SKILL.md files, or at the start of the file for reference / workflow files.
+ */
+export const CODEX_GATE_SECTION = `## Codex Interaction Gates
+This skill was converted from Claude Code. Treat every \`AskUserQuestion(...)\` block below as a blocking Codex prompt gate:
+- Render the question, header, and options in normal chat.
+- Stop immediately after presenting the prompt.
+- Wait for the user's next reply before continuing.
+- Do not proceed to later phases until the answer is available.
+- If running in a non-interactive or sub-agent context, use the fallback stated near the prompt.
+`;
+
+/**
+ * Rewrite AskUserQuestion prose phrases outside fenced blocks.
+ *
+ * Rewrites applied outside fences:
+ *   "Use AskUserQuestion to"                                  →  "Use a Codex prompt gate to"
+ *   "If AskUserQuestion unavailable (sub-agent context)"       →  "If running non-interactively (Codex sub-agent context)"
+ *   "If AskUserQuestion unavailable"  (no trailing tag)        →  "If running non-interactively (Codex sub-agent context)"
+ *
+ * The optional ` (sub-agent context)` suffix is consumed by the same replace so
+ * the rewrite does not produce doubled tags when the source carries the
+ * Claude-side canonical form.
+ *
+ * @param {string} content  Raw Markdown content
+ * @returns {string}        Rewritten content
+ */
+export function rewritePromptGatePhrases(content) {
+  const lines = content.split('\n');
+  let inFence = false;
+  const result = [];
+  for (const line of lines) {
+    // Detect fence boundaries: a line starting with ``` toggles fence state.
+    if (/^```/.test(line)) {
+      inFence = !inFence;
+      result.push(line);
+      continue;
+    }
+    if (inFence) {
+      result.push(line);
+      continue;
+    }
+    // Apply prose rewrites only outside fences.
+    // The (?:\s*\(sub-agent context\))? optional group absorbs the canonical
+    // Claude-side trailing tag so the rewrite does not double it.
+    const rewritten = line
+      .replace(/Use AskUserQuestion to/g, 'Use a Codex prompt gate to')
+      .replace(
+        /If AskUserQuestion unavailable(?:\s*\(sub-agent context\))?/g,
+        'If running non-interactively (Codex sub-agent context)',
+      );
+    result.push(rewritten);
+  }
+  return result.join('\n');
+}
+
+/**
+ * Inject the `## Codex Interaction Gates` section exactly once.
+ *
+ * Injection location:
+ *   - Files with YAML frontmatter (starting with `---`): injected immediately
+ *     after the closing `---\n` delimiter.
+ *   - Files without frontmatter (reference / workflow files): injected at the start.
+ *
+ * Idempotent: if the section is already present, returns content unchanged.
+ *
+ * @param {string} content  Raw Markdown content
+ * @returns {string}        Content with gate section injected (exactly once)
+ */
+export function injectCodexGateSection(content) {
+  // Idempotency guard. Flat includes is safe here: '## Codex Interaction Gates' is only ever
+  // emitted by this function, never present in source .claude/ files, so a fenced-block
+  // false-positive is impossible in practice.
+  if (content.includes('## Codex Interaction Gates')) {
+    return content;
+  }
+
+  // Has frontmatter: inject after closing `---`.
+  if (/^---\r?\n/.test(content)) {
+    const closingRe = /^---\r?\n([\s\S]*?)\r?\n---\r?\n/;
+    const m = content.match(closingRe);
+    if (m) {
+      const insertAt = m[0].length;
+      return content.slice(0, insertAt) + CODEX_GATE_SECTION + '\n' + content.slice(insertAt);
+    }
+  }
+
+  // No frontmatter: inject at start.
+  return CODEX_GATE_SECTION + '\n' + content;
+}
+
+/**
+ * Full AskUserQuestion rewrite pipeline for a single Markdown file:
+ *   1. If the content contains no `AskUserQuestion`, return unchanged.
+ *   2. Inject the `## Codex Interaction Gates` section (idempotent).
+ *   3. Rewrite prose phrases outside fenced blocks.
+ *
+ * @param {string} content  Raw Markdown content
+ * @returns {string}        Transformed content
+ */
+export function rewriteAskUserQuestionForCodex(content) {
+  if (!content.includes('AskUserQuestion')) {
+    return content;
+  }
+  const withGate = injectCodexGateSection(content);
+  return rewritePromptGatePhrases(withGate);
+}