@oxgeneral/orch 1.0.9 → 1.0.10

package/dist/{workspace-manager-RH24FSNT.js → workspace-manager-KUU7UMMC.js}

@@ -91,20 +91,8 @@ var WorkspaceManager = class {
   }
   async requireGitRepo(mode) {
     if (!this.gitRepoChecked) {
-      try {
-        const { process: proc } = this.processManager.spawn(
-          "git",
-          ["rev-parse", "--is-inside-work-tree"],
-          { cwd: this.projectRoot }
-        );
-        const code = await new Promise((resolve) => {
-          proc.on("close", resolve);
-          proc.on("error", () => resolve(1));
-        });
-        this.isGitRepo = code === 0;
-      } catch {
-        this.isGitRepo = false;
-      }
+      const code = await this.spawnAndWait("git", ["rev-parse", "--is-inside-work-tree"]);
+      this.isGitRepo = code === 0;
       if (this.isGitRepo) this.gitRepoChecked = true;
     }
     if (!this.isGitRepo) {
@@ -119,32 +107,9 @@ var WorkspaceManager = class {
   }
   async cleanup(taskId, branch) {
     const workspacePath = path.join(this.orchestryDir, "workspaces", sanitizeId(taskId));
-    try {
-      const { process: proc } = this.processManager.spawn(
-        "git",
-        ["worktree", "remove", "--force", workspacePath],
-        { cwd: this.projectRoot }
-      );
-      await new Promise((resolve) => {
-        proc.on("close", () => resolve());
-        proc.on("error", () => resolve());
-      });
-    } catch {
-    }
-    const branchDeletion = branch ? (async () => {
-      try {
-        const { process: proc } = this.processManager.spawn(
-          "git",
-          ["branch", "-D", branch],
-          { cwd: this.projectRoot }
-        );
-        await new Promise((resolve) => {
-          proc.on("close", () => resolve());
-          proc.on("error", () => resolve());
-        });
-      } catch {
-      }
-    })() : Promise.resolve();
+    await this.spawnAndWait("git", ["worktree", "remove", "--force", workspacePath]);
+    const branchDeletion = branch ? this.spawnAndWait("git", ["branch", "-D", branch]).then(() => {
+    }) : Promise.resolve();
     const dirRemoval = fs.rm(workspacePath, { recursive: true, force: true }).catch(() => {
     });
     await Promise.all([branchDeletion, dirRemoval]);
@@ -152,6 +117,28 @@ var WorkspaceManager = class {
   validate(workspacePath, projectRoot) {
     validateWorkspacePath(workspacePath, projectRoot);
   }
+  /**
+   * Get files changed on a worktree branch relative to its merge-base.
+   * Uses `git merge-base` to find the fork point dynamically (no hardcoded branch name).
+   */
+  async getChangedFiles(branch) {
+    try {
+      const { stdout: baseStdout } = await this.spawnAndCapture(
+        "git",
+        ["merge-base", "HEAD", branch]
+      );
+      const mergeBase = baseStdout.trim();
+      if (!mergeBase) return [];
+      const { stdout: diffStdout, code } = await this.spawnAndCapture(
+        "git",
+        ["diff", "--name-only", `${mergeBase}...${branch}`]
+      );
+      if (code !== 0 || !diffStdout.trim()) return [];
+      return diffStdout.trim().split("\n").filter(Boolean);
+    } catch {
+      return [];
+    }
+  }
   resolveMode(task, agent, config) {
     return task.workspace_mode ?? agent.config.workspace_mode ?? config.defaults.agent.workspace_mode ?? "worktree";
   }
@@ -164,26 +151,62 @@ var WorkspaceManager = class {
     await ensureDir(path.dirname(workspacePath));
     const titleSlug = sanitizeTitle(task.title) || sanitizeId(task.id);
     const branchName = `orchestry/${sanitizeId(task.id)}/${titleSlug}`;
-    const { process: proc } = this.processManager.spawn(
+    try {
+      await fs.access(workspacePath);
+      return { path: workspacePath, branch: branchName };
+    } catch {
+    }
+    const createResult = await this.spawnAndWait(
       "git",
-      ["worktree", "add", workspacePath, "-b", branchName],
-      { cwd: this.projectRoot }
+      ["worktree", "add", workspacePath, "-b", branchName]
     );
-    await new Promise((resolve, reject) => {
-      proc.on("close", (code) => {
-        if (code === 0) resolve();
-        else reject(new WorkspaceError(
-          `git worktree add failed with code ${code}`,
+    if (createResult !== 0) {
+      await this.spawnAndWait("git", ["worktree", "prune"]);
+      const reuseResult = await this.spawnAndWait(
+        "git",
+        ["worktree", "add", workspacePath, branchName]
+      );
+      if (reuseResult !== 0) {
+        throw new WorkspaceError(
+          `git worktree add failed with code ${reuseResult}`,
           "Run: git worktree prune && git branch | grep orchestry | xargs -r git branch -D"
-        ));
-      });
-      proc.on("error", reject);
-    });
+        );
+      }
+    }
     const worktreeOrchestry = path.join(workspacePath, ".orchestry");
     await fs.rm(worktreeOrchestry, { recursive: true, force: true }).catch(() => {
     });
     return { path: workspacePath, branch: branchName };
   }
+  /** Spawn a command and return exit code (non-throwing). */
+  async spawnAndWait(cmd, args) {
+    try {
+      const { process: proc } = this.processManager.spawn(cmd, args, { cwd: this.projectRoot });
+      return new Promise((resolve) => {
+        proc.on("close", (code) => resolve(code ?? 1));
+        proc.on("error", () => resolve(1));
+      });
+    } catch {
+      return 1;
+    }
+  }
+  /** Spawn a command and capture stdout + exit code. */
+  async spawnAndCapture(cmd, args) {
+    try {
+      const { process: proc } = this.processManager.spawn(cmd, args, { cwd: this.projectRoot });
+      let stdout = "";
+      proc.stdout?.on("data", (chunk) => {
+        stdout += chunk.toString();
+      });
+      const code = await new Promise((resolve) => {
+        proc.on("close", (c) => resolve(c ?? 1));
+        proc.on("error", () => resolve(1));
+      });
+      return { stdout, code };
+    } catch {
+      return { stdout: "", code: 1 };
+    }
+  }
   async prepareIsolated(task) {
     const workspacePath = path.join(
       this.orchestryDir,
@@ -192,31 +215,18 @@ var WorkspaceManager = class {
     );
     await ensureDir(path.dirname(workspacePath));
     try {
-      const { process: proc } = this.processManager.spawn(
+      const cloneResult = await this.spawnAndWait(
         "git",
-        ["clone", "--local", "--no-hardlinks", ".", workspacePath],
-        { cwd: this.projectRoot }
+        ["clone", "--local", "--no-hardlinks", this.projectRoot, workspacePath]
       );
-      await new Promise((resolve, reject) => {
-        proc.on("close", (code) => {
-          if (code === 0) resolve();
-          else reject(new Error("git clone failed"));
-        });
-        proc.on("error", reject);
-      });
+      if (cloneResult !== 0) throw new Error("git clone failed");
     } catch {
       const excludeFile = path.join(this.orchestryDir, "workspace-exclude");
       const args = ["-a", `--exclude-from=${excludeFile}`, "./", `${workspacePath}/`];
-      const { process: proc } = this.processManager.spawn("rsync", args, {
-        cwd: this.projectRoot
-      });
-      await new Promise((resolve, reject) => {
-        proc.on("close", (code) => {
-          if (code === 0) resolve();
-          else reject(new Error(`rsync failed with code ${code}`));
-        });
-        proc.on("error", reject);
-      });
+      const rsyncResult = await this.spawnAndWait("rsync", args);
+      if (rsyncResult !== 0) {
+        throw new Error(`rsync failed with code ${rsyncResult}`);
+      }
     }
     const clonedOrchestry = path.join(workspacePath, ".orchestry");
     await fs.rm(clonedOrchestry, { recursive: true, force: true }).catch(() => {
@@ -229,5 +239,5 @@ function sanitizeTitle(title) {
 }
 
 export { WorkspaceManager };
-//# sourceMappingURL=workspace-manager-RH24FSNT.js.map
-//# sourceMappingURL=workspace-manager-RH24FSNT.js.map
+//# sourceMappingURL=workspace-manager-KUU7UMMC.js.map
+//# sourceMappingURL=workspace-manager-KUU7UMMC.js.map

package/dist/workspace-manager-KUU7UMMC.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/infrastructure/workspace/merge-strategy.ts","../src/infrastructure/workspace/workspace-manager.ts"],"names":[],"mappings":";;;;;;;AAYO,IAAM,gBAAN,MAAoB;AAAA,EACzB,WAAA,CACmB,aACA,cAAA,EACjB;AAFiB,IAAA,IAAA,CAAA,WAAA,GAAA,WAAA;AACA,IAAA,IAAA,CAAA,cAAA,GAAA,cAAA;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMH,MAAM,UAAU,MAAA,EAAsC;AACpD,IAAA,OAAO,IAAI,OAAA,CAAQ,CAAC,OAAA,KAAY;AAC9B,MAAA,MAAM,EAAE,OAAA,EAAS,IAAA,EAAK,GAAI,KAAK,cAAA,CAAe,KAAA;AAAA,QAC5C,KAAA;AAAA,QACA,CAAC,OAAA,EAAS,SAAA,EAAW,QAAQ,IAAA,EAAM,CAAA,MAAA,EAAS,MAAM,CAAA,CAAE,CAAA;AAAA,QACpD,EAAE,GAAA,EAAK,IAAA,CAAK,WAAA;AAAY,OAC1B;AAEA,MAAA,IAAI,MAAA,GAAS,EAAA;AACb,MAAA,MAAM,YAAA,GAAe,GAAA;AACrB,MAAA,MAAM,YAAA,GAAe,CAAC,KAAA,KAAkB;AACtC,QAAA,IAAI,MAAA,CAAO,MAAA,GAAS,YAAA,EAAc,MAAA,IAAU,MAAM,QAAA,EAAS;AAAA,MAC7D,CAAA;AACA,MAAA,IAAA,CAAK,MAAA,EAAQ,EAAA,CAAG,MAAA,EAAQ,YAAY,CAAA;AACpC,MAAA,IAAA,CAAK,MAAA,EAAQ,EAAA,CAAG,MAAA,EAAQ,YAAY,CAAA;AAEpC,MAAA,IAAA,CAAK,EAAA,CAAG,OAAA,EAAS,CAAC,IAAA,KAAS;AACzB,QAAA,IAAI,SAAS,CAAA,EAAG;AACd,UAAA,OAAA,CAAQ,EAAE,OAAA,EAAS,IAAA,EAAM,CAAA;AACzB,UAAA;AAAA,QACF;AAEA,QAAA,MAAM,aAAA,GAAgB,MAAA,CAAO,KAAA,CAAM,CAAA,EAAG,GAAI,CAAA;AAC1C,QAAA,MAAM,aAAa,aAAA,CAAc,QAAA,CAAS,UAAU,CAAA,IAAK,aAAA,CAAc,SAAS,gBAAgB,CAAA;AAEhG,QAAA,IAAI,CAAC,UAAA,EAAY;AAEf,UAAA,OAAA,CAAQ,EAAE,OAAA,EAAS,KAAA,EAAO,YAAA,EAAc,eAAe,CAAA;AACvD,UAAA;AAAA,QACF;AAGA,QAAA,IAAI;AACF,UAAA,MAAM,EAAE,OAAA,EAAS,SAAA,EAAU,GAAI,KAAK,cAAA,CAAe,KAAA;AAAA,YACjD,KAAA;AAAA,YACA,CAAC,SAAS,SAAS,CAAA;AAAA,YACnB,EAAE,GAAA,EAAK,IAAA,CAAK,WAAA;AAAY,WAC1B;AACA,UAAA,SAAA,CAAU,EAAA,CAAG,SAAS,MAAM;AAC1B,YAAA,OAAA,CAAQ,EAAE,OAAA,EAAS,KAAA,EAAO,YAAA,EAAc,eAAe,CAAA;AAAA,UACzD,CAAC,CAAA;AACD,UAAA,SAAA,CAAU,EAAA,CAAG,SAAS,MAAM;AAC1B,YAAA,OAAA,CAAQ,EAAE,OAAA,EAAS,KAAA,EAAO,YAAA,EAAc,eAAe,CAAA;AAAA,UACzD,CAAC,CAAA;AAAA,QACH,CAAA,CAAA,MAAQ;AACN,UAAA,OAAA,CAAQ,EAAE,OAAA,EAAS,KAAA,EAAO,YAAA,EAAc,eAAe,CAAA;AAAA,QACzD;AAAA,MACF,CAAC,CAAA;AAED,MAAA,IAAA,CAAK,EAAA,CAAG,OAAA,EAAS,CAAC,GAAA,KAAQ;AACxB,QAAA,OAAA,CAAQ,EAAE,OAAA,EAAS,KAAA,EAAO,YAAA,EAAc,GAAA,CAAI,SAAS,CAAA;AAAA,MACvD,CAAC,CAAA;AAAA,IACH,CAAC,CAAA;AAAA,EACH;AACF,CAAA;;;ACzDO,IAAM,mBAAN,MAAoD;AAAA,EAKzD,WAAA,CACmB,WAAA,EACA,YAAA,EACA,cAAA,EACjB;AAHiB,IAAA,IAAA,CAAA,WAAA,GAAA,WAAA;AACA,IAAA,IAAA,CAAA,YAAA,GAAA,YAAA;AACA,IAAA,IAAA,CAAA,cAAA,GAAA,cAAA;AAEjB,IAAA,IAAA,CAAK,aAAA,GAAgB,IAAI,aAAA,CAAc,WAAA,EAAa,cAAc,CAAA;AAAA,EACpE;AAAA,EAViB,aAAA;AAAA,EACT,cAAA,GAAiB,KAAA;AAAA,EACjB,SAAA,GAAY,KAAA;AAAA,EAUpB,MAAM,OAAA,CAAQ,IAAA,EAAY,KAAA,EAAc,MAAA,EAAoD;AAC1F,IAAA,MAAM,IAAA,GAAO,IAAA,CAAK,WAAA,CAAY,IAAA,EAAM,OAAO,MAAM,CAAA;AAEjD,IAAA,IAAI,SAAS,QAAA,EAAU;AACrB,MAAA,MAAM,IAAA,CAAK,eAAe,IAAI,CAAA;AAAA,IAChC;AAEA,IAAA,QAAQ,IAAA;AAAM,MACZ,KAAK,QAAA;AACH,QAAA,OAAO,EAAE,IAAA,EAAM,IAAA,CAAK,WAAA,EAAY;AAAA,MAElC,KAAK,UAAA;AACH,QAAA,OAAO,IAAA,CAAK,gBAAgB,IAAI,CAAA;AAAA,MAElC,KAAK,UAAA;AACH,QAAA,OAAO,EAAE,IAAA,EAAM,MAAM,IAAA,CAAK,eAAA,CAAgB,IAAI,CAAA,EAAE;AAAA,MAElD;AACE,QAAA,OAAO,EAAE,IAAA,EAAM,IAAA,CAAK,WAAA,EAAY;AAAA;AACpC,EACF;AAAA,EAEA,MAAc,eAAe,IAAA,EAAoC;AAC/D,IAAA,IAAI,CAAC,KAAK,cAAA,EAAgB;AACxB,MAAA,MAAM,IAAA,GAAO,MAAM,IAAA,CAAK,YAAA,CAAa,OAAO,CAAC,WAAA,EAAa,uBAAuB,CAAC,CAAA;AAClF,MAAA,IAAA,CAAK,YAAY,IAAA,KAAS,CAAA;AAE1B,MAAA,IAAI,IAAA,CAAK,SAAA,EAAW,IAAA,CAAK,cAAA,GAAiB,IAAA;AAAA,IAC5C;AAEA,IAAA,IAAI,CAAC,KAAK,SAAA,EAAW;AACnB,MAAA,MAAM,IAAI,cAAA;AAAA,QACR,mBAAmB,IAAI,CAAA,2BAAA,CAAA;AAAA,QACvB;AAAA,OACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,UAAU,MAAA,EAAsC;AACpD,IAAA,OAAO,IAAA,CAAK,aAAA,CAAc,SAAA,CAAU,MAAM,CAAA;AAAA,EAC5C;AAAA,EAEA,MAAM,OAAA,CAAQ,MAAA,EAAgB,MAAA,EAAgC;AAC5D,IAAA,MAAM,aAAA,GAAgB,KAAK,IAAA,CAAK,IAAA,CAAK,cAAc,YAAA,EAAc,UAAA,CAAW,MAAM,CAAC,CAAA;AAGnF,IAAA,MAAM,IAAA,CAAK,aAAa,KAAA,EAAO,CAAC,YAAY,QAAA,EAAU,SAAA,EAAW,aAAa,CAAC,CAAA;AAG/E,IAAA,MAAM,cAAA,GAAiB,MAAA,GACnB,IAAA,CAAK,YAAA,CAAa,KAAA,EAAO,CAAC,QAAA,EAAU,IAAA,EAAM,MAAM,CAAC,CAAA,CAAE,IAAA,CAAK,MAAM;AAAA,IAAC,CAAC,CAAA,GAChE,OAAA,CAAQ,OAAA,EAAQ;AAEpB,IAAA,MAAM,UAAA,GAAa,EAAA,CAAG,EAAA,CAAG,aAAA,EAAe,EAAE,SAAA,EAAW,IAAA,EAAM,KAAA,EAAO,IAAA,EAAM,CAAA,CAAE,KAAA,CAAM,MAAM;AAAA,IAAC,CAAC,CAAA;AAExF,IAAA,MAAM,OAAA,CAAQ,GAAA,CAAI,CAAC,cAAA,EAAgB,UAAU,CAAC,CAAA;AAAA,EAChD;AAAA,EAEA,QAAA,CAAS,eAAuB,WAAA,EAA2B;AACzD,IAAA,qBAAA,CAAsB,eAAe,WAAW,CAAA;AAAA,EAClD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,gBAAgB,MAAA,EAAmC;AACvD,IAAA,IAAI;AACF,MAAA,MAAM,EAAE,MAAA,EAAQ,UAAA,EAAW,GAAI,MAAM,IAAA,CAAK,eAAA;AAAA,QACxC,KAAA;AAAA,QAAO,CAAC,YAAA,EAAc,MAAA,EAAQ,MAAM;AAAA,OACtC;AACA,MAAA,MAAM,SAAA,GAAY,WAAW,IAAA,EAAK;AAClC,MAAA,IAAI,CAAC,SAAA,EAAW,OAAO,EAAC;AAExB,MAAA,MAAM,EAAE,MAAA,EAAQ,UAAA,EAAY,IAAA,EAAK,GAAI,MAAM,IAAA,CAAK,eAAA;AAAA,QAC9C,KAAA;AAAA,QAAO,CAAC,MAAA,EAAQ,aAAA,EAAe,GAAG,SAAS,CAAA,GAAA,EAAM,MAAM,CAAA,CAAE;AAAA,OAC3D;AACA,MAAA,IAAI,SAAS,CAAA,IAAK,CAAC,WAAW,IAAA,EAAK,SAAU,EAAC;AAC9C,MAAA,OAAO,WAAW,IAAA,EAAK,CAAE,MAAM,IAAI,CAAA,CAAE,OAAO,OAAO,CAAA;AAAA,IACrD,CAAA,CAAA,MAAQ;AACN,MAAA,OAAO,EAAC;AAAA,IACV;AAAA,EACF;AAAA,EAEQ,WAAA,CAAY,IAAA,EAAY,KAAA,EAAc,MAAA,EAA2C;AACvF,IAAA,OACE,IAAA,CAAK,kBACL,KAAA,CAAM,MAAA,CAAO,kBACb,MAAA,CAAO,QAAA,CAAS,MAAM,cAAA,IACtB,UAAA;AAAA,EAEJ;AAAA,EAEA,MAAc,gBAAgB,IAAA,EAAoC;AAChE,IAAA,MAAM,gBAAgB,IAAA,CAAK,IAAA;AAAA,MACzB,IAAA,CAAK,YAAA;AAAA,MACL,YAAA;AAAA,MACA,UAAA,CAAW,KAAK,EAAE;AAAA,KACpB;AACA,IAAA,MAAM,SAAA,CAAU,IAAA,CAAK,OAAA,CAAQ,aAAa,CAAC,CAAA;AAE3C,IAAA,MAAM,YAAY,aAAA,CAAc,IAAA,CAAK,KAAK,CAAA,IAAK,UAAA,CAAW,KAAK,EAAE,CAAA;AACjE,IAAA,MAAM,aAAa,CAAA,UAAA,EAAa,UAAA,CAAW,KAAK,EAAE,CAAC,IAAI,SAAS,CAAA,CAAA;AAGhE,IAAA,IAAI;AACF,MAAA,MAAM,EAAA,CAAG,OAAO,aAAa,CAAA;AAC7B,MAAA,OAAO,EAAE,IAAA,EAAM,aAAA,EAAe,MAAA,EAAQ,UAAA,EAAW;AAAA,IACnD,CAAA,CAAA,MAAQ;AAAA,IAER;AAGA,IAAA,MAAM,YAAA,GAAe,MAAM,IAAA,CAAK,YAAA;AAAA,MAC9B,KAAA;AAAA,MAAO,CAAC,UAAA,EAAY,KAAA,EAAO,aAAA,EAAe,MAAM,UAAU;AAAA,KAC5D;AACA,IAAA,IAAI,iBAAiB,CAAA,EAAG;AAEtB,MAAA,MAAM,KAAK,YAAA,CAAa,KAAA,EAAO,CAAC,UAAA,EAAY,OAAO,CAAC,CAAA;AACpD,MAAA,MAAM,WAAA,GAAc,MAAM,IAAA,CAAK,YAAA;AAAA,QAC7B,KAAA;AAAA,QAAO,CAAC,UAAA,EAAY,KAAA,EAAO,aAAA,EAAe,UAAU;AAAA,OACtD;AACA,MAAA,IAAI,gBAAgB,CAAA,EAAG;AACrB,QAAA,MAAM,IAAI,cAAA;AAAA,UACR,qCAAqC,WAAW,CAAA,CAAA;AAAA,UAChD;AAAA,SACF;AAAA,MACF;AAAA,IACF;AAGA,IAAA,MAAM,iBAAA,GAAoB,IAAA,CAAK,IAAA,CAAK,aAAA,EAAe,YAAY,CAAA;AAC/D,IAAA,MAAM,EAAA,CAAG,EAAA,CAAG,iBAAA,EAAmB,EAAE,SAAA,EAAW,IAAA,EAAM,KAAA,EAAO,IAAA,EAAM,CAAA,CAAE,KAAA,CAAM,MAAM;AAAA,IAAC,CAAC,CAAA;AAE/E,IAAA,OAAO,EAAE,IAAA,EAAM,aAAA,EAAe,MAAA,EAAQ,UAAA,EAAW;AAAA,EACnD;AAAA;AAAA,EAGA,MAAc,YAAA,CAAa,GAAA,EAAa,IAAA,EAAiC;AACvE,IAAA,IAAI;AACF,MAAA,MAAM,EAAE,OAAA,EAAS,IAAA,EAAK,GAAI,IAAA,CAAK,cAAA,CAAe,KAAA,CAAM,GAAA,EAAK,IAAA,EAAM,EAAE,GAAA,EAAK,IAAA,CAAK,aAAa,CAAA;AACxF,MAAA,OAAO,IAAI,OAAA,CAAgB,CAAC,OAAA,KAAY;AACtC,QAAA,IAAA,CAAK,GAAG,OAAA,EAAS,CAAC,SAAS,OAAA,CAAQ,IAAA,IAAQ,CAAC,CAAC,CAAA;AAC7C,QAAA,IAAA,CAAK,EAAA,CAAG,OAAA,EAAS,MAAM,OAAA,CAAQ,CAAC,CAAC,CAAA;AAAA,MACnC,CAAC,CAAA;AAAA,IACH,CAAA,CAAA,MAAQ;AACN,MAAA,OAAO,CAAA;AAAA,IACT;AAAA,EACF;AAAA;AAAA,EAGA,MAAc,eAAA,CAAgB,GAAA,EAAa,IAAA,EAA2D;AACpG,IAAA,IAAI;AACF,MAAA,MAAM,EAAE,OAAA,EAAS,IAAA,EAAK,GAAI,IAAA,CAAK,cAAA,CAAe,KAAA,CAAM,GAAA,EAAK,IAAA,EAAM,EAAE,GAAA,EAAK,IAAA,CAAK,aAAa,CAAA;AACxF,MAAA,IAAI,MAAA,GAAS,EAAA;AACb,MAAA,IAAA,CAAK,MAAA,EAAQ,EAAA,CAAG,MAAA,EAAQ,CAAC,KAAA,KAAkB;AAAE,QAAA,MAAA,IAAU,MAAM,QAAA,EAAS;AAAA,MAAG,CAAC,CAAA;AAC1E,MAAA,MAAM,IAAA,GAAO,MAAM,IAAI,OAAA,CAAgB,CAAC,OAAA,KAAY;AAClD,QAAA,IAAA,CAAK,GAAG,OAAA,EAAS,CAAC,MAAM,OAAA,CAAQ,CAAA,IAAK,CAAC,CAAC,CAAA;AACvC,QAAA,IAAA,CAAK,EAAA,CAAG,OAAA,EAAS,MAAM,OAAA,CAAQ,CAAC,CAAC,CAAA;AAAA,MACnC,CAAC,CAAA;AACD,MAAA,OAAO,EAAE,QAAQ,IAAA,EAAK;AAAA,IACxB,CAAA,CAAA,MAAQ;AACN,MAAA,OAAO,EAAE,MAAA,EAAQ,EAAA,EAAI,IAAA,EAAM,CAAA,EAAE;AAAA,IAC/B;AAAA,EACF;AAAA,EAEA,MAAc,gBAAgB,IAAA,EAA6B;AACzD,IAAA,MAAM,gBAAgB,IAAA,CAAK,IAAA;AAAA,MACzB,IAAA,CAAK,YAAA;AAAA,MACL,YAAA;AAAA,MACA,UAAA,CAAW,KAAK,EAAE;AAAA,KACpB;AACA,IAAA,MAAM,SAAA,CAAU,IAAA,CAAK,OAAA,CAAQ,aAAa,CAAC,CAAA;AAG3C,IAAA,IAAI;AACF,MAAA,MAAM,WAAA,GAAc,MAAM,IAAA,CAAK,YAAA;AAAA,QAC7B,KAAA;AAAA,QAAO,CAAC,OAAA,EAAS,SAAA,EAAW,gBAAA,EAAkB,IAAA,CAAK,aAAa,aAAa;AAAA,OAC/E;AACA,MAAA,IAAI,WAAA,KAAgB,CAAA,EAAG,MAAM,IAAI,MAAM,kBAAkB,CAAA;AAAA,IAC3D,CAAA,CAAA,MAAQ;AAEN,MAAA,MAAM,WAAA,GAAc,IAAA,CAAK,IAAA,CAAK,IAAA,CAAK,cAAc,mBAAmB,CAAA;AACpE,MAAA,MAAM,IAAA,GAAO,CAAC,IAAA,EAAM,CAAA,eAAA,EAAkB,WAAW,CAAA,CAAA,EAAI,IAAA,EAAM,CAAA,EAAG,aAAa,CAAA,CAAA,CAAG,CAAA;AAE9E,MAAA,MAAM,WAAA,GAAc,MAAM,IAAA,CAAK,YAAA,CAAa,SAAS,IAAI,CAAA;AACzD,MAAA,IAAI,gBAAgB,CAAA,EAAG;AACrB,QAAA,MAAM,IAAI,KAAA,CAAM,CAAA,uBAAA,EAA0B,WAAW,CAAA,CAAE,CAAA;AAAA,MACzD;AAAA,IACF;AAGA,IAAA,MAAM,eAAA,GAAkB,IAAA,CAAK,IAAA,CAAK,aAAA,EAAe,YAAY,CAAA;AAC7D,IAAA,MAAM,EAAA,CAAG,EAAA,CAAG,eAAA,EAAiB,EAAE,SAAA,EAAW,IAAA,EAAM,KAAA,EAAO,IAAA,EAAM,CAAA,CAAE,KAAA,CAAM,MAAM;AAAA,IAAC,CAAC,CAAA;AAE7E,IAAA,OAAO,aAAA;AAAA,EACT;AACF;AAEA,SAAS,cAAc,KAAA,EAAuB;AAC5C,EAAA,OAAO,KAAA,CACJ,WAAA,EAAY,CACZ,OAAA,CAAQ,aAAA,EAAe,GAAG,CAAA,CAC1B,OAAA,CAAQ,QAAA,EAAU,EAAE,CAAA,CACpB,KAAA,CAAM,GAAG,EAAE,CAAA;AAChB","file":"workspace-manager-KUU7UMMC.js","sourcesContent":["/**\n * Git merge strategy for worktree branches.\n *\n * Encapsulates `git merge --no-ff` execution and conflict handling.\n */\n\nimport type { IProcessManager } from '../process/process-manager.js';\n\nexport type MergeResult =\n  | { success: true }\n  | { success: false; conflictInfo: string };\n\nexport class MergeStrategy {\n  constructor(\n    private readonly projectRoot: string,\n    private readonly processManager: IProcessManager,\n  ) {}\n\n  /**\n   * Merge a branch into the current branch with --no-ff.\n   * On conflict, aborts the merge and returns conflict info.\n   */\n  async mergeBack(branch: string): Promise<MergeResult> {\n    return new Promise((resolve) => {\n      const { process: proc } = this.processManager.spawn(\n        'git',\n        ['merge', '--no-ff', branch, '-m', `Merge ${branch}`],\n        { cwd: this.projectRoot },\n      );\n\n      let output = '';\n      const maxOutputLen = 2000;\n      const appendOutput = (chunk: Buffer) => {\n        if (output.length < maxOutputLen) output += chunk.toString();\n      };\n      proc.stdout?.on('data', appendOutput);\n      proc.stderr?.on('data', appendOutput);\n\n      proc.on('close', (code) => {\n        if (code === 0) {\n          resolve({ success: true });\n          return;\n        }\n\n        const trimmedOutput = output.slice(0, 1000);\n        const isConflict = trimmedOutput.includes('CONFLICT') || trimmedOutput.includes('Merge conflict');\n\n        if (!isConflict) {\n          // Non-conflict failure (branch not found, hook failure, etc.) — no merge to abort\n          resolve({ success: false, conflictInfo: trimmedOutput });\n          return;\n        }\n\n        // Abort the failed merge to restore clean state\n        try {\n          const { process: abortProc } = this.processManager.spawn(\n            'git',\n            ['merge', '--abort'],\n            { cwd: this.projectRoot },\n          );\n          abortProc.on('close', () => {\n            resolve({ success: false, conflictInfo: trimmedOutput });\n          });\n          abortProc.on('error', () => {\n            resolve({ success: false, conflictInfo: trimmedOutput });\n          });\n        } catch {\n          resolve({ success: false, conflictInfo: trimmedOutput });\n        }\n      });\n\n      proc.on('error', (err) => {\n        resolve({ success: false, conflictInfo: err.message });\n      });\n    });\n  }\n}\n","/**\n * Workspace manager implementation.\n *\n * Resolves workspace path based on mode priority chain:\n * task.workspace_mode → agent.config.workspace_mode → defaults.agent.workspace_mode → 'worktree'\n */\n\nimport path from 'node:path';\nimport fs from 'node:fs/promises';\nimport type { Agent } from '../../domain/agent.js';\nimport type { OrchestratorConfig } from '../../domain/config.js';\nimport type { Task, WorkspaceMode } from '../../domain/task.js';\nimport type { IProcessManager } from '../process/process-manager.js';\nimport { validateWorkspacePath, sanitizeId } from '../storage/paths.js';\nimport { ensureDir } from '../storage/fs-utils.js';\nimport type { IWorkspaceManager, PrepareResult } from './interface.js';\nimport { MergeStrategy, type MergeResult } from './merge-strategy.js';\nimport { WorkspaceError } from '../../domain/errors.js';\n\nexport class WorkspaceManager implements IWorkspaceManager {\n  private readonly mergeStrategy: MergeStrategy;\n  private gitRepoChecked = false;\n  private isGitRepo = false;\n\n  constructor(\n    private readonly projectRoot: string,\n    private readonly orchestryDir: string,\n    private readonly processManager: IProcessManager,\n  ) {\n    this.mergeStrategy = new MergeStrategy(projectRoot, processManager);\n  }\n\n  async prepare(task: Task, agent: Agent, config: OrchestratorConfig): Promise<PrepareResult> {\n    const mode = this.resolveMode(task, agent, config);\n\n    if (mode !== 'shared') {\n      await this.requireGitRepo(mode);\n    }\n\n    switch (mode) {\n      case 'shared':\n        return { path: this.projectRoot };\n\n      case 'worktree':\n        return this.prepareWorktree(task);\n\n      case 'isolated':\n        return { path: await this.prepareIsolated(task) };\n\n      default:\n        return { path: this.projectRoot };\n    }\n  }\n\n  private async requireGitRepo(mode: WorkspaceMode): Promise<void> {\n    if (!this.gitRepoChecked) {\n      const code = await this.spawnAndWait('git', ['rev-parse', '--is-inside-work-tree']);\n      this.isGitRepo = code === 0;\n      // Only cache positive result — negative may change if user runs git init\n      if (this.isGitRepo) this.gitRepoChecked = true;\n    }\n\n    if (!this.isGitRepo) {\n      throw new WorkspaceError(\n        `workspace_mode \"${mode}\" requires a git repository`,\n        'Run: git init && git add -A && git commit -m \"Initial commit\"\\n         Or set workspace_mode: shared in .orchestry/config.yml',\n      );\n    }\n  }\n\n  async mergeBack(branch: string): Promise<MergeResult> {\n    return this.mergeStrategy.mergeBack(branch);\n  }\n\n  async cleanup(taskId: string, branch?: string): Promise<void> {\n    const workspacePath = path.join(this.orchestryDir, 'workspaces', sanitizeId(taskId));\n\n    // Try git worktree remove first (cleans up .git/worktrees/ metadata)\n    await this.spawnAndWait('git', ['worktree', 'remove', '--force', workspacePath]);\n\n    // Delete branch + remove directory concurrently\n    const branchDeletion = branch\n      ? this.spawnAndWait('git', ['branch', '-D', branch]).then(() => {})\n      : Promise.resolve();\n\n    const dirRemoval = fs.rm(workspacePath, { recursive: true, force: true }).catch(() => {});\n\n    await Promise.all([branchDeletion, dirRemoval]);\n  }\n\n  validate(workspacePath: string, projectRoot: string): void {\n    validateWorkspacePath(workspacePath, projectRoot);\n  }\n\n  /**\n   * Get files changed on a worktree branch relative to its merge-base.\n   * Uses `git merge-base` to find the fork point dynamically (no hardcoded branch name).\n   */\n  async getChangedFiles(branch: string): Promise<string[]> {\n    try {\n      const { stdout: baseStdout } = await this.spawnAndCapture(\n        'git', ['merge-base', 'HEAD', branch],\n      );\n      const mergeBase = baseStdout.trim();\n      if (!mergeBase) return [];\n\n      const { stdout: diffStdout, code } = await this.spawnAndCapture(\n        'git', ['diff', '--name-only', `${mergeBase}...${branch}`],\n      );\n      if (code !== 0 || !diffStdout.trim()) return [];\n      return diffStdout.trim().split('\\n').filter(Boolean);\n    } catch {\n      return [];\n    }\n  }\n\n  private resolveMode(task: Task, agent: Agent, config: OrchestratorConfig): WorkspaceMode {\n    return (\n      task.workspace_mode ??\n      agent.config.workspace_mode ??\n      config.defaults.agent.workspace_mode ??\n      'worktree'\n    );\n  }\n\n  private async prepareWorktree(task: Task): Promise<PrepareResult> {\n    const workspacePath = path.join(\n      this.orchestryDir,\n      'workspaces',\n      sanitizeId(task.id),\n    );\n    await ensureDir(path.dirname(workspacePath));\n\n    const titleSlug = sanitizeTitle(task.title) || sanitizeId(task.id);\n    const branchName = `orchestry/${sanitizeId(task.id)}/${titleSlug}`;\n\n    // Idempotent: if worktree directory already exists (retry after failure), reuse it\n    try {\n      await fs.access(workspacePath);\n      return { path: workspacePath, branch: branchName };\n    } catch {\n      // Directory doesn't exist — create fresh\n    }\n\n    // Try creating worktree: first with new branch (-b), fallback to existing branch\n    const createResult = await this.spawnAndWait(\n      'git', ['worktree', 'add', workspacePath, '-b', branchName],\n    );\n    if (createResult !== 0) {\n      // Branch may already exist from a previous failed run — prune stale metadata and retry\n      await this.spawnAndWait('git', ['worktree', 'prune']);\n      const reuseResult = await this.spawnAndWait(\n        'git', ['worktree', 'add', workspacePath, branchName],\n      );\n      if (reuseResult !== 0) {\n        throw new WorkspaceError(\n          `git worktree add failed with code ${reuseResult}`,\n          'Run: git worktree prune && git branch | grep orchestry | xargs -r git branch -D',\n        );\n      }\n    }\n\n    // Remove .orchestry/ from worktree to prevent recursive state/workspaces\n    const worktreeOrchestry = path.join(workspacePath, '.orchestry');\n    await fs.rm(worktreeOrchestry, { recursive: true, force: true }).catch(() => {});\n\n    return { path: workspacePath, branch: branchName };\n  }\n\n  /** Spawn a command and return exit code (non-throwing). */\n  private async spawnAndWait(cmd: string, args: string[]): Promise<number> {\n    try {\n      const { process: proc } = this.processManager.spawn(cmd, args, { cwd: this.projectRoot });\n      return new Promise<number>((resolve) => {\n        proc.on('close', (code) => resolve(code ?? 1));\n        proc.on('error', () => resolve(1));\n      });\n    } catch {\n      return 1;\n    }\n  }\n\n  /** Spawn a command and capture stdout + exit code. */\n  private async spawnAndCapture(cmd: string, args: string[]): Promise<{ stdout: string; code: number }> {\n    try {\n      const { process: proc } = this.processManager.spawn(cmd, args, { cwd: this.projectRoot });\n      let stdout = '';\n      proc.stdout?.on('data', (chunk: Buffer) => { stdout += chunk.toString(); });\n      const code = await new Promise<number>((resolve) => {\n        proc.on('close', (c) => resolve(c ?? 1));\n        proc.on('error', () => resolve(1));\n      });\n      return { stdout, code };\n    } catch {\n      return { stdout: '', code: 1 };\n    }\n  }\n\n  private async prepareIsolated(task: Task): Promise<string> {\n    const workspacePath = path.join(\n      this.orchestryDir,\n      'workspaces',\n      sanitizeId(task.id),\n    );\n    await ensureDir(path.dirname(workspacePath));\n\n    // Try git clone first, fall back to rsync\n    try {\n      const cloneResult = await this.spawnAndWait(\n        'git', ['clone', '--local', '--no-hardlinks', this.projectRoot, workspacePath],\n      );\n      if (cloneResult !== 0) throw new Error('git clone failed');\n    } catch {\n      // Fallback: rsync\n      const excludeFile = path.join(this.orchestryDir, 'workspace-exclude');\n      const args = ['-a', `--exclude-from=${excludeFile}`, './', `${workspacePath}/`];\n\n      const rsyncResult = await this.spawnAndWait('rsync', args);\n      if (rsyncResult !== 0) {\n        throw new Error(`rsync failed with code ${rsyncResult}`);\n      }\n    }\n\n    // Remove .orchestry/ to prevent recursive workspaces (covers both clone and rsync)\n    const clonedOrchestry = path.join(workspacePath, '.orchestry');\n    await fs.rm(clonedOrchestry, { recursive: true, force: true }).catch(() => {});\n\n    return workspacePath;\n  }\n}\n\nfunction sanitizeTitle(title: string): string {\n  return title\n    .toLowerCase()\n    .replace(/[^a-z0-9]+/g, '-')\n    .replace(/^-|-$/g, '')\n    .slice(0, 40);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxgeneral/orch",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "AI agent runtime — orchestrate Claude, Cursor, Codex & OpenCode as one team. Multi-agent task automation with state machine, auto-retry, inter-agent messaging, goals and teams. Zero-config CLI + programmatic API.",
   "type": "module",
   "engines": {