@mclawnet/mcp-server 0.1.7 → 0.1.9

package/dist/inbox-touch-relay.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Cross-process "wake the agent" shim.
+ *
+ * The MCP server lives in a stdio subprocess spawned by the LLM backend
+ * (claude / codex CLI); the agent process owns the real InboxRelay and runs an
+ * InboxWatcher (fs.watch on the inbox dir, 50ms debounce) that calls
+ * InboxRelay.deliver() whenever anything in the inbox dir changes.
+ *
+ * When this process needs to wake the agent — e.g. a `wakeup_after` timer
+ * fires, or a `watch_path` trigger just wrote a new inbox message — we can't
+ * call InboxRelay directly (different process). Instead we touch the
+ * recipient's inbox file's mtime so the agent's InboxWatcher picks it up and
+ * runs its normal deliver pass.
+ *
+ * `home` matches the value passed to InboxStore (CLAWNET_HOME or os.homedir());
+ * filenames live at `<projectRoot>/swarms/<swarmId>/inboxes/<instanceId>.json`.
+ */
+export declare class InboxTouchRelay {
+    private home;
+    constructor(home: string);
+    deliver(workDir: string, swarmId: string, instanceId: string): void;
+}
+//# sourceMappingURL=inbox-touch-relay.d.ts.map

package/dist/inbox-touch-relay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox-touch-relay.d.ts","sourceRoot":"","sources":["../src/inbox-touch-relay.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,MAAM;IAEhC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAiBpE"}

package/dist/inbox-touch-relay.js

@@ -0,0 +1,41 @@
+import { utimesSync } from "node:fs";
+import { join } from "node:path";
+import { projectRoot } from "@mclawnet/task";
+import { createLogger } from "@mclawnet/logger";
+const log = createLogger({ module: "mcp-server/inbox-touch-relay" });
+/**
+ * Cross-process "wake the agent" shim.
+ *
+ * The MCP server lives in a stdio subprocess spawned by the LLM backend
+ * (claude / codex CLI); the agent process owns the real InboxRelay and runs an
+ * InboxWatcher (fs.watch on the inbox dir, 50ms debounce) that calls
+ * InboxRelay.deliver() whenever anything in the inbox dir changes.
+ *
+ * When this process needs to wake the agent — e.g. a `wakeup_after` timer
+ * fires, or a `watch_path` trigger just wrote a new inbox message — we can't
+ * call InboxRelay directly (different process). Instead we touch the
+ * recipient's inbox file's mtime so the agent's InboxWatcher picks it up and
+ * runs its normal deliver pass.
+ *
+ * `home` matches the value passed to InboxStore (CLAWNET_HOME or os.homedir());
+ * filenames live at `<projectRoot>/swarms/<swarmId>/inboxes/<instanceId>.json`.
+ */
+export class InboxTouchRelay {
+    home;
+    constructor(home) {
+        this.home = home;
+    }
+    deliver(workDir, swarmId, instanceId) {
+        try {
+            const fp = join(projectRoot(workDir, this.home), "swarms", swarmId, "inboxes", `${instanceId}.json`);
+            const now = new Date();
+            utimesSync(fp, now, now);
+        }
+        catch (err) {
+            // File may not exist yet (no messages ever appended) or perms problem.
+            // Best-effort: the agent will catch up on the next message_send / scan.
+            log.debug({ err, swarmId, instanceId }, "inbox touch failed (best-effort)");
+        }
+    }
+}
+//# sourceMappingURL=inbox-touch-relay.js.map

package/dist/inbox-touch-relay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox-touch-relay.js","sourceRoot":"","sources":["../src/inbox-touch-relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAC,CAAC;AAErE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,eAAe;IACN;IAApB,YAAoB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAEpC,OAAO,CAAC,OAAe,EAAE,OAAe,EAAE,UAAkB;QAC1D,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,IAAI,CACb,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAC/B,QAAQ,EACR,OAAO,EACP,SAAS,EACT,GAAG,UAAU,OAAO,CACrB,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,uEAAuE;YACvE,wEAAwE;YACxE,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,kCAAkC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;CACF"}

