@oxgeneral/orch 0.3.2 → 0.3.4

package/dist/{workspace-manager-T6AXG7XL.js.map → workspace-manager-EVD67GCG.js.map}

@@ -1 +1 @@
-{"version":3,"sources":["../src/infrastructure/workspace/merge-strategy.ts","../src/infrastructure/workspace/workspace-manager.ts"],"names":[],"mappings":"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","file":"workspace-manager-T6AXG7XL.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      try {\n        const { process: proc } = this.processManager.spawn(\n          'git',\n          ['rev-parse', '--is-inside-work-tree'],\n          { cwd: this.projectRoot },\n        );\n        const code = await new Promise<number | null>((resolve) => {\n          proc.on('close', resolve);\n          proc.on('error', () => resolve(1));\n        });\n        this.isGitRepo = code === 0;\n      } catch {\n        this.isGitRepo = false;\n      }\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): 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    try {\n      const { process: proc } = this.processManager.spawn(\n        'git',\n        ['worktree', 'remove', '--force', workspacePath],\n        { cwd: this.projectRoot },\n      );\n      await new Promise<void>((resolve) => {\n        proc.on('close', () => resolve());\n        proc.on('error', () => resolve());\n      });\n    } catch {\n      // Not a worktree or git not available — fall through to rm\n    }\n\n    // Remove directory regardless (handles isolated mode and worktree cleanup failures)\n    try {\n      await fs.rm(workspacePath, { recursive: true, force: true });\n    } catch {\n      // Workspace may not exist\n    }\n  }\n\n  validate(workspacePath: string, projectRoot: string): void {\n    validateWorkspacePath(workspacePath, projectRoot);\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    const { process: proc } = this.processManager.spawn(\n      'git',\n      ['worktree', 'add', workspacePath, '-b', branchName],\n      { cwd: this.projectRoot },\n    );\n\n    await new Promise<void>((resolve, reject) => {\n      proc.on('close', (code) => {\n        if (code === 0) resolve();\n        else reject(new Error(`git worktree add failed with code ${code}`));\n      });\n      proc.on('error', reject);\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  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 { process: proc } = this.processManager.spawn(\n        'git',\n        ['clone', '--local', '--no-hardlinks', '.', workspacePath],\n        { cwd: this.projectRoot },\n      );\n\n      await new Promise<void>((resolve, reject) => {\n        proc.on('close', (code) => {\n          if (code === 0) resolve();\n          else reject(new Error('git clone failed'));\n        });\n        proc.on('error', reject);\n      });\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 { process: proc } = this.processManager.spawn('rsync', args, {\n        cwd: this.projectRoot,\n      });\n\n      await new Promise<void>((resolve, reject) => {\n        proc.on('close', (code) => {\n          if (code === 0) resolve();\n          else reject(new Error(`rsync failed with code ${code}`));\n        });\n        proc.on('error', reject);\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"]}
+{"version":3,"sources":["../src/infrastructure/workspace/merge-strategy.ts","../src/infrastructure/workspace/workspace-manager.ts"],"names":[],"mappings":"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","file":"workspace-manager-EVD67GCG.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      try {\n        const { process: proc } = this.processManager.spawn(\n          'git',\n          ['rev-parse', '--is-inside-work-tree'],\n          { cwd: this.projectRoot },\n        );\n        const code = await new Promise<number | null>((resolve) => {\n          proc.on('close', resolve);\n          proc.on('error', () => resolve(1));\n        });\n        this.isGitRepo = code === 0;\n      } catch {\n        this.isGitRepo = false;\n      }\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): 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    try {\n      const { process: proc } = this.processManager.spawn(\n        'git',\n        ['worktree', 'remove', '--force', workspacePath],\n        { cwd: this.projectRoot },\n      );\n      await new Promise<void>((resolve) => {\n        proc.on('close', () => resolve());\n        proc.on('error', () => resolve());\n      });\n    } catch {\n      // Not a worktree or git not available — fall through to rm\n    }\n\n    // Remove directory regardless (handles isolated mode and worktree cleanup failures)\n    try {\n      await fs.rm(workspacePath, { recursive: true, force: true });\n    } catch {\n      // Workspace may not exist\n    }\n  }\n\n  validate(workspacePath: string, projectRoot: string): void {\n    validateWorkspacePath(workspacePath, projectRoot);\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    const { process: proc } = this.processManager.spawn(\n      'git',\n      ['worktree', 'add', workspacePath, '-b', branchName],\n      { cwd: this.projectRoot },\n    );\n\n    await new Promise<void>((resolve, reject) => {\n      proc.on('close', (code) => {\n        if (code === 0) resolve();\n        else reject(new Error(`git worktree add failed with code ${code}`));\n      });\n      proc.on('error', reject);\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  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 { process: proc } = this.processManager.spawn(\n        'git',\n        ['clone', '--local', '--no-hardlinks', '.', workspacePath],\n        { cwd: this.projectRoot },\n      );\n\n      await new Promise<void>((resolve, reject) => {\n        proc.on('close', (code) => {\n          if (code === 0) resolve();\n          else reject(new Error('git clone failed'));\n        });\n        proc.on('error', reject);\n      });\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 { process: proc } = this.processManager.spawn('rsync', args, {\n        cwd: this.projectRoot,\n      });\n\n      await new Promise<void>((resolve, reject) => {\n        proc.on('close', (code) => {\n          if (code === 0) resolve();\n          else reject(new Error(`rsync failed with code ${code}`));\n        });\n        proc.on('error', reject);\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/dist/workspace-manager-JM6U7JOH.js

@@ -0,0 +1,215 @@
+#!/usr/bin/env node
+import { sanitizeId, validateWorkspacePath, ensureDir } from './chunk-LV6GDBBI.js';
+import { WorkspaceError } from './chunk-2C2TFQ7K.js';
+import path from 'path';
+import fs from 'fs/promises';
+
+// src/infrastructure/workspace/merge-strategy.ts
+var MergeStrategy = class {
+  constructor(projectRoot, processManager) {
+    this.projectRoot = projectRoot;
+    this.processManager = processManager;
+  }
+  /**
+   * Merge a branch into the current branch with --no-ff.
+   * On conflict, aborts the merge and returns conflict info.
+   */
+  async mergeBack(branch) {
+    return new Promise((resolve) => {
+      const { process: proc } = this.processManager.spawn(
+        "git",
+        ["merge", "--no-ff", branch, "-m", `Merge ${branch}`],
+        { cwd: this.projectRoot }
+      );
+      let output = "";
+      const maxOutputLen = 2e3;
+      const appendOutput = (chunk) => {
+        if (output.length < maxOutputLen) output += chunk.toString();
+      };
+      proc.stdout?.on("data", appendOutput);
+      proc.stderr?.on("data", appendOutput);
+      proc.on("close", (code) => {
+        if (code === 0) {
+          resolve({ success: true });
+          return;
+        }
+        const trimmedOutput = output.slice(0, 1e3);
+        const isConflict = trimmedOutput.includes("CONFLICT") || trimmedOutput.includes("Merge conflict");
+        if (!isConflict) {
+          resolve({ success: false, conflictInfo: trimmedOutput });
+          return;
+        }
+        try {
+          const { process: abortProc } = this.processManager.spawn(
+            "git",
+            ["merge", "--abort"],
+            { cwd: this.projectRoot }
+          );
+          abortProc.on("close", () => {
+            resolve({ success: false, conflictInfo: trimmedOutput });
+          });
+          abortProc.on("error", () => {
+            resolve({ success: false, conflictInfo: trimmedOutput });
+          });
+        } catch {
+          resolve({ success: false, conflictInfo: trimmedOutput });
+        }
+      });
+      proc.on("error", (err) => {
+        resolve({ success: false, conflictInfo: err.message });
+      });
+    });
+  }
+};
+
+// src/infrastructure/workspace/workspace-manager.ts
+var WorkspaceManager = class {
+  constructor(projectRoot, orchestryDir, processManager) {
+    this.projectRoot = projectRoot;
+    this.orchestryDir = orchestryDir;
+    this.processManager = processManager;
+    this.mergeStrategy = new MergeStrategy(projectRoot, processManager);
+  }
+  mergeStrategy;
+  gitRepoChecked = false;
+  isGitRepo = false;
+  async prepare(task, agent, config) {
+    const mode = this.resolveMode(task, agent, config);
+    if (mode !== "shared") {
+      await this.requireGitRepo(mode);
+    }
+    switch (mode) {
+      case "shared":
+        return { path: this.projectRoot };
+      case "worktree":
+        return this.prepareWorktree(task);
+      case "isolated":
+        return { path: await this.prepareIsolated(task) };
+      default:
+        return { path: this.projectRoot };
+    }
+  }
+  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;
+      }
+      if (this.isGitRepo) this.gitRepoChecked = true;
+    }
+    if (!this.isGitRepo) {
+      throw new WorkspaceError(
+        `workspace_mode "${mode}" requires a git repository`,
+        'Run: git init && git add -A && git commit -m "Initial commit"\n         Or set workspace_mode: shared in .orchestry/config.yml'
+      );
+    }
+  }
+  async mergeBack(branch) {
+    return this.mergeStrategy.mergeBack(branch);
+  }
+  async cleanup(taskId) {
+    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 {
+    }
+    try {
+      await fs.rm(workspacePath, { recursive: true, force: true });
+    } catch {
+    }
+  }
+  validate(workspacePath, projectRoot) {
+    validateWorkspacePath(workspacePath, projectRoot);
+  }
+  resolveMode(task, agent, config) {
+    return task.workspace_mode ?? agent.config.workspace_mode ?? config.defaults.agent.workspace_mode ?? "worktree";
+  }
+  async prepareWorktree(task) {
+    const workspacePath = path.join(
+      this.orchestryDir,
+      "workspaces",
+      sanitizeId(task.id)
+    );
+    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(
+      "git",
+      ["worktree", "add", workspacePath, "-b", branchName],
+      { cwd: this.projectRoot }
+    );
+    await new Promise((resolve, reject) => {
+      proc.on("close", (code) => {
+        if (code === 0) resolve();
+        else reject(new Error(`git worktree add failed with code ${code}`));
+      });
+      proc.on("error", reject);
+    });
+    const worktreeOrchestry = path.join(workspacePath, ".orchestry");
+    await fs.rm(worktreeOrchestry, { recursive: true, force: true }).catch(() => {
+    });
+    return { path: workspacePath, branch: branchName };
+  }
+  async prepareIsolated(task) {
+    const workspacePath = path.join(
+      this.orchestryDir,
+      "workspaces",
+      sanitizeId(task.id)
+    );
+    await ensureDir(path.dirname(workspacePath));
+    try {
+      const { process: proc } = this.processManager.spawn(
+        "git",
+        ["clone", "--local", "--no-hardlinks", ".", workspacePath],
+        { cwd: this.projectRoot }
+      );
+      await new Promise((resolve, reject) => {
+        proc.on("close", (code) => {
+          if (code === 0) resolve();
+          else reject(new Error("git clone failed"));
+        });
+        proc.on("error", reject);
+      });
+    } 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 clonedOrchestry = path.join(workspacePath, ".orchestry");
+    await fs.rm(clonedOrchestry, { recursive: true, force: true }).catch(() => {
+    });
+    return workspacePath;
+  }
+};
+function sanitizeTitle(title) {
+  return title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
+}
+
+export { WorkspaceManager };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxgeneral/orch",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Agents Organizations — CLI orchestrator for AI agents",
   "type": "module",
   "engines": {

package/readme.md

@@ -10,7 +10,7 @@
     <a href="https://www.npmjs.com/package/@oxgeneral/orch"><img src="https://img.shields.io/npm/v/@oxgeneral/orch?color=cb0000" alt="npm" /></a>
     <a href="#get-started-in-30-seconds"><img src="https://img.shields.io/badge/setup-one%20command-brightgreen" alt="One command setup" /></a>
     <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue" alt="MIT License" /></a>
-    <a href="#development"><img src="https://img.shields.io/badge/tests-1020%20passing-brightgreen" alt="Tests" /></a>
+    <a href="#development"><img src="https://img.shields.io/badge/tests-1386%20passing-brightgreen" alt="Tests" /></a>
     <a href="#architecture"><img src="https://img.shields.io/badge/TypeScript-strict-blue" alt="TypeScript strict" /></a>
   </p>
 </p>
@@ -94,6 +94,13 @@ Full-screen Ink/React dashboard with:
 - Activity feed with token counts
 - Keyboard-driven: create tasks, assign agents, approve reviews — without leaving the terminal
 - Command bar with `/task add`, `/agent add`, tab completion
+- **Help overlay** (`?` or `F1`) — discover all keyboard shortcuts at any time
+- **Toast notifications** — done/failed/review completions with optional bell sound
+- **Error hint panel** — when an agent fails, see the exact cause and fix hint inline
+- **Detail panel resize** (`+`/`-`/`M`) — expand agent/task detail to full screen
+- **Goal-task linking** — badge tasks with their goal, group by goal with `G`, see per-goal progress bars
+- **Inline validation** — wizard forms validate as you type (duplicate names, invalid priority)
+- **Tab badge flash** — header tabs blink on task completion events outside the active tab
 
 ### Goals — strategic direction for your agents
 Define high-level goals and let ORCH autonomously generate tasks to achieve them. Goals have statuses (`active`, `paused`, `achieved`, `abandoned`), can be assigned to specific agents, and appear in a dedicated TUI tab for tracking.
@@ -231,7 +238,7 @@ src/
 ```bash
 npm run dev            # Run via tsx
 npm run build          # Build ESM + DTS
-npm test               # 1020 tests via Vitest
+npm test               # 1386 tests via Vitest
 npm run typecheck      # Strict TypeScript
 ```
 

package/scripts/postinstall.js

@@ -1,11 +1,53 @@
 #!/usr/bin/env node
 
 /**
- * Post-install banner — shown once after `npm install -g @oxgeneral/orch`.
+ * Post-install: patch Ink caches + show banner.
  * Pure Node.js, no dependencies.
  */
 
-// Skip in CI or non-interactive environments
+// Patch Ink's unbounded caches before anything else
+try {
+  const { readFileSync, writeFileSync, existsSync } = require('node:fs');
+  const { join } = require('node:path');
+  const inkBuild = join(__dirname, '..', 'node_modules', 'ink', 'build');
+  const MAX = 2000;
+
+  const wrapPath = join(inkBuild, 'wrap-text.js');
+  if (existsSync(wrapPath)) {
+    let s = readFileSync(wrapPath, 'utf8');
+    if (!s.includes('_lruKeys')) {
+      s = s.replace('const cache = {};', `const cache = {};\nconst _lruKeys = [];\nconst _MAX = ${MAX};`);
+      s = s.replace('cache[cacheKey] = wrappedText;', `cache[cacheKey] = wrappedText;\n    _lruKeys.push(cacheKey);\n    if (_lruKeys.length > _MAX) { delete cache[_lruKeys.shift()]; }`);
+      writeFileSync(wrapPath, s);
+    }
+  }
+
+  const measurePath = join(inkBuild, 'measure-text.js');
+  if (existsSync(measurePath)) {
+    let s = readFileSync(measurePath, 'utf8');
+    if (!s.includes('_MAX_MT')) {
+      s = s.replace('const cache = new Map();', `const cache = new Map();\nconst _MAX_MT = ${MAX};`);
+      s = s.replace('cache.set(text, dimensions);', `cache.set(text, dimensions);\n    if (cache.size > _MAX_MT) { const first = cache.keys().next().value; cache.delete(first); }`);
+      writeFileSync(measurePath, s);
+    }
+  }
+  // Patch output.js: add LRU eviction to OutputCaches maps
+  const outputPath = join(inkBuild, 'output.js');
+  if (existsSync(outputPath)) {
+    let s = readFileSync(outputPath, 'utf8');
+    if (!s.includes('_OC_MAX')) {
+      // Add LRU bound to all three Maps in OutputCaches
+      const lru = (prop) => `\n        if (this.${prop}.size > _OC_MAX) { const k = this.${prop}.keys().next().value; this.${prop}.delete(k); }`;
+      s = s.replace('class OutputCaches {', `const _OC_MAX = ${MAX};\nclass OutputCaches {`);
+      s = s.replace('this.styledChars.set(line, cached);', `this.styledChars.set(line, cached);${lru('styledChars')}`);
+      s = s.replace('this.widths.set(text, cached);', `this.widths.set(text, cached);${lru('widths')}`);
+      s = s.replace('this.blockWidths.set(text, cached);', `this.blockWidths.set(text, cached);${lru('blockWidths')}`);
+      writeFileSync(outputPath, s);
+    }
+  }
+} catch { /* non-fatal: caches will just be unbounded */ }
+
+// Skip banner in CI or non-interactive environments
 if (process.env.CI || !process.stderr.isTTY) process.exit(0);
 
 // Color values synced with src/cli/output.ts colors map