@michaelxwb/code-flow 0.6.2 → 0.6.3

package/src/adapters/opencode/commands/cf-validate.md

@@ -8,7 +8,7 @@ description: 根据变更文件自动匹配并执行验证规则
 
 ## 输入
 
-- `/project:cf-validate` — 基于 git diff 自动获取变更文件
+- `/project:cf-validate` — 自动获取任务基线或 Git 全部变更文件
 - `/project:cf-validate src/Foo.tsx` — 验证指定文件
 - `/project:cf-validate --files=src/a.ts,src/b.ts` — 验证多个文件
 
@@ -19,10 +19,10 @@ description: 根据变更文件自动匹配并执行验证规则
 用 Bash 执行：
 
 ```bash
-git diff --name-only HEAD
+python3 .code-flow/scripts/cf_validation.py --root "$PWD" --scope-only --json
 ```
 
-如果用户指定了文件路径，使用用户指定的文件。如果无变更文件，输出"无变更需要验证"。
+有 active TASK 时使用冻结基线以来的全部任务变更（含已提交文件）；无 active TASK 时包含暂存、未暂存和未跟踪文件。用户指定路径时用 `--files "src/a.py" "src/b.py"` 原样传递；若结果确实为空才输出“无变更需要验证”。
 
 ### 2. 读取验证规则
 
@@ -41,14 +41,13 @@ validators:
 
 ### 3. 匹配并执行验证
 
-对每条验证规则：
-- 将 `trigger` glob 与变更文件列表做匹配
-- 匹配到 → 用 Bash 执行 `command`
-  - 如果 command 包含 `{files}` → 替换为匹配到的文件路径列表，**每个路径用单引号包裹**（如 `'src/foo.ts' 'src/bar.ts'`）
-  - 如果 command 不含 `{files}` → 直接执行原命令（如 `npx tsc --noEmit` 本身就检查全局）
-- 未匹配 → 跳过该规则
+执行统一验证入口：
 
-每条命令使用对应的 `timeout` 值（毫秒）。
+```bash
+python3 .code-flow/scripts/cf_validation.py --root "$PWD" --json
+```
+
+显式范围追加 `--files "src/a.py" "src/b.py"`。程序匹配 trigger、解析 argv 并展开 `{files}`，不拼接 shell 命令；同一运行内相同 argv/cwd/timeout 去重，跨运行不复用。删除文件仍触发全局测试，但不传给文件级编译器。每条 timeout 仍按配置的毫秒值生效，总预算耗尽返回 incomplete/block。
 
 ### 4. 汇总结果
 
@@ -65,13 +64,13 @@ validators:
 
 ## 安全设计
 
-- 对 `{files}` 中的每个文件路径用单引号包裹，防止 shell 注入
-- 仅接受 `git diff` 输出的文件路径或用户显式指定的路径
+- `{files}` 直接展开为 argv 参数；带空格、引号的路径仍是一个参数，不手工拼接引号或执行 shell
+- 范围来自任务基线、Git 状态（包括 untracked）或用户显式指定的路径
 - 用户指定的路径必须位于项目根目录内
 
 ## 异常处理
 
 - validation.yml 不存在 → 尝试检测 package.json scripts 中的 test/lint 命令
 - 命令执行超时 → 输出超时提示，建议增大 timeout 或缩小验证范围
-- 命令不存在 → 提示安装依赖（如 `pip install mypy`）
+- 命令不存在或配置无效 → 返回 block 并提示所缺依赖，不当作验证通过
 - 无变更文件 → 输出"无变更需要验证"

package/src/adapters/opencode/plugins/code-flow/index.js

@@ -1,12 +1,21 @@
-import { spawnSync } from "child_process";
+import { execFile } from "child_process";
 import { join } from "path";
 import { appendFileSync, mkdirSync } from "fs";
 
 const SCRIPT_DIR = ".code-flow/scripts";
 
-// Per-session cache of spec context to inject into system prompt
+// Per-session queued feedback. Single map, append-only: idle/stop-check and
+// post-check feedback accumulate here and are consumed by the next
+// system.transform. Never overwrite — chat.message arriving between idle and
+// transform must not drop queued stop-check feedback.
 const sessionContext = new Map();
 
