prizmkit 1.1.107 → 1.1.109

package/src/config.js

@@ -48,7 +48,7 @@ import {
 import { detectPlatform } from './detect-platform.js';
 import {
   selectPlatform,
-  selectAiCli,
+  selectAiCliLaunch,
   selectSkillSuite,
   selectRulesPreset,
   confirmTeamMode,
@@ -56,6 +56,7 @@ import {
 } from './prompts.js';
 import { isKnownPlatform, platformLabel, projectMemoryFile, resolvePayloadPlatforms } from './platforms.js';
 import { normalizeRuntime, runtimeLabel } from './runtimes.js';
+import { applyAiCliLaunchToConfig, resolveAiCliLaunchSelection, storedAiCliLaunch } from './ai-cli-launch.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8'));
@@ -367,6 +368,7 @@ export async function runConfig(directory, options = {}) {
     team: oldManifest.options?.team ?? true,
     pipeline: oldManifest.options?.pipeline ?? true,
     aiCli: userConfig.ai_cli || oldManifest.options?.aiCli || '',
+    aiCliLaunch: storedAiCliLaunch(userConfig),
   };
 
   if (options.platform !== undefined && !isKnownPlatform(options.platform)) {
@@ -393,12 +395,18 @@ export async function runConfig(directory, options = {}) {
   if (nonInteractive) {
     // Non-interactive: only change what's explicitly specified via CLI options
     if (!platformManifestNeedsNormalization && !runtimeManifestNeedsNormalization && !runtimeOptionNeedsNormalization && !options.platform && !options.skills && !options.rules && options.runtime === undefined
-        && options.aiCli === undefined && options.team === undefined && options.pipeline === undefined) {
+        && options.aiCli === undefined && options.headlessPromptArg === undefined && options.headlessExtraArgs === undefined && options.team === undefined && options.pipeline === undefined) {
       console.log(chalk.yellow('  ⚠ 非交互式模式下未指定任何变更。'));
-      console.log(chalk.gray('    使用 --platform, --runtime, --skills, --rules, --ai-cli, --team/--no-team, --pipeline/--no-pipeline'));
+      console.log(chalk.gray('    使用 --platform, --runtime, --skills, --rules, --ai-cli, --headless-prompt-arg, --headless-extra-args, --team/--no-team, --pipeline/--no-pipeline'));
       return;
     }
 
+    const aiCliValue = options.aiCli !== undefined ? options.aiCli : currentConfig.aiCli;
+    const aiCliLaunchValue = resolveAiCliLaunchSelection(aiCliValue, {
+      headlessPromptArg: options.headlessPromptArg,
+      headlessExtraArgs: options.headlessExtraArgs,
+      existingLaunch: currentConfig.aiCliLaunch,
+    });
     newConfig = {
       platform: options.platform || currentConfig.platform,
       runtime: optionRuntime || currentConfig.runtime,
@@ -406,7 +414,8 @@ export async function runConfig(directory, options = {}) {
       rules: options.rules || currentConfig.rules,
       team: options.team !== undefined ? options.team : currentConfig.team,
       pipeline: options.pipeline !== undefined ? options.pipeline : currentConfig.pipeline,
-      aiCli: options.aiCli !== undefined ? options.aiCli : currentConfig.aiCli,
+      aiCli: aiCliLaunchValue.aiCli,
+      aiCliLaunch: aiCliLaunchValue.aiCliLaunch,
     };
   } else {
     // Interactive: let user select each setting
@@ -417,7 +426,7 @@ export async function runConfig(directory, options = {}) {
 
       const newRuntime = optionRuntime || currentConfig.runtime;
       const newPlatform = await selectPlatform(currentConfig.platform, detected);
-      const newAiCli = await selectAiCli(currentConfig.aiCli, detected);
+      const aiCliSelection = await selectAiCliLaunch(currentConfig.aiCli, detected, currentConfig.aiCliLaunch);
 
       const metadata = await loadMetadata();
       const newSuite = await selectSkillSuite(currentConfig.suite, metadata);
@@ -432,7 +441,8 @@ export async function runConfig(directory, options = {}) {
         rules: newRules,
         team: newTeam,
         pipeline: newPipeline,
-        aiCli: newAiCli,
+        aiCli: aiCliSelection.aiCli,
+        aiCliLaunch: aiCliSelection.aiCliLaunch,
       };
     } catch (err) {
       if (err.message?.includes('User force closed')) {
@@ -463,6 +473,9 @@ export async function runConfig(directory, options = {}) {
   if (newConfig.aiCli !== currentConfig.aiCli) {
     changes.push(`AI CLI: ${currentConfig.aiCli || '(未设置)'} → ${newConfig.aiCli || '(未设置)'}`);
   }
+  if (JSON.stringify(newConfig.aiCliLaunch || null) !== JSON.stringify(currentConfig.aiCliLaunch || null)) {
+    changes.push('AI CLI 无头启动参数已更新');
+  }
   if (newConfig.suite !== currentConfig.suite) {
     changes.push(`技能套件: ${currentConfig.suite} → ${newConfig.suite}`);
   }
@@ -646,20 +659,19 @@ export async function runConfig(directory, options = {}) {
     await installPrizmkitScripts(projectRoot, false, newConfig.runtime);
   }
 
-  // 5h. Update .prizmkit/config.json (ai_cli)
-  if (newConfig.aiCli !== currentConfig.aiCli) {
+  // 5h. Update .prizmkit/config.json (ai_cli + custom launch profile)
+  if (newConfig.aiCli !== currentConfig.aiCli || JSON.stringify(newConfig.aiCliLaunch || null) !== JSON.stringify(currentConfig.aiCliLaunch || null)) {
     const prizmkitDir = path.join(projectRoot, '.prizmkit');
     await fs.ensureDir(prizmkitDir);
     let existingConfig = {};
     if (await fs.pathExists(configPath)) {
       try { existingConfig = await fs.readJSON(configPath); } catch { /* ignore */ }
     }
-    if (newConfig.aiCli) {
-      existingConfig.ai_cli = newConfig.aiCli;
-    } else {
-      delete existingConfig.ai_cli;
-    }
-    await fs.writeJSON(configPath, existingConfig, { spaces: 2 });
+    const nextConfig = applyAiCliLaunchToConfig(existingConfig, {
+      aiCli: newConfig.aiCli,
+      aiCliLaunch: newConfig.aiCliLaunch,
+    });
+    await fs.writeJSON(configPath, nextConfig, { spaces: 2 });
     console.log(chalk.green(`\n      ✓ .prizmkit/config.json (ai_cli: ${newConfig.aiCli || '(cleared)'})`));
   }
 

package/src/index.js

@@ -5,7 +5,7 @@
  * 然后调用 scaffold.js 执行纯净安装。
  */
 
-import { select, confirm, input } from '@inquirer/prompts';
+import { select, confirm } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
@@ -16,6 +16,8 @@ import { scaffold } from './scaffold.js';
 import { loadMetadata } from './metadata.js';
 import { platformLabel } from './platforms.js';
 import { normalizeRuntime, runtimeLabel } from './runtimes.js';
+import { resolveAiCliLaunchSelection } from './ai-cli-launch.js';
+import { selectAiCliLaunch } from './prompts.js';
 
 export { runUpgrade } from './upgrade.js';
 
@@ -75,6 +77,10 @@ export async function runScaffold(directory, options) {
       openCliAutoDownload: options.openCliAutoDownload !== false,
       rules: options.rules || 'recommended',
       aiCli: options.aiCli || '',
+      aiCliLaunch: resolveAiCliLaunchSelection(options.aiCli || '', {
+        headlessPromptArg: options.headlessPromptArg,
+        headlessExtraArgs: options.headlessExtraArgs,
+      }).aiCliLaunch,
       externalSkills: options.externalSkills ? options.externalSkills.split(',').map(s => s.trim()).filter(Boolean) : [],
       projectRoot,
       dryRun: options.dryRun || false,
@@ -112,49 +118,9 @@ export async function runScaffold(directory, options) {
     });
 
     // 2.5. AI CLI 命令配置（独立于平台，决定实际运行的可执行命令）
-    const cliChoices = [
-      {
-        name: `cbc — CodeBuddy CLI${detected.cbc ? chalk.green(' ✓ 已安装') : chalk.gray(' (未检测到)')}`,
-        value: 'cbc',
-      },
-      {
-        name: `claude — Claude Code${detected.claude ? chalk.green(' ✓ 已安装') : chalk.gray(' (未检测到)')}`,
-        value: 'claude',
-      },
-      {
-        name: `codex — Codex CLI${detected.codex ? chalk.green(' ✓ 已安装') : chalk.gray(' (未检测到)')}`,
-        value: 'codex',
-      },
-      {
-        name: '自定义 — 输入其他命令',
-        value: '__custom__',
-      },
-      {
-        name: '跳过 — 稍后手动配置',
-        value: '',
-      },
-    ];
-
-    // 如果检测到的推荐命令不在固定列表里，默认选"自定义"
-    const knownCliValues = ['cbc', 'claude', 'codex'];
-    const cliDefault = knownCliValues.includes(detected.suggestedCli)
-      ? detected.suggestedCli
-      : (detected.suggestedCli ? '__custom__' : '');
-
-    const cliSelection = await select({
-      message: '选择底层 AI CLI 可执行命令:',
-      choices: cliChoices,
-      default: cliDefault,
-    });
-
-    let aiCli = cliSelection;
-    if (cliSelection === '__custom__') {
-      aiCli = await input({
-        message: '输入自定义 AI CLI 命令:',
-        default: knownCliValues.includes(detected.suggestedCli) ? '' : detected.suggestedCli,
-        validate: (v) => v.trim() ? true : '请输入命令',
-      });
-    }
+    const aiCliSelection = await selectAiCliLaunch('', detected);
+    const aiCli = aiCliSelection.aiCli;
+    const aiCliLaunch = aiCliSelection.aiCliLaunch;
 
     // 2. 选择技能套件
     const skillSuiteChoice = await select({
@@ -275,6 +241,7 @@ export async function runScaffold(directory, options) {
       openCliAutoDownload,
       rules: rulesPreset,
       aiCli: aiCli || '',
+      aiCliLaunch,
       externalSkills: selectedExternalSkills,
       projectRoot,
       dryRun: options.dryRun || false,

package/src/platforms.js

@@ -1,3 +1,5 @@
+import { isBuiltInAiCli } from './ai-cli-launch.js';
+
 export const PLATFORM_IDS = ['codebuddy', 'claude', 'codex'];
 export const PLATFORM_GROUPS = {
   all: PLATFORM_IDS,
@@ -12,11 +14,16 @@ export function expandPlatforms(platform) {
 
 export function platformFromAiCli(aiCli) {
   if (!aiCli || typeof aiCli !== 'string') return null;
+  try {
+    if (!isBuiltInAiCli(aiCli)) return null;
+  } catch {
+    return null;
+  }
   const token = aiCli.trim().split(/\s+/)[0]?.replace(/^['"]|['"]$/g, '');
   const name = token.split(/[\\/]/).pop()?.toLowerCase() || '';
-  if (name.includes('claude')) return 'claude';
-  if (name.includes('codex')) return 'codex';
-  if (name.includes('cbc') || name.includes('codebuddy')) return 'codebuddy';
+  if (name === 'claude') return 'claude';
+  if (name === 'codex') return 'codex';
+  if (name === 'cbc' || name === 'codebuddy') return 'codebuddy';
   return null;
 }
 

package/src/prompts.js

@@ -6,17 +6,36 @@
 import { select, confirm, checkbox, input } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { platformLabel } from './platforms.js';
+import {
+  formatCliArgsForPrompt,
+  isCustomAiCli,
+  resolveAiCliLaunchSelection,
+  storedAiCliLaunch,
+  tokenizeCliArgs,
+} from './ai-cli-launch.js';
 
 let selectPlatformPrompt = select;
+let selectAiCliPrompt = select;
+let inputPrompt = input;
 
 export function __setSelectPlatformPromptForTests(promptFn) {
   selectPlatformPrompt = promptFn;
 }
 
+export function __setAiCliPromptsForTests({ select: selectFn, input: inputFn } = {}) {
+  if (selectFn) selectAiCliPrompt = selectFn;
+  if (inputFn) inputPrompt = inputFn;
+}
+
 export function __resetSelectPlatformPromptForTests() {
   selectPlatformPrompt = select;
 }
 
+export function __resetAiCliPromptsForTests() {
+  selectAiCliPrompt = select;
+  inputPrompt = input;
+}
+
 /**
  * Select target platform (codebuddy, claude, codex, or all).
  * @param {string} currentPlatform - current platform value
@@ -94,7 +113,7 @@ export async function selectAiCli(currentCommand, detected = {}) {
     ? currentCommand
     : (currentCommand ? '__custom__' : (detected.suggestedCli || ''));
 
-  const cliSelection = await select({
+  const cliSelection = await selectAiCliPrompt({
     message: '选择底层 AI CLI 可执行命令:',
     choices: cliChoices,
     default: cliDefault,
@@ -102,7 +121,7 @@ export async function selectAiCli(currentCommand, detected = {}) {
 
   let aiCli = cliSelection;
   if (cliSelection === '__custom__') {
-    aiCli = await input({
+    aiCli = await inputPrompt({
       message: '输入自定义 AI CLI 命令:',
       default: currentCommand || (detected.suggestedCli || ''),
       validate: (v) => v.trim() ? true : '请输入命令',
@@ -112,6 +131,45 @@ export async function selectAiCli(currentCommand, detected = {}) {
   return aiCli;
 }
 
+export async function selectAiCliLaunch(currentCommand, detected = {}, currentLaunch = null) {
+  const aiCli = await selectAiCli(currentCommand, detected);
+  if (!isCustomAiCli(aiCli)) {
+    return resolveAiCliLaunchSelection(aiCli);
+  }
+
+  const existingLaunch = storedAiCliLaunch({ ai_cli_launch: currentLaunch }) || currentLaunch || {};
+  const promptArg = await inputPrompt({
+    message: '无头模式的参数(比如-p)：',
+    default: existingLaunch.prompt_arg || '-p',
+    validate: (v) => {
+      try {
+        resolveAiCliLaunchSelection(aiCli, { headlessPromptArg: v, headlessExtraArgs: existingLaunch.extra_args || [] });
+        return true;
+      } catch (err) {
+        return err.message;
+      }
+    },
+  });
+  const extraArgsDefault = formatCliArgsForPrompt(existingLaunch.extra_args || []);
+  const extraArgs = await inputPrompt({
+    message: '无头模式希望添加的参数:',
+    default: extraArgsDefault,
+    validate: (v) => {
+      try {
+        tokenizeCliArgs(v);
+        return true;
+      } catch (err) {
+        return err.message;
+      }
+    },
+  });
+
+  return resolveAiCliLaunchSelection(aiCli, {
+    headlessPromptArg: promptArg,
+    headlessExtraArgs: extraArgs,
+  });
+}
+
 /**
  * Select skill suite (core, minimal, or recommended:<type>).
  * @param {string} currentSuite - current suite value

package/src/scaffold.js

@@ -29,6 +29,7 @@ import { generateGitignore } from './gitignore-template.js';
 import { buildManifest, writeManifest } from './manifest.js';
 import { defaultCliForPlatform, expandPlatforms, isKnownPlatform, platformLabel, projectMemoryFile, resolvePayloadPlatforms } from './platforms.js';
 import { normalizeRuntime, runtimeLabel } from './runtimes.js';
+import { applyAiCliLaunchToConfig, resolveAiCliLaunchSelection } from './ai-cli-launch.js';
 
 const __scaffoldDirname = dirname(fileURLToPath(import.meta.url));
 const scaffoldPkg = JSON.parse(readFileSync(join(__scaffoldDirname, '..', 'package.json'), 'utf-8'));
@@ -895,11 +896,11 @@ export async function installProjectMemory(platform, projectRoot, dryRun) {
   let templateContent = (await fs.readFile(templatePath, 'utf-8')).trimEnd();
   if (platform === 'codex') {
     templateContent = templateContent.replace(
-      '### Available Commands\nRun `/prizm-kit` to see all available PrizmKit commands.',
+      '### Available Commands\nRun `/prizmkit` to see all available PrizmKit commands.',
       `### Available PrizmKit Skills
 Codex discovers repository skills from \`.agents/skills/\`. When a user or prompt mentions \`/prizmkit-xxx\`, use the matching skill at \`.agents/skills/prizmkit-xxx/SKILL.md\`.
 
-- Start with \`.agents/skills/prizm-kit/SKILL.md\` to see all available PrizmKit skills.
+- Start with \`.agents/skills/prizmkit/SKILL.md\` to see all available PrizmKit skills.
 - Skill assets and references live inside each \`.agents/skills/<skill>/\` directory.
 - PrizmKit behavioral rules live in \`.agents/rules/\`; read the relevant Markdown guidance before commit, documentation, or context-loading work.
 - Native Codex subagents live in \`.codex/agents/*.toml\`; use them when spawning or coordinating subagents.`
@@ -1430,13 +1431,18 @@ export const EXTRAS_REGISTRY = {
  * @param {boolean} config.dryRun - 是否为预览模式
  */
 export async function scaffold(config) {
-  const { platform, skills, team, pipeline, rules, aiCli, externalSkills, playwrightCli, openCli, openCliAutoDownload, projectRoot, dryRun } = config;
+  const { platform, skills, team, pipeline, rules, aiCli, aiCliLaunch, externalSkills, playwrightCli, openCli, openCliAutoDownload, projectRoot, dryRun } = config;
   const runtime = normalizeRuntime(config.runtime);
+  const launchSelection = resolveAiCliLaunchSelection(aiCli || '', {
+    aiCliLaunch,
+    existingLaunch: aiCliLaunch,
+  });
+  const resolvedAiCli = launchSelection.aiCli;
   if (!isKnownPlatform(platform)) {
     throw new Error(`Unknown platform "${platform}". Expected codebuddy, claude, codex, or all.`);
   }
   const platforms = expandPlatforms(platform);
-  const payloadPlatforms = resolvePayloadPlatforms(platform, aiCli);
+  const payloadPlatforms = resolvePayloadPlatforms(platform, resolvedAiCli);
 
   if (dryRun) {
     console.log(chalk.yellow('\n  [DRY RUN] 预览将要安装的内容:\n'));
@@ -1488,21 +1494,27 @@ export async function scaffold(config) {
   await installGitignore(projectRoot, { pipeline }, dryRun);
 
   // 8. 写入 .prizmkit/config.json（如果指定了 aiCli）
-  if (aiCli) {
+  if (resolvedAiCli) {
     const prizmkitDir = path.join(projectRoot, '.prizmkit');
     const configPath = path.join(prizmkitDir, 'config.json');
 
     if (dryRun) {
-      console.log(chalk.gray(`      [dry-run] .prizmkit/config.json (ai_cli: ${aiCli})`));
+      const customText = launchSelection.aiCliLaunch
+        ? `, prompt_arg: ${launchSelection.aiCliLaunch.prompt_arg}`
+        : '';
+      console.log(chalk.gray(`      [dry-run] .prizmkit/config.json (ai_cli: ${resolvedAiCli}${customText})`));
     } else {
       await fs.ensureDir(prizmkitDir);
       let existingConfig = {};
       if (await fs.pathExists(configPath)) {
         existingConfig = await fs.readJSON(configPath);
       }
-      existingConfig.ai_cli = aiCli;
-      await fs.writeJSON(configPath, existingConfig, { spaces: 2 });
-      console.log(chalk.green(`      ✓ .prizmkit/config.json (ai_cli: ${aiCli})`));
+      const nextConfig = applyAiCliLaunchToConfig(existingConfig, launchSelection);
+      await fs.writeJSON(configPath, nextConfig, { spaces: 2 });
+      const customText = launchSelection.aiCliLaunch
+        ? `, prompt_arg: ${launchSelection.aiCliLaunch.prompt_arg}`
+        : '';
+      console.log(chalk.green(`      ✓ .prizmkit/config.json (ai_cli: ${resolvedAiCli}${customText})`));
     }
   }
 
@@ -1516,7 +1528,7 @@ export async function scaffold(config) {
       const skillDef = knownSkills.find(s => s.name === name);
       if (skillDef) {
         try {
-          await installExternalSkill(skillDef, platform, projectRoot, dryRun, aiCli);
+          await installExternalSkill(skillDef, platform, projectRoot, dryRun, resolvedAiCli);
           console.log(chalk.green(`      ✓ ${name} (external)`));
         } catch (e) {
           console.log(chalk.yellow(`      ⚠ ${name} 安装失败，跳过: ${e.message}`));
@@ -1524,7 +1536,7 @@ export async function scaffold(config) {
       }
     }
     if (!dryRun) {
-      await cleanExternalSkillArtifacts(projectRoot, platform, aiCli);
+      await cleanExternalSkillArtifacts(projectRoot, platform, resolvedAiCli);
     }
   }
 
@@ -1582,7 +1594,7 @@ export async function scaffold(config) {
       rules: ruleFileNames,
       pipeline: installedPipelineFiles,
       team,
-      aiCli,
+      aiCli: resolvedAiCli,
       rulesPreset: rulesPresetName,
       extras: activeExtras,
       payloadPlatforms,
@@ -1608,7 +1620,7 @@ export async function scaffold(config) {
       : platforms.includes('codebuddy') ? 'codebuddy'
         : platforms[0];
     const defaultCli = defaultCliForPlatform(mainPlatform);
-    const cli = aiCli || defaultCli;
+    const cli = resolvedAiCli || defaultCli;
 
     console.log('');
     console.log('  下一步:');
@@ -1643,7 +1655,7 @@ export async function scaffold(config) {
     const browserTools = [playwrightCli && 'playwright-cli', openCli && 'opencli'].filter(Boolean);
     console.log(chalk.gray(`    浏览器工具: ${browserTools.length ? '已安装 (' + browserTools.join(' + ') + ')' : '未安装'}`));
     console.log(chalk.gray(`    规则: ${rules || 'recommended'}`));
-    if (aiCli) console.log(chalk.gray(`    AI CLI: ${aiCli}`));
+    if (resolvedAiCli) console.log(chalk.gray(`    AI CLI: ${resolvedAiCli}`));
     console.log('');
   }
 }