mcp-agent-foundry 1.0.0

package/dist/worktrees/conflict-handler.js

@@ -0,0 +1,287 @@
+/**
+ * Conflict Handler
+ *
+ * Detects, parses, and resolves git merge conflicts with multiple strategies.
+ */
+import * as fs from "fs/promises";
+import * as path from "path";
+import { isInMergeConflict, getConflictedFiles, getMergeHeads, stageFile, completeMerge, abortMerge, checkoutFileVersion, } from "../utils/git.js";
+import { parseConflictsInFile, resolveConflictContent, hasConflictMarkers, } from "./conflict-parser.js";
+import { createLogger } from "../observability/logger.js";
+export class ConflictHandler {
+    worktreePath;
+    logger;
+    cachedConflicts = null;
+    constructor(worktreePath) {
+        this.worktreePath = worktreePath;
+        this.logger = createLogger({ name: "conflict-handler" });
+    }
+    /**
+     * Check if the worktree has merge conflicts.
+     */
+    async hasConflicts() {
+        return isInMergeConflict(this.worktreePath);
+    }
+    /**
+     * Detect and parse all conflicts in the worktree.
+     */
+    async detectConflicts() {
+        const conflictedFiles = await getConflictedFiles(this.worktreePath);
+        if (conflictedFiles.length === 0) {
+            this.cachedConflicts = new Map();
+            return [];
+        }
+        this.logger.info("Detected conflicted files", {
+            count: conflictedFiles.length,
+            files: conflictedFiles,
+        });
+        const fileConflicts = [];
+        this.cachedConflicts = new Map();
+        for (const file of conflictedFiles) {
+            const fullPath = path.join(this.worktreePath, file);
+            try {
+                const markers = await parseConflictsInFile(fullPath);
+                this.cachedConflicts.set(file, markers);
+                if (markers.length > 0) {
+                    fileConflicts.push({
+                        file,
+                        conflicts: markers,
+                        totalConflicts: markers.length,
+                    });
+                }
+            }
+            catch (error) {
+                this.logger.warn("Failed to parse conflicts in file", { file, error });
+            }
+        }
+        return fileConflicts;
+    }
+    /**
+     * Get conflict state for tracking.
+     */
+    async getConflictState(taskId, worktreeId) {
+        const files = await this.detectConflicts();
+        return {
+            taskId,
+            worktreeId,
+            detectedAt: Date.now(),
+            files,
+            totalConflicts: files.reduce((sum, f) => sum + f.totalConflicts, 0),
+            resolved: false,
+        };
+    }
+    /**
+     * Resolve conflicts using the specified strategy.
+     */
+    async resolveConflicts(strategy, manualResolutions) {
+        this.logger.info("Resolving conflicts", { strategy });
+        switch (strategy) {
+            case "ours":
+                return this.resolveWithOurs();
+            case "theirs":
+                return this.resolveWithTheirs();
+            case "auto":
+                return this.resolveWithAuto();
+            case "manual":
+                if (!manualResolutions || manualResolutions.length === 0) {
+                    return {
+                        success: false,
+                        strategy,
+                        resolvedFiles: [],
+                        remainingConflicts: await this.detectConflicts(),
+                        error: "Manual resolutions required but none provided",
+                    };
+                }
+                return this.resolveManually(manualResolutions);
+            default:
+                return {
+                    success: false,
+                    strategy,
+                    resolvedFiles: [],
+                    remainingConflicts: await this.detectConflicts(),
+                    error: `Unknown strategy: ${strategy}`,
+                };
+        }
+    }
+    /**
+     * Resolve all conflicts by accepting "ours" (current branch) version.
+     */
+    async resolveWithOurs() {
+        const conflictedFiles = await getConflictedFiles(this.worktreePath);
+        const resolvedFiles = [];
+        const errors = [];
+        for (const file of conflictedFiles) {
+            try {
+                await checkoutFileVersion(this.worktreePath, file, "ours");
+                await stageFile(this.worktreePath, file);
+                resolvedFiles.push(file);
+            }
+            catch (error) {
+                errors.push(`Failed to resolve ${file}: ${error}`);
+            }
+        }
+        const remaining = await this.detectConflicts();
+        return {
+            success: remaining.length === 0,
+            strategy: "ours",
+            resolvedFiles,
+            remainingConflicts: remaining,
+            error: errors.length > 0 ? errors.join("; ") : undefined,
+        };
+    }
+    /**
+     * Resolve all conflicts by accepting "theirs" (incoming branch) version.
+     */
+    async resolveWithTheirs() {
+        const conflictedFiles = await getConflictedFiles(this.worktreePath);
+        const resolvedFiles = [];
+        const errors = [];
+        for (const file of conflictedFiles) {
+            try {
+                await checkoutFileVersion(this.worktreePath, file, "theirs");
+                await stageFile(this.worktreePath, file);
+                resolvedFiles.push(file);
+            }
+            catch (error) {
+                errors.push(`Failed to resolve ${file}: ${error}`);
+            }
+        }
+        const remaining = await this.detectConflicts();
+        return {
+            success: remaining.length === 0,
+            strategy: "theirs",
+            resolvedFiles,
+            remainingConflicts: remaining,
+            error: errors.length > 0 ? errors.join("; ") : undefined,
+        };
+    }
+    /**
+     * Attempt automatic resolution by combining non-overlapping changes.
+     * Falls back to keeping both versions separated by a marker.
+     */
+    async resolveWithAuto() {
+        const conflictedFiles = await getConflictedFiles(this.worktreePath);
+        const resolvedFiles = [];
+        const remainingConflicts = [];
+        for (const file of conflictedFiles) {
+            const fullPath = path.join(this.worktreePath, file);
+            try {
+                const content = await fs.readFile(fullPath, "utf-8");
+                // For auto strategy, we try to keep both changes
+                // This is a simple approach - real auto-merge would be more sophisticated
+                const resolved = this.autoMergeContent(content);
+                if (!hasConflictMarkers(resolved)) {
+                    await fs.writeFile(fullPath, resolved);
+                    await stageFile(this.worktreePath, file);
+                    resolvedFiles.push(file);
+                }
+                else {
+                    // Still has conflicts - can't auto-resolve
+                    const markers = await parseConflictsInFile(fullPath);
+                    remainingConflicts.push({
+                        file,
+                        conflicts: markers,
+                        totalConflicts: markers.length,
+                    });
+                }
+            }
+            catch (error) {
+                this.logger.warn("Auto-merge failed for file", { file, error });
+                const markers = await parseConflictsInFile(fullPath).catch(() => []);
+                if (markers.length > 0) {
+                    remainingConflicts.push({
+                        file,
+                        conflicts: markers,
+                        totalConflicts: markers.length,
+                    });
+                }
+            }
+        }
+        return {
+            success: remainingConflicts.length === 0,
+            strategy: "auto",
+            resolvedFiles,
+            remainingConflicts,
+        };
+    }
+    /**
+     * Simple auto-merge: combine both versions with a separator comment.
+     * For code files, this often results in both changes being kept.
+     */
+    autoMergeContent(content) {
+        // For now, use a simple strategy: keep ours for auto
+        // A more sophisticated version could analyze the changes
+        return resolveConflictContent(content, "ours");
+    }
+    /**
+     * Apply manual resolutions provided by the user.
+     */
+    async resolveManually(resolutions) {
+        const resolvedFiles = [];
+        const errors = [];
+        for (const resolution of resolutions) {
+            const fullPath = path.join(this.worktreePath, resolution.file);
+            try {
+                // Validate no conflict markers in resolved content
+                if (hasConflictMarkers(resolution.resolvedContent)) {
+                    errors.push(`${resolution.file}: Resolved content still contains conflict markers`);
+                    continue;
+                }
+                await fs.writeFile(fullPath, resolution.resolvedContent);
+                await stageFile(this.worktreePath, resolution.file);
+                resolvedFiles.push(resolution.file);
+            }
+            catch (error) {
+                errors.push(`Failed to apply resolution for ${resolution.file}: ${error}`);
+            }
+        }
+        const remaining = await this.detectConflicts();
+        return {
+            success: remaining.length === 0 && errors.length === 0,
+            strategy: "manual",
+            resolvedFiles,
+            remainingConflicts: remaining,
+            error: errors.length > 0 ? errors.join("; ") : undefined,
+        };
+    }
+    /**
+     * Complete the merge after all conflicts are resolved.
+     */
+    async completeMerge(message) {
+        try {
+            const hasConflicts = await this.hasConflicts();
+            if (hasConflicts) {
+                const remaining = await this.detectConflicts();
+                return {
+                    success: false,
+                    error: `Cannot complete merge: ${remaining.length} files still have conflicts`,
+                };
+            }
+            const commitHash = await completeMerge(this.worktreePath, message);
+            this.cachedConflicts = null;
+            this.logger.info("Merge completed", { commitHash });
+            return { success: true, commitHash };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+            };
+        }
+    }
+    /**
+     * Abort the merge and return to pre-merge state.
+     */
+    async abortMerge() {
+        await abortMerge(this.worktreePath);
+        this.cachedConflicts = null;
+        this.logger.info("Merge aborted");
+    }
+    /**
+     * Get merge head information.
+     */
+    async getMergeInfo() {
+        return getMergeHeads(this.worktreePath);
+    }
+}
+//# sourceMappingURL=conflict-handler.js.map

