@mclawnet/swarm 0.1.12 → 0.1.14

package/dist/watch-manager.js

@@ -0,0 +1,153 @@
+import { existsSync, watch } from "node:fs";
+import { relative, isAbsolute } from "node:path";
+import { createLogger } from "@mclawnet/logger";
+const log = createLogger({ module: "swarm/watch-manager" });
+export class WatchManager {
+    handles = new Map();
+    watchFn;
+    constructor(opts = {}) {
+        this.watchFn = opts.watchFn ?? watch;
+    }
+    size() { return this.handles.size; }
+    /** Count of active watches for (swarmId, instanceId). Used by the
+     *  mcp-server wrapper to enforce per-instance caps before register and to
+     *  decide whether to prune external registries on unregister
+     *  (`countForInstance(s, i) === 0`). */
+    countForInstance(swarmId, instanceId) {
+        const prefix = `${swarmId}::${instanceId}::`;
+        let c = 0;
+        for (const k of this.handles.keys())
+            if (k.startsWith(prefix))
+                c++;
+        return c;
+    }
+    key(s, i, w) { return `${s}::${i}::${w}`; }
+    register(reg) {
+        const k = this.key(reg.swarmId, reg.instanceId, reg.watchId);
+        if (this.handles.has(k))
+            this.unregister(reg.swarmId, reg.instanceId, reg.watchId);
+        if (!existsSync(reg.projectRoot)) {
+            log.warn({ root: reg.projectRoot, key: k }, "WatchManager: projectRoot missing, skipping");
+            return;
+        }
+        const h = {
+            reg, watcher: undefined, timer: undefined,
+            includeRes: reg.includeGlobs.map(compileGlob),
+            ignoreRes: reg.ignoreGlobs.map(compileGlob),
+        };
+        try {
+            h.watcher = this.watchFn(reg.projectRoot, { recursive: true }, (_ev, filename) => {
+                // Race guard: if dispose/unregister ran while a watcher event was in-flight
+                // (or fired after fs.watch.close() but before the listener detached), the
+                // handle has already been removed from the map. Reject early to avoid
+                // scheduling a new debounce timer that nobody can clear.
+                if (!this.handles.has(k))
+                    return;
+                const name = toUtf8(filename);
+                if (!name)
+                    return;
+                const rel = isAbsolute(name) ? (relative(reg.projectRoot, name) || name) : name;
+                if (h.ignoreRes.some(r => r.test(rel)))
+                    return;
+                if (h.includeRes.length > 0 && !h.includeRes.some(r => r.test(rel)))
+                    return;
+                if (h.timer)
+                    clearTimeout(h.timer);
+                h.timer = setTimeout(() => {
+                    h.timer = undefined;
+                    if (!this.handles.has(k))
+                        return; // also guard timer fire
+                    Promise.resolve(reg.onTrigger(rel)).catch(err => log.warn({ err, key: k }, "watch onTrigger failed"));
+                }, Math.max(0, reg.debounceMs));
+            });
+            h.watcher.on("error", err => log.warn({ err, key: k }, "fs.watch error"));
+        }
+        catch (err) {
+            log.warn({ err, key: k }, "WatchManager: watch() failed");
+            return;
+        }
+        this.handles.set(k, h);
+    }
+    unregister(swarmId, instanceId, watchId) {
+        const k = this.key(swarmId, instanceId, watchId);
+        const h = this.handles.get(k);
+        if (!h)
+            return;
+        if (h.timer)
+            clearTimeout(h.timer);
+        try {
+            h.watcher?.close();
+        }
+        catch { /* best-effort */ }
+        this.handles.delete(k);
+    }
+    unwatchByInstance(swarmId, instanceId) {
+        const prefix = `${swarmId}::${instanceId}::`;
+        for (const k of [...this.handles.keys()]) {
+            if (k.startsWith(prefix)) {
+                const h = this.handles.get(k);
+                if (h.timer)
+                    clearTimeout(h.timer);
+                try {
+                    h.watcher?.close();
+                }
+                catch { /* best-effort */ }
+                this.handles.delete(k);
+            }
+        }
+    }
+    dispose() {
+        for (const h of this.handles.values()) {
+            if (h.timer)
+                clearTimeout(h.timer);
+            try {
+                h.watcher?.close();
+            }
+            catch { /* best-effort */ }
+        }
+        this.handles.clear();
+    }
+}
+function toUtf8(v) {
+    if (typeof v === "string")
+        return v;
+    if (v && typeof v.toString === "function")
+        return v.toString("utf-8");
+    return "";
+}
+/** gitignore-style glob → RegExp. Copied from PilotDeck SignalWatcher.compileGlob. */
+function compileGlob(glob) {
+    let body = "", i = 0;
+    while (i < glob.length) {
+        const ch = glob[i];
+        if (ch === "*") {
+            if (glob[i + 1] === "*") {
+                if (glob[i + 2] === "/") {
+                    body += "(?:.*/)?";
+                    i += 3;
+                    continue;
+                }
+                body += ".*";
+                i += 2;
+                continue;
+            }
+            body += "[^/]*";
+            i += 1;
+            continue;
+        }
+        if (ch === "?") {
+            body += "[^/]";
+            i += 1;
+            continue;
+        }
+        if (/[.+^$|()\\\[\]{}/]/.test(ch)) {
+            body += `\\${ch}`;
+            i += 1;
+            continue;
+        }
+        body += ch;
+        i += 1;
+    }
+    return new RegExp(`^(?:${body})$`);
+}
+//# sourceMappingURL=watch-manager.js.map

