kenaz 0.3.3 → 0.3.6

package/core/.formation/tools/task-utils.js

@@ -1,344 +0,0 @@
-'use strict';
-/**
- * Task Utilities
- *
- * Task management helpers extracted from headless.js.
- *
- * Exports: FIX_QUEUE_FILE, checkAndDispatchFix, checkTaskDependencies,
- *          recoverStaleTasks, findNextTask
- */
-
-const fs = require('fs');
-const path = require('path');
-const { ROOT } = require('./utils');
-const { readActiveDispatches } = require('./dispatch-registry');
-
-// ─────────────────────────────────────────
-// FIX queue — 閉環自動 re-dispatch
-// ─────────────────────────────────────────
-
-const FIX_QUEUE_FILE = path.join(ROOT, '.formation', '.fix-queue.json');
-
-/**
- * 檢查 post-complete 是否建立了 FIX 任務，若有則自動 re-dispatch。
- * 讀取後立即刪除 queue 檔 — 防止無限遞迴。
- */
-function checkAndDispatchFix({ formation, skill, projectPath }) {
-  try {
-    if (!fs.existsSync(FIX_QUEUE_FILE)) return;
-    const queue = JSON.parse(fs.readFileSync(FIX_QUEUE_FILE, 'utf-8'));
-    fs.unlinkSync(FIX_QUEUE_FILE); // 消費 queue（atomic）
-
-    if (!queue.fixTaskId) return;
-
-    console.log(`\n🔄 Closed-loop: regression FIX detected — auto-dispatching ${queue.fixTaskId}`);
-    console.log(`   Source: ${queue.sourceTaskId} → Fix: ${queue.fixTaskId}`);
-
-    // 使用 headless 自身的 main() 邏輯 re-dispatch
-    const { spawnSync: spawnS } = require('child_process');
-    const headlessPath = path.join(ROOT, '.formation', 'tools', 'headless.js');
-    spawnS('node', [
-      headlessPath,
-      `--formation=${formation}`,
-      `--skill=${skill}`,
-      `--task=${queue.fixTaskId}`,
-      ...(projectPath ? [`--project-path=${projectPath}`] : []),
-    ], {
-      cwd: ROOT,
-      stdio: 'inherit',
-      timeout: 600000, // 10 min max for FIX task
-      windowsHide: true,
-    });
-  } catch (err) {
-    console.log(`   ⚠️  FIX auto-dispatch failed: ${err.message}`);
-  }
-}
-
-// ─────────────────────────────────────────
-// 依賴預檢（與 dispatch.js 共用邏輯）
-// ─────────────────────────────────────────
-
-/**
- * 檢查任務的依賴是否都已完成。
- * @param {string} taskData - JSON 任務文本
- * @param {string|null} projectPath - 子專案路徑
- * @returns {{ blocked: boolean, unmet: string[] }}
- */
-function checkTaskDependencies(taskData, projectPath) {
-  let deps = [];
-  try {
-    const parsed = JSON.parse(taskData);
-    deps = parsed.dependencies || [];
-  } catch {
-    const match = (taskData || '').match(/^dependencies:\s*\n((?:\s+-\s+\S+\n?)+)/m);
-    if (match) {
-      deps = match[1].split('\n').map(l => l.trim().replace(/^-\s*/, '')).filter(Boolean);
-    }
-  }
-  if (deps.length === 0) return { blocked: false, unmet: [] };
-
-  const completedIds = new Set();
-  const blockedIds = new Set();
-  const scanDir = (dir, bucket) => {
-    if (!dir || !fs.existsSync(dir)) return;
-    try {
-      for (const f of fs.readdirSync(dir)) {
-        const m = f.match(/^(TASK_\d+)/); if (m) bucket.add(m[1]);
-      }
-    } catch { /* ignore */ }
-  };
-
-  const projectRoot = projectPath || ROOT;
-  // Scan BOTH task directories — KenazAI core has both .kenaz/tasks/ and .collaboration/tasks/
-  const kenazTasks = path.join(projectRoot, '.kenaz', 'tasks');
-  const collabTasks = path.join(projectRoot, '.collaboration', 'tasks');
-
-  scanDir(path.join(kenazTasks, 'done'), completedIds);
-  scanDir(path.join(kenazTasks, 'archived'), completedIds);
-  scanDir(path.join(collabTasks, 'done'), completedIds);
-  scanDir(path.join(collabTasks, 'archived'), completedIds);
-  scanDir(path.join(kenazTasks, 'blocked'), blockedIds);
-  scanDir(path.join(collabTasks, 'blocked'), blockedIds);
-  scanDir(path.join(projectRoot, 'dev', 'pipeline', 'completed'), completedIds);
-
-  // Only check deps that match TASK_\d+ format; skip descriptive text
-  const blockedDeps = deps.filter(dep => {
-    const taskId = dep.match(/TASK_\d+/)?.[0];
-    if (!taskId) return false;
-    return blockedIds.has(taskId);
-  });
-  const unmet = deps.filter(dep => {
-    const taskId = dep.match(/TASK_\d+/)?.[0];
-    if (!taskId) return false; // not a real task ID — skip
-    return !completedIds.has(taskId);
-  });
-  return { blocked: unmet.length > 0, unmet, blockedDeps };
-}
-
-// ─────────────────────────────────────────
-// Stale active-task recovery
-// ─────────────────────────────────────────
-
-/**
- * 偵測卡在 active/ 但沒有對應 dispatch 的任務，自動 complete。
- * 常見原因：互動對話 context 耗盡、手動中斷忘記收尾。
- *
- * 判定條件（全部滿足才觸發）：
- *   1. 任務檔在 active/ 目錄
- *   2. claimed_at 超過 STALE_THRESHOLD_HOURS 小時
- *   3. 沒有對應的 .active-dispatches.json 記錄
- *   4. git log 有該任務的 commit（代表程式碼已完成）
- */
-const STALE_THRESHOLD_HOURS = 2;
-
-function recoverStaleTasks(projectPath) {
-  const pathMod = require('path');
-  const yamlLib = (() => { try { return require('js-yaml'); } catch { return require('../../.vendor/js-yaml.cjs'); } })();
-
-  const coreRoot = pathMod.resolve(__dirname, '../..');
-  const projectRoot = projectPath || coreRoot;
-
-  // Find active task directories
-  const activeDirs = [];
-  const kenazActive = pathMod.join(projectRoot, '.kenaz', 'tasks', 'active');
-  const collabActive = pathMod.join(projectRoot, '.collaboration', 'tasks', 'active');
-  if (fs.existsSync(kenazActive)) activeDirs.push(kenazActive);
-  if (fs.existsSync(collabActive)) activeDirs.push(collabActive);
-  if (activeDirs.length === 0) return;
-
-  // Currently running dispatches
-  const activeDispatches = readActiveDispatches();
-  const dispatchedTaskIds = new Set(activeDispatches.map(d => d.taskId));
-
-  const now = Date.now();
-  let recovered = 0;
-
-  for (const dir of activeDirs) {
-    const files = fs.readdirSync(dir).filter(f => f.endsWith('.yaml'));
-    for (const file of files) {
-      try {
-        const filePath = pathMod.join(dir, file);
-        const content = fs.readFileSync(filePath, 'utf-8');
-        const data = yamlLib.load(content);
-        if (!data || !data.id) continue;
-
-        // Skip if there's an active dispatch for this task
-        if (dispatchedTaskIds.has(data.id)) continue;
-
-        // Check if claimed_at is stale
-        const claimedAt = data.metadata?.claimed_at || data.assigned_to?.timestamp;
-        if (!claimedAt) continue;
-        const ageHours = (now - new Date(claimedAt).getTime()) / (1000 * 60 * 60);
-        if (ageHours < STALE_THRESHOLD_HOURS) continue;
-
-        // Check if git has a commit for this task (code was completed)
-        try {
-          const { execSync: es } = require('child_process');
-          const gitLog = es(`git log --oneline --all --grep="${data.id}" -1`, {
-            cwd: projectRoot, encoding: 'utf8', timeout: 5000, windowsHide: true,
-          }).trim();
-          if (!gitLog) continue; // No commit found — task may still be in progress manually
-        } catch {
-          continue;
-        }
-
-        // All conditions met — auto-complete
-        console.log(`🔧 Stale task recovery: ${data.id} (active for ${ageHours.toFixed(1)}h, has commit, no dispatch)`);
-        try {
-          const { execSync: es } = require('child_process');
-          es(`node "${pathMod.join(coreRoot, '.collaboration', 'core', 'task-api.js')}" complete ${data.id} --by=system --git-user=auto-recovery --skip-post-complete`, {
-            cwd: coreRoot, encoding: 'utf8', timeout: 30000, stdio: 'pipe', windowsHide: true,
-          });
-          recovered++;
-        } catch (err) {
-          console.warn(`   ⚠️  Recovery failed for ${data.id}: ${err.message}`);
-        }
-      } catch {
-        // skip invalid files
-      }
-    }
-  }
-
-  if (recovered > 0) {
-    console.log(`🔧 Recovered ${recovered} stale task(s)\n`);
-  }
-}
-
-// ─────────────────────────────────────────
-// 自動尋找最高優先任務
-// ─────────────────────────────────────────
-
-/**
- * 從 backlog 中找出最高優先級的任務
- * 支援多專案：優先搜尋 projectPath 的 .kenaz/tasks/backlog/，
- * 再 fallback 到 core 的 .collaboration/tasks/backlog/。
- *
- * @param {string} [projectPath] - 子專案路徑（可選）
- * @returns {{ id: string, priority: number, idNum: number, title: string }|null}
- */
-function findNextTask(projectPath) {
-  const fs = require('fs');
-  const pathMod = require('path');
-  const yamlLib = (() => { try { return require('js-yaml'); } catch { return require('../../.vendor/js-yaml.cjs'); } })();
-
-  const coreRoot = pathMod.resolve(__dirname, '../..');
-
-  // Build candidate backlog directories to scan
-  const backlogDirs = [];
-  if (projectPath) {
-    // All projects with projectPath: scan .kenaz/tasks/ first, then .collaboration/tasks/
-    backlogDirs.push(pathMod.join(projectPath, '.kenaz', 'tasks', 'backlog'));
-    backlogDirs.push(pathMod.join(projectPath, '.collaboration', 'tasks', 'backlog'));
-  } else {
-    // No projectPath: use core's .collaboration/tasks/
-    backlogDirs.push(pathMod.join(coreRoot, '.collaboration', 'tasks', 'backlog'));
-  }
-
-  // Find the first backlog dir that exists and has tasks
-  let backlogDir = null;
-  for (const dir of backlogDirs) {
-    if (fs.existsSync(dir)) {
-      const files = fs.readdirSync(dir).filter(f => f.endsWith('.yaml'));
-      if (files.length > 0) {
-        backlogDir = dir;
-        break;
-      }
-    }
-  }
-  if (!backlogDir) return null;
-
-  const files = fs.readdirSync(backlogDir).filter(f => f.endsWith('.yaml'));
-  if (files.length === 0) return null;
-
-  // Resolve the done dir relative to the same task root
-  const taskRoot = pathMod.resolve(backlogDir, '..');
-  const doneDir = pathMod.join(taskRoot, 'done');
-
-  const priorityOrder = { P0: 0, P1: 1, P2: 2, P3: 3 };
-  const tasks = [];
-
-  for (const file of files) {
-    try {
-      const content = fs.readFileSync(pathMod.join(backlogDir, file), 'utf-8');
-      const data = yamlLib.load(content);
-      if (!data || !data.id) continue;
-
-      // 跳過有未完成依賴的任務（done/ + archived/ 都算完成）
-      const deps = Array.isArray(data.dependencies) ? data.dependencies : (data.dependencies ? [data.dependencies] : []); // TASK_1771
-      if (deps.length > 0) {
-        const archivedDir = pathMod.join(taskRoot, 'archived');
-        const hasPendingDep = deps.some(dep => {
-          const doneFiles = fs.existsSync(doneDir) ? fs.readdirSync(doneDir) : [];
-          const archivedFiles = fs.existsSync(archivedDir) ? fs.readdirSync(archivedDir) : [];
-          return !doneFiles.some(f => f.startsWith(dep)) && !archivedFiles.some(f => f.startsWith(dep));
-        });
-        if (hasPendingDep) continue;
-      }
-
-      const prio = priorityOrder[data.priority] ?? 99;
-      const idNum = parseInt((data.id.match(/\d+/) || [0])[0], 10);
-      tasks.push({ id: data.id, priority: prio, idNum, title: data.title });
-    } catch {
-      // skip invalid files
-    }
-  }
-
-  if (tasks.length === 0) return null;
-
-  // 排序: 優先級 asc, ID asc
-  tasks.sort((a, b) => a.priority - b.priority || a.idNum - b.idNum);
-  return tasks[0];
-}
-
-// ─────────────────────────────────────────
-// Cross-project task verification
-// ─────────────────────────────────────────
-
-/**
- * Verify that resolvedTask YAML exists inside the specified projectPath.
- * Prevents cross-project dispatch errors (2026-03-17 incident: TASK_549 → wrong repo).
- *
- * Extracted from launch() in headless.js (TASK_891).
- *
- * @param {string|null} taskData - JSON task data (guard is skipped when null)
- * @param {string} resolvedTask - Task ID (e.g. TASK_891)
- * @param {string|null} projectPath - Sub-project path to search in
- * @returns {boolean} true = valid (or guard not applicable), false = cross-project error
- */
-function verifyTaskInProject(taskData, resolvedTask, projectPath) {
-  if (!taskData || !projectPath || !resolvedTask || !resolvedTask.startsWith('TASK_')) return true;
-
-  const taskDirs = ['.kenaz/tasks', '.collaboration/tasks'];
-  const statusDirs = ['active', 'backlog', 'done', 'blocked', 'todo', 'archived'];
-  let foundInProject = false;
-  for (const taskDir of taskDirs) {
-    for (const status of statusDirs) {
-      const dirPath = path.join(projectPath, taskDir, status);
-      if (!fs.existsSync(dirPath)) continue;
-      try {
-        const files = fs.readdirSync(dirPath);
-        if (files.some(f => f.startsWith(resolvedTask) && f.endsWith('.yaml'))) {
-          foundInProject = true;
-          break;
-        }
-      } catch { /* dir not readable — skip */ }
-    }
-    if (foundInProject) break;
-  }
-  if (!foundInProject) {
-    console.error(`❌ Task ${resolvedTask} not found in project ${projectPath}`);
-    console.error(`   Searched: ${taskDirs.map(d => path.join(projectPath, d, '*/')).join(', ')}`);
-    console.error(`   This may indicate a cross-project dispatch error. Aborting.`);
-    return false;
-  }
-  return true;
-}
-
-module.exports = {
-  FIX_QUEUE_FILE,
-  checkAndDispatchFix,
-  checkTaskDependencies,
-  recoverStaleTasks,
-  findNextTask,
-  verifyTaskInProject,
-};

