@mclawnet/swarm 0.1.3 → 0.1.5

package/README.md

@@ -0,0 +1,118 @@
+# @mclawnet/swarm
+
+Swarm coordination, message routing, and role management. Phase 2 adds an
+**Inbox layer** (`InboxStore` + `InboxRelay`) on top of the existing
+`SwarmCoordinator`, giving the host a push-based path for delivering
+messages to agent sessions.
+
+## BREAKING CHANGE — persistence path migrated
+
+Swarm state has moved under the per-project directory shared with
+`@mclawnet/task`:
+
+```
+OLD:  ~/.clawnet/swarms/<swarmId>/...
+NEW:  ~/.clawnet/projects/<encoded-cwd>/swarms/<swarmId>/...
+```
+
+There is **no backward-compatibility shim**. Snapshots, message logs, and
+inbox files written by 0.1.4 and earlier will not be picked up by 0.1.5+.
+Any in-flight swarms should be drained before upgrading.
+
+`<encoded-cwd>` is computed by `encodeCwd()` from `@mclawnet/task` (absolute
+path with `/` replaced by `-`).
+
+## Modules
+
+### Coordinator (existing)
+
+`SwarmCoordinator`, action parsing, role/template
+loading, persistence, and recovery — see exports in `src/index.ts`.
+Inter-role messaging is delivered via `InboxStore` + `InboxRelay` (see below).
+
+### Inbox (new)
+
+```ts
+interface InboxMessage {
+  id: string;
+  from: string;
+  type: string;
+  data: string;
+  taskId?: string;
+  timestamp: number;
+  delivered: boolean;
+  deliveredAt?: number;
+}
+
+class InboxStore {
+  constructor(workDir: string, swarmId: string);
+  append(instanceId: string, msg: InboxMessage): Promise<void>;
+  readAll(instanceId: string): Promise<InboxMessage[]>;
+  readUndelivered(instanceId: string): Promise<InboxMessage[]>;
+  markDelivered(instanceId: string, ids: string[]): Promise<void>;
+}
+
+class InboxRelay {
+  constructor(
+    sessionAdapter: SessionAdapter,
+    getSwarm: (swarmId: string) => SwarmInstance | undefined,
+  );
+  deliver(swarmId: string, instanceId: string): Promise<void>;
+  onAgentTurnSettled(swarmId: string, instanceId: string): Promise<void>;
+}
+```
+
+`InboxStore` writes one JSON file per recipient under
+`~/.clawnet/projects/<encoded-cwd>/swarms/<swarmId>/inboxes/<instanceId>.json`,
+guarded by `proper-lockfile` for concurrent appenders.
+
+`InboxRelay` is the push side. It wraps undelivered messages in a single
+`<info_for_agent>` envelope and feeds them to the session through
+`SessionAdapter.sendInput`. Four gates guard the push:
+
+1. **single-flight** — at most one in-flight `deliver()` per `(swarmId, instanceId)`.
+2. **liveness** — swarm and role must exist with a `workDir`.
+3. **lifecycle** — agents in `spawning` or `stopped` are skipped.
+4. **pending-echo** — messages already pushed but not yet ack'd by a turn
+   completion are not re-pushed.
+
+`onAgentTurnSettled()` is called when the host sees a `result` event for a
+turn; it marks pending messages `delivered=true` and triggers another
+deliver pass to flush messages that arrived mid-turn.
+
+## Wiring points
+
+The host connects the relay to the coordinator at three places:
+
+- **spawn** — after `SwarmCoordinator` creates a role and the session is
+  ready, call `relay.deliver(swarmId, instanceId)` to flush any inbox
+  messages buffered before the agent existed.
+- **resume** — on snapshot recovery, call `deliver()` for each restored role
+  so agents receive what queued up while offline.
+- **turn-complete** — on the session adapter's turn-settled signal, call
+  `relay.onAgentTurnSettled(swarmId, instanceId)`.
+
+Producers append to the inbox via `InboxStore.append()` (e.g. router
+fan-out, task notifications); the relay handles delivery semantics.
+
+## Example
+
+```ts
+import { InboxStore, InboxRelay } from "@mclawnet/swarm";
+
+const store = new InboxStore(process.cwd(), swarmId);
+await store.append("worker-1", {
+  id: crypto.randomUUID(),
+  from: "host",
+  type: "task-assigned",
+  data: "please pick up TASK-42",
+  taskId: "TASK-42",
+  timestamp: Date.now(),
+  delivered: false,
+});
+
+const relay = new InboxRelay(sessionAdapter, (id) => coordinator.get(id));
+await relay.deliver(swarmId, "worker-1");
+// later, when the agent's turn completes:
+await relay.onAgentTurnSettled(swarmId, "worker-1");
+```

