@mclawnet/swarm 0.1.13 → 0.1.14

package/dist/shipment/shipment-pipeline.js.map

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

package/dist/shipment/transport-detect.d.ts

@@ -0,0 +1,16 @@
+export interface TransportDetectResult {
+    kind: "pr" | "diff-only" | "no-remote";
+    reason: string;
+    defaultBranch?: string;
+    remoteUrl?: string;
+}
+export type CommandRunner = (cmd: string, args: string[], cwd?: string) => Promise<{
+    exitCode: number;
+    stdout: string;
+    stderr: string;
+}>;
+export interface TransportDetectOptions {
+    runner?: CommandRunner;
+}
+export declare function detectTransport(cwd: string, opts?: TransportDetectOptions): Promise<TransportDetectResult>;
+//# sourceMappingURL=transport-detect.d.ts.map

package/dist/shipment/transport-detect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport-detect.d.ts","sourceRoot":"","sources":["../../src/shipment/transport-detect.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,aAAa,GAAG,CAC1B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,CAAC,EAAE,MAAM,KACT,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnE,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAkBD,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,qBAAqB,CAAC,CAkDhC"}

package/dist/shipment/transport-detect.js

@@ -0,0 +1,54 @@
+import { spawn } from "node:child_process";
+const INSTALL_HINTS = "macOS: brew install gh | " +
+    "Linux: see https://github.com/cli/cli/blob/trunk/docs/install_linux.md | " +
+    "Windows: winget install --id GitHub.cli";
+const defaultRunner = (cmd, args, cwd) => new Promise((resolve) => {
+    const child = spawn(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (c) => (stdout += c.toString("utf-8")));
+    child.stderr?.on("data", (c) => (stderr += c.toString("utf-8")));
+    child.on("error", (e) => resolve({ exitCode: -1, stdout, stderr: e.message }));
+    child.on("close", (code) => resolve({ exitCode: code ?? -1, stdout, stderr }));
+});
+export async function detectTransport(cwd, opts = {}) {
+    const run = opts.runner ?? defaultRunner;
+    // 1. Origin remote
+    const remote = await run("git", ["remote", "get-url", "origin"], cwd).catch(() => null);
+    if (!remote || remote.exitCode !== 0 || !remote.stdout.trim()) {
+        return { kind: "no-remote", reason: "no 'origin' remote configured" };
+    }
+    const remoteUrl = remote.stdout.trim();
+    // 2. gh CLI
+    const gh = await run("gh", ["--version"]).catch(() => null);
+    if (!gh || gh.exitCode !== 0) {
+        return {
+            kind: "diff-only",
+            reason: `gh CLI not installed; install with: ${INSTALL_HINTS}`,
+            remoteUrl,
+        };
+    }
+    // 3. Default branch
+    const symref = await run("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], cwd).catch(() => null);
+    let defaultBranch = "main";
+    if (symref && symref.exitCode === 0 && symref.stdout.trim()) {
+        defaultBranch =
+            symref.stdout.trim().replace(/^refs\/remotes\/origin\//, "") || "main";
+    }
+    else {
+        // Fresh clones often have origin/HEAD unset → symbolic-ref exits non-zero.
+        // Ask gh for the repo's declared default branch before falling back to "main"
+        // (which is wrong on legacy master repos and breaks PR creation).
+        const ghDefault = await run("gh", ["repo", "view", "--json", "defaultBranchRef", "-q", ".defaultBranchRef.name"], cwd).catch(() => null);
+        if (ghDefault && ghDefault.exitCode === 0 && ghDefault.stdout.trim()) {
+            defaultBranch = ghDefault.stdout.trim();
+        }
+    }
+    return {
+        kind: "pr",
+        reason: "remote + gh ok",
+        defaultBranch,
+        remoteUrl,
+    };
+}
+//# sourceMappingURL=transport-detect.js.map

package/dist/shipment/transport-detect.js.map

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

package/dist/shipment/workspace-diff.d.ts

@@ -0,0 +1,39 @@
+export type DiffCommandRunner = (cmd: string, args: string[], cwd?: string) => Promise<{
+    exitCode: number;
+    stdout: string;
+    stderr: string;
+}>;
+export interface WorkspaceDiffFile {
+    path: string;
+    added: number;
+    removed: number;
+}
+export interface WorkspaceDiff {
+    /** Human-readable `git diff --stat` body. Empty when no changes. */
+    stat: string;
+    /** Full unified diff (may be empty). */
+    patch: string;
+    /** Structured per-file additions/removals. */
+    files: WorkspaceDiffFile[];
+    /** Set when the underlying git command failed. */
+    error?: string;
+}
+export interface ComputeWorkspaceDiffInput {
+    /** Absolute path to the worktree. */
+    worktreeCwd: string;
+    /** Base commit (the commit the worktree was created from). */
+    baseCommit: string;
+    /** Optional injected runner (defaults to internal spawn-based git). */
+    runner?: DiffCommandRunner;
+}
+/**
+ * Compute the diff of a worktree relative to its base commit. Includes both
+ * committed (HEAD vs baseCommit) and uncommitted (workdir + index vs HEAD)
+ * changes — `git diff <baseCommit>` covers both naturally.
+ *
+ * Returns an error result (not throws) on non-git dirs / git failures, so the
+ * caller (ShipmentPipeline) can gracefully fall back to a "skipped" outcome
+ * instead of aborting the swarm destroy flow.
+ */
+export declare function computeWorkspaceDiff(input: ComputeWorkspaceDiffInput): Promise<WorkspaceDiff>;
+//# sourceMappingURL=workspace-diff.d.ts.map

package/dist/shipment/workspace-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-diff.d.ts","sourceRoot":"","sources":["../../src/shipment/workspace-diff.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,iBAAiB,GAAG,CAC9B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,CAAC,EAAE,MAAM,KACT,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,qCAAqC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,8DAA8D;IAC9D,UAAU,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,aAAa,CAAC,CAyCxB"}

package/dist/shipment/workspace-diff.js

@@ -0,0 +1,64 @@
+import { spawn } from "node:child_process";
+import { createLogger } from "@mclawnet/logger";
+const log = createLogger({ module: "swarm/shipment/workspace-diff" });
+/**
+ * Compute the diff of a worktree relative to its base commit. Includes both
+ * committed (HEAD vs baseCommit) and uncommitted (workdir + index vs HEAD)
+ * changes — `git diff <baseCommit>` covers both naturally.
+ *
+ * Returns an error result (not throws) on non-git dirs / git failures, so the
+ * caller (ShipmentPipeline) can gracefully fall back to a "skipped" outcome
+ * instead of aborting the swarm destroy flow.
+ */
+export async function computeWorkspaceDiff(input) {
+    const run = input.runner ?? ((cmd, args, cwd) => defaultSpawn(cmd, args, cwd));
+    const stat = await run("git", ["diff", "--stat", input.baseCommit], input.worktreeCwd).catch(() => null);
+    if (!stat || stat.exitCode !== 0) {
+        return {
+            stat: "",
+            patch: "",
+            files: [],
+            error: stat?.stderr || "git diff --stat failed",
+        };
+    }
+    const patch = await run("git", ["diff", input.baseCommit], input.worktreeCwd).catch(() => null);
+    if (!patch || patch.exitCode !== 0) {
+        return {
+            stat: "",
+            patch: "",
+            files: [],
+            error: patch?.stderr || "git diff failed",
+        };
+    }
+    const numstat = await run("git", ["diff", "--numstat", input.baseCommit], input.worktreeCwd).catch(() => null);
+    const files = [];
+    if (numstat && numstat.exitCode === 0) {
+        for (const line of numstat.stdout.split("\n")) {
+            if (!line.trim())
+                continue;
+            const parts = line.split("\t");
+            if (parts.length < 3)
+                continue;
+            const [a, r, ...rest] = parts;
+            const path = rest.join("\t");
+            // For binary files git emits "-" "-" — treat as 0/0
+            const added = a === "-" ? 0 : parseInt(a, 10) || 0;
+            const removed = r === "-" ? 0 : parseInt(r, 10) || 0;
+            files.push({ path, added, removed });
+        }
+    }
+    log.debug({ worktreeCwd: input.worktreeCwd, baseCommit: input.baseCommit, fileCount: files.length }, "computeWorkspaceDiff ok");
+    return { stat: stat.stdout, patch: patch.stdout, files };
+}
+function defaultSpawn(cmd, args, cwd) {
+    return new Promise((resolve) => {
+        const child = spawn(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+        let stdout = "";
+        let stderr = "";
+        child.stdout?.on("data", (c) => (stdout += c.toString("utf-8")));
+        child.stderr?.on("data", (c) => (stderr += c.toString("utf-8")));
+        child.on("error", (e) => resolve({ exitCode: -1, stdout, stderr: e.message }));
+        child.on("close", (code) => resolve({ exitCode: code ?? -1, stdout, stderr }));
+    });
+}
+//# sourceMappingURL=workspace-diff.js.map

package/dist/shipment/workspace-diff.js.map

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

package/dist/swarm-coordinator.d.ts

@@ -4,6 +4,7 @@ import { InboxWatcher } from "./inbox-watcher.js";
 import { TaskStore } from "@mclawnet/task";
 import type { SwarmInstance, RoleInstance, SwarmCreateOptions, CustomRoleDefinition } from "./types.js";
 import { type SandboxLevel } from "@mclawnet/shared";
+import { WorkspaceManager } from "./workspace/index.js";
 /**
  * SwarmCoordinator — orchestrates multi-role Claude CLI swarms.
  *
@@ -30,6 +31,14 @@ export declare class SwarmCoordinator {
      * inline call sites still honour `CLAWNET_HOME` env var as before.
      */
     private home?;
+    /**
+     * Optional WorkspaceManager (M6). Used to prepare an isolated workspace
+     * (git worktree or snapshot copy) per swarm on create(), and to dispose
+     * it on destroy(). When omitted, a default WorkspaceManager is created
+     * (git-worktree → snapshot-copy fallback). Workspace prepare is
+     * best-effort: if it fails the swarm continues using `workDir` as before.
+     */
+    private workspaceManager;
     private swarms;
     readonly inboxRelay: InboxRelay;
     readonly inboxWatcher: InboxWatcher;
@@ -61,7 +70,15 @@ export declare class SwarmCoordinator {
      * `homedir()` and write files into the real `~/.clawnet`. When omitted,
      * inline call sites still honour `CLAWNET_HOME` env var as before.
      */
-    home?: string | undefined);
+    home?: string | undefined, 
+    /**
+     * Optional WorkspaceManager (M6). Used to prepare an isolated workspace
+     * (git worktree or snapshot copy) per swarm on create(), and to dispose
+     * it on destroy(). When omitted, a default WorkspaceManager is created
+     * (git-worktree → snapshot-copy fallback). Workspace prepare is
+     * best-effort: if it fails the swarm continues using `workDir` as before.
+     */
+    workspaceManager?: WorkspaceManager);
     /** Resolve the user-home root used for InboxStore / TaskStore lookups. */
     private resolveHome;
     /**
@@ -144,6 +161,8 @@ export declare class SwarmCoordinator {
         presetInstanceId?: string;
         backendOverride?: "claude" | "codex";
         sandboxOverride?: SandboxLevel;
+        modelOverride?: string;
+        modeOverride?: string;
         isDynamicAdd?: boolean;
     }): Promise<RoleInstance>;
     /** Spawn a new role instance in a swarm (real implementation, serialized by spawnRole). */

package/dist/swarm-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarm-coordinator.d.ts","sourceRoot":"","sources":["../src/swarm-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swarm-coordinator.d.ts","sourceRoot":"","sources":["../src/swarm-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAQ7D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,SAAS,EAA+J,MAAM,gBAAgB,CAAC;AAMxM,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAuBxD;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAkBzB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,GAAG;IACX;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB,CAAC;IACzB;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,CAAC;IACb;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IA1C1B,OAAO,CAAC,MAAM,CAAoC;IAClD,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,SAAgB,YAAY,EAAE,YAAY,CAAC;IAC3C;;;;;;;;;;OAUG;IACH,OAAO,CAAC,UAAU,CAAuC;gBAG/C,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,UAAU;IACvB;;;;;;OAMG;IACK,gBAAgB,CAAC,GAAE,SAAS,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,CAAC,aAAA;IACnF;;;;;;OAMG;IACK,IAAI,CAAC,EAAE,MAAM,YAAA;IACrB;;;;;;OAMG;IACK,gBAAgB,GAAE,gBAAyC;IAWrE,0EAA0E;IAC1E,OAAO,CAAC,WAAW;IAInB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,YAAY;IAYpB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,uBAAuB;IAiD/B,wDAAwD;IAClD,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8MhF,iDAAiD;IAC3C,iBAAiB,CACrB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;OAKG;IACH,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO;IAkE/D;;;OAGG;IACH,sBAAsB,CACpB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GACpH,OAAO;IAqCV;;;;OAIG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO;IAe/F,4GAA4G;IAC5G,gCAAgC,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO;IAM1F;;;;;;OAMG;IACG,SAAS,CACb,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE;QACJ,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;QACxC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,eAAe,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;QACrC,eAAe,CAAC,EAAE,YAAY,CAAC;QAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,OAAO,CAAC;KACnB,GACL,OAAO,CAAC,YAAY,CAAC;IAWxB,2FAA2F;YAC7E,WAAW;IA2RzB;;;;;;;;;;;;;OAaG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+H7C,4BAA4B;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBlE;;;;;;;;;;OAUG;YACW,oBAAoB;IAkDlC,+BAA+B;IACzB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC7C,kDAAkD;IAClD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI1C;;;;;;;;;;;;;;;;;;;OAmBG;IACH,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAkC9D;;;;OAIG;YACW,sBAAsB;IAmEpC,4CAA4C;IAC5C,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;IAIzC,8CAA8C;IAC9C,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI3D,kHAAkH;IAC5G,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9C,+GAA+G;IACzG,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB1C;;;;;;;;;;;;;OAaG;YACW,wBAAwB;IAkItC;;;;;;;OAOG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,UAAU,GAAG,UAAU,CAAC;QACjC,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC,IAAI,CAAC;IAqEjB;;;;;;;;;;;;OAYG;YACW,2BAA2B;IAiCzC,gEAAgE;YAClD,kBAAkB;IA8IhC;;;;;;OAMG;YACW,WAAW;IAsBzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;;;OAMG;YACW,YAAY;IAiD1B;;;;;;OAMG;YACW,cAAc;IAU5B;;;;;;;;;OASG;YACW,sBAAsB;IAuBpC;;;;;;;OAOG;YACW,4BAA4B;IAsB1C,OAAO,CAAC,SAAS;IAOjB;;;;;OAKG;IACH,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAM5D,OAAO,CAAC,YAAY;IAOpB,sFAAsF;IACtF,OAAO,CAAC,wBAAwB;IAoChC,gFAAgF;YAClE,iBAAiB;IAgD/B;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,eAAe;IA2EvB,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,kBAAkB;IAgC1B,OAAO,CAAC,gBAAgB;CAWzB"}

package/dist/swarm-coordinator.js

@@ -3,7 +3,7 @@ import { resolveRoleTools } from "./roles/role-tools.js";
 import { loadTemplate } from "./templates/template-loader.js";
 import { parsePlanFromText } from "./action-parser.js";
 import { BUILTIN_ROLES, initDatabase, syncToAutoMemory } from "@mclawnet/memory";
-import { saveSwarmSnapshot, deleteSwarmSnapshot, appendMessageLog, loadSwarmSnapshot, readMessageLog, listRecoverableSwarmIds } from "./persistence.js";
+import { saveSwarmSnapshot, deleteSwarmSnapshot, appendMessageLog, loadSwarmSnapshot, readMessageLog, listRecoverableSwarmIds, saveShipmentResult } from "./persistence.js";
 import { runRetrospective } from "./retrospective.js";
 import { InboxRelay } from "./inbox-relay.js";
 import { InboxStore } from "./inbox-store.js";
@@ -17,6 +17,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { createLogger } from "@mclawnet/logger";
 import { DEFAULT_SANDBOX } from "@mclawnet/shared";
+import { WorkspaceManager } from "./workspace/index.js";
 const log = createLogger({ module: "swarm" });
 // Queen periodic patrol: pure safety-net heartbeat now that crash detection
 // is event-driven via handleRoleCrashed. Worker `task_set_status` /
@@ -48,6 +49,7 @@ export class SwarmCoordinator {
     hub;
     taskStoreFactory;
     home;
+    workspaceManager;
     swarms = new Map();
     inboxRelay;
     inboxWatcher;
@@ -79,11 +81,20 @@ export class SwarmCoordinator {
      * `homedir()` and write files into the real `~/.clawnet`. When omitted,
      * inline call sites still honour `CLAWNET_HOME` env var as before.
      */
-    home) {
+    home, 
+    /**
+     * Optional WorkspaceManager (M6). Used to prepare an isolated workspace
+     * (git worktree or snapshot copy) per swarm on create(), and to dispose
+     * it on destroy(). When omitted, a default WorkspaceManager is created
+     * (git-worktree → snapshot-copy fallback). Workspace prepare is
+     * best-effort: if it fails the swarm continues using `workDir` as before.
+     */
+    workspaceManager = new WorkspaceManager()) {
         this.sessionAdapter = sessionAdapter;
         this.hub = hub;
         this.taskStoreFactory = taskStoreFactory;
         this.home = home;
+        this.workspaceManager = workspaceManager;
         this.inboxRelay = new InboxRelay(sessionAdapter, (id) => this.swarms.get(id), (swarmId, instanceId, msg) => this.handleInterceptedMessage(swarmId, instanceId, msg), home);
         this.inboxWatcher = new InboxWatcher(this.inboxRelay);
     }
@@ -217,7 +228,7 @@ export class SwarmCoordinator {
                     const idx = roleSpecs.findIndex((s, i) => !claimed.has(i) && s.roleName === uiRole.roleName);
                     if (idx >= 0) {
                         claimed.add(idx);
-                        if (uiRole.backend) {
+                        if (uiRole.backend !== undefined) {
                             roleSpecs[idx] = { ...roleSpecs[idx], backend: uiRole.backend };
                         }
                         // Mirror backend overlay for sandbox so user's per-role choice in
@@ -225,9 +236,20 @@ export class SwarmCoordinator {
                         // persistence.json. Without this, only dynamically-added roles
                         // ever carried `sandbox`; the 6 initial roles silently dropped to
                         // undefined and recovery.json had no record of the user's pick.
-                        if (uiRole.sandbox) {
+                        if (uiRole.sandbox !== undefined) {
                             roleSpecs[idx] = { ...roleSpecs[idx], sandbox: uiRole.sandbox };
                         }
+                        // N4.5 per-role sticky model + mode (UI ModelPicker / ModePicker).
+                        // Same overlay pattern as backend/sandbox so the per-role choice
+                        // reaches spawnRole → definition → SessionAdapter.createSession.
+                        // Use !== undefined (not truthy) so a future caller can clear a
+                        // field by passing "" without being silently ignored.
+                        if (uiRole.model !== undefined) {
+                            roleSpecs[idx] = { ...roleSpecs[idx], model: uiRole.model };
+                        }
+                        if (uiRole.mode !== undefined) {
+                            roleSpecs[idx] = { ...roleSpecs[idx], mode: uiRole.mode };
+                        }
                     }
                 }
             }
@@ -249,9 +271,27 @@ export class SwarmCoordinator {
             isPaused: false,
             status: "creating",
             planStatus: "none",
+            // PR-B D11 — default "user" when caller doesn't specify (preserves
+            // pre-D11 chat-driven create() behaviour).
+            kind: options.kind ?? "user",
         };
         // Store pending role specs for on-demand spawning
         this.swarms.set(swarmSessionId, swarm);
+        // M6: prepare an isolated workspace for this swarm (git worktree or
+        // snapshot copy). Best-effort — if it fails, the swarm falls back to
+        // using `workDir` directly (legacy behavior, no regression).
+        if (swarm.workDir) {
+            try {
+                swarm.workspace = await this.workspaceManager.prepare({
+                    swarmId: swarmSessionId,
+                    projectRoot: swarm.workDir,
+                });
+                log.info({ swarmId: swarmSessionId, strategy: swarm.workspace.strategy, cwd: swarm.workspace.cwd }, "workspace prepared for swarm");
+            }
+            catch (err) {
+                log.warn({ err, swarmId: swarmSessionId }, "workspace prepare failed; swarm continues using main workDir");
+            }
+        }
         // Snapshot may already exist from a prior run (continuation, or
         // restart-after-crash with the same swarmId). Record this BEFORE any
         // spawnRole writes a new one — cleanup must not delete what wasn't ours.
@@ -283,6 +323,8 @@ export class SwarmCoordinator {
                         customDefinition: spec.customDefinition,
                         backendOverride: spec.backend,
                         sandboxOverride: spec.sandbox,
+                        modelOverride: spec.model,
+                        modeOverride: spec.mode,
                     });
                     trackOpen(role);
                 }
@@ -529,7 +571,7 @@ export class SwarmCoordinator {
     }
     /** Spawn a new role instance in a swarm (real implementation, serialized by spawnRole). */
     async doSpawnRole(swarmId, roleName, opts = {}) {
-        const { taskPrompt, customPrompt, customDefinition, additionalDirs, resumeId, presetInstanceId, backendOverride, sandboxOverride, isDynamicAdd, } = opts;
+        const { taskPrompt, customPrompt, customDefinition, additionalDirs, resumeId, presetInstanceId, backendOverride, sandboxOverride, modelOverride, modeOverride, isDynamicAdd, } = opts;
         const swarm = this.swarms.get(swarmId);
         if (!swarm)
             throw new Error(`Swarm ${swarmId} not found`);
@@ -545,6 +587,8 @@ export class SwarmCoordinator {
                 color: customDefinition.color,
                 promptBody: customDefinition.promptBody,
                 backend: customDefinition.backend,
+                model: customDefinition.model,
+                mode: customDefinition.mode,
             };
         }
         else {
@@ -556,16 +600,26 @@ export class SwarmCoordinator {
         }
         // Per-spawn backend override (UI selector) takes precedence over the
         // role definition's static backend. Frozen here for the lifetime of the
-        // role instance.
-        if (backendOverride) {
+        // role instance. Use !== undefined (not truthy) so callers can opt out
+        // explicitly with an empty string in the future without being ignored.
+        if (backendOverride !== undefined) {
             definition = { ...definition, backend: backendOverride };
         }
         // Per-spawn sandbox override — same precedence rule. Each adapter
         // maps the abstract level to its own permission model (see
         // SpawnOptions.sandbox in @mclawnet/agent).
-        if (sandboxOverride) {
+        if (sandboxOverride !== undefined) {
             definition = { ...definition, sandbox: sandboxOverride };
         }
+        // N4.5 per-spawn sticky model / mode override (UI ModelPicker / ModePicker).
+        // Same precedence rule as backend/sandbox: per-spawn override wins over
+        // any value baked into the role definition (frontmatter or customDefinition).
+        if (modelOverride !== undefined) {
+            definition = { ...definition, model: modelOverride };
+        }
+        if (modeOverride !== undefined) {
+            definition = { ...definition, mode: modeOverride };
+        }
         // Final default: role files don't currently declare `sandbox`, and not
         // every caller passes an override (e.g. legacy recovery, programmatic
         // spawns). Pin to DEFAULT_SANDBOX so snapshots and the membership-change
@@ -634,7 +688,7 @@ export class SwarmCoordinator {
         try {
             await this.sessionAdapter.createSession({
                 sessionId: roleSessionId,
-                workDir: swarm.workDir,
+                workDir: swarm.workspace?.cwd ?? swarm.workDir,
                 systemPrompt: finalPrompt,
                 roleId,
                 additionalDirs,
@@ -646,6 +700,20 @@ export class SwarmCoordinator {
                 disallowedTools: tools.disallowedTools,
                 backend: definition.backend,
                 sandbox: definition.sandbox,
+                model: definition.model,
+                mode: definition.mode,
+                // M6 T7: when the swarm is running inside a prepared workspace (worktree
+                // or snapshot), the role's cwd is the workspace path — NOT the original
+                // project root. MCP tools (inbox / task / wakeup) take a `workDir` arg
+                // that the LLM typically derives from `process.cwd()`, which would now
+                // land in a per-worktree namespace and break cross-swarm routing.
+                // Expose the original project root via env so MCP tools can fall back
+                // to it when `workDir` is missing or when the caller wants the canonical
+                // namespace. Always set (even when no workspace) so tools have a
+                // consistent fallback.
+                ...(swarm.workDir
+                    ? { env: { CLAWNET_PROJECT_ROOT: swarm.workDir } }
+                    : {}),
             });
             sessionOpened = true;
         }
@@ -782,6 +850,27 @@ export class SwarmCoordinator {
             planStatus: snapshot.planStatus ?? "none",
         };
         this.swarms.set(swarmId, swarm);
+        // M6 T8: re-adopt the per-swarm workspace from the snapshot. We do this
+        // BEFORE respawning roles so spawnRole sees the correct workspace.cwd and
+        // routes the role into the same worktree the previous session used. If the
+        // workspace directory disappeared between sessions (e.g. user `rm -rf`'d
+        // it), fall back to the main workDir without throwing.
+        if (snapshot.workspace) {
+            const { existsSync } = await import("node:fs");
+            if (existsSync(snapshot.workspace.cwd)) {
+                this.workspaceManager.adopt(snapshot.workspace);
+                swarm.workspace = snapshot.workspace;
+                log.info({ swarmId, cwd: snapshot.workspace.cwd, strategy: snapshot.workspace.strategy }, "workspace adopted from snapshot");
+            }
+            else {
+                log.warn({ swarmId, cwd: snapshot.workspace.cwd }, "workspace dir missing on disk (deleted between sessions); swarm falls back to main workDir");
+            }
+        }
+        // M6.1 T7: Restore shipment result from snapshot (one-shot — never re-run
+        // shipment on recover, only surface the previous outcome to the UI).
+        if (snapshot.shipment) {
+            swarm.shipment = snapshot.shipment;
+        }
         // Respawn each role with the same instanceId, passing backendSessionId
         // through as resumeId so SessionAdapter can `--resume` the conversation.
         // Suppress per-role snapshot writes — we save once at the end with the
@@ -946,6 +1035,14 @@ export class SwarmCoordinator {
         else {
             log.warn({ swarmId }, "destroy: swarm.workDir missing, cannot delete snapshot");
         }
+        // M6: dispose the per-swarm workspace (git worktree or snapshot copy).
+        // Best-effort: never block destroy on filesystem cleanup.
+        try {
+            await this.workspaceManager.dispose(swarmId, { keep: false });
+        }
+        catch (err) {
+            log.warn({ err, swarmId }, "workspace dispose failed (best-effort)");
+        }
         log.info({ swarmId }, "swarm destroyed");
     }
     /** Check if a session ID belongs to any swarm. */
@@ -1119,6 +1216,30 @@ export class SwarmCoordinator {
      * idempotent so duplicate reviewer envelopes (e.g. retries) are safe.
      */
     async handleInterceptedMessage(swarmId, instanceId, msg) {
+        // PR-B Sub-PR-B2 — `swarm_complete_request` (queen → self via the
+        // `swarm_complete` MCP tool). Coordinator runs the full cleanup chain
+        // (runRetroAndCleanup → closeSession → workspace dispose → shipment).
+        // Returns true to drop the raw message from the LLM payload.
+        if (msg.type === "swarm_complete_request") {
+            // Authorization: only queen instances may complete a swarm. The MCP
+            // tool's `from.startsWith("queen-")` guard is advisory across the
+            // process boundary — enforce again at the trust boundary.
+            if (!msg.from.startsWith("queen-")) {
+                log.warn({ swarmId, instanceId, msgId: msg.id, from: msg.from }, "swarm_complete_request interceptor: rejected non-queen sender — consuming");
+                return true;
+            }
+            log.info({ swarmId, instanceId, from: msg.from, msgId: msg.id }, "swarm_complete_request interceptor: queen requested completion — running cleanup");
+            try {
+                await this.complete(swarmId);
+            }
+            catch (err) {
+                // Best-effort: complete() is idempotent. A failure here would mean
+                // the swarm stays alive after the queen tried to close it; the
+                // runner's D14 paused-fallback or a manual UI cancel will catch it.
+                log.warn({ err, swarmId, from: msg.from }, "swarm_complete_request interceptor: complete() threw — leaving swarm for fallback paths");
+            }
+            return true;
+        }
         if (msg.type !== "plan_review_result")
             return false;
         // Authorization: only reviewer instances may flip planStatus via this path.
@@ -1349,6 +1470,68 @@ export class SwarmCoordinator {
         for (const role of swarm.roles.values()) {
             await this.sessionAdapter.closeSession(role.roleSessionId).catch(() => { });
         }
+        // 3.5 M6.1: Shipment — compute diff, generate report, try PR / write
+        // fallback artifacts. Best-effort: never block destroy. Runs after role
+        // sessions are closed (so git commands don't race with role processes)
+        // and before workspace dispose / snapshot delete (so the worktree dir
+        // still exists and the snapshot can record the result for M6.2 UI).
+        // Skips snapshot-copy and missing workspaces — git-worktree only.
+        if (swarm.workspace && swarm.workspace.strategy === "git-worktree") {
+            if (swarm.shipment) {
+                // Re-entrancy guard: double-destroy must not re-run shipment and
+                // overwrite the first result. Existing snapshot already has the
+                // outcome from the prior call (or from recovery restoration above).
+                log.info({ swarmId, existing: swarm.shipment.strategy }, "shipment already ran; skipping re-entry");
+            }
+            else {
+                try {
+                    const { runShipment } = await import("./shipment/shipment-pipeline.js");
+                    const result = await runShipment({ swarm });
+                    swarm.shipment = result;
+                    log.info({ swarmId, strategy: result.strategy, prUrl: result.prUrl, error: result.error }, "shipment complete");
+                    // M6.2.0: persist to dedicated shipment.json *first* — this file
+                    // survives `deleteSwarmSnapshot` below (which only wipes
+                    // recovery.json), so the M6.2 UI can still read the outcome after
+                    // the workspace is disposed. Done before saveSwarmSnapshot so a
+                    // snapshot-write failure can't strand the shipment outcome.
+                    if (swarm.workDir) {
+                        try {
+                            saveShipmentResult(swarm.workDir, swarmId, result);
+                        }
+                        catch (err) {
+                            log.warn({ err, swarmId }, "shipment: saveShipmentResult failed");
+                        }
+                    }
+                    // Persist so M6.2 UI can read it after dispose.
+                    if (swarm.workDir) {
+                        try {
+                            saveSwarmSnapshot(swarm);
+                        }
+                        catch (err) {
+                            log.warn({ err, swarmId }, "shipment snapshot save failed");
+                        }
+                    }
+                    // M6.2.1: best-effort live push to the hub so the UI can react
+                    // immediately without waiting for the user to reload. The file
+                    // (shipment.json) already saved above is the source of truth; this
+                    // push is purely a notification. Swallow all errors so a flaky hub
+                    // connection can never block destroy.
+                    try {
+                        this.hub.send({
+                            type: "swarm.shipment",
+                            sessionId: swarmId,
+                            shipment: result,
+                        });
+                    }
+                    catch (err) {
+                        log.warn({ err, swarmId }, "shipment: hub push failed (best-effort, file already saved)");
+                    }
+                }
+                catch (err) {
+                    log.warn({ swarmId, err }, "shipment failed (best-effort)");
+                }
+            }
+        }
         // 4. Delete recovery.json (keep messages.jsonl)
         if (swarm.workDir) {
             // Detach tasks before deleting snapshot — keeps task index consistent
@@ -1715,7 +1898,7 @@ ${planJson}
                     await this.deliverInbox(swarm, queen.instanceId, {
                         from: "system",
                         type: "system",
-                        data: `[系统] 蜂群已自动暂停。连续${swarm.maxIdleChecks}次巡查发现所有成员空闲，已暂停任务释放资源。用户可以resume恢复。`,
+                        data: `[系统] 蜂群已自动暂停。连续${swarm.maxIdleChecks}次巡查发现所有成员空闲。注意：资源（CLI 进程、worktree、内存）仍占用——如不再需要请 cancel 释放，或 resume 继续。Queen 任务完成后应该显式调 swarm_complete 工具，而不是依赖此暂停兜底。`,
                     });
                     log.info({ swarmId, idleChecks: swarm.maxIdleChecks }, "swarm auto-paused");
                     return; // Don't schedule next tick