@loompad/cli 1.2.2 → 1.2.4

package/dist/core/crew.d.ts

@@ -19,7 +19,7 @@
  * crews across people are later phases (§11).
  */
 import type { TeamPolicy } from "./team-policy.js";
-import type { OrchestraCoordinator, TaskHold, OrchestraRun } from "./orchestra.js";
+import { type OrchestraCoordinator, type TaskHold, type OrchestraRun } from "./orchestra.js";
 import { type ContinuityEngine } from "./continuity/engine.js";
 import type { Adapter, AgentConfig, ChatInfo, EventKind, LoomEvent } from "../types.js";
 import { type BoardTask } from "./registry.js";
@@ -182,6 +182,8 @@ export interface CrewHost {
     projectId: string;
     projectName: string;
     projectDir: string;
+    /** `orchestra.worktreeDir` from the project config — crews share orchestra's root (#328). */
+    worktreeDir?: () => string | undefined;
     crews(): CrewConfig[];
     saveCrews(crews: CrewConfig[]): void;
     roster(): AgentConfig[];
@@ -249,6 +251,13 @@ export interface CrewSeats {
 }
 /** The template's seats, with the ones you named filled by those agents (builders in turn). */
 export declare function seatCrew(teammates: CrewTeammate[], seats?: CrewSeats): CrewTeammate[];
+/**
+ * Where a project's crew worktrees go: orchestra's root (#295) — under ~/.loom
+ * on the same disk, beside the project when it lives on another volume, or
+ * `orchestra.worktreeDir` — so a crew's checkouts don't fill the internal disk
+ * either (#328).
+ */
+export declare function crewWorktreeRoot(projectDir: string, projectId: string, override?: string): string;
 export declare class CrewEngine {
     private readonly host;
     private states;
@@ -276,6 +285,12 @@ export declare class CrewEngine {
     private testControllers;
     private teamRechecks;
     private deliveries;
+    /**
+     * A crew checkout's folder under the worktree root. One a crew already has at
+     * the old ~/.loom/crews spot stays where it is — a native seat's workspace
+     * lives across goals — so only new checkouts move.
+     */
+    private worktreePath;
     constructor(host: CrewHost);
     /** The agents a teammate can be. */
     roster(): AgentConfig[];

package/dist/core/crew.js

@@ -26,6 +26,7 @@ import { digest } from "./continuity/contracts.js";
 import { coordinationRun, crewRunId } from "./crew-coordination.js";
 import { DEFAULT_CREW_POLICY } from "./crew-policy.js";
 import { vendorOf } from "./team-landing.js";
+import { orchestraWorktreeRoot } from "./orchestra.js";
 import fs from "node:fs";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
@@ -120,6 +121,16 @@ async function git(args, cwd) {
     const { stdout } = await exec("git", args, { cwd, maxBuffer: 32 * 1024 * 1024 });
     return stdout;
 }
+/**
+ * Where a project's crew worktrees go: orchestra's root (#295) — under ~/.loom
+ * on the same disk, beside the project when it lives on another volume, or
+ * `orchestra.worktreeDir` — so a crew's checkouts don't fill the internal disk
+ * either (#328).
+ */
+export function crewWorktreeRoot(projectDir, projectId, override) {
+    const orchestra = orchestraWorktreeRoot(projectDir, projectId, override);
+    return orchestra === path.join(loomHome(), "orchestra", projectId) ? path.join(loomHome(), "crews", projectId) : path.join(orchestra, "crews");
+}
 export class CrewEngine {
     host;
     states = new Map();
@@ -149,6 +160,17 @@ export class CrewEngine {
     testControllers = new Map();
     teamRechecks = new Map();
     deliveries = new Map();
+    /**
+     * A crew checkout's folder under the worktree root. One a crew already has at
+     * the old ~/.loom/crews spot stays where it is — a native seat's workspace
+     * lives across goals — so only new checkouts move.
+     */
+    worktreePath(crewId, ...parts) {
+        const legacy = path.join(loomHome(), "crews", this.host.projectId, crewId, ...parts);
+        if (fs.existsSync(legacy))
+            return legacy;
+        return path.join(crewWorktreeRoot(this.host.projectDir, this.host.projectId, this.host.worktreeDir?.()), crewId, ...parts);
+    }
     constructor(host) {
         this.host = host;
         // A goal that was mid-turn when Loom stopped is interrupted, not lost:
@@ -348,7 +370,7 @@ export class CrewEngine {
         const branch = `loom/crew/${cfg.id}/${gid}`;
         // Native sessions retain their workspace identity between goals. Branches
         // remain per goal; switching a clean, stopped checkout changes its snapshot.
-        const dir = path.join(loomHome(), "crews", this.host.projectId, cfg.id, this.host.native?.() ? "workspace" : gid);
+        const dir = this.worktreePath(cfg.id, this.host.native?.() ? "workspace" : gid);
         fs.mkdirSync(path.dirname(dir), { recursive: true });
         await this.serial(async () => {
             if (fs.existsSync(dir)) {
@@ -1070,7 +1092,7 @@ export class CrewEngine {
         }
         const base = (await git(["rev-parse", "HEAD"], g.dir)).trim();
         const branch = `${g.branch}-card-${card.id}`;
-        const dir = path.join(loomHome(), "crews", this.host.projectId, cfg.id, this.host.native?.() ? `seat-${card.builder}` : `cards-${g.id}`, this.host.native?.() ? "workspace" : card.id);
+        const dir = this.worktreePath(cfg.id, this.host.native?.() ? `seat-${card.builder}` : `cards-${g.id}`, this.host.native?.() ? "workspace" : card.id);
         fs.mkdirSync(path.dirname(dir), { recursive: true });
         await this.serial(async () => {
             if (fs.existsSync(dir)) {
@@ -1363,6 +1385,8 @@ export class CrewEngine {
         this.save(st);
         this.phase(cfg, st, status === "completed" ? "completed" : "failed", {
             branch: g.branch, cards: g.cards.length, ...(g.summary ? { summary: g.summary } : {}), ...(error ? { error } : {}), costUsd: g.costUsd,
+            // which cards failed, by id — what `loom crew accept --card` takes (#329)
+            ...(status === "failed" ? { failedCards: g.cards.filter(c => c.stage === "failed").map(c => ({ id: c.id, title: c.title, ...(c.error ? { error: c.error.slice(0, 300) } : {}) })) } : {}),
         });
         const stopping = this.stopAgents(cfg.id).finally(() => this.stopping.delete(cfg.id));
         this.stopping.set(cfg.id, stopping);