mcp-coordinator 0.6.0 → 0.7.0

package/dist/src/types.d.ts

@@ -2,6 +2,7 @@ export type AgentConnectionStatus = "online" | "offline";
 export type ActivityStatus = "working" | "idle" | "waiting" | "offline";
 export interface Agent {
     id: string;
+    org_id: string;
     name: string;
     modules: string;
     status: AgentConnectionStatus;
@@ -19,6 +20,7 @@ export type ThreadStatus = "open" | "resolving" | "resolved" | "cancelled" | "po
 export type ResolutionType = "consensus" | "auto_resolved" | "timeout" | "closed" | "max_rounds" | "agent_departure";
 export interface Thread {
     id: string;
+    org_id: string;
     initiator_id: string;
     subject: string;
     plan: string | null;

package/dist/src/working-files-tracker.d.ts

@@ -6,10 +6,10 @@ import type { Metrics } from "./metrics.js";
  * historical log; this is current state with TTL.
  *
  * Lifecycle:
- *   PreToolUse  → start(agent, file, ttlMin)  → UPSERT row
- *   PostToolUse → stop(agent, file)            → DELETE row
- *   Sweeper     → sweepExpired()               → DELETE rows past claim_until
- *   Agent LWT   → clearForAgent(agent)         → DELETE all rows for agent
+ *   PreToolUse  → start(orgId, agent, file, ttlMin)  → UPSERT row
+ *   PostToolUse → stop(orgId, agent, file)            → DELETE row
+ *   Sweeper     → sweepExpired()                      → DELETE rows past claim_until (cross-org)
+ *   Agent LWT   → clearForAgent(agent)                → DELETE all rows for agent (cross-org maintenance)
  */
 export declare class WorkingFilesTracker {
     private sweeperHandle;
@@ -18,18 +18,26 @@ export declare class WorkingFilesTracker {
     constructor(logger?: Logger, metrics?: Metrics);
     /**
      * Start (or refresh) a working-files claim. Idempotent: re-calling with
-     * the same (agent_id, file_path) updates last_activity_at + claim_until
+     * the same (org_id, agent_id, file_path) updates last_activity_at + claim_until
      * without erroring.
      */
-    start(agentId: string, filePath: string, ttlMinutes: number): void;
+    start(orgId: string, agentId: string, filePath: string, ttlMinutes: number): void;
     /**
      * Stop a working-files claim. No-op when no row matches (PostToolUse can
      * arrive after a TTL eviction or before the matching PreToolUse on slow Pre).
      */
-    stop(agentId: string, filePath: string): void;
-    /** Returns number of rows evicted. */
+    stop(orgId: string, agentId: string, filePath: string): void;
+    /** Returns number of rows evicted.
+     * cross-org maintenance — intentional: TTL expiry is a housekeeping concern,
+     * not a data-visibility concern; sweeping only own-org would leave other orgs'
+     * expired rows accumulating indefinitely.
+     */
     sweepExpired(): number;
-    /** Called when an agent goes offline (MQTT LWT). Returns rows deleted. */
+    /** Called when an agent goes offline (MQTT LWT). Returns rows deleted.
+     * cross-org maintenance — intentional: MQTT topics carry no org_id today
+     * (see TODO(Task 22) in serve-http.ts); clearing by agent_id only is safe
+     * in single-tenant Phase 1 and matches the cross-org setOffline("default", …) pattern.
+     */
     clearForAgent(agentId: string): number;
     /**
      * Background sweeper. unref() so it doesn't keep the loop alive at shutdown.
@@ -37,6 +45,8 @@ export declare class WorkingFilesTracker {
      */
     startSweeper(intervalMs?: number): void;
     stopSweeper(): void;
-    /** Read in-flight files map: file_path → set<agent_id>, excluding caller. */
-    getIndex(filePaths: string[], excludeAgentId: string): Map<string, Set<string>>;
+    /** Read in-flight files map: file_path → set<agent_id>, excluding caller.
+     * Scoped to orgId so cross-org agent lists are not leaked.
+     */
+    getIndex(orgId: string, filePaths: string[], excludeAgentId: string): Map<string, Set<string>>;
 }

package/dist/src/working-files-tracker.js

@@ -6,10 +6,10 @@ import { silentLogger } from "./logger.js";
  * historical log; this is current state with TTL.
  *
  * Lifecycle:
- *   PreToolUse  → start(agent, file, ttlMin)  → UPSERT row
- *   PostToolUse → stop(agent, file)            → DELETE row
- *   Sweeper     → sweepExpired()               → DELETE rows past claim_until
- *   Agent LWT   → clearForAgent(agent)         → DELETE all rows for agent
+ *   PreToolUse  → start(orgId, agent, file, ttlMin)  → UPSERT row
+ *   PostToolUse → stop(orgId, agent, file)            → DELETE row
+ *   Sweeper     → sweepExpired()                      → DELETE rows past claim_until (cross-org)
+ *   Agent LWT   → clearForAgent(agent)                → DELETE all rows for agent (cross-org maintenance)
  */
 export class WorkingFilesTracker {
     sweeperHandle = null;
@@ -21,30 +21,34 @@ export class WorkingFilesTracker {
     }
     /**
      * Start (or refresh) a working-files claim. Idempotent: re-calling with
-     * the same (agent_id, file_path) updates last_activity_at + claim_until
+     * the same (org_id, agent_id, file_path) updates last_activity_at + claim_until
      * without erroring.
      */
-    start(agentId, filePath, ttlMinutes) {
+    start(orgId, agentId, filePath, ttlMinutes) {
         const db = getDb();
-        const existing = db.prepare("SELECT 1 FROM working_files WHERE agent_id = ? AND file_path = ?")
-            .get(agentId, filePath);
-        db.prepare(`INSERT INTO working_files (agent_id, file_path, started_at, last_activity_at, claim_until)
-       VALUES (?, ?, strftime('%Y-%m-%dT%H:%M:%SZ', 'now'), strftime('%Y-%m-%dT%H:%M:%SZ', 'now'), strftime('%Y-%m-%dT%H:%M:%SZ', 'now', '+' || CAST(? AS TEXT) || ' minutes'))
-       ON CONFLICT(agent_id, file_path) DO UPDATE SET
+        const existing = db.prepare("SELECT 1 FROM working_files WHERE org_id = ? AND agent_id = ? AND file_path = ?")
+            .get(orgId, agentId, filePath);
+        db.prepare(`INSERT INTO working_files (org_id, agent_id, file_path, started_at, last_activity_at, claim_until)
+       VALUES (?, ?, ?, strftime('%Y-%m-%dT%H:%M:%SZ', 'now'), strftime('%Y-%m-%dT%H:%M:%SZ', 'now'), strftime('%Y-%m-%dT%H:%M:%SZ', 'now', '+' || CAST(? AS TEXT) || ' minutes'))
+       ON CONFLICT(org_id, agent_id, file_path) DO UPDATE SET
          last_activity_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now'),
-         claim_until      = strftime('%Y-%m-%dT%H:%M:%SZ', 'now', '+' || CAST(? AS TEXT) || ' minutes')`).run(agentId, filePath, ttlMinutes, ttlMinutes);
+         claim_until      = strftime('%Y-%m-%dT%H:%M:%SZ', 'now', '+' || CAST(? AS TEXT) || ' minutes')`).run(orgId, agentId, filePath, ttlMinutes, ttlMinutes);
         this.metrics?.workingFilesStarts.inc({ result: existing ? "updated" : "inserted" });
     }
     /**
      * Stop a working-files claim. No-op when no row matches (PostToolUse can
      * arrive after a TTL eviction or before the matching PreToolUse on slow Pre).
      */
-    stop(agentId, filePath) {
+    stop(orgId, agentId, filePath) {
         const db = getDb();
-        db.prepare("DELETE FROM working_files WHERE agent_id = ? AND file_path = ?")
-            .run(agentId, filePath);
+        db.prepare("DELETE FROM working_files WHERE org_id = ? AND agent_id = ? AND file_path = ?")
+            .run(orgId, agentId, filePath);
     }
-    /** Returns number of rows evicted. */
+    /** Returns number of rows evicted.
+     * cross-org maintenance — intentional: TTL expiry is a housekeeping concern,
+     * not a data-visibility concern; sweeping only own-org would leave other orgs'
+     * expired rows accumulating indefinitely.
+     */
     sweepExpired() {
         const db = getDb();
         const result = db.prepare("DELETE FROM working_files WHERE claim_until < strftime('%Y-%m-%dT%H:%M:%SZ', 'now')").run();
@@ -55,7 +59,11 @@ export class WorkingFilesTracker {
         }
         return evicted;
     }
-    /** Called when an agent goes offline (MQTT LWT). Returns rows deleted. */
+    /** Called when an agent goes offline (MQTT LWT). Returns rows deleted.
+     * cross-org maintenance — intentional: MQTT topics carry no org_id today
+     * (see TODO(Task 22) in serve-http.ts); clearing by agent_id only is safe
+     * in single-tenant Phase 1 and matches the cross-org setOffline("default", …) pattern.
+     */
     clearForAgent(agentId) {
         const db = getDb();
         const result = db.prepare("DELETE FROM working_files WHERE agent_id = ?").run(agentId);
@@ -87,17 +95,20 @@ export class WorkingFilesTracker {
             this.sweeperHandle = null;
         }
     }
-    /** Read in-flight files map: file_path → set<agent_id>, excluding caller. */
-    getIndex(filePaths, excludeAgentId) {
+    /** Read in-flight files map: file_path → set<agent_id>, excluding caller.
+     * Scoped to orgId so cross-org agent lists are not leaked.
+     */
+    getIndex(orgId, filePaths, excludeAgentId) {
         const index = new Map();
         if (filePaths.length === 0)
             return index;
         const db = getDb();
         const placeholders = filePaths.map(() => "?").join(",");
         const rows = db.prepare(`SELECT DISTINCT file_path, agent_id FROM working_files
-       WHERE file_path IN (${placeholders})
+       WHERE org_id = ?
+         AND file_path IN (${placeholders})
          AND agent_id != ?
-         AND claim_until > strftime('%Y-%m-%dT%H:%M:%SZ', 'now')`).all(...filePaths, excludeAgentId);
+         AND claim_until > strftime('%Y-%m-%dT%H:%M:%SZ', 'now')`).all(orgId, ...filePaths, excludeAgentId);
         for (const r of rows) {
             let set = index.get(r.file_path);
             if (!set) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-coordinator",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "mcpName": "io.github.swoofer/mcp-coordinator",
   "description": "Embedded MQTT broker + MCP server for multi-agent coordination",
   "type": "module",
@@ -94,6 +94,9 @@
     "tree-sitter-swift": "^0.6.0",
     "tree-sitter-bash": "^0.21.0"
   },
+  "overrides": {
+    "ip-address": "^10.2.0"
+  },
   "engines": {
     "node": ">=20"
   }