@oxgeneral/orch 1.0.7 → 1.0.8

package/dist/orchestrator-XPEMMBOO.js

@@ -1,6 +0,0 @@
-export { Orchestrator } from './chunk-4TDXD3LA.js';
-import './chunk-VG4465AG.js';
-import './chunk-RHFRHCN5.js';
-import './chunk-NLQAJ7TW.js';
-//# sourceMappingURL=orchestrator-XPEMMBOO.js.map
-//# sourceMappingURL=orchestrator-XPEMMBOO.js.map

package/dist/workspace-manager-5EYCMAEO.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/infrastructure/workspace/merge-strategy.ts","../src/infrastructure/workspace/workspace-manager.ts"],"names":[],"mappings":"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","file":"workspace-manager-5EYCMAEO.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, 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    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    // Delete branch + remove directory concurrently (independent of each other)\n    const branchDeletion = branch\n      ? (async () => {\n          try {\n            const { process: proc } = this.processManager.spawn(\n              'git',\n              ['branch', '-D', branch],\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            // Branch may not exist or git not available\n          }\n        })()\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  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 WorkspaceError(\n          `git worktree add failed with code ${code}`,\n          'Run: git worktree prune && git branch | grep orchestry | xargs -r git branch -D',\n        ));\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-XKOZ5WM6.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-import {o,p,j}from'./chunk-WVJTXBPL.js';import {l as l$1}from'./chunk-IKNBPOQL.js';import n from'path';import u from'fs/promises';var l=class{constructor(r,e){this.projectRoot=r;this.processManager=e;}async mergeBack(r){return new Promise(e=>{let{process:t}=this.processManager.spawn("git",["merge","--no-ff",r,"-m",`Merge ${r}`],{cwd:this.projectRoot}),o="",a=2e3,i=s=>{o.length<a&&(o+=s.toString());};t.stdout?.on("data",i),t.stderr?.on("data",i),t.on("close",s=>{if(s===0){e({success:true});return}let c=o.slice(0,1e3);if(!(c.includes("CONFLICT")||c.includes("Merge conflict"))){e({success:false,conflictInfo:c});return}try{let{process:f}=this.processManager.spawn("git",["merge","--abort"],{cwd:this.projectRoot});f.on("close",()=>{e({success:!1,conflictInfo:c});}),f.on("error",()=>{e({success:!1,conflictInfo:c});});}catch{e({success:false,conflictInfo:c});}}),t.on("error",s=>{e({success:false,conflictInfo:s.message});});})}};var y=class{constructor(r,e,t){this.projectRoot=r;this.orchestryDir=e;this.processManager=t;this.mergeStrategy=new l(r,t);}mergeStrategy;gitRepoChecked=false;isGitRepo=false;async prepare(r,e,t){let o=this.resolveMode(r,e,t);switch(o!=="shared"&&await this.requireGitRepo(o),o){case "shared":return {path:this.projectRoot};case "worktree":return this.prepareWorktree(r);case "isolated":return {path:await this.prepareIsolated(r)};default:return {path:this.projectRoot}}}async requireGitRepo(r){if(!this.gitRepoChecked){try{let{process:e}=this.processManager.spawn("git",["rev-parse","--is-inside-work-tree"],{cwd:this.projectRoot}),t=await new Promise(o=>{e.on("close",o),e.on("error",()=>o(1));});this.isGitRepo=t===0;}catch{this.isGitRepo=false;}this.isGitRepo&&(this.gitRepoChecked=true);}if(!this.isGitRepo)throw new l$1(`workspace_mode "${r}" requires a git repository`,`Run: git init && git add -A && git commit -m "Initial commit"
-         Or set workspace_mode: shared in .orchestry/config.yml`)}async mergeBack(r){return this.mergeStrategy.mergeBack(r)}async cleanup(r,e){let t=n.join(this.orchestryDir,"workspaces",o(r));try{let{process:i}=this.processManager.spawn("git",["worktree","remove","--force",t],{cwd:this.projectRoot});await new Promise(s=>{i.on("close",()=>s()),i.on("error",()=>s());});}catch{}let o$1=e?(async()=>{try{let{process:i}=this.processManager.spawn("git",["branch","-D",e],{cwd:this.projectRoot});await new Promise(s=>{i.on("close",()=>s()),i.on("error",()=>s());});}catch{}})():Promise.resolve(),a=u.rm(t,{recursive:true,force:true}).catch(()=>{});await Promise.all([o$1,a]);}validate(r,e){p(r,e);}resolveMode(r,e,t){return r.workspace_mode??e.config.workspace_mode??t.defaults.agent.workspace_mode??"worktree"}async prepareWorktree(r){let e=n.join(this.orchestryDir,"workspaces",o(r.id));await j(n.dirname(e));let t=k(r.title)||o(r.id),o$1=`orchestry/${o(r.id)}/${t}`,{process:a}=this.processManager.spawn("git",["worktree","add",e,"-b",o$1],{cwd:this.projectRoot});await new Promise((s,c)=>{a.on("close",p=>{p===0?s():c(new l$1(`git worktree add failed with code ${p}`,"Run: git worktree prune && git branch | grep orchestry | xargs -r git branch -D"));}),a.on("error",c);});let i=n.join(e,".orchestry");return await u.rm(i,{recursive:true,force:true}).catch(()=>{}),{path:e,branch:o$1}}async prepareIsolated(r){let e=n.join(this.orchestryDir,"workspaces",o(r.id));await j(n.dirname(e));try{let{process:o}=this.processManager.spawn("git",["clone","--local","--no-hardlinks",".",e],{cwd:this.projectRoot});await new Promise((a,i)=>{o.on("close",s=>{s===0?a():i(new Error("git clone failed"));}),o.on("error",i);});}catch{let a=["-a",`--exclude-from=${n.join(this.orchestryDir,"workspace-exclude")}`,"./",`${e}/`],{process:i}=this.processManager.spawn("rsync",a,{cwd:this.projectRoot});await new Promise((s,c)=>{i.on("close",p=>{p===0?s():c(new Error(`rsync failed with code ${p}`));}),i.on("error",c);});}let t=n.join(e,".orchestry");return await u.rm(t,{recursive:true,force:true}).catch(()=>{}),e}};function k(d){return d.toLowerCase().replace(/[^a-z0-9]+/g,"-").replace(/^-|-$/g,"").slice(0,40)}export{y as WorkspaceManager};