package/dist/watch-manager.js.map

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

package/dist/workspace/git-worktree-provider.d.ts

@@ -0,0 +1,11 @@
+import type { WorkspaceProvider, WorkspacePrepareInput, WorkspaceHandle } from "./types.js";
+export declare class GitWorktreeProvider implements WorkspaceProvider {
+    readonly id: "git-worktree";
+    readonly priority = 1;
+    isApplicable(projectRoot: string): Promise<boolean>;
+    prepare(input: WorkspacePrepareInput): Promise<WorkspaceHandle>;
+    dispose(handle: WorkspaceHandle, opts: {
+        keep: boolean;
+    }): Promise<void>;
+}
+//# sourceMappingURL=git-worktree-provider.d.ts.map

package/dist/workspace/git-worktree-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-provider.d.ts","sourceRoot":"","sources":["../../src/workspace/git-worktree-provider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAI5F,qBAAa,mBAAoB,YAAW,iBAAiB;IAC3D,QAAQ,CAAC,EAAE,EAAG,cAAc,CAAU;IACtC,QAAQ,CAAC,QAAQ,KAAK;IAEhB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUnD,OAAO,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAyC/D,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAsD/E"}

package/dist/workspace/git-worktree-provider.js

@@ -0,0 +1,123 @@
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { rm } from "node:fs/promises";
+import { join } from "node:path";
+import { createLogger } from "@mclawnet/logger";
+const log = createLogger({ module: "swarm/workspace/git-worktree" });
+export class GitWorktreeProvider {
+    id = "git-worktree";
+    priority = 1;
+    async isApplicable(projectRoot) {
+        const top = await runGit(projectRoot, ["rev-parse", "--show-toplevel"]).catch(() => null);
+        if (!top || top.exitCode !== 0)
+            return false;
+        const head = await runGit(projectRoot, ["rev-parse", "HEAD"]).catch(() => null);
+        if (!head || head.exitCode !== 0)
+            return false;
+        const status = await runGit(projectRoot, ["status", "--porcelain"]).catch(() => null);
+        if (!status || status.exitCode !== 0)
+            return false;
+        return status.stdout.trim().length === 0;
+    }
+    async prepare(input) {
+        const top = await expectOk(await runGit(input.projectRoot, ["rev-parse", "--show-toplevel"]), "rev-parse top");
+        const repoRoot = top.stdout.trim();
+        const branchRes = await expectOk(await runGit(repoRoot, ["rev-parse", "--abbrev-ref", "HEAD"]), "abbrev-ref");
+        const baseBranch = branchRes.stdout.trim();
+        const commitRes = await expectOk(await runGit(repoRoot, ["rev-parse", "HEAD"]), "rev-parse HEAD");
+        const baseCommit = commitRes.stdout.trim();
+        const worktreePath = join(input.projectRoot, ".worktrees", input.swarmId);
+        // Caller-supplied branchName wins (chat sessions can pass a user-typed
+        // suffix already prefixed with `clawnet/chat-` by the hub). Falls back to
+        // the swarm default. We don't sanitize here — hub regex already gated it.
+        const branchName = input.branchName ?? `clawnet/swarm-${input.swarmId}`;
+        // If a stale worktree from a previous crash/leak still exists at the same
+        // path/branch, scrub it before re-creating. swarmId is the caller's
+        // identity contract — same swarmId means "re-prepare the same swarm",
+        // not "two distinct swarms". Without this, git worktree add fails with
+        // "already exists" and the caller can't recover without manual cleanup.
+        if (existsSync(worktreePath)) {
+            log.warn({ swarmId: input.swarmId, worktreePath }, "stale worktree found; scrubbing before re-prepare");
+            await runGit(repoRoot, ["worktree", "remove", "--force", worktreePath]).catch(() => null);
+            await rm(worktreePath, { recursive: true, force: true }).catch(() => undefined);
+            await runGit(repoRoot, ["worktree", "prune"]).catch(() => null);
+            await runGit(repoRoot, ["branch", "-D", branchName]).catch(() => null);
+        }
+        const add = await runGit(repoRoot, ["worktree", "add", "-b", branchName, worktreePath, baseCommit]);
+        if (add.exitCode !== 0) {
+            throw new Error(`git worktree add failed: ${add.stderr || add.stdout}`);
+        }
+        log.info({ swarmId: input.swarmId, worktreePath, branchName, baseCommit }, "git worktree prepared");
+        return {
+            swarmId: input.swarmId,
+            projectRoot: input.projectRoot,
+            strategy: "git-worktree",
+            cwd: worktreePath,
+            metadata: { repoRoot, baseBranch, baseCommit, branchName },
+        };
+    }
+    async dispose(handle, opts) {
+        if (opts.keep)
+            return;
+        const repoRoot = handle.metadata.repoRoot ?? handle.cwd;
+        let worktreeRemoved = false;
+        let branchDeleted = false;
+        const remove = await runGit(repoRoot, ["worktree", "remove", "--force", handle.cwd]).catch(() => null);
+        if (remove && remove.exitCode === 0) {
+            worktreeRemoved = true;
+        }
+        else {
+            log.warn({ swarmId: handle.swarmId, cwd: handle.cwd, stderr: remove?.stderr }, "git worktree remove failed; falling back to rm -rf + worktree prune");
+            const rmOk = await rm(handle.cwd, { recursive: true, force: true })
+                .then(() => true)
+                .catch((err) => {
+                log.warn({ err, swarmId: handle.swarmId, cwd: handle.cwd }, "rm -rf fallback also failed");
+                return false;
+            });
+            worktreeRemoved = rmOk;
+            await runGit(repoRoot, ["worktree", "prune"]).catch(() => null);
+        }
+        const branchName = handle.metadata.branchName;
+        if (branchName) {
+            // Use `branch -d` (safe) not `-D` (force). If the branch has unmerged
+            // commits, git refuses and we warn loudly with the exact command to
+            // force-delete. M6.1 (PR flow) / M6.2 (UI confirm) own the
+            // force-delete decision; at this layer we never destroy unmerged work.
+            const branchDel = await runGit(repoRoot, ["branch", "-d", branchName]).catch(() => null);
+            if (branchDel && branchDel.exitCode === 0) {
+                branchDeleted = true;
+            }
+            else {
+                log.warn({ swarmId: handle.swarmId, branchName, stderr: branchDel?.stderr }, `branch -d refused (likely unmerged commits); branch preserved. ` +
+                    `Use 'git -C ${repoRoot} branch -D ${branchName}' to force-delete.`);
+            }
+        }
+        else {
+            // No branch was recorded — nothing to delete, treat as success for the
+            // purposes of the structured outcome log.
+            branchDeleted = true;
+        }
+        log.info({
+            swarmId: handle.swarmId,
+            worktreePath: handle.cwd,
+            worktreeRemoved,
+            branchDeleted,
+        }, worktreeRemoved && branchDeleted ? "git worktree disposed" : "git worktree dispose completed with leaks");
+    }
+}
+function runGit(cwd, args) {
+    return new Promise((resolve) => {
+        const child = spawn("git", ["-C", cwd, ...args], { stdio: ["ignore", "pipe", "pipe"] });
+        let stdout = "", 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 }));
+    });
+}
+async function expectOk(r, label) {
+    if (r.exitCode !== 0)
+        throw new Error(`git ${label} failed: ${r.stderr || r.stdout}`);
+    return r;
+}
+//# sourceMappingURL=git-worktree-provider.js.map