package/core/.formation/tools/task2028-headless-worktree.test.js

@@ -1,112 +0,0 @@
-'use strict';
-/**
- * TASK_2028 follow-up — regression test for the REAL root cause of the stray
- * .formation/worktrees/task_task_<id> worktrees observed on TASK_2025/2027.
- *
- * Pinned root cause (not the dangling-branch collision theory from the first
- * TASK_2028 commit, which remains valid hardening but was not the trigger):
- *
- *   post-complete/milestone.js's triggerHuginn(taskId, projectPath) fires
- *   every HUGINN_MILESTONE_INTERVAL (10) completions and spawns
- *   `headless.js --skill=huginn-think --trigger=milestone --task=<taskId>
- *   --skip-post-complete` so the trigger can be attributed back to the task
- *   that crossed the milestone. Because --task is set, headless.js's
- *   `isRealTask` guard was true, so `formations.setupUnitWorktree({taskId})`
- *   ran and created `.formation/worktrees/task_<id>` on branch `task/<id>`
- *   at HEAD -- BEFORE the `skill === 'huginn-think'` special route returned.
- *   That route calls formations.launchHuginnThink() directly and returns
- *   without ever using or cleaning the worktree it was just handed (it never
- *   reaches launchUnit's onDone cleanup), so the worktree/branch pair is
- *   orphaned every 10th completion. .prefrontal/milestone_counter.json
- *   showed count=610 with last_trigger matching the exact minute
- *   task_task_2027 appeared; TASK_2026 (count 609) did not trigger it.
- *
- *   Fix: the huginn-think special route was moved ABOVE the worktree-setup
- *   block in headless.js's launch(), so setupUnitWorktree() is never called
- *   for skill=huginn-think regardless of whether --task is set. `observe`
- *   (Muninn's milestone-adjacent trigger) is unaffected -- it has no
- *   early-return route, so it flows through the normal launchUnit path and
- *   already receives the same onDone worktree cleanup as any other dispatch.
- *
- * This test drives the REAL CLI entry point as a child process (not an
- * in-process require+call — headless.js's model-resolution helper is only
- * defined inside its `if (require.main === module)` CLI block, so an
- * in-process call would hit an unrelated pre-existing gap) with --dry-run,
- * which formations.js's launchHuginnThink checks FIRST and returns before
- * ever spawning a real claude session — matching the task's "no real claude
- * launch" requirement — and --project-path pointed at a disposable temp git
- * repo, so nothing under the real KenazAI repo is touched by the assertion
- * itself (the huginn-think route reads/writes nothing there either way).
- *
- * Run: node --test .formation/tools/task2028-headless-worktree.test.js
- */
-
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const { execSync, execFileSync } = require('child_process');
-
-function git(cmd, cwd) {
-  return execSync(cmd, { cwd, encoding: 'utf8', timeout: 20000, stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true }).trim();
-}
-function gitSafe(cmd, cwd) { try { return git(cmd, cwd); } catch { return null; } }
-
-function makeFixtureRepo() {
-  const tmpRoot = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'tn2028hl-')));
-  const repo = path.join(tmpRoot, 'repo');
-  fs.mkdirSync(repo, { recursive: true });
-  git('git init -q', repo);
-  git('git config user.email "t2028hl@test.local"', repo);
-  git('git config user.name "T2028HL"', repo);
-  git('git config commit.gpgsign false', repo);
-  gitSafe('git checkout -q -b xyz9516', repo);
-  for (const d of ['backlog', 'active', 'done', 'blocked']) {
-    fs.mkdirSync(path.join(repo, '.kenaz', 'tasks', d), { recursive: true });
-  }
-  fs.writeFileSync(path.join(repo, 'README.md'), 'init\n');
-  git('git add -A', repo);
-  git('git commit -q --no-verify -m "init"', repo);
-  return { tmpRoot, repo };
-}
-
-test('TASK_2028 follow-up: headless.js does NOT create a worktree for skill=huginn-think with --task set', async () => {
-  const { tmpRoot, repo } = makeFixtureRepo();
-  try {
-    const headlessPath = path.join(__dirname, 'headless.js');
-    const args = [
-      headlessPath,
-      '--skill=huginn-think',
-      '--trigger=milestone',
-      '--task=TASK_9999', // mirrors milestone.js's triggerHuginn(taskId, projectPath)
-      `--project-path=${repo}`,
-      '--dry-run',
-      '--skip-post-complete',
-    ];
-
-    let stdout = '';
-    let exitCode = 0;
-    try {
-      stdout = execFileSync(process.execPath, args, {
-        encoding: 'utf8', timeout: 60000, windowsHide: true, stdio: ['pipe', 'pipe', 'pipe'],
-      });
-    } catch (e) {
-      stdout = (e.stdout || '').toString();
-      exitCode = typeof e.status === 'number' ? e.status : 1;
-    }
-
-    assert.match(stdout, /HUGINN THINK DRY RUN/,
-      'the huginn-think special route must still run (dry-run banner expected in stdout)');
-    assert.equal(exitCode, 0, `headless.js should exit 0 on a dry-run huginn-think dispatch; stdout:\n${stdout}`);
-
-    assert.equal(fs.existsSync(path.join(repo, '.formation', 'worktrees')), false,
-      'no .formation/worktrees/ directory should exist in the fixture repo after a huginn-think dispatch with --task set — this is exactly what leaked .formation/worktrees/task_task_<id> on every 10th real completion');
-
-    const branches = gitSafe('git branch -a', repo) || '';
-    assert.doesNotMatch(branches, /task\/task_9999/,
-      'no task/<id> branch should have been created for a huginn-think dispatch either');
-  } finally {
-    fs.rmSync(tmpRoot, { recursive: true, force: true });
-  }
-});