package/dist/__tests__/action-parser.test.js

@@ -1,91 +1,38 @@
 import { describe, it, expect } from "vitest";
-import { parseSwarmActions } from "../action-parser.js";
-describe("parseSwarmActions", () => {
-    it("should parse a single swarm block", () => {
-        const text = `一些文字
-\`\`\`swarm
-{"action":"send","to":"dev-0","type":"task","data":"执行任务"}
+import { parsePlanFromText } from "../action-parser.js";
+describe("parsePlanFromText", () => {
+    it("should parse plan from ```json code block", () => {
+        const text = `Queen 给出方案：
+\`\`\`json
+{"plan":{"goal":"实现登录","tasks":[{"id":"t1","desc":"写表单"}]}}
 \`\`\`
-后续文字`;
-        const { actions, cleanText } = parseSwarmActions(text);
-        expect(actions).toHaveLength(1);
-        expect(actions[0]).toMatchObject({ action: "send", to: "dev-0", data: "执行任务" });
-        expect(cleanText).not.toContain("```swarm");
-        expect(cleanText).toContain("一些文字");
-        expect(cleanText).toContain("后续文字");
+请审核`;
+        const plan = parsePlanFromText(text);
+        expect(plan).not.toBeNull();
+        expect(plan.goal).toBe("实现登录");
+        expect(plan.tasks).toHaveLength(1);
     });
-    it("should parse swarm block with nested code blocks in data field", () => {
-        const text = `\`\`\`swarm
-{"action":"send","to":"dev-0","type":"task","data":"请实现：\\n\`\`\`typescript\\nconst x = 1;\\n\`\`\`\\n完成后汇报"}
-\`\`\``;
-        const { actions } = parseSwarmActions(text);
-        expect(actions).toHaveLength(1);
-        expect(actions[0]).toMatchObject({ action: "send", to: "dev-0" });
-        expect(actions[0].data).toContain("```typescript");
-        expect(actions[0].data).toContain("const x = 1;");
+    it("should parse inline JSON containing plan key", () => {
+        const text = `这里直接给出 {"plan":{"goal":"x","tasks":[]}} 内联 JSON`;
+        const plan = parsePlanFromText(text);
+        expect(plan).not.toBeNull();
+        expect(plan.goal).toBe("x");
     });
-    it("should parse multiple swarm blocks", () => {
-        const text = `\`\`\`swarm
-{"action":"send","to":"dev-0","type":"task","data":"任务1"}
-\`\`\`
-中间文字
-\`\`\`swarm
-{"action":"report","status":"completed","output":"完成"}
-\`\`\``;
-        const { actions, cleanText } = parseSwarmActions(text);
-        expect(actions).toHaveLength(2);
-        expect(actions[0]).toMatchObject({ action: "send" });
-        expect(actions[1]).toMatchObject({ action: "report", status: "completed" });
-        expect(cleanText).toContain("中间文字");
-        expect(cleanText).not.toContain("```swarm");
-    });
-    it("should skip malformed JSON", () => {
-        const text = `\`\`\`swarm
-{"action":"send","to":"dev-0"
-\`\`\``;
-        const { actions } = parseSwarmActions(text);
-        expect(actions).toHaveLength(0);
-    });
-    it("should skip JSON without action field", () => {
-        const text = `\`\`\`swarm
-{"foo":"bar"}
-\`\`\``;
-        const { actions } = parseSwarmActions(text);
-        expect(actions).toHaveLength(0);
-    });
-    it("should handle nested braces in data field", () => {
-        const text = `\`\`\`swarm
-{"action":"send","to":"dev-0","type":"task","data":"{\\"nested\\":{\\"deep\\":true}}"}
-\`\`\``;
-        const { actions } = parseSwarmActions(text);
-        expect(actions).toHaveLength(1);
-        expect(actions[0].data).toBe('{"nested":{"deep":true}}');
+    it("should return null when there is no plan", () => {
+        expect(parsePlanFromText("普通文字，不含 plan")).toBeNull();
     });
-    it("should return empty actions for text without swarm blocks", () => {
-        const text = "普通文字，没有任何指令";
-        const { actions, cleanText } = parseSwarmActions(text);
-        expect(actions).toHaveLength(0);
-        expect(cleanText).toBe(text);
+    it("should return null for malformed JSON", () => {
+        const text = "```json\n{\"plan\": { broken }\n```";
+        expect(parsePlanFromText(text)).toBeNull();
     });
-    it("should produce clean text with swarm blocks removed", () => {
-        const text = `前文
-\`\`\`swarm
-{"action":"report","status":"completed","output":"done"}
-\`\`\`
-后文`;
-        const { cleanText } = parseSwarmActions(text);
-        expect(cleanText).not.toContain("```swarm");
-        expect(cleanText).not.toContain('"action"');
-        expect(cleanText).toContain("前文");
-        expect(cleanText).toContain("后文");
-    });
-    it("should handle escaped quotes in data field", () => {
-        const text = `\`\`\`swarm
-{"action":"send","to":"dev-0","type":"task","data":"他说:\\"你好\\""}
-\`\`\``;
-        const { actions } = parseSwarmActions(text);
-        expect(actions).toHaveLength(1);
-        expect(actions[0].data).toBe('他说:"你好"');
+});
+describe("action-parser exports (hard cut)", () => {
+    it("should not export parseSwarmActions / extractSwarmJsonBlocks / tryExtractPlan", async () => {
+        const mod = await import("../action-parser.js");
+        expect("parseSwarmActions" in mod).toBe(false);
+        expect("extractSwarmJsonBlocks" in mod).toBe(false);
+        expect("tryExtractPlan" in mod).toBe(false);
+        expect("parsePlanFromText" in mod).toBe(true);
     });
 });
 //# sourceMappingURL=action-parser.test.js.map

package/dist/__tests__/action-parser.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-parser.test.js","sourceRoot":"","sources":["../../src/__tests__/action-parser.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"action-parser.test.js","sourceRoot":"","sources":["../../src/__tests__/action-parser.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,IAAI,GAAG;;;;IAIb,CAAC;QACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAQ,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,IAAI,GAAG,iDAAiD,CAAC;QAC/D,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAQ,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,IAAI,GAAG,qCAAqC,CAAC;QACnD,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC7F,MAAM,GAAG,GAA4B,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACzE,MAAM,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,CAAC,wBAAwB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,gBAAgB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/coordinator-create-tx.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=coordinator-create-tx.test.d.ts.map

package/dist/__tests__/coordinator-create-tx.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coordinator-create-tx.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/coordinator-create-tx.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/coordinator-create-tx.test.js

@@ -0,0 +1,114 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+const { warnFn } = vi.hoisted(() => ({ warnFn: vi.fn() }));
+vi.mock("@mclawnet/logger", () => ({
+    createLogger: () => ({ info: vi.fn(), warn: warnFn, error: vi.fn(), debug: vi.fn() }),
+}));
+vi.mock("../retrospective.js", () => ({ runRetrospective: vi.fn() }));
+import { mkdtempSync, rmSync, existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+// keep persistence real so we can observe snapshot cleanup
+import { SwarmCoordinator } from "../swarm-coordinator.js";
+import { projectRoot } from "@mclawnet/task";
+let tempHome;
+let workDir;
+let prevHome;
+beforeEach(() => {
+    tempHome = mkdtempSync(join(tmpdir(), "create-tx-"));
+    workDir = mkdtempSync(join(tmpdir(), "create-tx-work-"));
+    prevHome = process.env.CLAWNET_HOME;
+    process.env.CLAWNET_HOME = tempHome;
+    warnFn.mockClear();
+});
+afterEach(() => {
+    if (prevHome === undefined)
+        delete process.env.CLAWNET_HOME;
+    else
+        process.env.CLAWNET_HOME = prevHome;
+    rmSync(tempHome, { recursive: true, force: true });
+    rmSync(workDir, { recursive: true, force: true });
+});
+function makeCoordinator(opts) {
+    let openCount = 0;
+    const sessionAdapter = {
+        createSession: vi.fn(async (options) => {
+            openCount++;
+            if (opts.failAtRole && openCount === opts.failAtRole) {
+                throw new Error(`simulated openSession failure on call ${openCount}`);
+            }
+            return options.sessionId;
+        }),
+        closeSession: vi.fn(async (id) => { opts.closed.push(id); }),
+        sendInput: vi.fn(),
+    };
+    const hub = { send: vi.fn() };
+    return new SwarmCoordinator(sessionAdapter, hub);
+}
+describe("SwarmCoordinator.create — transactional cleanup", () => {
+    it("on spawnRole failure, retry with same swarmId succeeds (state was cleaned up)", async () => {
+        const closed = [];
+        const coord1 = makeCoordinator({ failAtRole: 1, closed });
+        await expect(coord1.create("swarm-tx-1", {
+            workDir,
+            roles: [{ roleName: "queen", eager: true }],
+            task: "hello",
+        })).rejects.toThrow(/simulated openSession failure/);
+        // Memory registry is empty — same id can be reused
+        expect(coord1.hasSwarm("swarm-tx-1")).toBe(false);
+        // No persisted recovery.json left behind
+        const recoveryPath = join(projectRoot(workDir, tempHome), "swarms", "swarm-tx-1", "recovery.json");
+        expect(existsSync(recoveryPath)).toBe(false);
+        // Retry must NOT throw "already exists"
+        const closed2 = [];
+        const coord2 = makeCoordinator({ closed: closed2 }); // no failure this time
+        await expect(coord2.create("swarm-tx-1", {
+            workDir,
+            roles: [{ roleName: "queen", eager: true }],
+            task: "hello",
+        })).resolves.toBeUndefined();
+    });
+    it("on spawnRole failure mid-loop, all previously opened sessions are closed and timer cleared", async () => {
+        const closed = [];
+        // Two roles requested; fail on the SECOND openSession
+        const coord = makeCoordinator({ failAtRole: 2, closed });
+        await expect(coord.create("swarm-tx-2", {
+            workDir,
+            roles: [
+                { roleName: "queen", eager: true },
+                { roleName: "developer", eager: true },
+            ],
+            task: "hello",
+        })).rejects.toThrow(/simulated openSession failure on call 2/);
+        // The successfully-opened first role's session must have been closed.
+        expect(closed.length).toBeGreaterThanOrEqual(1);
+        // No swarm in the map → its checkTimer cannot fire.
+        expect(coord.hasSwarm("swarm-tx-2")).toBe(false);
+        // Cleanup is logged for visibility (operators want to see this).
+        const cleanupLogged = warnFn.mock.calls.some(([ctx, msg]) => {
+            const ctxStr = JSON.stringify(ctx ?? {});
+            return ctxStr.includes("swarm-tx-2") &&
+                /partial.*create|cleanup|rollback/i.test(String(msg ?? ""));
+        });
+        expect(cleanupLogged).toBe(true);
+    });
+    it("on spawnRole failure, a pre-existing recovery.json from a prior run is preserved", async () => {
+        // Simulate the continuation / restart-after-crash path: recovery.json
+        // already exists on disk before create() runs.
+        const swarmDir = join(projectRoot(workDir, tempHome), "swarms", "swarm-tx-3");
+        mkdirSync(swarmDir, { recursive: true });
+        const recoveryPath = join(swarmDir, "recovery.json");
+        const priorContent = JSON.stringify({ id: "swarm-tx-3", marker: "PRIOR" });
+        writeFileSync(recoveryPath, priorContent);
+        const closed = [];
+        const coord = makeCoordinator({ failAtRole: 1, closed });
+        await expect(coord.create("swarm-tx-3", {
+            workDir,
+            roles: [{ roleName: "queen", eager: true }],
+            task: "hello",
+        })).rejects.toThrow(/simulated openSession failure/);
+        // The prior snapshot must NOT be deleted by cleanup.
+        expect(existsSync(recoveryPath)).toBe(true);
+        expect(readFileSync(recoveryPath, "utf-8")).toBe(priorContent);
+    });
+});
+//# sourceMappingURL=coordinator-create-tx.test.js.map

package/dist/__tests__/coordinator-create-tx.test.js.map

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

package/dist/__tests__/coordinator-inbox-migration.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=coordinator-inbox-migration.test.d.ts.map

package/dist/__tests__/coordinator-inbox-migration.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coordinator-inbox-migration.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/coordinator-inbox-migration.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/coordinator-inbox-migration.test.js

@@ -0,0 +1,56 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+vi.mock("@mclawnet/logger", () => ({
+    createLogger: () => ({ info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }),
+}));
+vi.mock("../persistence.js", () => ({
+    saveSwarmSnapshot: vi.fn(),
+    deleteSwarmSnapshot: vi.fn(),
+    appendMessageLog: vi.fn(),
+    loadSwarmSnapshot: vi.fn(),
+    readMessageLog: vi.fn(() => []),
+}));
+vi.mock("../retrospective.js", () => ({
+    runRetrospective: vi.fn(async () => ({})),
+}));
+import { SwarmCoordinator } from "../swarm-coordinator.js";
+import { InboxStore } from "../inbox-store.js";
+let HOME;
+let WORK;
+beforeEach(() => {
+    HOME = mkdtempSync(join(tmpdir(), "coord-mig-home-"));
+    WORK = mkdtempSync(join(tmpdir(), "coord-mig-work-"));
+    process.env.CLAWNET_HOME = HOME;
+});
+afterEach(() => {
+    rmSync(HOME, { recursive: true, force: true });
+    rmSync(WORK, { recursive: true, force: true });
+    delete process.env.CLAWNET_HOME;
+});
+describe("Task 6 — coordinator routes through InboxStore", () => {
+    it("handleUserMessage writes the user task into the queen's inbox file", async () => {
+        const sessionAdapter = {
+            createSession: vi.fn(async (o) => `proc-${o.sessionId}`),
+            sendInput: vi.fn(),
+            closeSession: vi.fn(async () => { }),
+        };
+        const hub = { send: vi.fn() };
+        const coordinator = new SwarmCoordinator(sessionAdapter, hub);
+        const swarmId = "sw-mig-1";
+        await coordinator.create(swarmId, {
+            workDir: WORK,
+            roles: [{ roleName: "queen", count: 1, eager: true }],
+        });
+        await coordinator.handleUserMessage(swarmId, "make me a sandwich");
+        // Allow the fire-and-forget deliver in handleUserMessage to settle.
+        await new Promise((r) => setTimeout(r, 30));
+        const store = new InboxStore(WORK, swarmId);
+        const all = await store.readAll("queen-0");
+        const userMsg = all.find((m) => m.from === "user" && m.data === "make me a sandwich");
+        expect(userMsg).toBeDefined();
+        expect(userMsg.type).toBe("task");
+    });
+});
+//# sourceMappingURL=coordinator-inbox-migration.test.js.map

package/dist/__tests__/coordinator-inbox-migration.test.js.map

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

package/dist/__tests__/inbox-integration.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=inbox-integration.test.d.ts.map

package/dist/__tests__/inbox-integration.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox-integration.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/inbox-integration.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/inbox-integration.test.js

@@ -0,0 +1,120 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync, readFileSync, existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+// Mock logger
+vi.mock("@mclawnet/logger", () => ({
+    createLogger: () => ({
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+        debug: vi.fn(),
+    }),
+}));
+// Mock persistence
+vi.mock("../persistence.js", () => ({
+    saveSwarmSnapshot: vi.fn(),
+    deleteSwarmSnapshot: vi.fn(),
+    appendMessageLog: vi.fn(),
+    loadSwarmSnapshot: vi.fn(),
+    readMessageLog: vi.fn(() => []),
+}));
+vi.mock("../retrospective.js", () => ({
+    runRetrospective: vi.fn(async () => ({})),
+}));
+import { SwarmCoordinator, InboxStore, InboxRelay, } from "../index.js";
+function createMockSessionAdapter() {
+    const inputs = [];
+    const adapter = {
+        _inputs: inputs,
+        createSession: vi.fn(async (options) => `proc-${options.sessionId}`),
+        sendInput: vi.fn((sessionId, input) => {
+            inputs.push({ sessionId, input });
+        }),
+        closeSession: vi.fn(async () => { }),
+    };
+    return adapter;
+}
+function createMockHubAdapter() {
+    const adapter = { send: vi.fn() };
+    return adapter;
+}
+const baseMsg = {
+    from: "queen",
+    type: "task",
+    data: "implement feature X",
+    timestamp: 1,
+    delivered: false,
+};
+let HOME;
+let WORK;
+beforeEach(() => {
+    HOME = mkdtempSync(join(tmpdir(), "swarm-inbox-int-"));
+    WORK = mkdtempSync(join(tmpdir(), "swarm-inbox-int-work-"));
+    process.env.CLAWNET_HOME = HOME;
+});
+afterEach(() => {
+    rmSync(HOME, { recursive: true, force: true });
+    rmSync(WORK, { recursive: true, force: true });
+    delete process.env.CLAWNET_HOME;
+});
+describe("Inbox end-to-end integration", () => {
+    it("re-exports InboxStore, InboxRelay, and InboxMessage type from package index", () => {
+        expect(typeof InboxStore).toBe("function");
+        expect(typeof InboxRelay).toBe("function");
+        // InboxMessage is a type-only export — verified at compile time.
+        const msg = { ...baseMsg, id: "x" };
+        expect(msg.id).toBe("x");
+    });
+    it("delivers inbox message via inboxRelay.deliver and marks it delivered after turn-complete", async () => {
+        const sessionAdapter = createMockSessionAdapter();
+        const hubAdapter = createMockHubAdapter();
+        const coordinator = new SwarmCoordinator(sessionAdapter, hubAdapter);
+        const swarmId = "sw-int-1";
+        // Spec: pre-populate the developer's inbox BEFORE create() is fine, but
+        // the spec also mentions "directly use coordinator.inboxRelay.deliver(...)".
+        // We do both: create the swarm, then append to dev-0's inbox, then call
+        // inboxRelay.deliver directly.
+        await coordinator.create(swarmId, {
+            workDir: WORK,
+            roles: [
+                { roleName: "queen", count: 1, eager: true },
+                { roleName: "developer", count: 1, eager: true },
+            ],
+            task: "Outer task",
+        });
+        // Wait for spawn-time deliver passes to settle.
+        await new Promise((r) => setTimeout(r, 30));
+        // Append a fresh inbox message addressed to dev-0.
+        const store = new InboxStore(WORK, swarmId);
+        await store.append("dev-0", { ...baseMsg, id: "int-msg-1", data: "do the thing" });
+        // Directly trigger delivery via the public relay.
+        expect(coordinator.inboxRelay).toBeInstanceOf(InboxRelay);
+        await coordinator.inboxRelay.deliver(swarmId, "dev-0");
+        // sendInput should have been called with the wrapped envelope to dev-0.
+        const devInputs = sessionAdapter._inputs.filter((i) => i.sessionId === `${swarmId}::dev-0` && i.input.includes("<info_for_agent>"));
+        expect(devInputs.length).toBeGreaterThanOrEqual(1);
+        const lastDev = devInputs[devInputs.length - 1];
+        expect(lastDev.input).toEqual(expect.stringContaining("<info_for_agent>"));
+        expect(lastDev.input).toEqual(expect.stringMatching(/<message [^>]*id="int-msg-1"/));
+        expect(lastDev.input).toContain("do the thing");
+        // The message is still pendingEcho — not yet marked delivered.
+        let all = await store.readAll("dev-0");
+        let m = all.find((x) => x.id === "int-msg-1");
+        expect(m.delivered).toBe(false);
+        // Trigger turn-complete, which should call onAgentTurnSettled and mark delivered.
+        const handled = coordinator.handleRoleTurnComplete(`${swarmId}::dev-0`, {});
+        expect(handled).toBe(true);
+        // Wait for the async markDelivered.
+        await new Promise((r) => setTimeout(r, 80));
+        // Read the inbox file directly and assert delivered flag + deliveredAt.
+        const inboxFile = store.inboxFile("dev-0");
+        expect(existsSync(inboxFile)).toBe(true);
+        const raw = JSON.parse(readFileSync(inboxFile, "utf-8"));
+        const persisted = raw.find((x) => x.id === "int-msg-1");
+        expect(persisted.delivered).toBe(true);
+        expect(typeof persisted.deliveredAt).toBe("number");
+        expect(persisted.deliveredAt).toBeGreaterThan(0);
+    });
+});
+//# sourceMappingURL=inbox-integration.test.js.map

package/dist/__tests__/inbox-integration.test.js.map

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

package/dist/__tests__/inbox-persistence-recovery.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=inbox-persistence-recovery.test.d.ts.map

package/dist/__tests__/inbox-persistence-recovery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox-persistence-recovery.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/inbox-persistence-recovery.test.ts"],"names":[],"mappings":""}