@hasna/todos 0.10.9 → 0.10.10

package/dist/cli/index.js

@@ -9812,6 +9812,7 @@ __export(exports_task_files, {
   listActiveFiles: () => listActiveFiles,
   getTaskFile: () => getTaskFile,
   findTasksByFile: () => findTasksByFile,
+  detectFileConflicts: () => detectFileConflicts,
   bulkFindTasksByFiles: () => bulkFindTasksByFiles,
   bulkAddTaskFiles: () => bulkAddTaskFiles,
   addTaskFile: () => addTaskFile
@@ -9853,6 +9854,24 @@ function removeTaskFile(taskId, path, db) {
   const result = d.run("DELETE FROM task_files WHERE task_id = ? AND path = ?", [taskId, path]);
   return result.changes > 0;
 }
+function detectFileConflicts(taskId, paths, db) {
+  const d = db || getDatabase();
+  if (paths.length === 0)
+    return [];
+  const placeholders = paths.map(() => "?").join(", ");
+  const rows = d.query(`
+    SELECT tf.path, tf.agent_id AS conflicting_agent_id, t.id AS conflicting_task_id,
+           t.title AS conflicting_task_title, t.status AS conflicting_task_status
+    FROM task_files tf
+    JOIN tasks t ON tf.task_id = t.id
+    WHERE tf.path IN (${placeholders})
+      AND tf.task_id != ?
+      AND tf.status != 'removed'
+      AND t.status = 'in_progress'
+    ORDER BY tf.updated_at DESC
+  `).all(...paths, taskId);
+  return rows;
+}
 function bulkFindTasksByFiles(paths, db) {
   const d = db || getDatabase();
   if (paths.length === 0)
@@ -13289,7 +13308,7 @@ Claimed: ${formatTask(result.claimed)}`);
     return { contents: [{ uri: "todos://agents", text: JSON.stringify(agents, null, 2), mimeType: "application/json" }] };
   });
   if (shouldRegisterTool("add_task_file")) {
-    server.tool("add_task_file", "Link a file path to a task. Tracks which files an agent is working on. Upserts if same task+path exists.", {
+    server.tool("add_task_file", "Link a file path to a task. Tracks which files an agent is working on. Upserts if same task+path exists. Auto-detects conflicts with other in-progress tasks.", {
       task_id: exports_external.string().describe("Task ID"),
       path: exports_external.string().describe("File path (relative or absolute)"),
       paths: exports_external.array(exports_external.string()).optional().describe("Multiple file paths to add at once"),
@@ -13298,14 +13317,41 @@ Claimed: ${formatTask(result.claimed)}`);
       note: exports_external.string().optional().describe("Note about why this file is linked")
     }, async ({ task_id, path, paths: multiplePaths, status, agent_id, note }) => {
       try {
-        const { addTaskFile: addTaskFile2, bulkAddTaskFiles: bulkAddTaskFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
+        const { addTaskFile: addTaskFile2, bulkAddTaskFiles: bulkAddTaskFiles2, detectFileConflicts: detectFileConflicts2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const resolvedId = resolveId(task_id);
+        let addedFiles;
         if (multiplePaths && multiplePaths.length > 0) {
           const allPaths = path ? [path, ...multiplePaths] : multiplePaths;
-          const files = bulkAddTaskFiles2(resolvedId, allPaths, agent_id);
-          return { content: [{ type: "text", text: `${files.length} file(s) linked to task ${resolvedId.slice(0, 8)}` }] };
+          addedFiles = bulkAddTaskFiles2(resolvedId, allPaths, agent_id);
+          const conflicts2 = detectFileConflicts2(resolvedId, allPaths);
+          if (conflicts2.length > 0) {
+            return {
+              content: [{
+                type: "text",
+                text: JSON.stringify({
+                  added: addedFiles.length,
+                  conflicts: conflicts2,
+                  warning: `${conflicts2.length} file(s) already claimed by other in-progress tasks`
+                }, null, 2)
+              }]
+            };
+          }
+          return { content: [{ type: "text", text: `${addedFiles.length} file(s) linked to task ${resolvedId.slice(0, 8)}` }] };
         }
         const file = addTaskFile2({ task_id: resolvedId, path, status, agent_id, note });
+        const conflicts = detectFileConflicts2(resolvedId, [path]);
+        if (conflicts.length > 0) {
+          return {
+            content: [{
+              type: "text",
+              text: JSON.stringify({
+                file,
+                conflicts,
+                warning: `${path} is already claimed by another in-progress task`
+              }, null, 2)
+            }]
+          };
+        }
         return { content: [{ type: "text", text: `${file.status} ${file.path} \u2192 task ${resolvedId.slice(0, 8)}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };

package/dist/db/task-files.d.ts

@@ -22,6 +22,18 @@ export declare function listTaskFiles(taskId: string, db?: Database): TaskFile[]
 export declare function findTasksByFile(path: string, db?: Database): TaskFile[];
 export declare function updateTaskFileStatus(taskId: string, path: string, status: TaskFile["status"], agentId?: string, db?: Database): TaskFile | null;
 export declare function removeTaskFile(taskId: string, path: string, db?: Database): boolean;
+export interface FileConflict {
+    path: string;
+    conflicting_task_id: string;
+    conflicting_agent_id: string | null;
+    conflicting_task_title: string;
+    conflicting_task_status: string;
+}
+/**
+ * Check if adding a file to a task would conflict with another in-progress task.
+ * Returns conflicts (not a hard block — caller decides what to do).
+ */
+export declare function detectFileConflicts(taskId: string, paths: string[], db?: Database): FileConflict[];
 export interface BulkFileResult {
     path: string;
     tasks: TaskFile[];

package/dist/db/task-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-files.d.ts","sourceRoot":"","sources":["../../src/db/task-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-files.d.ts","sourceRoot":"","sources":["../../src/db/task-files.ts"],"names":[],"mappings":"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"}

package/dist/mcp/index.js

@@ -1357,6 +1357,7 @@ __export(exports_task_files, {
   listActiveFiles: () => listActiveFiles,
   getTaskFile: () => getTaskFile,
   findTasksByFile: () => findTasksByFile,
+  detectFileConflicts: () => detectFileConflicts,
   bulkFindTasksByFiles: () => bulkFindTasksByFiles,
   bulkAddTaskFiles: () => bulkAddTaskFiles,
   addTaskFile: () => addTaskFile
@@ -1398,6 +1399,24 @@ function removeTaskFile(taskId, path, db) {
   const result = d.run("DELETE FROM task_files WHERE task_id = ? AND path = ?", [taskId, path]);
   return result.changes > 0;
 }
+function detectFileConflicts(taskId, paths, db) {
+  const d = db || getDatabase();
+  if (paths.length === 0)
+    return [];
+  const placeholders = paths.map(() => "?").join(", ");
+  const rows = d.query(`
+    SELECT tf.path, tf.agent_id AS conflicting_agent_id, t.id AS conflicting_task_id,
+           t.title AS conflicting_task_title, t.status AS conflicting_task_status
+    FROM task_files tf
+    JOIN tasks t ON tf.task_id = t.id
+    WHERE tf.path IN (${placeholders})
+      AND tf.task_id != ?
+      AND tf.status != 'removed'
+      AND t.status = 'in_progress'
+    ORDER BY tf.updated_at DESC
+  `).all(...paths, taskId);
+  return rows;
+}
 function bulkFindTasksByFiles(paths, db) {
   const d = db || getDatabase();
   if (paths.length === 0)
@@ -11017,7 +11036,7 @@ server.resource("agents", "todos://agents", { description: "All registered agent
   return { contents: [{ uri: "todos://agents", text: JSON.stringify(agents, null, 2), mimeType: "application/json" }] };
 });
 if (shouldRegisterTool("add_task_file")) {
-  server.tool("add_task_file", "Link a file path to a task. Tracks which files an agent is working on. Upserts if same task+path exists.", {
+  server.tool("add_task_file", "Link a file path to a task. Tracks which files an agent is working on. Upserts if same task+path exists. Auto-detects conflicts with other in-progress tasks.", {
     task_id: exports_external.string().describe("Task ID"),
     path: exports_external.string().describe("File path (relative or absolute)"),
     paths: exports_external.array(exports_external.string()).optional().describe("Multiple file paths to add at once"),
@@ -11026,14 +11045,41 @@ if (shouldRegisterTool("add_task_file")) {
     note: exports_external.string().optional().describe("Note about why this file is linked")
   }, async ({ task_id, path, paths: multiplePaths, status, agent_id, note }) => {
     try {
-      const { addTaskFile: addTaskFile2, bulkAddTaskFiles: bulkAddTaskFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
+      const { addTaskFile: addTaskFile2, bulkAddTaskFiles: bulkAddTaskFiles2, detectFileConflicts: detectFileConflicts2 } = (init_task_files(), __toCommonJS(exports_task_files));
       const resolvedId = resolveId(task_id);
+      let addedFiles;
       if (multiplePaths && multiplePaths.length > 0) {
         const allPaths = path ? [path, ...multiplePaths] : multiplePaths;
-        const files = bulkAddTaskFiles2(resolvedId, allPaths, agent_id);
-        return { content: [{ type: "text", text: `${files.length} file(s) linked to task ${resolvedId.slice(0, 8)}` }] };
+        addedFiles = bulkAddTaskFiles2(resolvedId, allPaths, agent_id);
+        const conflicts2 = detectFileConflicts2(resolvedId, allPaths);
+        if (conflicts2.length > 0) {
+          return {
+            content: [{
+              type: "text",
+              text: JSON.stringify({
+                added: addedFiles.length,
+                conflicts: conflicts2,
+                warning: `${conflicts2.length} file(s) already claimed by other in-progress tasks`
+              }, null, 2)
+            }]
+          };
+        }
+        return { content: [{ type: "text", text: `${addedFiles.length} file(s) linked to task ${resolvedId.slice(0, 8)}` }] };
       }
       const file = addTaskFile2({ task_id: resolvedId, path, status, agent_id, note });
+      const conflicts = detectFileConflicts2(resolvedId, [path]);
+      if (conflicts.length > 0) {
+        return {
+          content: [{
+            type: "text",
+            text: JSON.stringify({
+              file,
+              conflicts,
+              warning: `${path} is already claimed by another in-progress task`
+            }, null, 2)
+          }]
+        };
+      }
       return { content: [{ type: "text", text: `${file.status} ${file.path} \u2192 task ${resolvedId.slice(0, 8)}` }] };
     } catch (e) {
       return { content: [{ type: "text", text: formatError(e) }], isError: true };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/todos",
-  "version": "0.10.9",
+  "version": "0.10.10",
   "description": "Universal task management for AI coding agents - CLI + MCP server + interactive TUI",
   "type": "module",
   "main": "dist/index.js",