package/dist/worktrees/conflict-handler.js.map

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

package/dist/worktrees/conflict-parser.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Conflict Parser
+ *
+ * Parses git merge conflict markers from files to extract
+ * structured conflict information.
+ */
+import type { ConflictMarker, FileConflict } from "../types.js";
+/**
+ * Parse a single file for conflict markers.
+ */
+export declare function parseConflictsInFile(filePath: string): Promise<ConflictMarker[]>;
+/**
+ * Parse conflict markers from file content.
+ */
+export declare function parseConflictMarkers(filePath: string, content: string): ConflictMarker[];
+/**
+ * Parse multiple files for conflicts.
+ */
+export declare function parseConflictsInFiles(filePaths: string[]): Promise<FileConflict[]>;
+/**
+ * Check if file content contains conflict markers.
+ */
+export declare function hasConflictMarkers(content: string): boolean;
+/**
+ * Remove conflict markers from content, keeping specified side.
+ */
+export declare function resolveConflictContent(content: string, strategy: "ours" | "theirs"): string;
+//# sourceMappingURL=conflict-parser.d.ts.map

package/dist/worktrees/conflict-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-parser.d.ts","sourceRoot":"","sources":["../../src/worktrees/conflict-parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOhE;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CAG3B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,cAAc,EAAE,CAwDlB;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,YAAY,EAAE,CAAC,CAoBzB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAC1B,MAAM,CA6CR"}