package/dist/server.js

@@ -14,7 +14,9 @@ import { join } from "node:path";
 import { createLogger } from "@mclawnet/logger";
 import { createEmbeddingProviders, EmbeddingService, initDatabase, MemoryStore, } from "@mclawnet/memory";
 import { SkillStore, EvolutionPipeline } from "@mclawnet/skill-manager";
+import { WakeupScheduler, WatchManager } from "@mclawnet/swarm";
 import { getAllToolDefinitions, routeToolCall } from "./tools/index.js";
+import { InboxTouchRelay } from "./inbox-touch-relay.js";
 const log = createLogger({ module: "mcp-server" });
 // Two distinct roots:
 //   homeDir    — user home (no `.clawnet` suffix). TaskStore/InboxStore append
@@ -39,7 +41,89 @@ const context = {
     task: { rootDir: homeDir },
     inbox: { rootDir: homeDir },
     planReview: { rootDir: homeDir },
+    swarm: { rootDir: homeDir },
 };
+// === Self-wakeup wiring (M5 Task 7) ===
+//
+// The MCP server lives in a stdio subprocess (one per LLM session) while the
+// agent — which owns the real InboxRelay and runs an InboxWatcher on the
+// inbox dir — lives in a sibling process. Same-process injection is therefore
+// impossible. The fix:
+//   1. Construct WakeupScheduler + WatchManager inside this process.
+//   2. Wire them into the inbox tool context.
+//   3. When a timer/watch fires, the cross-process touch-relay updates the
+//      recipient's inbox file mtime; the agent's InboxWatcher catches the fs
+//      event (50ms debounce) and runs its normal InboxRelay.deliver pass,
+//      which picks up the newly-deliverable message (notBefore <= now).
+//
+// The scheduler / watchManager from @mclawnet/swarm only know (swarmId,
+// instanceId); the touch-relay also needs workDir to resolve the inbox file
+// path. We keep a small in-process registry mapping (s,i)→workDir, populated
+// at register time by the wrapper. It can grow indefinitely for distinct
+// (s,i) keys but is bounded by the MCP server's process lifetime (single LLM
+// session) — acceptable for v1.
+const touchRelay = new InboxTouchRelay(homeDir);
+const workdirRegistry = new Map();
+const registryKey = (s, i) => `${s}::${i}`;
+const wakeupScheduler = new WakeupScheduler({
+    deliver: (swarmId, instanceId) => {
+        const key = registryKey(swarmId, instanceId);
+        const workDir = workdirRegistry.get(key);
+        if (!workDir) {
+            // Should not happen — wakeup_after always populates the registry before
+            // register. Log so a future eviction policy can be debugged.
+            log.warn({ swarmId, instanceId }, "wakeup deliver: no workDir in registry");
+            return;
+        }
+        touchRelay.deliver(workDir, swarmId, instanceId);
+        // Wakeup is single-fire — drop the registry entry to bound growth.
+        // (Re-registration by a new wakeup_after call will re-populate.)
+        workdirRegistry.delete(key);
+    },
+});
+const watchManager = new WatchManager();
+context.inbox.scheduler = {
+    register: (swarmId, instanceId, notBefore, workDir) => {
+        workdirRegistry.set(registryKey(swarmId, instanceId), workDir);
+        wakeupScheduler.register(swarmId, instanceId, notBefore);
+    },
+    countForInstance: (s, i) => wakeupScheduler.countForInstance(s, i),
+};
+context.inbox.watchManager = {
+    register: (reg) => {
+        workdirRegistry.set(registryKey(reg.swarmId, reg.instanceId), reg.projectRoot);
+        watchManager.register(reg);
+    },
+    countForInstance: (s, i) => watchManager.countForInstance(s, i),
+    unregister: (s, i, w) => {
+        watchManager.unregister(s, i, w);
+        // I3: when the last watch for (s,i) is dropped, prune the registry
+        // entry too — long-lived sessions with many distinct (s,i) pairs
+        // otherwise grow monotonically. Wakeups re-set the entry on demand;
+        // we don't need to worry about racing with an in-flight wakeup
+        // because the registry entry is single-fire (wakeup deliver also
+        // deletes it on fire).
+        if (watchManager.countForInstance(s, i) === 0) {
+            workdirRegistry.delete(registryKey(s, i));
+        }
+    },
+    unwatchByInstance: (s, i) => {
+        watchManager.unwatchByInstance(s, i);
+        workdirRegistry.delete(registryKey(s, i));
+    },
+};
+context.inbox.relay = {
+    deliver: (swarmId, instanceId) => {
+        const workDir = workdirRegistry.get(registryKey(swarmId, instanceId));
+        if (workDir)
+            touchRelay.deliver(workDir, swarmId, instanceId);
+    },
+};
+// Restart safety: timers don't survive process exit. We intentionally do NOT
+// call WakeupScheduler.restoreFromInbox here — mcp-server lifetime equals the
+// LLM session, so restoring across sessions would pile up stale timers. The
+// agent-process restart story is a separate concern (it owns InboxRelay and
+// can re-scan inboxes on its own startup).
 const server = new Server({ name: "clawnet-mcp", version: "0.1.0" }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
     tools: getAllToolDefinitions(),
@@ -53,6 +137,18 @@ await server.connect(transport);
 log.info("ClawNet MCP server connected via stdio");
 function cleanup() {
     log.info("ClawNet MCP server shutting down");
+    try {
+        wakeupScheduler.dispose();
+    }
+    catch {
+        // ignore
+    }
+    try {
+        watchManager.dispose();
+    }
+    catch {
+        // ignore
+    }
     try {
         db.close();
     }
@@ -60,6 +156,17 @@ function cleanup() {
         // ignore
     }
 }
+// `process.on("exit")` runs cleanup at natural exit too. SIGINT/SIGTERM
+// handlers below call cleanup and then exit; the "exit" handler is a no-op
+// the second time around (dispose / db.close are idempotent enough).
+//
+// We do NOT try to drain in-flight `routeToolCall` work before exiting —
+// MCP protocol over stdio has no graceful-close handshake exposed via the
+// SDK at the time of writing, and a stuck handler would block shutdown
+// indefinitely. The trade-off: a tool call interrupted at the wrong instant
+// may leave a partially-written inbox file. InboxStore uses proper-lockfile +
+// integer-replace writes, so the file stays valid JSON; the worst case is
+// a missing message that the caller will need to retry.
 process.on("exit", cleanup);
 process.on("SIGINT", () => {
     cleanup();

package/dist/server.js.map

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

package/dist/tools/inbox.d.ts

@@ -16,9 +16,54 @@ export interface InboxToolContext {
      * agent is woken immediately. Failures are swallowed (best-effort).
      */
     relay?: InboxRelayLike;
+    /**
+     * Optional wakeup scheduler. When present, `wakeup_after` registers a timer
+     * after writing the deferred inbox message so it fires in-process when the
+     * notBefore time arrives. Without this, the message still lands on disk and
+     * will be picked up on the next inbox scan / restart restore.
+     */
+    scheduler?: {
+        /**
+         * `workDir` is required by the MCP server's wrapper, which keeps a
+         * (swarmId,instanceId)→workDir registry so the cross-process touch-relay
+         * can resolve the inbox file path when the timer fires. The underlying
+         * @mclawnet/swarm WakeupScheduler still takes only 3 args; the extra
+         * parameter is consumed by the wrapper before delegating.
+         */
+        register(swarmId: string, instanceId: string, notBefore: number, workDir: string): void;
+        /** I4 caps: per-instance active timer count, used to reject before write. */
+        countForInstance?(swarmId: string, instanceId: string): number;
+    };
+    /**
+     * Optional fs-watch manager. When present, `watch_path` registers a watch
+     * whose `onTrigger` writes an inbox message and (best-effort) wakes the
+     * recipient via `relay.deliver`. Without it, `watch_path` returns isError.
+     */
+    watchManager?: {
+        register(reg: WatchRegistrationLike): void;
+        unregister(swarmId: string, instanceId: string, watchId: string): void;
+        unwatchByInstance(swarmId: string, instanceId: string): void;
+        /** I4 caps: per-instance active watch count, used to reject before register. */
+        countForInstance?(swarmId: string, instanceId: string): number;
+    };
+}
+/**
+ * Minimal structural shape for a WatchManager registration. Kept local (not
+ * imported from @mclawnet/swarm) to keep the contextual coupling loose — the
+ * router wires in the real type at start time.
+ */
+export interface WatchRegistrationLike {
+    swarmId: string;
+    instanceId: string;
+    watchId: string;
+    projectRoot: string;
+    includeGlobs: string[];
+    ignoreGlobs: string[];
+    debounceMs: number;
+    onTrigger: (matchedPath: string) => void | Promise<void>;
 }
 export declare const INBOX_TOOL_NAMES: Set<string>;
-export declare function getInboxToolDefinitions(): {
+export declare function getInboxToolDefinitions(): ({
     name: string;
     description: string;
     inputSchema: {
@@ -60,10 +105,128 @@ export declare function getInboxToolDefinitions(): {
                 type: string[];
                 description: string;
             };
+            instanceId?: undefined;
+            seconds?: undefined;
+            payload?: undefined;
+            includeGlobs?: undefined;
+            ignoreGlobs?: undefined;
+            debounceMs?: undefined;
+            watchId?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: "object";
+        properties: {
+            workDir: {
+                type: string;
+                description: string;
+            };
+            swarmId: {
+                type: string;
+                description: string;
+            };
+            instanceId: {
+                type: string;
+                description: string;
+            };
+            seconds: {
+                type: string;
+                exclusiveMinimum: number;
+                maximum: number;
+                description: string;
+            };
+            payload: {
+                type: string;
+                description: string;
+            };
+            type: {
+                type: string;
+                description: string;
+            };
+            from: {
+                type: string;
+                description: string;
+            };
+            to?: undefined;
+            data?: undefined;
+            taskId?: undefined;
+            expectedStatus?: undefined;
+            expectedOwner?: undefined;
+            includeGlobs?: undefined;
+            ignoreGlobs?: undefined;
+            debounceMs?: undefined;
+            watchId?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: "object";
+        properties: {
+            workDir: {
+                type: string;
+                description: string;
+            };
+            swarmId: {
+                type: string;
+                description?: undefined;
+            };
+            instanceId: {
+                type: string;
+                description: string;
+            };
+            includeGlobs: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                minItems: number;
+                description: string;
+            };
+            payload: {
+                type: string;
+                description: string;
+            };
+            ignoreGlobs: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                description: string;
+            };
+            debounceMs: {
+                type: string;
+                minimum: number;
+                description: string;
+            };
+            type: {
+                type: string;
+                description: string;
+            };
+            from: {
+                type: string;
+                description: string;
+            };
+            watchId: {
+                type: string;
+                description: string;
+            };
+            to?: undefined;
+            data?: undefined;
+            taskId?: undefined;
+            expectedStatus?: undefined;
+            expectedOwner?: undefined;
+            seconds?: undefined;
         };
         required: string[];
     };
-}[];
+})[];
 export declare function handleInboxToolCall(name: string, args: Record<string, unknown>, context: InboxToolContext): Promise<{
     content: Array<{
         type: "text";

package/dist/tools/inbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/tools/inbox.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,eAAO,MAAM,gBAAgB,aAA4B,CAAC;AAE1D,wBAAgB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA+BtC;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAoBhF"}
+{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/tools/inbox.ts"],"names":[],"mappings":"AAiCA,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB;;;;;OAKG;IACH,SAAS,CAAC,EAAE;QACV;;;;;;WAMG;QACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACxF,6EAA6E;QAC7E,gBAAgB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;KAChE,CAAC;IACF;;;;OAIG;IACH,YAAY,CAAC,EAAE;QACb,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,IAAI,CAAC;QAC3C,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvE,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7D,gFAAgF;QAChF,gBAAgB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;KAChE,CAAC;CACH;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D;AAED,eAAO,MAAM,gBAAgB,aAA0D,CAAC;AAcxF,wBAAgB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkFtC;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAmChF"}