package/dist/workspace/git-worktree-provider.js.map

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

package/dist/workspace/gitignore-check.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Returns true if the given project's .gitignore contains an entry matching
+ * `.worktrees/`. Accepted variants:
+ *   .worktrees    /.worktrees    .worktrees/    /.worktrees/    .worktrees/**
+ *
+ * Comments (#-prefixed) and blank lines are skipped. We intentionally do NOT
+ * auto-write the user's .gitignore — the M6 design (D4) is "advisory only".
+ */
+export declare function isWorktreesIgnored(projectRoot: string): boolean;
+//# sourceMappingURL=gitignore-check.d.ts.map

package/dist/workspace/gitignore-check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitignore-check.d.ts","sourceRoot":"","sources":["../../src/workspace/gitignore-check.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAU/D"}

package/dist/workspace/gitignore-check.js

@@ -0,0 +1,25 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+/**
+ * Returns true if the given project's .gitignore contains an entry matching
+ * `.worktrees/`. Accepted variants:
+ *   .worktrees    /.worktrees    .worktrees/    /.worktrees/    .worktrees/**
+ *
+ * Comments (#-prefixed) and blank lines are skipped. We intentionally do NOT
+ * auto-write the user's .gitignore — the M6 design (D4) is "advisory only".
+ */
+export function isWorktreesIgnored(projectRoot) {
+    const fp = join(projectRoot, ".gitignore");
+    if (!existsSync(fp))
+        return false;
+    const lines = readFileSync(fp, "utf-8").split(/\r?\n/);
+    for (const raw of lines) {
+        const line = raw.trim();
+        if (!line || line.startsWith("#"))
+            continue;
+        if (/^\/?\.worktrees(\/(\*\*)?)?$/.test(line))
+            return true;
+    }
+    return false;
+}
+//# sourceMappingURL=gitignore-check.js.map

