@kaddo/mcp 3.90.2 → 3.91.0

package/dist/index.js

@@ -10472,6 +10472,7 @@ import path32 from "path";
 import crypto2 from "crypto";
 import matter72 from "gray-matter";
 import crypto3 from "crypto";
+import fs4 from "fs";
 import matter82 from "gray-matter";
 import matter92 from "gray-matter";
 import { parse as parseYaml92, stringify as stringifyYaml5 } from "yaml";
@@ -16581,6 +16582,12 @@ function findDuplicateByHash(dir, hash) {
   }
   return void 0;
 }
+function findExistingById(dir, id) {
+  const items = discoverWorkItems2(dir);
+  const match = items.find((item) => (item.id || item.title) === id);
+  if (!match) return void 0;
+  return { workItemId: match.id || match.title, path: match.relPath, filePath: match.filePath };
+}
 function importWorkItem(dir, opts) {
   const content = opts.content;
   if (!content?.trim()) throw new ImportError("EMPTY_INPUT", "Import content is empty.");
@@ -16609,6 +16616,31 @@ function importWorkItem(dir, opts) {
     sourceHash,
     sourceFormat: parsed.format
   });
+  const importedId = typeof parsed.candidateFields.id === "string" ? parsed.candidateFields.id.trim() : void 0;
+  let replacedWorkItem;
+  if (importedId && /^WI-\d+$/.test(importedId)) {
+    const existing = findExistingById(dir, importedId);
+    if (existing) {
+      if (!opts.onConflict) {
+        return {
+          created: false,
+          workItemId: existing.workItemId,
+          path: existing.path,
+          status: "draft",
+          source: opts.source,
+          sourceFormat: parsed.format,
+          sourceHash,
+          executed: false,
+          conflict: { importedId, existingPath: existing.path },
+          ...normalized.discardedFields.length > 0 ? { discardedFields: normalized.discardedFields } : {}
+        };
+      }
+      if (opts.onConflict === "replace") {
+        fs4.rmSync(existing.filePath, { force: true });
+        replacedWorkItem = existing.workItemId;
+      }
+    }
+  }
   const result = createWorkItem(dir, {
     intent: normalized.intent,
     type: normalized.type,
@@ -16630,7 +16662,8 @@ function importWorkItem(dir, opts) {
     sourceHash,
     executed: false,
     refinementHandoff,
-    ...normalized.discardedFields.length > 0 ? { discardedFields: normalized.discardedFields } : {}
+    ...normalized.discardedFields.length > 0 ? { discardedFields: normalized.discardedFields } : {},
+    ...replacedWorkItem ? { replacedWorkItem } : {}
   };
 }
 var ImportError = class extends Error {
@@ -17396,12 +17429,24 @@ function listGraphHints(root, filter = {}) {
 }
 function importWorkItemTool(root, args) {
   const source = args.source === "cli" || args.source === "admin" ? args.source : "chat";
+  const onConflict = args.onConflict === "replace" || args.onConflict === "new-id" ? args.onConflict : void 0;
   try {
     const result = importWorkItem(root, {
       content: args.content,
       source,
-      type: args.type
+      type: args.type,
+      onConflict
     });
+    if (result.conflict) {
+      return ok({
+        created: false,
+        conflict: true,
+        importedId: result.conflict.importedId,
+        existingPath: result.conflict.existingPath,
+        message: `The imported content has id "${result.conflict.importedId}" which already exists. Call again with onConflict: "replace" to delete the existing Work Item and create the new one, or onConflict: "new-id" to assign a new consecutive ID.`,
+        executed: false
+      });
+    }
     return ok({
       created: result.created,
       workItemId: result.workItemId,
@@ -17412,7 +17457,8 @@ function importWorkItemTool(root, args) {
       duplicateOf: result.duplicateOf,
       executed: false,
       refinementHandoff: result.refinementHandoff ? { agent: result.refinementHandoff.recommendedAgent, skill: result.refinementHandoff.recommendedSkill, text: result.refinementHandoff.text } : void 0,
-      ...result.discardedFields?.length ? { discardedFields: result.discardedFields } : {}
+      ...result.discardedFields?.length ? { discardedFields: result.discardedFields } : {},
+      ...result.replacedWorkItem ? { replacedWorkItem: result.replacedWorkItem } : {}
     });
   } catch (err) {
     if (err instanceof ImportError) return fail(`[${err.code}] ${err.message}`);
@@ -17421,7 +17467,7 @@ function importWorkItemTool(root, args) {
 }
 
 // src/multirepo.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import path4 from "path";
 import matter12 from "gray-matter";
 import { parse as parseYaml11, stringify as stringifyYaml6 } from "yaml";
@@ -17446,21 +17492,21 @@ function readModuleFile(root, repoPath, relFile) {
   const moduleDir = path4.resolve(root, repoPath);
   const abs = path4.resolve(moduleDir, relFile);
   if (!abs.startsWith(moduleDir)) return null;
-  if (!fs4.existsSync(abs) || !fs4.statSync(abs).isFile()) return null;
-  return fs4.readFileSync(abs, "utf-8");
+  if (!fs5.existsSync(abs) || !fs5.statSync(abs).isFile()) return null;
+  return fs5.readFileSync(abs, "utf-8");
 }
 function detectModuleStatus2(root, repoPath) {
   const moduleDir = path4.resolve(root, repoPath);
-  if (!fs4.existsSync(moduleDir)) {
+  if (!fs5.existsSync(moduleDir)) {
     return { status: "missing", configured: false, moduleContext: false, currentState: false, codebase: false, warning: `Directory \`${repoPath}\` does not exist.` };
   }
   const configPath = path4.join(moduleDir, ".kaddo", "config.yml");
-  if (!fs4.existsSync(configPath)) {
+  if (!fs5.existsSync(configPath)) {
     return { status: "not_configured", configured: false, moduleContext: false, currentState: false, codebase: false, warning: `Run \`kaddo init\` inside \`${repoPath}\` and select multirepo \u2192 module.` };
   }
   let parsed = null;
   try {
-    parsed = parseYaml11(fs4.readFileSync(configPath, "utf-8"));
+    parsed = parseYaml11(fs5.readFileSync(configPath, "utf-8"));
   } catch {
   }
   const role = parsed?.project?.role ?? parsed?.multirepo?.role;
@@ -17471,14 +17517,14 @@ function detectModuleStatus2(root, repoPath) {
     status: "configured",
     configured: true,
     role: "module",
-    moduleContext: fs4.existsSync(path4.join(moduleDir, "knowledge", "tech", "module", "module-context.md")) || fs4.existsSync(path4.join(moduleDir, "knowledge", "module", "module-context.md")),
-    currentState: fs4.existsSync(path4.join(moduleDir, "knowledge", "tech", "current-state.md")),
-    codebase: fs4.existsSync(path4.join(moduleDir, "knowledge", "tech", "codebase.md"))
+    moduleContext: fs5.existsSync(path4.join(moduleDir, "knowledge", "tech", "module", "module-context.md")) || fs5.existsSync(path4.join(moduleDir, "knowledge", "module", "module-context.md")),
+    currentState: fs5.existsSync(path4.join(moduleDir, "knowledge", "tech", "current-state.md")),
+    codebase: fs5.existsSync(path4.join(moduleDir, "knowledge", "tech", "codebase.md"))
   };
 }
 function resolveModuleContextPath(root, repoPath) {
   const moduleDir = path4.resolve(root, repoPath);
-  if (fs4.existsSync(path4.join(moduleDir, "knowledge", "tech", "module", "module-context.md"))) {
+  if (fs5.existsSync(path4.join(moduleDir, "knowledge", "tech", "module", "module-context.md"))) {
     return "knowledge/tech/module/module-context.md";
   }
   return "knowledge/module/module-context.md";
@@ -17867,27 +17913,27 @@ function modulesDiscoverTool(root, args) {
   const discovered = [];
   for (const wr of workspaceRoots2) {
     const rootAbs = path4.resolve(root, wr);
-    if (!fs4.existsSync(rootAbs) || !fs4.statSync(rootAbs).isDirectory()) continue;
+    if (!fs5.existsSync(rootAbs) || !fs5.statSync(rootAbs).isDirectory()) continue;
     let entries;
     try {
-      entries = fs4.readdirSync(rootAbs);
+      entries = fs5.readdirSync(rootAbs);
     } catch {
       continue;
     }
     for (const entry of entries) {
       if (IGNORED.has(entry)) continue;
       const candidateAbs = path4.resolve(rootAbs, entry);
-      if (!fs4.statSync(candidateAbs).isDirectory()) continue;
+      if (!fs5.statSync(candidateAbs).isDirectory()) continue;
       if (candidateAbs === coreAbs) continue;
       const relPath = path4.relative(root, candidateAbs).replace(/\\/g, "/");
       const cfgPath = path4.join(candidateAbs, ".kaddo", "config.yml");
-      if (!fs4.existsSync(cfgPath)) {
+      if (!fs5.existsSync(cfgPath)) {
         discovered.push({ id: entry, path: relPath, status: "not_configured", eligibleForMapping: false });
         continue;
       }
       let parsed = null;
       try {
-        parsed = parseYaml11(fs4.readFileSync(cfgPath, "utf-8"));
+        parsed = parseYaml11(fs5.readFileSync(cfgPath, "utf-8"));
       } catch {
       }
       const role = parsed?.project?.role ?? parsed?.multirepo?.role;
@@ -17961,7 +18007,7 @@ ${list3(data.owners)}
 
 // ../cli/src/core/system-topology.ts
 import { parse as parseYaml12, stringify as stringifyYaml7 } from "yaml";
-import fs5 from "fs";
+import fs6 from "fs";
 import path5 from "path";
 import crypto from "crypto";
 var TOPOLOGY_FILE2 = "knowledge/tech/system-topology.yml";
@@ -18478,7 +18524,7 @@ import matter14 from "gray-matter";
 import { parse as parseYaml13, stringify as stringifyYaml8 } from "yaml";
 
 // ../cli/src/core/work-item-write.ts
-import fs6 from "fs";
+import fs7 from "fs";
 import path6 from "path";
 import crypto4 from "crypto";
 import matter13 from "gray-matter";
@@ -20974,7 +21020,8 @@ function createServer(root) {
       inputSchema: {
         content: z4.string().describe("The Work Item content \u2014 plain text, Markdown, or Kaddo-format Markdown with frontmatter"),
         type: z4.string().optional().describe("Kaddo Work Item type (feature/bugfix/hotfix/spike/chore). Defaults to feature if not detectable."),
-        source: z4.string().optional().describe("Import origin: chat (default), cli, admin")
+        source: z4.string().optional().describe("Import origin: chat (default), cli, admin"),
+        onConflict: z4.string().optional().describe('ID conflict resolution: "replace" deletes the existing WI and creates the new one; "new-id" assigns a new consecutive ID. Required when the imported content has an id that already exists.')
       }
     },
     async (args) => toolText(guarded(root, () => importWorkItemTool(root, args)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaddo/mcp",
-  "version": "3.90.2",
+  "version": "3.91.0",
   "description": "MCP server for Kaddo project knowledge: read-only resources/tools/prompts plus safe derived generation under .kaddo/.",
   "license": "MIT",
   "repository": {