@haposoft/cafekit 0.16.0-rc.8 → 0.16.1

package/bin/install.js

@@ -22,6 +22,7 @@ const backup = require('./lib/backup');
 const manifestLib = require('./lib/manifest');
 
 const { selectLanguage, resolvePlatforms } = require('./phases/select-platform');
+const { selectDocumentSkills } = require('./phases/select-skill-bundles');
 const { copyPlatformFiles } = require('./phases/copy-payload');
 const {
   copyRoutingFile,
@@ -30,16 +31,18 @@ const {
   copyClaudeMdFile,
   ensureSharedAgentsMdCore,
   copyRulesDirectory,
+  copyOutputStylesDirectory,
   removeObsoleteAgents
 } = require('./phases/claude-runtime');
+const { reconcileSkillInventory } = require('./phases/skill-inventory');
 const { mergeClaudeSettings } = require('./phases/claude-settings');
 const { installCodexRuntime } = require('./phases/codex-runtime');
+const { installOmpRuntime } = require('./phases/omp-runtime');
 const { writePlatformVersionMetadata } = require('./phases/write-metadata');
 const { checkVersions } = require('./lib/version-check');
 const { ensureGitignore } = require('./phases/root-config');
 const { runPostInstall } = require('./phases/post-install');
 const { setupSkillDeps } = require('./phases/skills-setup');
-const { setupRtk } = require('./phases/setup-rtk');
 const { printSummary } = require('./phases/summary');
 
 /** Install a single platform: payload + runtime + metadata, under one spinner. */
@@ -58,6 +61,7 @@ function installPlatform(ctx, platformKey) {
   ctx.ui.startSpinner(ctx.t('installingPlatform', { name: platform.name }));
 
   copyPlatformFiles(ctx, platformKey);
+  reconcileSkillInventory(ctx, platformKey);
   removeObsoleteAgents(ctx, platformKey);
 
   if (platformKey === 'claude') {
@@ -67,12 +71,17 @@ function installPlatform(ctx, platformKey) {
     mergeClaudeSettings(ctx, platformKey);
     copyClaudeMdFile(ctx, platformKey);
     copyRulesDirectory(ctx, platformKey);
+    copyOutputStylesDirectory(ctx, platformKey);
   }
 
   if (platformKey === 'codex') {
     installCodexRuntime(ctx, platformKey);
   }
 
+  if (platformKey === 'omp') {
+    installOmpRuntime(ctx, platformKey);
+  }
+
   writePlatformVersionMetadata(ctx, platformKey);
 
   const wrote = (ctx.results.copied - before.copied) + (ctx.results.updated - before.updated);
@@ -100,8 +109,9 @@ Options:
   -u, --upgrade, -f, --force   Alias of --force-overwrite
   --with-skills-deps   Install skill dependencies (Python venv + pip, npm,
                        Chromium/Playwright). Otherwise prompted interactively.
-  --with-rtk           Install the rtk token-saver (binary + Claude Code hook).
                        Otherwise prompted interactively.
+  --with-document-skills     Install docs/DOCX/PDF/PPTX/XLSX/multimodal skills
+  --without-document-skills  Skip or remove CafeKit-owned document skills
   -y, --yes            Non-interactive: skip prompts, use defaults (CI)
   -h, --help           Show this help
   -v, --version        Print version
@@ -162,6 +172,9 @@ async function main() {
       process.exit(result.status ?? 1);
     }
 
+    await selectDocumentSkills(ctx);
+    if (ctx.cancelled) { lock.release(); process.exit(0); }
+
     // ── Pre-run snapshot for rollback ─────────────────────
     // Capture platform folders AND the root files the pipeline mutates
     // (CLAUDE.md, .gitignore) so a mid-run failure rolls back cleanly.
@@ -180,9 +193,6 @@ async function main() {
     ensureGitignore(ctx);
     await runPostInstall(ctx);
     await setupSkillDeps(ctx);
-    if (ctx.platforms.includes('claude')) {
-      await setupRtk(ctx);
-    }
 
     // Phase handlers may report recoverable-looking errors through counters
     // instead of throwing. Treat them as transactional failure so the snapshot

package/bin/lib/codex-install.js

@@ -25,7 +25,6 @@ const AGENT_NAMES = [
   'ui-ux-designer'
 ];
 const INSTRUCTION_REPLACEMENTS = [
-  [/`?\bAskUserQuestion\b`?/g, 'a structured user-input request'],
   [/`?\bTodoWrite\b`?/g, 'task-state tracking'],
   [/`?\bTaskCreate\b`?/g, 'task creation'],
   [/`?\bTaskUpdate\b`?/g, 'task-state updates'],
@@ -64,6 +63,172 @@ function applyReplacements(content, replacements) {
   return next;
 }
 
+function isMarkdownLinkDestination(content, offset) {
+  const opener = content.lastIndexOf('](', offset);
+  if (opener < 0 || content.lastIndexOf('[', opener) < 0) return false;
+
+  let depth = 1;
+  for (let index = opener + 2; index < offset; index += 1) {
+    if (content[index] === '\\') {
+      index += 1;
+    } else if (content[index] === '(') {
+      depth += 1;
+    } else if (content[index] === ')') {
+      depth -= 1;
+      if (depth === 0) return false;
+    }
+  }
+  return depth > 0;
+}
+
+function isUrlLikeToken(content, offset) {
+  const prefix = content.slice(0, offset).split(/[\s]/).at(-1) || '';
+  return /^<?(?:[a-z][a-z0-9+.-]*:\/\/|mailto:|www\.)\S*$/i.test(prefix);
+}
+
+function maskMarkdownCodeSpans(content) {
+  const spans = [];
+  let markerNonce = 0;
+  while (content.includes(`\uE000CAFEKIT_${markerNonce}_`)) markerNonce += 1;
+  const markerPrefix = `\uE000CAFEKIT_${markerNonce}_`;
+  let masked = '';
+  let index = 0;
+
+  const addMarker = (kind, original) => {
+    const marker = `${markerPrefix}${kind}_${spans.length}\uE001`;
+    spans.push({ marker, original });
+    return marker;
+  };
+
+  const fencedBlockEnd = (openerLineEnd, delimiter, delimiterLength) => {
+    let lineStart = openerLineEnd < 0 ? content.length : openerLineEnd + 1;
+    while (lineStart < content.length) {
+      const newline = content.indexOf('\n', lineStart);
+      const lineEnd = newline < 0 ? content.length : newline;
+      const line = content.slice(lineStart, lineEnd);
+      const match = line.match(/^[ \t]{0,3}([`~]+)[ \t]*\r?$/);
+      if (match
+        && [...match[1]].every((character) => character === delimiter)
+        && match[1].length >= delimiterLength) {
+        return lineEnd;
+      }
+      lineStart = newline < 0 ? content.length : newline + 1;
+    }
+    return content.length;
+  };
+
+  while (index < content.length) {
+    if (content[index] !== '`' && content[index] !== '~') {
+      masked += content[index];
+      index += 1;
+      continue;
+    }
+
+    const opener = index;
+    const delimiter = content[index];
+    while (index < content.length && content[index] === delimiter) index += 1;
+    const delimiterLength = index - opener;
+    const lineStart = content.lastIndexOf('\n', opener - 1) + 1;
+    const linePrefix = content.slice(lineStart, opener);
+    const openerLineEnd = content.indexOf('\n', index);
+    const infoEnd = openerLineEnd < 0 ? content.length : openerLineEnd;
+    const info = content.slice(index, infoEnd);
+    const isFence = delimiterLength >= 3
+      && /^[ \t]{0,3}$/.test(linePrefix)
+      && (delimiter === '~' || !info.includes('`'));
+
+    if (isFence) {
+      const end = fencedBlockEnd(openerLineEnd, delimiter, delimiterLength);
+      masked += addMarker('CODE', content.slice(opener, end));
+      index = end;
+      continue;
+    }
+
+    if (delimiter !== '`') {
+      masked += content.slice(opener, index);
+      continue;
+    }
+
+    let cursor = index;
+    let closer = -1;
+    while (cursor < content.length) {
+      const runStart = content.indexOf('`', cursor);
+      if (runStart < 0) break;
+      let runEnd = runStart;
+      while (runEnd < content.length && content[runEnd] === '`') runEnd += 1;
+      if (runEnd - runStart === delimiterLength) {
+        closer = runStart;
+        break;
+      }
+      cursor = runEnd;
+    }
+
+    if (closer < 0) {
+      const newline = content.indexOf('\n', opener);
+      const end = newline < 0 ? content.length : newline;
+      masked += addMarker('CODE', content.slice(opener, end));
+      index = end;
+      continue;
+    }
+
+    const end = closer + delimiterLength;
+    const original = content.slice(opener, end);
+    const inner = content.slice(opener + delimiterLength, closer);
+    const kind = inner.trim() === 'AskUserQuestion' ? 'ASK' : 'CODE';
+    masked += addMarker(kind, original);
+    index = end;
+  }
+
+  return {
+    content: masked,
+    askMarkerPattern: `${markerPrefix}ASK_[0-9]+\uE001`,
+    askMarkerPrefix: `${markerPrefix}ASK_`,
+    restore(value) {
+      return spans.reduce(
+        (next, { marker, original }) => next.split(marker).join(original),
+        value
+      );
+    }
+  };
+}
+
+function normalizeAskUserQuestion(content) {
+  const masked = maskMarkdownCodeSpans(content);
+  const determinerPattern = [
+    'one', 'each', 'every', 'another', 'this', 'that', 'a', 'an', 'the'
+  ].map((word) => [...word].map((letter) => `[${letter}${letter.toUpperCase()}]`).join('')).join('|');
+  const oneSeparator = '(?:[^\\S\\r\\n]+|[^\\S\\r\\n]*\\r?\\n[^\\S\\r\\n]*)';
+  const pattern = new RegExp(
+    `(?:(\\b(?:${determinerPattern}|[0-9]+)\\b)(${oneSeparator}))?`
+      + `(\\bAskUserQuestion\\b|${masked.askMarkerPattern})`,
+    'g'
+  );
+  const normalized = masked.content.replace(pattern, (match, determiner, spacing, _token, offset, source) => {
+    const literalIndex = match.indexOf('AskUserQuestion');
+    const tokenOffset = offset + (literalIndex >= 0
+      ? literalIndex
+      : match.indexOf(masked.askMarkerPrefix));
+    const previous = source[tokenOffset - 1] || '';
+    if (isMarkdownLinkDestination(source, tokenOffset)
+      || isUrlLikeToken(source, tokenOffset)
+      || /[/=?#&%@]/.test(previous)) {
+      return match;
+    }
+
+    if (determiner) {
+      const normalizedDeterminer = /^an$/i.test(determiner)
+        ? (determiner[0] === 'A' ? 'A' : 'a')
+        : determiner;
+      return `${normalizedDeterminer}${spacing}structured user-input request`;
+    }
+
+    const trailing = source.slice(offset + match.length);
+    const pluralContext = new RegExp(`^${oneSeparator}(?:calls|batches)\\b`, 'i').test(trailing);
+    return `${pluralContext ? '' : 'a '}structured user-input request`;
+  });
+  return masked.restore(normalized);
+}
+
 function normalizeRuntimePaths(content) {
   return normalizeSourcePaths(content, {
     runtimeRoot: '.codex',
@@ -78,11 +243,11 @@ function normalizeRuntimePaths(content) {
 
 function normalizeSkillNames(content) {
   return content
-    .replace(/\/hapo:([a-z0-9-]+)/gi, (_match, name) => `$hapo-${name}`)
-    .replace(/\bhapo:([a-z0-9-]+)/gi, (_match, name) => `hapo-${name}`)
+    .replace(/\/cf:([a-z0-9-]+)/gi, (_match, name) => `$cf-${name}`)
+    .replace(/\bcf:([a-z0-9-]+)/gi, (_match, name) => `cf-${name}`)
     .replace(
       /(^|[\s("'`→])\/(brainstorm|code-review|debug|develop|docs|frontend-design|git|hotfix|inspect|question|research|specs|test)(?=$|[\s<`),.:])/gim,
-      (_match, prefix, name) => `${prefix}$hapo-${name}`
+      (_match, prefix, name) => `${prefix}$cf-${name}`
     );
 }
 
@@ -129,7 +294,7 @@ function normalizeCodexBody(content, sourcePath = '') {
   if (!isInstructionAsset(sourcePath)) return next;
 
   next = normalizeAgentInvocations(normalizeAgentNames(normalizeSkillNames(next)));
-  return applyReplacements(next, INSTRUCTION_REPLACEMENTS);
+  return applyReplacements(normalizeAskUserQuestion(next), INSTRUCTION_REPLACEMENTS);
 }
 
 function getCodexCopyOptions(baseOptions = {}) {

package/bin/lib/context.js

@@ -27,6 +27,9 @@ function validateManifestV2(manifest) {
   if (!manifest || manifest.version !== 2) return false;
   if (!manifest.runtime?.files || !Array.isArray(manifest.runtime.files)) return false;
   if (!manifest.settings?.template) return false;
+  if (!Array.isArray(manifest.skills?.required)) return false;
+  if (!Array.isArray(manifest.skills?.bundles?.documentSkills)) return false;
+  if (!Array.isArray(manifest.obsolete?.skills)) return false;
   return true;
 }
 
@@ -116,6 +119,35 @@ const PLATFORMS = {
       rules: true,
       commands: false
     }
+  },
+  omp: {
+    id: 'omp',
+    name: 'Oh My Pi',
+    description: 'Oh My Pi coding agent',
+    folder: '.omp',
+    detectFiles: ['.omp'],
+    commandsDir: null,
+    // omp discovers .claude/skills and .agents/skills itself, so CafeKit copies
+    // no skill payload for it. See specs/omp-runtime-support/plan.md.
+    skillsDir: '.agents/skills',
+    agentsDir: null,
+    skillsRef: '.agents/skills',
+    commandPrefix: '$',
+    sourceDir: 'claude',
+    sourceSubdir: null,
+    backupTargets: ['.omp', 'AGENTS.md'],
+    ownership: {
+      recordRoot: '.',
+      allowedRoots: ['.omp']
+    },
+    capabilities: {
+      skills: false,
+      agents: false,
+      references: true,
+      scripts: true,
+      rules: true,
+      commands: false
+    }
   }
   // Add new platforms here:
   // cursor: {
@@ -129,6 +161,25 @@ const PLATFORMS = {
   // }
 };
 
+/**
+ * Hosts that run another platform's install rather than one of their own.
+ *
+ * Grok CLI discovers `.claude/skills`, `.claude/rules`, `CLAUDE*.md` and the hooks in
+ * `.claude/settings.json` through its own Claude-compatibility layer, and the gate hooks
+ * normalize its envelope, so `--platform grok` provisions the Claude runtime. There is no
+ * `.grok/` payload and deliberately no detection marker: a repository that merely holds
+ * `.grok/` has not asked for a CafeKit install.
+ */
+const PLATFORM_ALIASES = Object.freeze({
+  grok: 'claude'
+});
+
+/** Resolve host aliases and drop duplicates, preserving the requested order. */
+function resolvePlatformAliases(keys = []) {
+  const resolved = keys.map((key) => PLATFORM_ALIASES[key] || key);
+  return { platforms: [...new Set(resolved)], aliased: keys.some((key) => Boolean(PLATFORM_ALIASES[key])) };
+}
+
 // ═══════════════════════════════════════════════════════════
 // DETECTION + PLATFORM HELPERS
 // ═══════════════════════════════════════════════════════════
@@ -204,7 +255,8 @@ function parseInstallerArgs(argv) {
     dryRun: false,
     yes: false,
     withSkillsDeps: false,
-    withRtk: false,
+    withDocumentSkills: false,
+    withoutDocumentSkills: false,
     platforms: []
   };
 
@@ -219,8 +271,10 @@ function parseInstallerArgs(argv) {
       args.yes = true;
     } else if (arg === '--with-skills-deps') {
       args.withSkillsDeps = true;
-    } else if (arg === '--with-rtk') {
-      args.withRtk = true;
+    } else if (arg === '--with-document-skills') {
+      args.withDocumentSkills = true;
+    } else if (arg === '--without-document-skills') {
+      args.withoutDocumentSkills = true;
     } else if (arg === '--platform') {
       args.platforms.push(...String(argv[++i] || '').split(',').filter(Boolean));
     } else if (arg.startsWith('--platform=')) {
@@ -232,6 +286,10 @@ function parseInstallerArgs(argv) {
     }
   }
 
+  if (args.withDocumentSkills && args.withoutDocumentSkills) {
+    throw new Error('--with-document-skills and --without-document-skills cannot be used together');
+  }
+
   // Back-compat alias used throughout the phases.
   args.upgrade = args.forceOverwrite;
   return args;
@@ -298,6 +356,7 @@ function buildContext(argv, runId) {
     results: createResults(),
     trackers: {},    // platformKey → ownership tracker, set per platform
     ownership: {},   // platformFolder → ownership manifest read at run start
+    documentSkills: {}, // platformKey → persisted optional-bundle selection
     cancelled: false
   };
 }
@@ -307,6 +366,8 @@ module.exports = {
   INSTALL_COMMAND,
   DEPENDENCY_TEMPLATES,
   PLATFORMS,
+  PLATFORM_ALIASES,
+  resolvePlatformAliases,
   validateManifestV2,
   loadClaudeMigrationManifest,
   detectPlatforms,

package/bin/lib/i18n.js

@@ -58,18 +58,10 @@ const MESSAGES = {
 
     // Skills / deps setup
     skillDepsConfirm:      'Install skill dependencies? (Python venv, pip, npm, Chromium — takes a few minutes)',
+    documentSkillsConfirm: 'Install optional document skills? (docs, DOCX, PDF, PPTX, XLSX, multimodal)',
+    documentSkillsMetadataRecovery: 'Could not read {path}; preserving document skills to avoid destructive cleanup.',
     skillsSkipped:         'Skill dependencies skipped.\n  Run later: npx @haposoft/cafekit --with-skills-deps',
 
-    // rtk token-saver setup
-    rtkConfirm:            'Install the rtk token-saver? (compacts git/grep/ls/build/test output for Claude Code Bash commands)',
-    rtkInstalling:         'Installing rtk via {method}',
-    rtkInstalled:          'rtk installed',
-    rtkInstallFailed:      'Could not install rtk — skipping (non-fatal). Install manually later: https://github.com/rtk-ai/rtk',
-    rtkInitFailed:         'rtk init -g failed: {reason} — hook not registered (non-fatal)',
-    rtkNeedsJq:            'rtk hook needs jq to run. Install jq, then the hook activates automatically.',
-    rtkFailed:             'rtk setup error: {reason} — skipped (non-fatal)',
-    rtkSkipped:            'rtk token-saver skipped.\n  Run later: npx @haposoft/cafekit --with-rtk',
-    rtkSummary:            'rtk token-saver: hook registered for Claude Code Bash commands',
     venvCreating:          'Setting up Python environment',
     venvReady:             'Python environment ready',
     venvFailed:            'Could not create Python environment — check your Python 3 installation.',
@@ -106,8 +98,8 @@ const MESSAGES = {
 
     // Next steps
     nextStepsTitle:  'Next steps',
-    nsClaude:        'Start coding: /hapo:specs <feature>',
-    nsCodex:         'Start with `$hapo-specs <feature>`; review and trust project hooks with `/hooks`',
+    nsClaude:        'Start coding: /cf:specs <feature>',
+    nsCodex:         'Start with `$cf-specs <feature>`; review and trust project hooks with `/hooks`',
     nsKeys:          'Some skills need API keys: {skills}\n  Copy <skill>/.env.example → .env and fill in the values',
     nsForce:         'To force-refresh managed files: npx @haposoft/cafekit --force-overwrite',
     dryRunOnly:      'Dry-run complete — no files were changed.\n  Re-run without --dry-run to apply.',
@@ -128,6 +120,7 @@ const MESSAGES = {
 
     // Platform/language auto-skip when already installed
     installingFor:        'Installing for: {names}',
+    grokCompatNotice:     'Grok CLI reads this install through its Claude compatibility. Trust the project first: run `grok --trust` or `/hooks-trust`, or its project hooks are skipped.',
     langKept:             'Language: {lang} (saved — skipping prompt)',
     platformKept:         'Platform: {names} (saved — skipping prompt)',
 
@@ -180,18 +173,10 @@ const MESSAGES = {
     changeAddressingOption:'別の名前に変更',
 
     skillDepsConfirm:      'スキルの依存関係をインストールしますか？（Python venv、pip、npm、Chromium — 数分かかります）',
+    documentSkillsConfirm: '任意のドキュメントスキルをインストールしますか？（docs、DOCX、PDF、PPTX、XLSX、multimodal）',
+    documentSkillsMetadataRecovery: '{path} を読み取れないため、破壊的な削除を避けて document skills を保持します。',
     skillsSkipped:         'スキルの依存関係をスキップしました。\n  後で実行: npx @haposoft/cafekit --with-skills-deps',
 
-    // rtk token-saver setup
-    rtkConfirm:            'rtk トークンセーバーをインストールしますか？（Claude Code の Bash コマンドの git/grep/ls/build/test 出力を圧縮します）',
-    rtkInstalling:         '{method} で rtk をインストール中',
-    rtkInstalled:          'rtk をインストールしました',
-    rtkInstallFailed:      'rtk をインストールできませんでした — スキップします（致命的ではありません）。後で手動でインストール: https://github.com/rtk-ai/rtk',
-    rtkInitFailed:         'rtk init -g が失敗しました: {reason} — フックは未登録です（致命的ではありません）',
-    rtkNeedsJq:            'rtk フックの実行には jq が必要です。jq をインストールするとフックが自動的に有効になります。',
-    rtkFailed:             'rtk セットアップエラー: {reason} — スキップしました（致命的ではありません）',
-    rtkSkipped:            'rtk トークンセーバーをスキップしました。\n  後で実行: npx @haposoft/cafekit --with-rtk',
-    rtkSummary:            'rtk トークンセーバー: Claude Code の Bash コマンド用にフックを登録しました',
     venvCreating:          'Python 環境を準備しています',
     venvReady:             'Python 環境の準備ができました',
     venvFailed:            'Python 環境を作成できませんでした — Python 3 のインストールを確認してください。',
@@ -226,8 +211,8 @@ const MESSAGES = {
     preservedNote:   '編集済みファイル {n} 件はそのままにしました。\n  --force-overwrite で再実行するとリセットできます（.cafekit-backup/ にバックアップ保存）。',
 
     nextStepsTitle:  '次のステップ',
-    nsClaude:        'コーディング開始: /hapo:specs <機能名>',
-    nsCodex:         '`$hapo-specs <機能名>` で開始し、`/hooks` でプロジェクトフックを確認・信頼',
+    nsClaude:        'コーディング開始: /cf:specs <機能名>',
+    nsCodex:         '`$cf-specs <機能名>` で開始し、`/hooks` でプロジェクトフックを確認・信頼',
     nsKeys:          '一部のスキルに API キーが必要です: {skills}\n  <skill>/.env.example を .env にコピーし、値を入力してください',
     nsForce:         '管理ファイルを強制更新: npx @haposoft/cafekit --force-overwrite',
     dryRunOnly:      'ドライラン完了 — ファイルへの変更はありませんでした。\n  変更を適用するには --dry-run なしで再実行してください。',
@@ -247,6 +232,7 @@ const MESSAGES = {
 
     // Platform/language auto-skip when already installed
     installingFor:        'インストール先: {names}',
+    grokCompatNotice:     'Grok CLI はこのインストールを Claude 互換として読み込みます。先にプロジェクトを信頼してください: `grok --trust` または `/hooks-trust`。信頼しないとプロジェクトフックはスキップされます。',
     langKept:             '言語: {lang} (保存済み — スキップ)',
     platformKept:         'プラットフォーム: {names} (保存済み — スキップ)',
 
@@ -299,18 +285,10 @@ const MESSAGES = {
     changeAddressingOption:'Đổi tên khác',
 
     skillDepsConfirm:      'Cài dependencies cho skill ngay? (Python venv, pip, npm, Chromium — mất vài phút)',
+    documentSkillsConfirm: 'Cài thêm nhóm skill tài liệu? (docs, DOCX, PDF, PPTX, XLSX, multimodal)',
+    documentSkillsMetadataRecovery: 'Không đọc được {path}; giữ nguyên skill tài liệu để tránh dọn nhầm dữ liệu.',
     skillsSkipped:         'Đã bỏ qua dependencies skill.\n  Cài sau bằng lệnh: npx @haposoft/cafekit --with-skills-deps',
 
-    // rtk token-saver setup
-    rtkConfirm:            'Cài rtk token-saver? (rút gọn output git/grep/ls/build/test cho các lệnh Bash của Claude Code)',
-    rtkInstalling:         'Đang cài rtk qua {method}',
-    rtkInstalled:          'Đã cài rtk',
-    rtkInstallFailed:      'Không thể cài rtk — bỏ qua (không nghiêm trọng). Cài thủ công sau: https://github.com/rtk-ai/rtk',
-    rtkInitFailed:         'rtk init -g thất bại: {reason} — hook chưa được đăng ký (không nghiêm trọng)',
-    rtkNeedsJq:            'Hook của rtk cần jq để chạy. Cài jq thì hook sẽ tự kích hoạt.',
-    rtkFailed:             'Lỗi cài rtk: {reason} — đã bỏ qua (không nghiêm trọng)',
-    rtkSkipped:            'Đã bỏ qua rtk token-saver.\n  Cài sau bằng lệnh: npx @haposoft/cafekit --with-rtk',
-    rtkSummary:            'rtk token-saver: đã đăng ký hook cho các lệnh Bash của Claude Code',
     venvCreating:          'Đang thiết lập môi trường Python',
     venvReady:             'Môi trường Python đã sẵn sàng',
     venvFailed:            'Không thể tạo môi trường Python — hãy kiểm tra cài đặt Python 3.',
@@ -345,8 +323,8 @@ const MESSAGES = {
     preservedNote:   '{n} tệp bạn đã chỉnh sửa được giữ nguyên.\n  Chạy lại với --force-overwrite để cài đè (bản sao lưu ở .cafekit-backup/).',
 
     nextStepsTitle:  'Bước tiếp theo',
-    nsClaude:        'Bắt đầu code: /hapo:specs <mô-tả-tính-năng>',
-    nsCodex:         'Bắt đầu bằng `$hapo-specs <tính-năng>`; kiểm tra và trust project hooks bằng `/hooks`',
+    nsClaude:        'Bắt đầu code: /cf:specs <mô-tả-tính-năng>',
+    nsCodex:         'Bắt đầu bằng `$cf-specs <tính-năng>`; kiểm tra và trust project hooks bằng `/hooks`',
     nsKeys:          'Một số skill cần API key: {skills}\n  Sao chép <skill>/.env.example → .env rồi điền giá trị',
     nsForce:         'Làm mới file được quản lý: npx @haposoft/cafekit --force-overwrite',
     dryRunOnly:      'Dry-run hoàn tất — không có tệp nào thay đổi.\n  Chạy lại không có --dry-run để áp dụng.',
@@ -366,6 +344,7 @@ const MESSAGES = {
 
     // Platform/language auto-skip when already installed
     installingFor:        'Cài cho: {names}',
+    grokCompatNotice:     'Grok CLI đọc bản cài này qua lớp tương thích Claude. Hãy trust project trước: chạy `grok --trust` hoặc `/hooks-trust`, nếu không project hooks sẽ bị bỏ qua.',
     langKept:             'Ngôn ngữ: {lang} (đã lưu — bỏ qua chọn lại)',
     platformKept:         'Nền tảng: {names} (đã lưu — bỏ qua chọn lại)',
 

package/bin/lib/skill-deps.js

@@ -271,15 +271,15 @@ function collectSkillPackages(skillsDir) {
 
 /** External binaries some skills shell out to — detected, never auto-installed. */
 const SYSTEM_TOOLS = [
-  { cmd: 'ffmpeg', why: 'ai-multimodal (audio/video)', brew: 'brew install ffmpeg', apt: 'sudo apt install ffmpeg', win: 'winget install ffmpeg' },
-  { cmd: 'pdftotext', why: 'pdf (text extraction, poppler)', brew: 'brew install poppler', apt: 'sudo apt install poppler-utils', win: 'choco install poppler' },
-  { cmd: 'rsvg-convert', why: 'generate-graph (PNG export, librsvg)', brew: 'brew install librsvg', apt: 'sudo apt install librsvg2-bin', win: 'choco install rsvg-convert' },
-  { cmd: 'tesseract', why: 'pdf/ai-multimodal (OCR)', brew: 'brew install tesseract', apt: 'sudo apt install tesseract-ocr', win: 'choco install tesseract' }
+  { cmd: 'ffmpeg', skills: ['ai-multimodal'], why: 'ai-multimodal (audio/video)', brew: 'brew install ffmpeg', apt: 'sudo apt install ffmpeg', win: 'winget install ffmpeg' },
+  { cmd: 'pdftotext', skills: ['pdf'], why: 'pdf (text extraction, poppler)', brew: 'brew install poppler', apt: 'sudo apt install poppler-utils', win: 'choco install poppler' },
+  { cmd: 'rsvg-convert', skills: ['generate-graph'], why: 'generate-graph (PNG export, librsvg)', brew: 'brew install librsvg', apt: 'sudo apt install librsvg2-bin', win: 'choco install rsvg-convert' },
+  { cmd: 'tesseract', skills: ['pdf', 'ai-multimodal'], why: 'pdf/ai-multimodal (OCR)', brew: 'brew install tesseract', apt: 'sudo apt install tesseract-ocr', win: 'choco install tesseract' }
 ];
 
 /** Global npm CLIs some skills expect — detected, never auto-installed. */
 const GLOBAL_NPM = [
-  { cmd: 'agent-browser', pkg: 'agent-browser', why: 'agent-browser skill' }
+  { cmd: 'agent-browser', pkg: 'agent-browser', skills: ['agent-browser'], why: 'agent-browser skill' }
 ];
 
 /** Per-OS install hint for a SYSTEM_TOOLS entry. */

package/bin/phases/claude-runtime.js

@@ -276,8 +276,31 @@ function copyRulesDirectory(ctx, platformKey) {
   report(ctx, treeAction(agg), 'rules/ directory');
 }
 
+/**
+ * Copy the output-styles/ tree from the one canonical source. Claude Code discovers
+ * these natively under `.claude/`; Codex CLI has no output-style feature, so its rules
+ * hook reads the selected file and injects it once per session instead.
+ */
+function copyOutputStylesDirectory(ctx, platformKey) {
+
+  const src = path.join(SRC, 'claude/output-styles');
+  const dest = getRuntimeSupportTargetDir(platformKey, 'output-styles');
+  if (!fs.existsSync(src)) {
+    ctx.ui.warn('output-styles/ directory not found');
+    ctx.results.missingDependencies++;
+    return;
+  }
+
+  const transform = getCopyOptions(platformKey, {}).transform;
+  const agg = copyManagedTree({
+    src, dest, platformFolder: PLATFORMS[platformKey].folder, ctx, tracker: ctx.trackers[platformKey], transform
+  });
+  report(ctx, treeAction(agg), 'output-styles/ directory');
+}
+
 module.exports = {
   copyRoutingFile,
+  copyOutputStylesDirectory,
   copyClaudeRuntimeFiles,
   removeObsoleteClaudeRuntimeFiles,
   copyClaudeMdFile,

package/bin/phases/claude-settings.js

@@ -109,6 +109,14 @@ function mergeClaudeSettings(ctx, platformKey) {
     }
   }
 
+  // outputStyle: a reader preference, not CafeKit functionality. Seed it once when
+  // the user has none, and never replace a choice they made — not even under
+  // --force-overwrite, which exists to repair managed files, not to reset taste.
+  if (managedSettings.outputStyle && !existingSettings.outputStyle) {
+    mergedSettings.outputStyle = managedSettings.outputStyle;
+    ctx.ui.detail(`  ✓ ${ctx.dryRun ? '[dry-run] ' : ''}Settings: outputStyle seeded (${managedSettings.outputStyle})`);
+  }
+
   // hooks: merge managed hooks per command (not per entry). An entry is keyed
   // by its matcher; commands missing from the matching entry are appended, so
   // a new command added to an existing matcher entry is not swallowed on