package/dist/workspace/gitignore-check.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitignore-check.js","sourceRoot":"","sources":["../../src/workspace/gitignore-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,WAAmB;IACpD,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAAE,OAAO,KAAK,CAAC;IAClC,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAC5C,IAAI,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;IAC7D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/workspace/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./types.js";
+export { GitWorktreeProvider } from "./git-worktree-provider.js";
+export { SnapshotCopyProvider } from "./snapshot-copy-provider.js";
+export { WorkspaceManager } from "./workspace-manager.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/workspace/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/workspace/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/workspace/index.js

@@ -0,0 +1,5 @@
+export * from "./types.js";
+export { GitWorktreeProvider } from "./git-worktree-provider.js";
+export { SnapshotCopyProvider } from "./snapshot-copy-provider.js";
+export { WorkspaceManager } from "./workspace-manager.js";
+//# sourceMappingURL=index.js.map

package/dist/workspace/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/workspace/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/workspace/snapshot-copy-provider.d.ts

@@ -0,0 +1,11 @@
+import type { WorkspaceProvider, WorkspacePrepareInput, WorkspaceHandle } from "./types.js";
+export declare class SnapshotCopyProvider implements WorkspaceProvider {
+    readonly id: "snapshot-copy";
+    readonly priority = 100;
+    isApplicable(_projectRoot: string): Promise<boolean>;
+    prepare(input: WorkspacePrepareInput): Promise<WorkspaceHandle>;
+    dispose(handle: WorkspaceHandle, opts: {
+        keep: boolean;
+    }): Promise<void>;
+}
+//# sourceMappingURL=snapshot-copy-provider.d.ts.map

