karajan-code 4.70.3 → 5.0.0

package/src/mcp/handlers/hu-handlers.js

@@ -1,86 +1,75 @@
 /**
- * HU, Skills, and Suggest handler logic.
+ * HU and Suggest handler logic (skills moved to `atril mcp`, ADR 0021).
  * Extracted from server-handlers.js for maintainability.
  */
 
 import { handleSuggestion } from "../suggest-handler.js";
+import { runKjCommand } from "../run-kj.js";
 import {
   resolveProjectDir,
   failPayload,
 } from "../shared-helpers.js";
 
+export const HU_STATUSES = ["pending", "running", "done", "failed", "skipped"];
+
+/**
+ * KJC-BUG-0452 (#2815): kj_hu used the old kj run store, so an agent saw an empty
+ * board while `kj hu list` showed every card. It runs the CLI's own `kj hu` in a
+ * subprocess: the same board (local, shared or a lane's), and stdout, which is
+ * this server's protocol channel, stays clean.
+ */
+async function kjHu(projectDir, args) {
+  const res = await runKjCommand({ command: "hu", commandArgs: [...args, "--json"], options: { projectDir } });
+  if (!res.ok) return { error: `kj hu ${args[0]} failed: ${res.errorSummary || res.stderr || "no output"}` };
+  const line = String(res.stdout || "").trim().split("\n").reverse().find((l) => /^[[{]/.test(l.trim()));
+  try { return { data: JSON.parse(line) }; } catch { return { error: `kj hu ${args[0]} answered no JSON: ${String(res.stdout || "").slice(0, 200)}` }; }
+}
+
+const notOnBoard = (id) => `HU ${id} is not on the board — kj_hu list shows its cards`;
+
+async function createHu(projectDir, a) {
+  if (!a.title) return failPayload("Missing required field: title (required for create)");
+  const args = ["add", a.title, ...(a.acceptanceCriteria ? ["--ac", a.acceptanceCriteria] : []), ...(a.ref ? ["--ref", a.ref] : [])];
+  const added = await kjHu(projectDir, args);
+  if (added.error) return failPayload(added.error);
+  if (!a.status || a.status === "pending") return { ok: true, hu: added.data };
+  return moveHu(projectDir, added.data.short_id || added.data.id, a.status);
+}
+
+async function moveHu(projectDir, huId, status) {
+  if (!HU_STATUSES.includes(status)) return failPayload(`Unknown status "${status}": use ${HU_STATUSES.join(", ")}`);
+  const moved = await kjHu(projectDir, ["move", huId, status]);
+  return moved.error ? failPayload(moved.error) : { ok: true, hu: moved.data };
+}
+
 export async function handleHu(a, server) {
   const action = a.action;
   if (!action) return failPayload("Missing required field: action");
-
   const projectDir = await resolveProjectDir(server, a.projectDir);
-  const { createManualHu, listHus, getHu, updateHuStatus } = await import("../../hu/store.js");
 
   switch (action) {
-    case "create": {
-      if (!a.title) return failPayload("Missing required field: title (required for create)");
-      const hu = await createManualHu(projectDir, {
-        title: a.title,
-        description: a.description,
-        status: a.status,
-        acceptanceCriteria: a.acceptanceCriteria
-      });
-      return { ok: true, hu };
-    }
+    case "create":
+      return createHu(projectDir, a);
     case "list": {
-      const hus = await listHus(projectDir);
-      return { ok: true, hus };
+      const listed = await kjHu(projectDir, ["list"]);
+      return listed.error ? failPayload(listed.error) : { ok: true, hus: listed.data };
     }
     case "get": {
       if (!a.huId) return failPayload("Missing required field: huId (required for get)");
-      const hu = await getHu(projectDir, a.huId);
-      return { ok: true, hu };
+      const listed = await kjHu(projectDir, ["list"]);
+      if (listed.error) return failPayload(listed.error);
+      const hu = listed.data.find((h) => h.id === a.huId || h.short_id === a.huId);
+      return hu ? { ok: true, hu } : failPayload(notOnBoard(a.huId));
     }
-    case "update": {
+    case "update":
       if (!a.huId) return failPayload("Missing required field: huId (required for update)");
       if (!a.status) return failPayload("Missing required field: status (required for update)");
-      const hu = await updateHuStatus(projectDir, a.huId, a.status);
-      return { ok: true, hu };
-    }
+      return moveHu(projectDir, a.huId, a.status);
     default:
       return failPayload(`Unknown hu action: ${action}`);
   }
 }
 
-export async function handleSkills(a) {
-  const action = a.action;
-  if (!action) return failPayload("Missing required field: action");
-
-  const { isOpenSkillsAvailable, installSkill, removeSkill, listSkills, readSkill } =
-    await import("../../skills/openskills-client.js");
-
-  const opts = { projectDir: a.projectDir || null };
-
-  switch (action) {
-    case "install": {
-      if (!a.source) return failPayload("Missing required field: source (required for install)");
-      const available = await isOpenSkillsAvailable();
-      if (!available) {
-        return failPayload("OpenSkills CLI is not available. Install it with: npm install -g openskills");
-      }
-      return installSkill(a.source, { ...opts, global: a.global || false });
-    }
-    case "remove": {
-      if (!a.name) return failPayload("Missing required field: name (required for remove)");
-      return removeSkill(a.name, opts);
-    }
-    case "list": {
-      return listSkills(opts);
-    }
-    case "read": {
-      if (!a.name) return failPayload("Missing required field: name (required for read)");
-      return readSkill(a.name, opts);
-    }
-    default:
-      return failPayload(`Unknown skills action: ${action}`);
-  }
-}
-
 export async function handleSuggest(a) {
   if (!a.suggestion) {
     return failPayload("Missing required field: suggestion");

package/src/mcp/handlers/management-handlers.js

@@ -1,11 +1,10 @@
 /**
- * Management handler logic (init, doctor, config, scan, report, roles, agents, preflight, status, board).
- * Extracted from server-handlers.js for maintainability.
+ * Management handler logic (init, doctor, config, scan, report, roles, agents, preflight, board, clean).
+ * KJC-TSK-1318: status and undo left with the kj run pipeline.
  */
 
 import { runKjCommand } from "../run-kj.js";
 import { loadConfig } from "../../config.js";
-import { readRunLog } from "../../utils/run-log.js";
 import { ackPreflight, getSessionOverrides } from "../preflight.js";
 import { ensureBootstrap } from "../../bootstrap.js";
 import {
@@ -14,8 +13,6 @@ import {
   responseText,
   buildConfig,
 } from "../shared-helpers.js";
-import { buildDashboardJson } from "../../utils/status-dashboard.js";
-import { loadMostRecentSession } from "../../session/store.js";
 import { escapeRegExp } from "../../utils/escape-regexp.js";
 
 const AGENT_ROLES = new Set(["coder", "reviewer", "tester", "security", "solomon"]);
@@ -29,31 +26,6 @@ async function runBootstrapGate(server, a) {
   await ensureBootstrap(projectDir, config);
 }
 
-export async function handleStatus(a, server) {
-  const maxLines = a.lines || 50;
-  const projectDir = await resolveProjectDir(server, a.projectDir);
-  const logResult = readRunLog(projectDir, maxLines);
-
-  // Enrich with dashboard data when possible
-  try {
-    const session = await loadMostRecentSession();
-    const stories = [];
-    if (session) {
-      try {
-        const { loadHuBatch } = await import("../../hu/store.js");
-        const batch = await loadHuBatch(session.id);
-        if (batch?.stories) stories.push(...batch.stories);
-      } catch { /* no HU batch for this session */ }
-    }
-
-    const dashboard = buildDashboardJson(session, logResult.lines || [], { stories });
-    return { ...logResult, dashboard };
-  } catch {
-    // Fallback: return raw log without dashboard
-    return logResult;
-  }
-}
-
 export async function handleAgents(a) {
   const action = a.action || "list";
   if (action === "set") {
@@ -190,18 +162,6 @@ export async function handleBoard(a) {
   }
 }
 
-export async function handleUndo(a, server) {
-  const projectDir = await resolveProjectDir(server, a.projectDir);
-  const origCwd = process.cwd();
-  try {
-    process.chdir(projectDir);
-    const { undoCommand } = await import("../../commands/undo.js");
-    return undoCommand({ hard: !!a.hard });
-  } finally {
-    process.chdir(origCwd);
-  }
-}
-
 /**
  * Garbage-collect stale Karajan state. Routed here (not through the
  * generic `runKjCommand`) because the user needs a structured result

package/src/mcp/server-handlers.js

@@ -20,32 +20,35 @@ export {
 } from "./shared-helpers.js";
 
 // ── Sub-module re-exports ────────────────────────────────────────────
-export { handleRunDirect, handleResumeDirect, validateResumeAnswer, handleRun, handleResume } from "./handlers/run-handler.js";
-export { handlePlanDirect, handleCodeDirect, handleReviewDirect, handleDiscoverDirect, handleTriageDirect, handleResearcherDirect, handleAuditDirect, handleArchitectDirect, handleCode, handleReview, handlePlan, handleDiscover, handleTriage, handleResearcher, handleArchitect, handleAudit } from "./handlers/direct-handlers.js";
-export { handleStatus, handleAgents, handlePreflight, handleRoles, handleReport, handleInit, handleDoctor, handleConfig, handleScan, handleBoard, handleUndo, handleClean, buildPreflightRequiredResponse } from "./handlers/management-handlers.js";
-export { handleHu, handleSkills, handleSuggest } from "./handlers/hu-handlers.js";
+export { handleCodeDirect, handleDiscoverDirect, handleAuditDirect, handleCode, handleDiscover, handleAudit } from "./handlers/direct-handlers.js";
+export { handleAgents, handlePreflight, handleRoles, handleReport, handleInit, handleDoctor, handleConfig, handleScan, handleBoard, handleClean, buildPreflightRequiredResponse } from "./handlers/management-handlers.js";
+export { handleHu, handleSuggest } from "./handlers/hu-handlers.js";
 
 // ── Handler dispatch ─────────────────────────────────────────────────
 
 import { asObject, failPayload } from "./shared-helpers.js";
-import { handleRun, handleResume } from "./handlers/run-handler.js";
+import { handleCode, handleDiscover, handleAudit } from "./handlers/direct-handlers.js";
 import {
-  handleCode, handleReview, handlePlan, handleDiscover,
-  handleTriage, handleResearcher, handleArchitect, handleAudit
-} from "./handlers/direct-handlers.js";
-import {
-  handleStatus, handleAgents, handlePreflight, handleRoles,
+  handleAgents, handlePreflight, handleRoles,
   handleReport, handleInit, handleDoctor, handleConfig,
-  handleScan, handleBoard, handleUndo, handleClean
+  handleScan, handleBoard, handleClean
 } from "./handlers/management-handlers.js";
-import { handleHu, handleSkills, handleSuggest } from "./handlers/hu-handlers.js";
+import { retiredMessage } from "../cli/retired-commands.js";
+
+// KJC-TSK-1318: the tools of the kj run pipeline, retired in 5.0 with their
+// commands; a call answers with the same notice and starts nothing.
+const RETIRED_TOOLS = {
+  kj_run: "run", kj_resume: "resume", kj_plan: "plan generate", kj_status: "status", kj_undo: "undo",
+  kj_triage: "triage", kj_researcher: "researcher", kj_architect: "architect", kj_review: "review",
+};
+import { handleHu, handleSuggest } from "./handlers/hu-handlers.js";
 import { handleRagQuery, handleRagIndex } from "./handlers/rag-handler.js";
 import { withKarajanHome } from "../utils/paths.js";
 
 export async function handleToolCall(name, args, server, extra) {
+  if (Object.hasOwn(RETIRED_TOOLS, name)) return failPayload(retiredMessage(RETIRED_TOOLS[name]));
   const a = asObject(args);
   const handler = {
-    kj_status:      (a, server) => handleStatus(a, server),
     kj_init:        (a) => handleInit(a),
     kj_doctor:      (a) => handleDoctor(a),
     kj_agents:      (a) => handleAgents(a),
@@ -54,21 +57,12 @@ export async function handleToolCall(name, args, server, extra) {
     kj_scan:        (a, server) => handleScan(a, server),
     kj_roles:       (a) => handleRoles(a),
     kj_report:      (a) => handleReport(a),
-    kj_resume:      (a, server, extra) => handleResume(a, server, extra),
-    kj_run:         (a, server, extra) => handleRun(a, server, extra),
     kj_code:        (a, server, extra) => handleCode(a, server, extra),
-    kj_review:      (a, server, extra) => handleReview(a, server, extra),
-    kj_plan:        (a, server, extra) => handlePlan(a, server, extra),
     kj_discover:    (a, server, extra) => handleDiscover(a, server, extra),
-    kj_triage:      (a, server, extra) => handleTriage(a, server, extra),
-    kj_researcher:  (a, server, extra) => handleResearcher(a, server, extra),
-    kj_architect:   (a, server, extra) => handleArchitect(a, server, extra),
     kj_audit:       (a, server, extra) => handleAudit(a, server, extra),
     kj_board:       (a) => handleBoard(a),
     kj_hu:          (a, server) => handleHu(a, server),
     kj_suggest:     (a) => handleSuggest(a),
-    kj_skills:      (a) => handleSkills(a),
-    kj_undo:        (a, server) => handleUndo(a, server),
     kj_clean:       (a) => handleClean(a),
     kj_rag_query:   (a, server) => handleRagQuery(a, server),
     kj_rag_index:   (a, server) => handleRagIndex(a, server),

package/src/mcp/tools.js

@@ -48,91 +48,6 @@ export const tools = [
       }
     }
   },
-  {
-    name: "kj_run",
-    description:
-      "Run the full Karajan pipeline. IMPORTANT: Pass the user's task description exactly as they wrote it. Do NOT group, split, reorder, or modify tasks yourself. Karajan handles decomposition, role activation, iteration, and quality gates internally. Do NOT override pipeline parameters (enableHuReviewer, mode, methodology) unless the user explicitly requested it. If you have observations about the task, use kj_suggest instead.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        task: { type: "string", description: "Task description for the coder (can include a Planning Game card ID like KJC-TSK-0042). Either `task` or `taskFile` is required." },
-        taskFile: { type: "string", description: "Alternative to `task`: path to a .md (or any text file) whose contents become the task description. Relative paths resolve against projectDir." },
-        plan: { type: "string", description: "Plan ID from kj_plan. Loads persisted plan context and skips researcher/architect/planner stages." },
-        projectDir: { type: "string", description: "Absolute path to the project directory. Required when KJ MCP server runs from a different directory than the target project." },
-        pgTask: { type: "string", description: "Planning Game card ID (e.g., KJC-TSK-0042). If provided, fetches full card details as task context and updates card status on completion." },
-        pgProject: { type: "string", description: "Planning Game project ID (e.g., 'Karajan Code'). Required when pgTask is used." },
-        planner: { type: "string" },
-        coder: { type: "string" },
-        reviewer: { type: "string" },
-        refactorer: { type: "string" },
-        plannerModel: { type: "string" },
-        coderModel: { type: "string" },
-        reviewerModel: { type: "string" },
-        refactorerModel: { type: "string" },
-        enablePlanner: { type: "boolean" },
-        enableReviewer: { type: "boolean" },
-        enableRefactorer: { type: "boolean" },
-        enableResearcher: { type: "boolean" },
-        enableTester: { type: "boolean" },
-        enableSecurity: { type: "boolean" },
-        enableImpeccable: { type: "boolean" },
-        enablePerf: { type: "boolean" },
-        enableTriage: { type: "boolean" },
-        enableDiscover: { type: "boolean" },
-        enableArchitect: { type: "boolean" },
-        enableHuReviewer: { type: "boolean" },
-        architectModel: { type: "string" },
-        huFile: { type: "string", description: "Path to YAML file with HU stories to certify before coding" },
-        enableSerena: { type: "boolean" },
-        enableCi: { type: "boolean", description: "Enable Karajan CI (early PR + dispatch comments/reviews)" },
-        reviewerFallback: { type: "string" },
-        reviewerRetries: { type: "number" },
-        mode: { type: "string" },
-        maxIterations: { type: "number" },
-        maxIterationMinutes: { type: "number" },
-        maxTotalMinutes: { type: "number" },
-        baseBranch: { type: "string" },
-        baseRef: { type: "string" },
-        methodology: { type: "string", enum: ["tdd", "standard"] },
-        autoCommit: { type: "boolean" },
-        autoPush: { type: "boolean" },
-        autoPr: { type: "boolean" },
-        autoRebase: { type: "boolean" },
-        branchPrefix: { type: "string" },
-        autoSimplify: { type: "boolean", description: "Auto-simplify pipeline for simple tasks (level trivial/simple). Disable with false to force full pipeline." },
-        smartModels: { type: "boolean", description: "Enable/disable smart model selection based on triage complexity" },
-        checkpointInterval: { type: "number", description: "Minutes between interactive checkpoints (default: 5). Set 0 to disable." },
-        taskType: { type: "string", enum: ["sw", "infra", "doc", "add-tests", "refactor"], description: "Explicit task type for policy resolution. Overrides triage classification." },
-        quiet: { type: "boolean", description: "Suppress raw agent output lines, show only stage status (default: true). Set false for verbose output." },
-        noSonar: { type: "boolean" },
-        design: { type: "boolean", description: "Activate design refactoring mode. Impeccable role applies design changes instead of just auditing." },
-        enableSonarcloud: { type: "boolean", description: "Enable SonarCloud scan (complementary to SonarQube)" },
-        kjHome: { type: "string" },
-        sonarToken: { type: "string" },
-        timeoutMs: { type: "number" },
-        domain: { type: "string", description: "Domain knowledge: inline text describing the project domain, or absolute path to a .md file. Auto-saved to .karajan/domains/ for the curator." },
-        brain: { type: "string", enum: ["on", "off"], description: "Brain decisor: on|off. Controls whether intent-driven routing overrides pipeline flags." },
-        forceRole: { type: "array", items: { type: "string" }, description: "Force roles ON regardless of triage (e.g. [\"security\"])" },
-        skipRole: { type: "array", items: { type: "string" }, description: "Force roles OFF regardless of triage (e.g. [\"tester\"])" },
-        specReviewMode: { type: "string", enum: ["auto", "skip"], description: "Pre-pipeline spec-reviewer behaviour (KJC-PCS-0048). `auto` (default): the role runs, findings stream to the client via progress events; the pipeline continues regardless. `skip`: bypass the reviewer entirely (mirrors the --skip-spec-review CLI flag)." }
-      }
-    }
-  },
-  {
-    name: "kj_resume",
-    description:
-      "Resume a paused, stopped, or failed session by ID. For paused sessions, provide an answer. For stopped/failed sessions, re-runs the flow from scratch. Sends real-time progress notifications via MCP logging.",
-    inputSchema: {
-      type: "object",
-      required: ["sessionId"],
-      properties: {
-        sessionId: { type: "string", description: "Session ID to resume" },
-        answer: { type: "string", description: "Answer to the question that caused the pause" },
-        projectDir: { type: "string", description: "Absolute path to the project directory" },
-        kjHome: { type: "string" }
-      }
-    }
-  },
   {
     name: "kj_report",
     description: "Read latest or list session reports. Use trace=true for chronological stage-by-stage breakdown with timing and token usage.",
@@ -176,7 +91,7 @@ export const tools = [
   },
   {
     name: "kj_preflight",
-    description: "Confirm or adjust agent configuration before first kj_run/kj_code. REQUIRED before running any task via MCP. Show the config to the human, get their confirmation or adjustments, then call this tool with their response.",
+    description: "Confirm or adjust agent configuration before first kj_code. REQUIRED before running any task via MCP. Show the config to the human, get their confirmation or adjustments, then call this tool with their response.",
     inputSchema: {
       type: "object",
       required: ["humanResponse"],
@@ -207,50 +122,6 @@ export const tools = [
       }
     }
   },
-  {
-    name: "kj_review",
-    description: "Run reviewer-only mode against current diff. Do NOT filter or pre-process the diff before passing it.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        task: { type: "string", description: "Task description. Either `task` or `taskFile` is required." },
-        taskFile: { type: "string", description: "Alternative to `task`: path to a .md/text file." },
-        reviewer: { type: "string" },
-        reviewerModel: { type: "string" },
-        baseRef: { type: "string" },
-        projectDir: { type: "string", description: "Absolute path to the project directory" },
-        kjHome: { type: "string" }
-      }
-    }
-  },
-  {
-    name: "kj_status",
-    description: "Show real-time status and log of the current or last Karajan run. Returns a parsed status (current stage, agent, iteration, errors) plus recent log lines. Use this to monitor progress while kj_run/kj_plan/kj_code is executing.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        lines: { type: "number", description: "Number of log lines to show (default 50)" }
-      }
-    }
-  },
-  {
-    name: "kj_plan",
-    description: "Generate implementation plan for a task. Pass the task as the user described it. Karajan's planner decides the approach.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        task: { type: "string", description: "Task description. Either `task` or `taskFile` is required." },
-        taskFile: { type: "string", description: "Alternative to `task`: path to a .md/text file." },
-        planner: { type: "string" },
-        plannerModel: { type: "string" },
-        coder: { type: "string", description: "Legacy alias for planner" },
-        coderModel: { type: "string", description: "Legacy alias for plannerModel" },
-        projectDir: { type: "string", description: "Absolute path to the project directory" },
-        kjHome: { type: "string" },
-        specReviewMode: { type: "string", enum: ["auto", "skip"], description: "Pre-planner spec-reviewer behaviour (KJC-PCS-0048). `auto` (default): runs the reviewer, findings stream as progress, planner continues. `skip`: bypass entirely." }
-      }
-    }
-  },
   {
     name: "kj_discover",
     description: "Analyze a task for gaps, ambiguities, and missing information before execution. Returns a verdict (ready/needs_validation) with structured gap list. Can read task details from Planning Game if pgTask is provided.",
@@ -268,46 +139,6 @@ export const tools = [
       }
     }
   },
-  {
-    name: "kj_triage",
-    description: "Classify task complexity and recommend which pipeline roles to activate. Returns level (trivial/simple/medium/complex), taskType, recommended roles, and optional decomposition.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        task: { type: "string", description: "Task description to classify. Either `task` or `taskFile` is required." },
-        taskFile: { type: "string", description: "Alternative to `task`: path to a .md/text file." },
-        projectDir: { type: "string", description: "Absolute path to the project directory" },
-        kjHome: { type: "string" }
-      }
-    }
-  },
-  {
-    name: "kj_researcher",
-    description: "Research the codebase for a task. Identifies affected files, patterns, constraints, prior decisions, risks, and test coverage.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        task: { type: "string", description: "Task description to research. Either `task` or `taskFile` is required." },
-        taskFile: { type: "string", description: "Alternative to `task`: path to a .md/text file." },
-        projectDir: { type: "string", description: "Absolute path to the project directory" },
-        kjHome: { type: "string" }
-      }
-    }
-  },
-  {
-    name: "kj_architect",
-    description: "Design solution architecture for a task. Returns layers, patterns, data model, API contracts, tradeoffs, and a verdict (ready/needs_clarification).",
-    inputSchema: {
-      type: "object",
-      properties: {
-        task: { type: "string", description: "Task description to architect. Either `task` or `taskFile` is required." },
-        taskFile: { type: "string", description: "Alternative to `task`: path to a .md/text file." },
-        context: { type: "string", description: "Additional context (e.g., researcher output)" },
-        projectDir: { type: "string", description: "Absolute path to the project directory" },
-        kjHome: { type: "string" }
-      }
-    }
-  },
   {
     name: "kj_audit",
     description: "Analyze codebase health without modifying files. Returns findings across security, code quality, performance, architecture, and testing dimensions.",
@@ -335,17 +166,17 @@ export const tools = [
   },
   {
     name: "kj_hu",
-    description: "Manage user stories (HUs) in the local board",
+    description: "Manage user stories (HUs) in the HU Board, the same board `kj hu` uses (local or shared)",
     inputSchema: {
       type: "object",
       required: ["action"],
       properties: {
         action: { type: "string", enum: ["create", "update", "list", "get"], description: "Action to perform" },
         title: { type: "string", description: "HU title (required for create)" },
-        description: { type: "string", description: "HU description" },
-        acceptanceCriteria: { type: "string", description: "Acceptance criteria" },
+        acceptanceCriteria: { type: "string", description: "Acceptance criteria, one per line" },
+        ref: { type: "string", description: "Id of this card's replica in the external tracker (Planning Game, Jira, Linear...)" },
         huId: { type: "string", description: "HU ID (required for update/get)" },
-        status: { type: "string", description: "HU status (for create/update)", enum: ["pending", "coding", "reviewing", "done", "failed", "blocked"] },
+        status: { type: "string", description: "HU status (for create/update)", enum: ["pending", "running", "done", "failed", "skipped"] },
         projectDir: { type: "string", description: "Project directory (defaults to cwd)" }
       }
     }
@@ -363,32 +194,6 @@ export const tools = [
       }
     }
   },
-  {
-    name: "kj_skills",
-    description: "Manage OpenSkills for domain-specific agent knowledge. Install skills from the marketplace or GitHub repos to give coders domain expertise.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        action: { type: "string", enum: ["install", "remove", "list", "read"], description: "Action to perform" },
-        source: { type: "string", description: "Skill source: marketplace name, GitHub URL, or local path (for install)" },
-        name: { type: "string", description: "Skill name (for remove/read)" },
-        global: { type: "boolean", description: "Install globally (~/.agent/skills/) instead of project-local" },
-        projectDir: { type: "string", description: "Project directory" }
-      },
-      required: ["action"]
-    }
-  },
-  {
-    name: "kj_undo",
-    description: "Revert the last pipeline run by resetting to the pre-pipeline commit. Default: soft reset (keeps changes staged). Use hard=true to discard all changes.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        hard: { type: "boolean", description: "If true, discard all changes (git reset --hard). Default: false (soft reset, keeps changes staged)." },
-        projectDir: { type: "string", description: "Absolute path to the project directory" }
-      }
-    }
-  },
   {
     name: "kj_clean",
     description: "Garbage-collect stale Karajan state: orphan plans (project dir no longer exists), finalised plans/sessions past their retention window, and HU story batches. Dry-run by default; pass yes=true to actually delete. Use nuke=true to wipe everything (retention=0 on every bucket + drop the HU board SQLite DB).",

package/src/plan/lane-plans.js

@@ -0,0 +1,54 @@
+/**
+ * #2566: a lane (<main>/.kj/worktrees/<x>, <main>/.claude/worktrees/<x>) kept plans under its own
+ * slug; `kj hu list` moves them to the main checkout's. A taken name is kept and reported.
+ */
+import fs from "node:fs/promises";
+import path from "node:path";
+import { plansDir } from "./plan-store.js";
+import { mainCheckout } from "../utils/main-checkout.js";
+import { MIRROR_PLAN_ID } from "../hu/team-board-mirror.js";
+
+const LANE_DIRS = [".kj_worktrees_", ".claude_worktrees_"];
+
+// Never overwrites: "wx" and errorOnExist fail with EEXIST if another session wrote dest first.
+async function moveEntry(from, dest, main) {
+  const plan = from.endsWith(".json") ? await fs.readFile(from, "utf8").then(JSON.parse, () => null) : null;
+  if (plan) {
+    // TSK-0341: the stamp must outlive the lane, or the GC sees the plan as orphan.
+    await fs.writeFile(dest, JSON.stringify({ ...plan, projectDir: main }, null, 2), { flag: "wx" });
+    return fs.unlink(from);
+  }
+  await fs.cp(from, dest, { recursive: true, force: false, errorOnExist: true });
+  return fs.rm(from, { recursive: true });
+}
+
+export async function migrateLanePlans(projectDir) {
+  const [target, main] = [plansDir(projectDir), mainCheckout(projectDir)];
+  const root = path.dirname(target);
+  const prefixes = LANE_DIRS.map((d) => `${path.basename(target)}_${d}`); // the main checkout's slug
+  const moved = [];
+  const kept = [];
+  let entries;
+  try { entries = await fs.readdir(root, { withFileTypes: true }); } catch (err) {
+    if (err.code === "ENOENT") return { moved, kept };
+    throw err;
+  }
+  const isLaneFolder = (e) => e.isDirectory() && prefixes.some((p) => e.name.startsWith(p));
+  for (const lane of entries.filter(isLaneFolder)) {
+    const from = path.join(root, lane.name);
+    await fs.mkdir(target, { recursive: true });
+    for (const file of await fs.readdir(from)) {
+      // The team board mirror is no plan: `kj hu list` rewrites it from GitHub, a lane's copy is stale.
+      if (file === `${MIRROR_PLAN_ID}.json`) { await fs.unlink(path.join(from, file)); continue; }
+      try {
+        await moveEntry(path.join(from, file), path.join(target, file), main);
+        moved.push(file);
+      } catch (err) {
+        if (err.code !== "EEXIST" && err.code !== "ERR_FS_CP_EEXIST") throw err;
+        kept.push(path.join(from, file));
+      }
+    }
+    await fs.rmdir(from).catch((err) => { if (err.code !== "ENOTEMPTY") throw err; }); // a collision stays
+  }
+  return { moved, kept };
+}

package/src/plan/plan-store.js

@@ -10,6 +10,7 @@ import { writeJsonAtomic } from "../utils/atomic-write.js";
 import { resolveHome } from "../utils/paths.js";
 import { getSharedPlansDir } from "../utils/shared-paths.js";
 import { generatePlanId, normaliseAlias } from "./plan-id.js";
+import { mainCheckout } from "../utils/main-checkout.js";
 
 /**
  * A plan JSON file failed to parse — typically an interrupted write
@@ -51,7 +52,7 @@ export function getKjHome() {
 /**
  * Deterministic slug for a project path — stable across plan-store writes,
  * HU-board syncs and board URL routing. Keep in lockstep with
- * `packages/hu-board/src/sync.js::deriveProjectIdFromDir`.
+ * `packages/hu-board/src/sync.js::deriveProjectIdFromDir` (kj slugs the main checkout, #2566).
  * @param {string} projectDir - absolute project path
  * @returns {string}
  */
@@ -64,12 +65,13 @@ export function projectSlug(projectDir) {
 }
 
 // KJC-TSK-1166: the board honours KJ_PLANS_DIR as its plans root; what kj writes must land
-// in the same root, or the board shows none of it.
+// in the same root, or the board shows none of it. #2566: one folder per main checkout, lanes included.
 export function plansDir(projectDir) {
   const root = process.env.KJ_PLANS_DIR || path.join(getKjHome(), "plans");
-  return path.join(root, projectSlug(projectDir));
+  return path.join(root, projectSlug(mainCheckout(projectDir)));
 }
 
+
 /**
  * Save a plan to disk. Accepts both v1 and v2 schemas.
  * @param {string} projectDir
@@ -88,7 +90,8 @@ export async function savePlan(projectDir, planResult) {
     // plan so the GC can check `fs.exists(projectDir)` reliably. Reverse-
     // engineering it from the slug is lossy (underscores in the original
     // name collide with underscores introduced by slash-substitution).
-    if (!planResult.projectDir && projectDir) planResult.projectDir = projectDir;
+    // #2566: the main checkout, never a lane that is deleted after merge.
+    if (!planResult.projectDir && projectDir) planResult.projectDir = mainCheckout(projectDir);
     // Humanización IDs: si el plan no tiene alias todavía, derívalo de
     // plan.name (lo que el planner pidió al usuario). Resuelve
     // colisiones con sufijo -2, -3… leyendo el dir antes.