prizmkit 1.1.57 → 1.1.60

package/src/upgrade.js

@@ -15,10 +15,8 @@ import { confirm } from '@inquirer/prompts';
 
 import { readManifest, writeManifest, buildManifest, diffManifest } from './manifest.js';
 import {
-  loadMetadata,
   loadRulesMetadata,
   getAgentsDir,
-  getRulesDir,
 } from './metadata.js';
 import {
   installSkills,
@@ -30,9 +28,12 @@ import {
   installGitignore,
   installProjectMemory,
   resolvePipelineFileList,
+  resolveRuleNamesForRuntime,
   resolveSkillList,
   EXTRAS_REGISTRY,
 } from './scaffold.js';
+import { expandPlatforms, platformLabel } from './platforms.js';
+import { normalizeRuntime, runtimeLabel } from './runtimes.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8'));
@@ -71,6 +72,16 @@ export async function removeSkillFiles(platform, projectRoot, skillNames, dryRun
           console.log(chalk.red(`      ✗ removed .codebuddy/skills/${skillName}/`));
         }
       }
+    } else if (platform === 'codex') {
+      const skillDir = path.join(projectRoot, '.agents', 'skills', skillName);
+      if (await fs.pathExists(skillDir)) {
+        if (dryRun) {
+          console.log(chalk.gray(`      [dry-run] remove .agents/skills/${skillName}/`));
+        } else {
+          await fs.remove(skillDir);
+          console.log(chalk.red(`      ✗ removed .agents/skills/${skillName}/`));
+        }
+      }
     }
   }
 }