package/dist/workspace/snapshot-copy-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot-copy-provider.d.ts","sourceRoot":"","sources":["../../src/workspace/snapshot-copy-provider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAM5F,qBAAa,oBAAqB,YAAW,iBAAiB;IAC5D,QAAQ,CAAC,EAAE,EAAG,eAAe,CAAU;IACvC,QAAQ,CAAC,QAAQ,OAAO;IAElB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIpD,OAAO,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6C/D,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAO/E"}

package/dist/workspace/snapshot-copy-provider.js

@@ -0,0 +1,66 @@
+import { mkdirSync, rmSync, readdirSync } from "node:fs";
+import { cp, rm } from "node:fs/promises";
+import { join } from "node:path";
+import { createLogger } from "@mclawnet/logger";
+const log = createLogger({ module: "swarm/workspace/snapshot-copy" });
+const SKIP_DIRS = new Set([".git", "node_modules", ".worktrees", ".clawnet"]);
+export class SnapshotCopyProvider {
+    id = "snapshot-copy";
+    priority = 100; // last resort — picked when GitWorktreeProvider declines
+    async isApplicable(_projectRoot) {
+        return true;
+    }
+    async prepare(input) {
+        const dest = join(input.projectRoot, ".worktrees", input.swarmId);
+        // Idempotent: clean any prior snapshot at this path so re-prepare picks
+        // up the current source state.
+        rmSync(dest, { recursive: true, force: true });
+        mkdirSync(dest, { recursive: true });
+        try {
+            // Iterate top-level entries (skipping SKIP_DIRS) and fs.cp each into
+            // dest. fs.cp upfront rejects when dest lives inside src, so we cannot
+            // copy projectRoot directly; per-entry copy is also what the previous
+            // `cp -R` shell-out did. fs.cp gives us:
+            //   - cross-platform (no Windows ENOENT on `cp`)
+            //   - dereference:false → symlink loops don't recurse
+            //   - no shell-injection surface
+            const entries = readdirSync(input.projectRoot, { withFileTypes: true });
+            for (const ent of entries) {
+                if (SKIP_DIRS.has(ent.name))
+                    continue;
+                const src = join(input.projectRoot, ent.name);
+                await cp(src, join(dest, ent.name), {
+                    recursive: true,
+                    force: true,
+                    errorOnExist: false,
+                    dereference: false,
+                    verbatimSymlinks: true,
+                });
+            }
+        }
+        catch (err) {
+            // Partial-failure cleanup: if cp throws mid-way, dest is left
+            // half-populated. Wipe it so the next prepare() doesn't adopt a
+            // corrupt snapshot.
+            rmSync(dest, { recursive: true, force: true });
+            throw err;
+        }
+        log.info({ swarmId: input.swarmId, dest }, "snapshot copy prepared");
+        return {
+            swarmId: input.swarmId,
+            projectRoot: input.projectRoot,
+            strategy: "snapshot-copy",
+            cwd: dest,
+            metadata: {},
+        };
+    }
+    async dispose(handle, opts) {
+        if (opts.keep)
+            return;
+        await rm(handle.cwd, { recursive: true, force: true }).catch((err) => {
+            log.warn({ err, swarmId: handle.swarmId, cwd: handle.cwd }, "snapshot dispose rm failed");
+        });
+        log.info({ swarmId: handle.swarmId, cwd: handle.cwd }, "snapshot disposed");
+    }
+}
+//# sourceMappingURL=snapshot-copy-provider.js.map