package/dist/worktrees/conflict-parser.js

@@ -0,0 +1,140 @@
+/**
+ * Conflict Parser
+ *
+ * Parses git merge conflict markers from files to extract
+ * structured conflict information.
+ */
+import * as fs from "fs/promises";
+// Git conflict marker patterns
+const CONFLICT_START = /^<<<<<<<\s*(.*)$/;
+const CONFLICT_SEPARATOR = /^=======$/;
+const CONFLICT_END = /^>>>>>>>\s*(.*)$/;
+/**
+ * Parse a single file for conflict markers.
+ */
+export async function parseConflictsInFile(filePath) {
+    const content = await fs.readFile(filePath, "utf-8");
+    return parseConflictMarkers(filePath, content);
+}
+/**
+ * Parse conflict markers from file content.
+ */
+export function parseConflictMarkers(filePath, content) {
+    const lines = content.split("\n");
+    const conflicts = [];
+    let i = 0;
+    while (i < lines.length) {
+        const startMatch = lines[i].match(CONFLICT_START);
+        if (startMatch) {
+            const startLine = i + 1; // 1-indexed
+            const oursLabel = startMatch[1] || "HEAD";
+            const oursLines = [];
+            const theirsLines = [];
+            let inOurs = true;
+            let theirsLabel = "";
+            i++;
+            while (i < lines.length) {
+                if (CONFLICT_SEPARATOR.test(lines[i])) {
+                    inOurs = false;
+                    i++;
+                    continue;
+                }
+                const endMatch = lines[i].match(CONFLICT_END);
+                if (endMatch) {
+                    theirsLabel = endMatch[1] || "MERGE_HEAD";
+                    conflicts.push({
+                        file: filePath,
+                        startLine,
+                        endLine: i + 1, // 1-indexed
+                        oursContent: oursLines.join("\n"),
+                        theirsContent: theirsLines.join("\n"),
+                        oursLabel,
+                        theirsLabel,
+                    });
+                    break;
+                }
+                if (inOurs) {
+                    oursLines.push(lines[i]);
+                }
+                else {
+                    theirsLines.push(lines[i]);
+                }
+                i++;
+            }
+        }
+        i++;
+    }
+    return conflicts;
+}
+/**
+ * Parse multiple files for conflicts.
+ */
+export async function parseConflictsInFiles(filePaths) {
+    const results = [];
+    for (const filePath of filePaths) {
+        try {
+            const conflicts = await parseConflictsInFile(filePath);
+            if (conflicts.length > 0) {
+                results.push({
+                    file: filePath,
+                    conflicts,
+                    totalConflicts: conflicts.length,
+                });
+            }
+        }
+        catch (error) {
+            // File might have been deleted or is inaccessible
+            console.warn(`Could not parse conflicts in ${filePath}:`, error);
+        }
+    }
+    return results;
+}
+/**
+ * Check if file content contains conflict markers.
+ */
+export function hasConflictMarkers(content) {
+    return CONFLICT_START.test(content) && CONFLICT_END.test(content);
+}
+/**
+ * Remove conflict markers from content, keeping specified side.
+ */
+export function resolveConflictContent(content, strategy) {
+    const lines = content.split("\n");
+    const result = [];
+    let i = 0;
+    while (i < lines.length) {
+        const startMatch = lines[i].match(CONFLICT_START);
+        if (startMatch) {
+            const oursLines = [];
+            const theirsLines = [];
+            let inOurs = true;
+            i++;
+            while (i < lines.length) {
+                if (CONFLICT_SEPARATOR.test(lines[i])) {
+                    inOurs = false;
+                    i++;
+                    continue;
+                }
+                if (CONFLICT_END.test(lines[i])) {
+                    // Add the chosen side's content
+                    const chosen = strategy === "ours" ? oursLines : theirsLines;
+                    result.push(...chosen);
+                    break;
+                }
+                if (inOurs) {
+                    oursLines.push(lines[i]);
+                }
+                else {
+                    theirsLines.push(lines[i]);
+                }
+                i++;
+            }
+        }
+        else {
+            result.push(lines[i]);
+        }
+        i++;
+    }
+    return result.join("\n");
+}
+//# sourceMappingURL=conflict-parser.js.map