+export function mergePending(existing, incoming) {
+  if (!existing) return incoming;
+  if (!incoming) return existing;
+  return existing + "\n\n" + incoming;
+}
+
 function debugLog(projectRoot, msg) {
   if (process.env.CF_DEBUG !== "1") return;
   try {
@@ -22,25 +31,39 @@ function pythonPath(projectRoot, script) {
 }
 
 function callHook(projectRoot, script, input, timeout = 5000) {
-  try {
-    const proc = spawnSync("python3", [pythonPath(projectRoot, script)], {
-      cwd: projectRoot,
-      input: JSON.stringify(input),
-      encoding: "utf-8",
-      timeout,
-      maxBuffer: 1024 * 1024,
-    });
-    if (proc.error || proc.status !== 0) {
-      debugLog(projectRoot, `callHook ${script} failed: ${proc.error || proc.stderr}`);
-      return null;
+  // Async child process: never block the plugin event thread. opencode's
+  // idle event cannot interrupt a turn, so stop-check failures queue into
+  // sessionContext for the next system.transform (documented platform gap
+  // vs. blocking Stop hooks).
+  return new Promise((resolve) => {
+    const child = execFile(
+      "python3",
+      [pythonPath(projectRoot, script)],
+      { cwd: projectRoot, timeout, maxBuffer: 1024 * 1024 },
+      (error, stdout, stderr) => {
+        if (error) {
+          debugLog(projectRoot, `callHook ${script} failed: ${error.message || stderr}`);
+          resolve(null);
+          return;
+        }
+        const text = (stdout || "").trim();
+        if (!text) {
+          resolve(null);
+          return;
+        }
+        try {
+          resolve(JSON.parse(text));
+        } catch (e) {
+          debugLog(projectRoot, `callHook ${script} bad JSON: ${e.message}`);
+          resolve(null);
+        }
+      }
+    );
+    if (input !== undefined && child.stdin) {
+      child.stdin.write(JSON.stringify(input));
+      child.stdin.end();
     }
-    const stdout = (proc.stdout || "").trim();
-    if (!stdout) return null;
-    return JSON.parse(stdout);
-  } catch (e) {
-    debugLog(projectRoot, `callHook ${script} exception: ${e.message}`);
-    return null;
-  }
+  });
 }
 
 function extractPromptText(output) {
@@ -65,11 +88,10 @@ export const CodeFlow = async (ctx) => {
         const sid =
           input.event?.properties?.sessionID ||
           input.event?.properties?.info?.id || "";
-        const result = callHook(projectRoot, "cf_stop_hook.py", { session_id: sid }, 35000);
+        const result = await callHook(projectRoot, "cf_stop_hook.py", { session_id: sid }, 35000);
         if (result?.reason) {
           // idle 无法阻断，校验失败排队到下一轮 system prompt
-          const pending = sessionContext.get(sid);
-          sessionContext.set(sid, pending ? pending + "\n\n" + result.reason : result.reason);
+          sessionContext.set(sid, mergePending(sessionContext.get(sid), result.reason));
           debugLog(projectRoot, `stop-check feedback queued`);
         }
       }
@@ -81,7 +103,7 @@ export const CodeFlow = async (ctx) => {
 
       debugLog(projectRoot, `chat.message sid=${input.sessionID} prompt_len=${promptText.length}`);
 
-      const result = callHook(projectRoot, "cf_user_prompt_hook.py", {
+      const result = await callHook(projectRoot, "cf_user_prompt_hook.py", {
         prompt: promptText,
         session_id: input.sessionID,
       });
@@ -89,9 +111,10 @@ export const CodeFlow = async (ctx) => {
       if (result?.hookSpecificOutput?.additionalContext) {
         const ctxLen = result.hookSpecificOutput.additionalContext.length;
         debugLog(projectRoot, `hook matched — context ${ctxLen} chars cached`);
+        // Append, never overwrite: queued stop-check feedback survives.
         sessionContext.set(
           input.sessionID,
-          result.hookSpecificOutput.additionalContext
+          mergePending(sessionContext.get(input.sessionID), result.hookSpecificOutput.additionalContext)
         );
       } else {
         debugLog(projectRoot, `hook returned no context`);
@@ -104,7 +127,7 @@ export const CodeFlow = async (ctx) => {
       const args = output?.args || input?.args || {};
       const filePath = args.filePath || args.file_path || args.path;
       if (!filePath) return;
-      const result = callHook(projectRoot, "cf_post_hook.py", {
+      const result = await callHook(projectRoot, "cf_post_hook.py", {
         tool_name: tool === "write" ? "Write" : "Edit",
         tool_input: { file_path: filePath },
         session_id: input?.sessionID || "",
@@ -113,8 +136,7 @@ export const CodeFlow = async (ctx) => {
       if (ctx) {
         // 反馈排队，下一轮 system.transform 注入（opencode 无法当轮插话）
         const sid = input?.sessionID || "";
-        const pending = sessionContext.get(sid);
-        sessionContext.set(sid, pending ? pending + "\n\n" + ctx : ctx);
+        sessionContext.set(sid, mergePending(sessionContext.get(sid), ctx));
         debugLog(projectRoot, `post-check feedback queued ${ctx.length} chars`);
       }
     },

package/src/cli.js

@@ -10,7 +10,7 @@ const pkg = require('../package.json');
 const specWorkflowMigration = require('./migrate/spec-workflow');
 
 const usage = [
-  'Usage: code-flow init [--force] [--platform=<claude|codex|costrict|opencode>]',
+  'Usage: code-flow init [--force] [--platform=<claude|codex|costrict|opencode>] [--backup-dir=<path>]',
   '       code-flow migrate --spec-workflow <--dry-run|--prepare|--apply --plan <path>|--rollback <id>>',
   '       code-flow -v | --version',
   '       code-flow -h | --help'
@@ -83,6 +83,43 @@ function compareVersions(a, b) {
   return 0;
 }
 
+function modeFor(installed, force) {
+  if (force) return 'force';
+  if (!installed) return 'fresh';
+  if (compareVersions(installed, pkg.version) < 0) return 'upgrade';
+  return 'current';
+}
+
+// Per-platform install records live beside the legacy global .version so one
+// platform's upgrade never masks another platform's staleness.
+function readAdapterVersions(cwd) {
+  const file = path.join(cwd, '.code-flow', '.adapter-versions.json');
+  try {
+    const data = JSON.parse(fs.readFileSync(file, 'utf8'));
+    if (data && typeof data === 'object' && data.adapters && typeof data.adapters === 'object') {
+      return { core: typeof data.core === 'string' ? data.core : null, adapters: data.adapters };
+    }
+  } catch (_) { /* missing or corrupt: fall through */ }
+  return { core: null, adapters: {} };
+}
+
+function writeAdapterVersions(cwd, versions) {
+  const file = path.join(cwd, '.code-flow', '.adapter-versions.json');
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, JSON.stringify({ core: versions.core, adapters: versions.adapters }, null, 2) + '\n');
+}
+
+// Marker dirs proving a platform was installed before per-platform tracking.
+function platformFilesExist(cwd, platform) {
+  const markers = {
+    claude: ['.claude/commands'],
+    codex: ['.agents/skills'],
+    costrict: ['.costrict/commands'],
+    opencode: ['.opencode/commands'],
+  };
+  return (markers[platform] || []).some(rel => fs.existsSync(path.join(cwd, rel)));
+}
+
 // --- Merge functions ---
 
 // Replace fenced code blocks with same-length whitespace so byte offsets in
@@ -342,6 +379,53 @@ function copyFileIfMissing(srcFile, destFile) {
   fs.copyFileSync(srcFile, destFile);
 }
 
+function removeLegacyClaudeSkills(cwd, removed, opts) {
+  // 0.1-era code-flow deployed its own skills (cf-*.md) under .claude/skills/.
+  // Only those historically managed names may be touched; everything else is
+  // user-owned and must survive init. Managed entries are backed up before
+  // removal. The legacy dir belongs to the claude domain: other platforms
+  // must never touch it.
+  const options = opts || {};
+  if (options.platform && options.platform !== 'claude') return;
+  const legacySkills = path.join(cwd, '.claude', 'skills');
+  if (!fs.existsSync(legacySkills)) return;
+
+  let entries;
+  try {
+    entries = fs.readdirSync(legacySkills, { withFileTypes: true });
+  } catch (error) {
+    const code = error && error.code ? ` (${error.code})` : '';
+    process.stderr.write(`Warning: failed to list deprecated .claude/skills/${code}; left untouched. Remove it manually.\n`);
+    return;
+  }
+  const stamp = new Date().toISOString().replace(/[:.]/g, '-');
+  const backupRoot = options.backupDir
+    ? path.resolve(cwd, options.backupDir)
+    : path.join(cwd, '.code-flow', 'backups', stamp);
+  for (const entry of entries) {
+    if (!MANAGED_LEGACY_SKILL_NAMES.has(entry.name)) continue; // user-owned: keep
+    const src = path.join(legacySkills, entry.name);
+    const rel = path.join('.claude', 'skills', entry.name);
+    try {
+      const dest = path.join(backupRoot, rel);
+      fs.mkdirSync(path.dirname(dest), { recursive: true });
+      if (entry.isDirectory()) {
+        copyDirRecursive(src, dest, true);
+      } else if (entry.isFile()) {
+        fs.copyFileSync(src, dest);
+      } else {
+        continue;
+      }
+      fs.rmSync(src, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+      removed.push(`${rel} (backup: ${path.relative(cwd, dest)})`);
+    } catch (error) {
+      const code = error && error.code ? ` (${error.code})` : '';
+      const message = error && error.message ? error.message : String(error);
+      process.stderr.write(`Warning: failed to migrate deprecated ${rel}${code}: ${message}\n`);
+    }
+  }
+}
+
 // Files renamed in 0.x → 1.x that may linger in upgraded projects.
 // Each entry: { path: relative-to-cwd, replacedBy: hint string for the warning }.
 const ORPHAN_FILES = [
@@ -367,35 +451,30 @@ function removeOrphanFiles(cwd, removed) {
   }
 }
 
-function removeLegacyClaudeSkills(cwd, removed) {
-  const legacySkills = path.join(cwd, '.claude', 'skills');
-  if (!fs.existsSync(legacySkills)) return;
-
-  try {
-    fs.rmSync(legacySkills, {
-      recursive: true,
-      force: true,
-      maxRetries: 5,
-      retryDelay: 100
-    });
-    if (!fs.existsSync(legacySkills)) {
-      removed.push('.claude/skills/');
-      return;
-    }
-  } catch (error) {
-    const code = error && error.code ? ` (${error.code})` : '';
-    const message = error && error.message ? error.message : String(error);
-    process.stderr.write(`Warning: failed to remove deprecated .claude/skills/${code}: ${message}\n`);
-    return;
-  }
-
-  process.stderr.write('Warning: failed to remove deprecated .claude/skills/. Remove it manually.\n');
-}
+// Skill entries historically deployed by code-flow 0.x under .claude/skills/.
+// Only these names are managed legacy content; any other entry is user-owned.
+const MANAGED_LEGACY_SKILL_NAMES = new Set([
+  'cf-init.md',
+  'cf-inject.md',
+  'cf-learn.md',
+  'cf-scan.md',
+  'cf-stats.md',
+  'cf-validate.md',
+]);
 
 // --- pyyaml dependency: probe first, fall back through PEP 668 strategies ---
 
-function ensurePyYaml() {
-  const probe = spawnSync('python3', ['-c', 'import yaml'], { stdio: 'ignore' });
+// --- pyyaml dependency: probe first, fall back through PEP 668 strategies ---
+// Bounded waits: each attempt carries its own timeout inside a total budget,
+// with progress on stderr. spawnFn/logFn/nowFn are injectable for tests.
+const PIP_PER_ATTEMPT_MS = 60000;
+const PIP_TOTAL_MS = 120000;
+
+function ensurePyYaml(spawnFn, logFn, nowFn) {
+  const spawn = spawnFn || spawnSync;
+  const log = logFn || ((message) => process.stderr.write(message));
+  const now = nowFn || Date.now;
+  const probe = spawn('python3', ['-c', 'import yaml'], { stdio: 'ignore' });
   if (!probe.error && probe.status === 0) return; // already installed
 
   const attempts = [
@@ -403,11 +482,18 @@ function ensurePyYaml() {
     ['-m', 'pip', 'install', 'pyyaml'],
     ['-m', 'pip', 'install', '--user', '--break-system-packages', 'pyyaml'],
   ];
-  for (const args of attempts) {
-    const result = spawnSync('python3', args, { stdio: 'ignore' });
+  const started = now();
+  for (let i = 0; i < attempts.length; i++) {
+    const remaining = PIP_TOTAL_MS - (now() - started);
+    if (remaining <= 0) break;
+    log(`Installing pyyaml (attempt ${i + 1}/${attempts.length})...\n`);
+    const result = spawn('python3', attempts[i], {
+      stdio: 'ignore',
+      timeout: Math.min(PIP_PER_ATTEMPT_MS, remaining),
+    });
     if (!result.error && result.status === 0) return;
   }
-  process.stderr.write(
+  log(
     'Warning: pyyaml install failed. Run manually:\n' +
     '  python3 -m pip install --user pyyaml\n' +
     '  # or, on PEP 668 systems:\n' +
@@ -468,10 +554,21 @@ function parsePlatform(args) {
   return null;
 }
 
+function parseStringFlag(args, name) {
+  const prefix = `--${name}=`;
+  for (const arg of args) {
+    if (arg.startsWith(prefix)) return arg.slice(prefix.length);
+  }
+  const idx = args.indexOf(`--${name}`);
+  if (idx !== -1) return args[idx + 1] || '';
+  return '';
+}
+
 // --- Main init ---
 
-function runInit(force, platform) {
+function runInit(force, platform, opts) {
   const cwd = process.cwd();
+  const options = opts || {};
   const installedVersion = readInstalledVersion(cwd);
   if (installedVersion && compareVersions(installedVersion, '0.4.2') >= 0 && compareVersions(installedVersion, '0.6.0') < 0) {
     process.stdout.write(`${JSON.stringify({ status: 'migration_required', version: installedVersion, command: 'code-flow migrate --spec-workflow --dry-run' })}\n`);
@@ -483,16 +580,28 @@ function runInit(force, platform) {
   const coreDir = path.join(baseDir, 'core');
   const adaptersDir = path.join(baseDir, 'adapters');
 
-  // Determine mode
-  let mode;
+  // Determine mode: global mode drives core files and messaging; each
+  // platform additionally resolves its own mode from per-platform records so
+  // upgrading one platform can never mask another platform's staleness.
+  // A global upgrade also refreshes the selected platform (previous behavior).
+  const mode = modeFor(installedVersion, force);
+  const adapterVersions = readAdapterVersions(cwd);
+  const adapterPrev = typeof adapterVersions.adapters[platform] === 'string'
+    ? adapterVersions.adapters[platform]
+    : null;
+  let platformMode;
   if (force) {
-    mode = 'force';
-  } else if (!installedVersion) {
-    mode = 'fresh';
-  } else if (compareVersions(installedVersion, pkg.version) < 0) {
-    mode = 'upgrade';
+    platformMode = 'force';
+  } else if (!adapterPrev && !platformFilesExist(cwd, platform)) {
+    platformMode = 'fresh';
+  } else if (
+    (adapterPrev && compareVersions(adapterPrev, pkg.version) < 0) ||
+    (!adapterPrev && platformFilesExist(cwd, platform)) ||
+    mode === 'upgrade'
+  ) {
+    platformMode = 'upgrade';
   } else {
-    mode = 'current';
+    platformMode = 'current';
   }
 
   const created = [];
@@ -502,8 +611,10 @@ function runInit(force, platform) {
   const removed = [];
   const results = { created, updated, merged, skipped };
 
-  // Track + copy helper for directory trees
-  const processDir = (srcDir, destDir, prefix) => {
+  // Track + copy helper for directory trees. dirMode is resolved per area:
+  // core files follow the global mode, platform files follow platformMode.
+  const processDir = (srcDir, destDir, prefix, dirMode) => {
+    const effective = dirMode || mode;
     if (!fs.existsSync(srcDir)) return;
     const files = collectFiles(srcDir, '');
     for (const rel of files) {
@@ -516,10 +627,10 @@ function runInit(force, platform) {
         created.push(label);
         fs.mkdirSync(path.dirname(dest), { recursive: true });
         fs.copyFileSync(src, dest);
-      } else if (mode === 'force') {
+      } else if (effective === 'force') {
         updated.push(label);
         fs.copyFileSync(src, dest);
-      } else if (mode === 'upgrade' && cat === 'tool') {
+      } else if (effective === 'upgrade' && cat === 'tool') {
         updated.push(label);
         fs.copyFileSync(src, dest);
       } else {
@@ -529,7 +640,7 @@ function runInit(force, platform) {
   };
 
   // Process .code-flow/ (core)
-  processDir(path.join(coreDir, 'code-flow'), path.join(cwd, '.code-flow'), '.code-flow');
+  processDir(path.join(coreDir, 'code-flow'), path.join(cwd, '.code-flow'), '.code-flow', mode);
 
   // Process Claude adapter
   if (platform === 'claude') {
@@ -537,7 +648,7 @@ function runInit(force, platform) {
       src: path.join(adaptersDir, 'claude', 'CLAUDE.md'),
       dest: path.join(cwd, 'CLAUDE.md'),
       label: 'CLAUDE.md',
-      mode,
+      mode: platformMode,
       mergeFn: mergeClaudeMd,
       toolOnUpgrade: false,
       results,
@@ -547,14 +658,14 @@ function runInit(force, platform) {
     processDir(
       path.join(adaptersDir, 'claude', 'commands'),
       path.join(cwd, '.claude', 'commands'),
-      '.claude/commands'
+      '.claude/commands', platformMode
     );
 
     installAdapterFile({
       src: path.join(adaptersDir, 'claude', 'settings.local.json'),
       dest: path.join(cwd, '.claude', 'settings.local.json'),
       label: '.claude/settings.local.json',
-      mode,
+      mode: platformMode,
       mergeFn: mergeSettingsJson,
       toolOnUpgrade: false,
       results,
@@ -567,7 +678,7 @@ function runInit(force, platform) {
       src: path.join(adaptersDir, 'costrict', 'CLAUDE.md'),
       dest: path.join(cwd, 'CLAUDE.md'),
       label: 'CLAUDE.md',
-      mode,
+      mode: platformMode,
       mergeFn: mergeClaudeMd,
       toolOnUpgrade: false,
       results,
@@ -577,14 +688,14 @@ function runInit(force, platform) {
     processDir(
       path.join(adaptersDir, 'costrict', 'commands'),
       path.join(cwd, '.costrict', 'commands'),
-      '.costrict/commands'
+      '.costrict/commands', platformMode
     );
 
     installAdapterFile({
       src: path.join(adaptersDir, 'costrict', 'settings.local.json'),
       dest: path.join(cwd, '.costrict', 'settings.local.json'),
       label: '.costrict/settings.local.json',
-      mode,
+      mode: platformMode,
       mergeFn: mergeSettingsJson,
       toolOnUpgrade: false,
       results,
@@ -597,7 +708,7 @@ function runInit(force, platform) {
       src: path.join(adaptersDir, 'codex', 'AGENTS.md'),
       dest: path.join(cwd, 'AGENTS.md'),
       label: 'AGENTS.md',
-      mode,
+      mode: platformMode,
       mergeFn: mergeClaudeMd,
       toolOnUpgrade: false,
       results,
@@ -607,7 +718,7 @@ function runInit(force, platform) {
       src: path.join(adaptersDir, 'codex', 'hooks.json'),
       dest: path.join(cwd, '.codex', 'hooks.json'),
       label: '.codex/hooks.json',
-      mode,
+      mode: platformMode,
       mergeFn: mergeSettingsJson,
       toolOnUpgrade: false,
       results,
@@ -617,7 +728,7 @@ function runInit(force, platform) {
       src: path.join(adaptersDir, 'codex', 'config.toml'),
       dest: path.join(cwd, '.codex', 'config.toml'),
       label: '.codex/config.toml',
-      mode,
+      mode: platformMode,
       mergeFn: mergeCodexConfigToml,
       toolOnUpgrade: false,
       results,
@@ -627,7 +738,7 @@ function runInit(force, platform) {
     processDir(
       path.join(adaptersDir, 'codex', 'skills'),
       path.join(cwd, '.agents', 'skills'),
-      '.agents/skills'
+      '.agents/skills', platformMode
     );
   }
 
@@ -637,7 +748,7 @@ function runInit(force, platform) {
       src: path.join(adaptersDir, 'opencode', 'AGENTS.md'),
       dest: path.join(cwd, 'AGENTS.md'),
       label: 'AGENTS.md',
-      mode,
+      mode: platformMode,
       mergeFn: mergeClaudeMd,
       toolOnUpgrade: false,
       results,
@@ -647,7 +758,7 @@ function runInit(force, platform) {
     processDir(
       path.join(adaptersDir, 'opencode', 'plugins'),
       path.join(cwd, '.opencode', 'plugins'),
-      '.opencode/plugins'
+      '.opencode/plugins', platformMode
     );
 
     // Stamp main package version into the plugin's package.json
@@ -662,14 +773,14 @@ function runInit(force, platform) {
     processDir(
       path.join(adaptersDir, 'opencode', 'commands'),
       path.join(cwd, '.opencode', 'commands'),
-      '.opencode/commands'
+      '.opencode/commands', platformMode
     );
 
     installAdapterFile({
       src: path.join(adaptersDir, 'opencode', 'opencode.json'),
       dest: path.join(cwd, 'opencode.json'),
       label: 'opencode.json',
-      mode,
+      mode: platformMode,
       mergeFn: mergeSettingsJson,
       toolOnUpgrade: false,
       results,
@@ -689,8 +800,8 @@ function runInit(force, platform) {
     }
   }
 
-  // Clean up legacy .claude/skills/
-  removeLegacyClaudeSkills(cwd, removed);
+  // Clean up legacy .claude/skills/ (claude domain only; user-owned kept, managed backed up)
+  removeLegacyClaudeSkills(cwd, removed, { platform, backupDir: options.backupDir || '' });
 
   // Clean up renamed orphan scripts (only meaningful on upgrade)
   if (mode === 'upgrade' || mode === 'force') {
@@ -700,13 +811,16 @@ function runInit(force, platform) {
   // Install pyyaml — probe first, fall back through PEP 668 strategies
   ensurePyYaml();
 
-  // Write version
+  // Write version (legacy global file kept for compatibility) + per-platform records
   writeVersion(cwd, pkg.version);
+  adapterVersions.adapters[platform] = pkg.version;
+  adapterVersions.core = pkg.version;
+  writeAdapterVersions(cwd, adapterVersions);
 
   // Output summary
   if (mode === 'upgrade') {
     process.stdout.write(`\ncode-flow upgraded: ${installedVersion} → ${pkg.version}\n\n`);
-  } else if (mode === 'current' && created.length === 0 && updated.length === 0 && merged.length === 0) {
+  } else if (mode === 'current' && platformMode === 'current' && created.length === 0 && updated.length === 0 && merged.length === 0) {
     process.stdout.write(`code-flow v${pkg.version} already up to date.\n`);
     process.exit(0);
   } else if (mode === 'force') {
@@ -841,7 +955,7 @@ if (args[0] === 'init') {
   if (platform !== 'claude' && platform !== 'codex' && platform !== 'costrict' && platform !== 'opencode') {
     fail(`Error: --platform must be "claude", "codex", "costrict", or "opencode", got "${platform}".`);
   }
-  runInit(force, platform);
+  runInit(force, platform, { backupDir: parseStringFlag(args, 'backup-dir') });
 }
 
 if (args[0] === 'migrate') {