package/dist/workspace/snapshot-copy-provider.js.map

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

package/dist/workspace/types.d.ts

@@ -0,0 +1,36 @@
+export type WorkspaceStrategy = "git-worktree" | "snapshot-copy";
+export interface WorkspacePrepareInput {
+    swarmId: string;
+    projectRoot: string;
+    /**
+     * Optional fully-qualified branch name override (e.g. `clawnet/chat-auth`).
+     * When provided, GitWorktreeProvider uses this verbatim instead of the
+     * default `clawnet/swarm-<swarmId>`. Caller is responsible for namespace
+     * isolation / regex validation — the provider passes the value straight
+     * to `git worktree add -b`. snapshot-copy fallback ignores this field.
+     */
+    branchName?: string;
+}
+export interface WorkspaceHandle {
+    swarmId: string;
+    projectRoot: string;
+    strategy: WorkspaceStrategy;
+    cwd: string;
+    metadata: {
+        repoRoot?: string;
+        baseBranch?: string;
+        baseCommit?: string;
+        branchName?: string;
+    };
+}
+export interface WorkspaceProvider {
+    readonly id: WorkspaceStrategy;
+    /** Lower = higher priority. */
+    readonly priority: number;
+    isApplicable(projectRoot: string): Promise<boolean>;
+    prepare(input: WorkspacePrepareInput): Promise<WorkspaceHandle>;
+    dispose(handle: WorkspaceHandle, opts: {
+        keep: boolean;
+    }): Promise<void>;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/workspace/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/workspace/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAC;AAEjE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE;QACR,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,EAAE,iBAAiB,CAAC;IAC/B,+BAA+B;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAChE,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E"}

package/dist/workspace/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/workspace/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/workspace/types.ts"],"names":[],"mappings":""}

package/dist/workspace/workspace-manager.d.ts

@@ -0,0 +1,30 @@
+import type { WorkspaceProvider, WorkspacePrepareInput, WorkspaceHandle } from "./types.js";
+export declare class WorkspaceManager {
+    private static readonly SWARM_ID_RE;
+    private providers;
+    private handles;
+    private warnedRoots;
+    private inFlight;
+    constructor(providers?: WorkspaceProvider[]);
+    prepare(input: WorkspacePrepareInput): Promise<WorkspaceHandle>;
+    get(swarmId: string): WorkspaceHandle | undefined;
+    /**
+     * Register a pre-existing WorkspaceHandle (typically loaded from a snapshot
+     * after process restart) so a subsequent dispose() can locate and clean up
+     * the on-disk workspace. The caller is responsible for verifying that
+     * `handle.cwd` actually exists on disk before adopting.
+     */
+    adopt(handle: WorkspaceHandle): void;
+    dispose(swarmId: string, opts: {
+        keep: boolean;
+    }): Promise<void>;
+    /**
+     * Emit the "add .worktrees/ to .gitignore" advisory at most once per project
+     * across all sessions. We persist a sentinel file at
+     * `<projectRoot>/.clawnet/.gitignore-warned` so a fresh agent process
+     * doesn't re-warn forever. .clawnet/ is in the default watch_path ignore
+     * globs (M5), so writing this file doesn't self-trigger watchers.
+     */
+    private maybeWarnAboutGitignore;
+}
+//# sourceMappingURL=workspace-manager.d.ts.map

package/dist/workspace/workspace-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-manager.d.ts","sourceRoot":"","sources":["../../src/workspace/workspace-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAO5F,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA2B;IAE9D,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,QAAQ,CAA+C;gBAEnD,SAAS,CAAC,EAAE,iBAAiB,EAAE;IAMrC,OAAO,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAoCrE,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIjD;;;;;OAKG;IACH,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAI9B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActE;;;;;;OAMG;IACH,OAAO,CAAC,uBAAuB;CAkBhC"}