package/dist/worktrees/conflict-parser.js.map

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

package/dist/worktrees/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Worktrees Module
+ *
+ * Provides git worktree management for parallel agent execution.
+ * Exports the WorktreeManager for lifecycle management,
+ * BranchManager for git branch operations, PipelineMergeOrchestrator
+ * for ordered merge operations, ConflictHandler for conflict resolution,
+ * conflict parser utilities, WorktreePool for pre-warming,
+ * and instruction builders for coding agent context.
+ */
+export { WorktreeManager } from "./manager.js";
+export { BranchManager } from "./branch-manager.js";
+export { ResourceManager } from "./resource-manager.js";
+export { WorktreePool, type PoolConfig, type PoolStats, } from "./pool.js";
+export { PipelineMergeOrchestrator, type MergeConflict, type StepMergeResult, type MergeOrchestratorConfig, } from "./pipeline-merge-orchestrator.js";
+export { ConflictHandler } from "./conflict-handler.js";
+export { buildWorktreeInstructions, buildCompactInstructions, injectWorktreeContext, } from "./instructions.js";
+export { parseConflictsInFile, parseConflictMarkers, parseConflictsInFiles, hasConflictMarkers, resolveConflictContent, } from "./conflict-parser.js";
+export { RecoveryManager, type OrphanedWorktree, type OrphanedTask, type OrphanedBranch, type ReconciliationResult, type RecoveryOptions, } from "./recovery.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worktrees/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,SAAS,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,yBAAyB,EACzB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,uBAAuB,GAC7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,eAAe,GACrB,MAAM,eAAe,CAAC"}