@@ -82,14 +93,21 @@ export async function removeAgentFiles(platform, projectRoot, agentFileNames, dr
   for (const fileName of agentFileNames) {
     const dir = platform === 'claude'
       ? path.join(projectRoot, '.claude', 'agents')
-      : path.join(projectRoot, '.codebuddy', 'agents');
-    const filePath = path.join(dir, fileName);
-    if (await fs.pathExists(filePath)) {
-      if (dryRun) {
-        console.log(chalk.gray(`      [dry-run] remove ${path.relative(projectRoot, filePath)}`));
-      } else {
-        await fs.remove(filePath);
-        console.log(chalk.red(`      ✗ removed ${path.relative(projectRoot, filePath)}`));
+      : platform === 'codex'
+        ? path.join(projectRoot, '.codex', 'agents')
+        : path.join(projectRoot, '.codebuddy', 'agents');
+    const targetNames = platform === 'codex'
+      ? [...new Set([fileName.replace(/\.md$/, '.toml'), fileName])]
+      : [fileName];
+    for (const targetName of targetNames) {
+      const filePath = path.join(dir, targetName);
+      if (await fs.pathExists(filePath)) {
+        if (dryRun) {
+          console.log(chalk.gray(`      [dry-run] remove ${path.relative(projectRoot, filePath)}`));
+        } else {
+          await fs.remove(filePath);
+          console.log(chalk.red(`      ✗ removed ${path.relative(projectRoot, filePath)}`));
+        }
       }
     }
   }
@@ -100,21 +118,30 @@ export async function removeAgentFiles(platform, projectRoot, agentFileNames, dr
  */
 export async function removeRuleFiles(platform, projectRoot, ruleFileNames, dryRun) {
   for (const fileName of ruleFileNames) {
-    const ext = platform === 'claude' ? '' : '';
+    const baseName = path.basename(fileName);
     const dir = platform === 'claude'
       ? path.join(projectRoot, '.claude', 'rules')
-      : path.join(projectRoot, '.codebuddy', 'rules');
+      : platform === 'codex'
+        ? path.join(projectRoot, '.agents', 'rules')
+        : path.join(projectRoot, '.codebuddy', 'rules');
     // Rules are stored as .md for claude, .mdc for codebuddy
     const targetName = platform === 'codebuddy'
-      ? fileName.replace(/\.md$/, '.mdc')
-      : fileName;
-    const filePath = path.join(dir, targetName);
-    if (await fs.pathExists(filePath)) {
-      if (dryRun) {
-        console.log(chalk.gray(`      [dry-run] remove ${path.relative(projectRoot, filePath)}`));
-      } else {
-        await fs.remove(filePath);
-        console.log(chalk.red(`      ✗ removed ${path.relative(projectRoot, filePath)}`));
+      ? baseName.replace(/\.md$/, '.mdc')
+      : baseName;
+    const filePaths = platform === 'codex'
+      ? [
+          path.join(dir, targetName),
+          path.join(projectRoot, '.codex', 'rules', targetName),
+        ]
+      : [path.join(dir, targetName)];
+    for (const filePath of filePaths) {
+      if (await fs.pathExists(filePath)) {
+        if (dryRun) {
+          console.log(chalk.gray(`      [dry-run] remove ${path.relative(projectRoot, filePath)}`));
+        } else {
+          await fs.remove(filePath);
+          console.log(chalk.red(`      ✗ removed ${path.relative(projectRoot, filePath)}`));
+        }
       }
     }
   }
@@ -149,7 +176,6 @@ export async function runUpgrade(directory, options = {}) {
   const projectRoot = path.resolve(directory || '.');
   const dryRun = Boolean(options.dryRun);
   const nonInteractive = Boolean(options.nonInteractive);
-  const force = Boolean(options.force);
 
   console.log('');
   console.log(chalk.bold('  PrizmKit Upgrade'));
@@ -191,8 +217,8 @@ export async function runUpgrade(directory, options = {}) {
   }
 
   // 3. Resolve new skill list using old manifest's suite + platform (or defaults)
-  const oldManifestPlatform = oldManifest?.platform || 'claude';
   const suite = oldManifest?.suite || 'core';
+  const runtime = normalizeRuntime(oldManifest?.runtime || 'unix');
   const team = oldManifest?.options?.team ?? true;
   const pipeline = oldManifest?.options?.pipeline ?? true;
   const rulesPreset = oldManifest?.options?.rules || 'recommended';
@@ -206,12 +232,24 @@ export async function runUpgrade(directory, options = {}) {
     platform = oldManifest.platform;
   } else {
     // Fallback: detect from filesystem for legacy manifests without platform field
-    const hasClaude = await fs.pathExists(path.join(projectRoot, '.claude', 'commands'))
-                      || await fs.pathExists(path.join(projectRoot, '.claude', 'agents'));
-    const hasCodeBuddy = await fs.pathExists(path.join(projectRoot, '.codebuddy', 'skills'))
-                         || await fs.pathExists(path.join(projectRoot, '.codebuddy', 'agents'));
-
-    if (hasClaude && hasCodeBuddy) platform = 'both';
+    const hasPlatformFiles = async (dir) => {
+      if (!await fs.pathExists(dir)) return false;
+      try {
+        return (await fs.readdir(dir)).length > 0;
+      } catch {
+        return false;
+      }
+    };
+    const hasClaude = await hasPlatformFiles(path.join(projectRoot, '.claude', 'commands'))
+                      || await hasPlatformFiles(path.join(projectRoot, '.claude', 'agents'));
+    const hasCodeBuddy = await hasPlatformFiles(path.join(projectRoot, '.codebuddy', 'skills'))
+                         || await hasPlatformFiles(path.join(projectRoot, '.codebuddy', 'agents'));
+    const hasCodex = await hasPlatformFiles(path.join(projectRoot, '.agents', 'skills'))
+                     || await hasPlatformFiles(path.join(projectRoot, '.codex', 'agents'));
+
+    if (hasClaude && hasCodeBuddy && hasCodex) platform = 'all';
+    else if (hasClaude && hasCodeBuddy) platform = 'both';
+    else if (hasCodex) platform = 'codex';
     else if (hasCodeBuddy) platform = 'codebuddy';
     else if (hasClaude) platform = 'claude';
     else platform = 'claude'; // ultimate fallback
@@ -221,11 +259,10 @@ export async function runUpgrade(directory, options = {}) {
   const agentsDir = getAgentsDir();
   const newAgentFiles = (await fs.readdir(agentsDir)).filter(f => f.endsWith('.md'));
   const rulesMeta = await loadRulesMetadata();
-  const rulesPresetDef = rulesMeta.presets[rulesPreset] || rulesMeta.presets.recommended;
-  const newRuleFiles = (rulesPresetDef?.rules || []).map(name => `${name}.md`);
+  const newRuleFiles = resolveRuleNamesForRuntime(rulesMeta, rulesPreset, runtime).map(name => `${name}.md`);
 
   // Resolve pipeline file list from source (for manifest diff)
-  const newPipelineFiles = pipeline ? resolvePipelineFileList() : [];
+  const newPipelineFiles = pipeline ? resolvePipelineFileList(runtime) : [];
 
   // Resolve extras: merge old manifest extras + default extras for old manifests without the field
   const extrasToInstall = [...new Set([
@@ -238,6 +275,7 @@ export async function runUpgrade(directory, options = {}) {
   const newManifest = buildManifest({
     version: pkg.version,
     platform,
+    runtime,
     suite,
     skills: newSkillList,
     agents: newAgentFiles,
@@ -261,6 +299,7 @@ export async function runUpgrade(directory, options = {}) {
   console.log(chalk.bold('  Upgrade Summary:'));
   console.log(`    Version: ${chalk.gray(oldVersion)} → ${chalk.cyan(pkg.version)}`);
   console.log(`    Platform: ${platform}${!oldManifest?.platform ? chalk.yellow(' (detected from filesystem — no platform in manifest)') : ''}`);
+  console.log(`    Runtime: ${runtimeLabel(runtime)}${!oldManifest?.runtime ? chalk.yellow(' (defaulted)') : ''}`);
   console.log(`    Suite: ${suite}`);
   console.log('');
 
@@ -299,7 +338,7 @@ export async function runUpgrade(directory, options = {}) {
   }
 
   // 7. Execute
-  const platforms = platform === 'both' ? ['codebuddy', 'claude'] : [platform];
+  const platforms = expandPlatforms(platform);
 
   // 7a. Remove orphaned files
   if (diff.skills.removed.length || diff.agents.removed.length || diff.rules.removed.length || diff.pipeline.removed.length) {
@@ -328,12 +367,11 @@ export async function runUpgrade(directory, options = {}) {
   console.log(chalk.bold('\n  Updating files...\n'));
 
   for (const p of platforms) {
-    const platformLabel = p === 'codebuddy' ? 'CodeBuddy' : 'Claude Code';
-    console.log(chalk.bold(`  Installing ${platformLabel} environment...\n`));
+    console.log(chalk.bold(`  Installing ${platformLabel(p)} environment...\n`));
 
     // Skills
     console.log(chalk.blue('    Skills:'));
-    await installSkills(p, newSkillList, projectRoot, dryRun);
+    await installSkills(p, newSkillList, projectRoot, dryRun, runtime);
 
     // Agents
     console.log(chalk.blue('\n    Agents:'));
@@ -341,7 +379,7 @@ export async function runUpgrade(directory, options = {}) {
 
     // Settings/Rules
     console.log(chalk.blue('\n    Settings & Rules:'));
-    await installSettings(p, projectRoot, { pipeline, rules: rulesPreset }, dryRun);
+    await installSettings(p, projectRoot, { pipeline, rules: rulesPreset }, dryRun, runtime);
 
     console.log('');
   }
@@ -349,7 +387,7 @@ export async function runUpgrade(directory, options = {}) {
   // Pipeline (with forceOverwrite)
   if (pipeline) {
     console.log(chalk.blue('    Pipeline:'));
-    await installPipeline(projectRoot, dryRun, { forceOverwrite: true });
+    await installPipeline(projectRoot, dryRun, { forceOverwrite: true, runtime });
     console.log('');
   }
 
@@ -366,7 +404,7 @@ export async function runUpgrade(directory, options = {}) {
 
   // Git hook
   console.log(chalk.blue('    Git Hook:'));
-  await installGitHook(projectRoot, dryRun);
+  await installGitHook(projectRoot, dryRun, runtime);
 
   // .gitignore
   console.log(chalk.blue('    Gitignore:'));
@@ -374,11 +412,13 @@ export async function runUpgrade(directory, options = {}) {
 
   // PrizmKit scripts
   console.log(chalk.blue('    PrizmKit Scripts:'));
-  await installPrizmkitScripts(projectRoot, dryRun);
+  await installPrizmkitScripts(projectRoot, dryRun, runtime);
 
   // 7c. Project memory — smart merge via markers
   console.log(chalk.blue('\n    Project Memory:'));
-  await installProjectMemory(platform, projectRoot, dryRun);
+  for (const p of platforms) {
+    await installProjectMemory(p, projectRoot, dryRun);
+  }
 
   // 8. Write new manifest
   if (!dryRun) {