package/core/.formation/tools/tests/headless-mcp-args-plumbing.test.js

@@ -1,123 +0,0 @@
-// TASK_1929 (Agent Hub M2) — zero-regression + new-flag proof for the
-// --mcp-config-extra / --allowed-tools plumbing added to headless.js /
-// formations.js / runner.js.
-//
-// Runs the REAL headless.js as a child process (not `require`d in-process —
-// spawnClaude calls `process.exit(0)` under the KENAZ_DEBUG_SPAWN_ARGS
-// diagnostic, which would kill an in-process test runner). The diagnostic
-// itself is the point: it exits BEFORE actually spawning `claude`/`node
-// relay.js`, so this test costs zero API calls / zero codex invocations —
-// see runner.js spawnClaude/spawnBifrost's "TASK_1929: opt-in, zero-cost
-// args dump" comment.
-//
-// Run: node --test .formation/tools/tests/headless-mcp-args-plumbing.test.js
-
-const { test } = require('node:test');
-const assert = require('node:assert/strict');
-const { spawnSync } = require('node:child_process');
-const path = require('node:path');
-const fs = require('node:fs');
-const os = require('node:os');
-
-const ROOT = path.resolve(__dirname, '..', '..', '..');
-const HEADLESS_JS = path.join(ROOT, '.formation', 'tools', 'headless.js');
-
-function runHeadless(extraArgs, scratchProject) {
-  const args = [
-    HEADLESS_JS,
-    '--formation=unit',
-    '--skill=do',
-    `--task=zero-regression check ${Math.random()}`,
-    `--project-path=${scratchProject}`,
-    '--skip-post-complete',
-    ...extraArgs,
-  ];
-  const result = spawnSync(process.execPath, args, {
-    cwd: ROOT,
-    // KENAZ_MAX_DISPATCHES: each KENAZ_DEBUG_SPAWN_ARGS run pre-registers a
-    // pid=null dispatch entry (headless.js's own "early dispatch
-    // registration") and then exits via process.exit(0) BEFORE ever
-    // spawning claude/reaching the normal unregister path — dispatch-
-    // registry.js's pruneZombieDispatches() only treats a pid=null entry as
-    // prunable once it's >30s old (PENDING_STALE_MS), so three of these
-    // tests run back-to-back (well under 30s apart) exhaust the default
-    // MAX_CONCURRENT_DISPATCHES=3 slot pool and waitForDispatchSlot() blocks
-    // for real (observed: hangs to the 30s spawnSync timeout below). This
-    // env var is the existing, documented escape hatch (dispatch-
-    // registry.js reads it) — raising it is a test-harness fix for an
-    // artifact of the debug diagnostic never registering a real PID, not a
-    // product bug.
-    env: { ...process.env, KENAZ_DEBUG_SPAWN_ARGS: '1', KENAZ_MAX_DISPATCHES: '1000' },
-    encoding: 'utf8',
-    timeout: 30_000,
-  });
-  assert.equal(result.status, 0, `headless.js exited non-zero: stderr=${result.stderr}`);
-  const jsonLine = result.stdout.trim().split('\n').filter(Boolean).pop();
-  let parsed;
-  try {
-    parsed = JSON.parse(jsonLine);
-  } catch (e) {
-    throw new Error(`last stdout line was not the args-dump JSON: ${jsonLine}\nfull stdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
-  }
-  return parsed;
-}
-
-function makeScratchProject() {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'kenaz-task1929-'));
-  return dir;
-}
-
-test('baseline (no new flags): args carry no --mcp-config-extra path and no --allowedTools override', (t) => {
-  const scratch = makeScratchProject();
-  t.after(() => fs.rmSync(scratch, { recursive: true, force: true }));
-
-  const { cmd, args } = runHeadless([], scratch);
-  assert.ok(cmd.toLowerCase().includes('claude'), 'baseline (no --dispatch-model/--bifrost-adapter) must resolve to the native claude CLI');
-
-  // The exact default allowedTools list (unchanged shape) — this is the
-  // BEFORE-this-task behavior, still produced when no override is passed.
-  const idx = args.indexOf('--allowedTools');
-  assert.ok(idx !== -1);
-  assert.ok(args[idx + 1].startsWith('Bash,Read,Edit,Write,Glob,Grep,ToolSearch,mcp__kenaz-dashboard__kenaz_lsp_callers'));
-
-  const mcpIdx = args.indexOf('--mcp-config');
-  assert.ok(mcpIdx !== -1);
-  assert.ok(args[mcpIdx + 1].endsWith('.mcp.json'));
-  // Exactly one path follows --mcp-config (the core .mcp.json) — no extra
-  // path appended when --mcp-config-extra was never passed.
-  const afterMcpConfig = args.slice(mcpIdx + 1);
-  assert.equal(afterMcpConfig.length, 1, `expected exactly one --mcp-config value, got: ${JSON.stringify(afterMcpConfig)}`);
-});
-
-test('with --mcp-config-extra + --allowed-tools: both are threaded through additively', (t) => {
-  const scratch = makeScratchProject();
-  t.after(() => fs.rmSync(scratch, { recursive: true, force: true }));
-
-  const fakeMcpConfigPath = path.join(scratch, 'fake-mcp-config.json');
-  fs.writeFileSync(fakeMcpConfigPath, JSON.stringify({ mcpServers: {} }));
-
-  const { args } = runHeadless(
-    ['--mcp-config-extra', fakeMcpConfigPath, '--allowed-tools', 'Read,Glob,Grep,mcp__flowpix'],
-    scratch
-  );
-
-  const allowedIdx = args.indexOf('--allowedTools');
-  assert.equal(args[allowedIdx + 1], 'Read,Glob,Grep,mcp__flowpix', 'allowedTools override must replace the default list verbatim');
-
-  const mcpIdx = args.indexOf('--mcp-config');
-  assert.ok(mcpIdx !== -1);
-  const afterMcpConfig = args.slice(mcpIdx + 1);
-  assert.equal(afterMcpConfig.length, 2, `expected core .mcp.json + the extra path, got: ${JSON.stringify(afterMcpConfig)}`);
-  assert.ok(afterMcpConfig[0].endsWith('.mcp.json'));
-  assert.equal(afterMcpConfig[1], fakeMcpConfigPath);
-});
-
-test('--dispatch-model routes through --model unchanged', (t) => {
-  const scratch = makeScratchProject();
-  t.after(() => fs.rmSync(scratch, { recursive: true, force: true }));
-
-  const { args } = runHeadless(['--dispatch-model', 'claude-sonnet-5'], scratch);
-  const idx = args.indexOf('--model');
-  assert.ok(idx !== -1);
-  assert.equal(args[idx + 1], 'claude-sonnet-5');
-});