package/dist/worktrees/index.js

@@ -0,0 +1,20 @@
+/**
+ * Worktrees Module
+ *
+ * Provides git worktree management for parallel agent execution.
+ * Exports the WorktreeManager for lifecycle management,
+ * BranchManager for git branch operations, PipelineMergeOrchestrator
+ * for ordered merge operations, ConflictHandler for conflict resolution,
+ * conflict parser utilities, WorktreePool for pre-warming,
+ * and instruction builders for coding agent context.
+ */
+export { WorktreeManager } from "./manager.js";
+export { BranchManager } from "./branch-manager.js";
+export { ResourceManager } from "./resource-manager.js";
+export { WorktreePool, } from "./pool.js";
+export { PipelineMergeOrchestrator, } from "./pipeline-merge-orchestrator.js";
+export { ConflictHandler } from "./conflict-handler.js";
+export { buildWorktreeInstructions, buildCompactInstructions, injectWorktreeContext, } from "./instructions.js";
+export { parseConflictsInFile, parseConflictMarkers, parseConflictsInFiles, hasConflictMarkers, resolveConflictContent, } from "./conflict-parser.js";
+export { RecoveryManager, } from "./recovery.js";
+//# sourceMappingURL=index.js.map

package/dist/worktrees/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worktrees/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,YAAY,GAGb,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,yBAAyB,GAI1B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,eAAe,GAMhB,MAAM,eAAe,CAAC"}

package/dist/worktrees/instructions.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Worktree Instructions Builder
+ *
+ * Generates markdown instructions for coding agents explaining
+ * how to work within their assigned git worktree.
+ */
+import type { Worktree, WorktreeInstructions } from "../types.js";
+/**
+ * Build comprehensive worktree instructions for a coding agent
+ */
+export declare function buildWorktreeInstructions(worktree: Worktree): WorktreeInstructions;
+/**
+ * Build a compact version of instructions (for context-limited scenarios)
+ */
+export declare function buildCompactInstructions(worktree: Worktree): string;
+/**
+ * Inject worktree instructions into an existing prompt
+ */
+export declare function injectWorktreeContext(originalPrompt: string, worktree: Worktree, format?: "full" | "compact"): string;
+//# sourceMappingURL=instructions.d.ts.map

package/dist/worktrees/instructions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/worktrees/instructions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAElE;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,QAAQ,GACjB,oBAAoB,CAkDtB;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAOnE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,MAAM,GAAG,SAAkB,GAClC,MAAM,CAWR"}

package/dist/worktrees/instructions.js

@@ -0,0 +1,84 @@
+/**
+ * Worktree Instructions Builder
+ *
+ * Generates markdown instructions for coding agents explaining
+ * how to work within their assigned git worktree.
+ */
+/**
+ * Build comprehensive worktree instructions for a coding agent
+ */
+export function buildWorktreeInstructions(worktree) {
+    const instructions = `
+## 🔧 WORKTREE ENVIRONMENT
+
+You are working in an **isolated git worktree**. This ensures your changes don't conflict with other parallel agents.
+
+### Your Working Directory
+\`\`\`
+${worktree.path}
+\`\`\`
+
+### Git Branch Information
+- **Your Branch**: \`${worktree.branch}\`
+- **Base Branch**: \`${worktree.baseBranch}\`
+
+### ⚠️ CRITICAL RULES
+
+1. **ALWAYS work within your worktree directory**
+   - All file paths should be relative to: \`${worktree.path}\`
+   - Do NOT navigate outside this directory
+
+2. **Commit your changes frequently**
+   - Use commit prefix: \`[${worktree.taskId || "task"}]\`
+   - Example: \`git commit -m "[${worktree.taskId || "task"}] Add feature X"\`
+
+3. **DO NOT perform these git operations**:
+   - ❌ \`git checkout\` to another branch
+   - ❌ \`git merge\` or \`git rebase\`
+   - ❌ \`git push\` (merging is handled automatically)
+
+4. **If you need files from the base branch**:
+   - They're already available - your branch was created from \`${worktree.baseBranch}\`
+   - If you need latest changes, inform the orchestrator
+
+### Example Workflow
+\`\`\`bash
+cd ${worktree.path}
+# Make your changes
+git add .
+git commit -m "[${worktree.taskId || "task"}] Implement feature"
+\`\`\`
+`.trim();
+    return {
+        workingDirectory: worktree.path,
+        branch: worktree.branch,
+        baseBranch: worktree.baseBranch,
+        commitPrefix: `[${worktree.taskId || "task"}]`,
+        instructions,
+    };
+}
+/**
+ * Build a compact version of instructions (for context-limited scenarios)
+ */
+export function buildCompactInstructions(worktree) {
+    return `
+WORKTREE: ${worktree.path}
+BRANCH: ${worktree.branch}
+COMMIT PREFIX: [${worktree.taskId || "task"}]
+RULES: Stay in worktree dir, commit with prefix, no checkout/merge/push
+`.trim();
+}
+/**
+ * Inject worktree instructions into an existing prompt
+ */
+export function injectWorktreeContext(originalPrompt, worktree, format = "full") {
+    const instructions = format === "full"
+        ? buildWorktreeInstructions(worktree).instructions
+        : buildCompactInstructions(worktree);
+    return `${instructions}
+
+---
+
+${originalPrompt}`;
+}
+//# sourceMappingURL=instructions.js.map

package/dist/worktrees/instructions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/worktrees/instructions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,QAAkB;IAElB,MAAM,YAAY,GAAG;;;;;;;EAOrB,QAAQ,CAAC,IAAI;;;;uBAIQ,QAAQ,CAAC,MAAM;uBACf,QAAQ,CAAC,UAAU;;;;;+CAKK,QAAQ,CAAC,IAAI;;;;6BAI/B,QAAQ,CAAC,MAAM,IAAI,MAAM;kCACpB,QAAQ,CAAC,MAAM,IAAI,MAAM;;;;;;;;kEAQO,QAAQ,CAAC,UAAU;;;;;KAKhF,QAAQ,CAAC,IAAI;;;kBAGA,QAAQ,CAAC,MAAM,IAAI,MAAM;;CAE1C,CAAC,IAAI,EAAE,CAAC;IAEP,OAAO;QACL,gBAAgB,EAAE,QAAQ,CAAC,IAAI;QAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,YAAY,EAAE,IAAI,QAAQ,CAAC,MAAM,IAAI,MAAM,GAAG;QAC9C,YAAY;KACb,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,QAAkB;IACzD,OAAO;YACG,QAAQ,CAAC,IAAI;UACf,QAAQ,CAAC,MAAM;kBACP,QAAQ,CAAC,MAAM,IAAI,MAAM;;CAE1C,CAAC,IAAI,EAAE,CAAC;AACT,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,cAAsB,EACtB,QAAkB,EAClB,SAA6B,MAAM;IAEnC,MAAM,YAAY,GAChB,MAAM,KAAK,MAAM;QACf,CAAC,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,YAAY;QAClD,CAAC,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAEzC,OAAO,GAAG,YAAY;;;;EAItB,cAAc,EAAE,CAAC;AACnB,CAAC"}