mcp-agent-foundry 1.0.0

package/dist/mcp/tools/worktree/cleanup-worktrees.js

@@ -0,0 +1,147 @@
+/**
+ * Cleanup Worktrees MCP Tool
+ *
+ * Cleans up worktrees by status (stale, completing) or force removes specific ones.
+ */
+import { z } from "zod";
+// ============================================================================
+// Constants
+// ============================================================================
+/**
+ * Tool description for cleanup_worktrees
+ */
+const TOOL_DESCRIPTION = "Clean up worktrees by status (stale, completing) or force remove specific ones. " +
+    "Modes: 'stale' (idle beyond threshold), 'completing' (finished tasks), 'force' (specific IDs).";
+// ============================================================================
+// Input Schema
+// ============================================================================
+/**
+ * Zod schema shape for cleanup_worktrees input validation.
+ */
+const cleanupWorktreesInputSchemaShape = {
+    mode: z
+        .enum(["stale", "completing", "force"])
+        .describe("Cleanup mode: 'stale' (idle >24h), 'completing' (finished tasks), 'force' (specific IDs)"),
+    worktreeIds: z
+        .array(z.string())
+        .optional()
+        .describe("Required for 'force' mode: specific worktree IDs to remove"),
+    maxIdleHours: z
+        .number()
+        .optional()
+        .default(24)
+        .describe("For 'stale' mode: max idle time in hours"),
+};
+// ============================================================================
+// Tool Registration
+// ============================================================================
+/**
+ * Register the cleanup_worktrees MCP tool.
+ *
+ * @param server - MCP server instance
+ * @param logger - Logger instance for structured logging
+ * @param resourceManager - Optional ResourceManager for worktree cleanup operations
+ */
+export function registerCleanupWorktreesTool(server, logger, resourceManager) {
+    // Use type assertion to work around Zod version compatibility issues
+    /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    const inputSchema = cleanupWorktreesInputSchemaShape;
+    server.registerTool("cleanup_worktrees", {
+        title: "Cleanup Worktrees",
+        description: TOOL_DESCRIPTION,
+        inputSchema,
+    }, 
+    /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    async (args) => {
+        const input = args;
+        const { mode, worktreeIds, maxIdleHours } = input;
+        logger.info("cleanup_worktrees called", { mode });
+        if (!resourceManager) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "## Error\n\nWorktree management not enabled.",
+                    },
+                ],
+            };
+        }
+        try {
+            let cleaned = [];
+            let failed = [];
+            switch (mode) {
+                case "stale": {
+                    const maxIdleMs = maxIdleHours * 60 * 60 * 1000;
+                    cleaned = await resourceManager.cleanupStale(maxIdleMs);
+                    break;
+                }
+                case "completing": {
+                    cleaned = await resourceManager.cleanupByStatus("completing");
+                    break;
+                }
+                case "force": {
+                    if (!worktreeIds || worktreeIds.length === 0) {
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: "## Error\n\n'force' mode requires worktreeIds parameter.",
+                                },
+                            ],
+                        };
+                    }
+                    const result = await resourceManager.forceCleanup(worktreeIds);
+                    cleaned = result.cleaned;
+                    failed = result.failed;
+                    break;
+                }
+            }
+            // Format output
+            const lines = [];
+            if (cleaned.length > 0) {
+                lines.push(`## Cleanup Complete\n`);
+                lines.push(`**Removed:** ${String(cleaned.length)} worktrees\n`);
+                for (const id of cleaned) {
+                    lines.push(`- ${id}`);
+                }
+            }
+            else {
+                lines.push(`## No Worktrees Cleaned\n`);
+                lines.push("No worktrees matched the cleanup criteria.");
+            }
+            if (failed.length > 0) {
+                lines.push(`\n### Failed to Remove\n`);
+                for (const id of failed) {
+                    lines.push(`- ${id}`);
+                }
+            }
+            // Show current usage
+            const usage = await resourceManager.getCurrentUsage();
+            lines.push(`\n### Current Usage`);
+            lines.push(`- **Worktrees:** ${String(usage.currentWorktrees)}`);
+            lines.push(`- **Disk:** ${String(usage.diskUsageMB)} MB`);
+            logger.info("cleanup_worktrees completed", {
+                mode,
+                cleaned: cleaned.length,
+                failed: failed.length,
+            });
+            return {
+                content: [{ type: "text", text: lines.join("\n") }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.error("cleanup_worktrees failed", { error: error instanceof Error ? error : undefined });
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `## Error\n\n${errorMessage}`,
+                    },
+                ],
+            };
+        }
+    });
+    logger.debug("Registered cleanup_worktrees tool");
+}
+//# sourceMappingURL=cleanup-worktrees.js.map

package/dist/mcp/tools/worktree/cleanup-worktrees.js.map

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

package/dist/mcp/tools/worktree/get-worktree-status.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Get Worktree Status MCP Tool
+ *
+ * Gets detailed status of a specific worktree including path, branch, disk usage, and age.
+ */
+import { type McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Logger } from "../../../observability/logger.js";
+import type { ResourceManager } from "../../../worktrees/resource-manager.js";
+/**
+ * Register the get_worktree_status MCP tool.
+ *
+ * @param server - MCP server instance
+ * @param logger - Logger instance for structured logging
+ * @param resourceManager - Optional ResourceManager for worktree metrics
+ */
+export declare function registerGetWorktreeStatusTool(server: McpServer, logger: Logger, resourceManager?: ResourceManager): void;
+//# sourceMappingURL=get-worktree-status.d.ts.map

package/dist/mcp/tools/worktree/get-worktree-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-worktree-status.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/worktree/get-worktree-status.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAoD9E;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,GAChC,IAAI,CAqFN"}

package/dist/mcp/tools/worktree/get-worktree-status.js

@@ -0,0 +1,123 @@
+/**
+ * Get Worktree Status MCP Tool
+ *
+ * Gets detailed status of a specific worktree including path, branch, disk usage, and age.
+ */
+import { z } from "zod";
+// ============================================================================
+// Constants
+// ============================================================================
+/**
+ * Tool description for get_worktree_status
+ */
+const TOOL_DESCRIPTION = "Get detailed status of a specific worktree including path, branch, disk usage, and age.";
+// ============================================================================
+// Input Schema
+// ============================================================================
+/**
+ * Zod schema shape for get_worktree_status input validation.
+ */
+const getWorktreeStatusInputSchemaShape = {
+    worktreeId: z.string().min(1).describe("The worktree ID to get status for"),
+};
+// ============================================================================
+// Helper Functions
+// ============================================================================
+/**
+ * Format duration in human-readable form.
+ */
+function formatDuration(ms) {
+    const hours = Math.floor(ms / (1000 * 60 * 60));
+    const minutes = Math.floor((ms % (1000 * 60 * 60)) / (1000 * 60));
+    if (hours > 24) {
+        const days = Math.floor(hours / 24);
+        return `${String(days)}d ${String(hours % 24)}h`;
+    }
+    if (hours > 0)
+        return `${String(hours)}h ${String(minutes)}m`;
+    return `${String(minutes)}m`;
+}
+// ============================================================================
+// Tool Registration
+// ============================================================================
+/**
+ * Register the get_worktree_status MCP tool.
+ *
+ * @param server - MCP server instance
+ * @param logger - Logger instance for structured logging
+ * @param resourceManager - Optional ResourceManager for worktree metrics
+ */
+export function registerGetWorktreeStatusTool(server, logger, resourceManager) {
+    // Use type assertion to work around Zod version compatibility issues
+    /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    const inputSchema = getWorktreeStatusInputSchemaShape;
+    server.registerTool("get_worktree_status", {
+        title: "Get Worktree Status",
+        description: TOOL_DESCRIPTION,
+        inputSchema,
+    }, 
+    /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    async (args) => {
+        const input = args;
+        const { worktreeId } = input;
+        logger.info("get_worktree_status called", { worktreeId });
+        if (!resourceManager) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "## Error\n\nWorktree management not enabled.",
+                    },
+                ],
+            };
+        }
+        try {
+            const metrics = await resourceManager.getWorktreeMetrics(worktreeId);
+            if (!metrics) {
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: `## Not Found\n\nWorktree '${worktreeId}' not found.`,
+                        },
+                    ],
+                };
+            }
+            const now = Date.now();
+            const age = formatDuration(now - metrics.createdAt);
+            const lastActivity = formatDuration(now - metrics.lastActivityAt);
+            const lines = [];
+            lines.push(`## Worktree: ${metrics.id}\n`);
+            lines.push(`| Property | Value |`);
+            lines.push(`|:---------|:------|`);
+            lines.push(`| **Status** | ${metrics.status} |`);
+            lines.push(`| **Path** | \`${metrics.path}\` |`);
+            lines.push(`| **Branch** | ${metrics.branch} |`);
+            lines.push(`| **Task ID** | ${metrics.taskId ?? "-"} |`);
+            lines.push(`| **Disk Usage** | ${String(metrics.diskUsageMB ?? 0)} MB |`);
+            lines.push(`| **Age** | ${age} |`);
+            lines.push(`| **Last Activity** | ${lastActivity} ago |`);
+            logger.info("get_worktree_status completed", {
+                worktreeId,
+                status: metrics.status,
+            });
+            return {
+                content: [{ type: "text", text: lines.join("\n") }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.error("get_worktree_status failed", { error: error instanceof Error ? error : undefined });
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `## Error\n\n${errorMessage}`,
+                    },
+                ],
+            };
+        }
+    });
+    logger.debug("Registered get_worktree_status tool");
+}
+//# sourceMappingURL=get-worktree-status.js.map

package/dist/mcp/tools/worktree/get-worktree-status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-worktree-status.js","sourceRoot":"","sources":["../../../../src/mcp/tools/worktree/get-worktree-status.ts"],"names":[],"mappings":"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"}

package/dist/mcp/tools/worktree/index.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Worktree Tools Index
+ *
+ * Exports all worktree-related MCP tool registration functions.
+ * These tools enable conflict resolution and worktree management.
+ */
+import { type McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Logger } from "../../../observability/logger.js";
+import type { StateCoordinator } from "../../../tasks/state-coordinator.js";
+import type { ResourceManager } from "../../../worktrees/resource-manager.js";
+import type { WorktreeManager } from "../../../worktrees/manager.js";
+/**
+ * Registers all worktree-related tools with the MCP server.
+ *
+ * Tools registered:
+ * - resolve_conflicts: Resolve git merge conflicts using various strategies
+ *
+ * @param server - The MCP server instance
+ * @param logger - Logger for tool operations
+ * @param worktreeManager - WorktreeManager for git worktree operations
+ * @param stateCoordinator - Optional StateCoordinator for conflict state tracking
+ */
+export declare function registerWorktreeTools(server: McpServer, logger: Logger, worktreeManager?: WorktreeManager, stateCoordinator?: StateCoordinator): void;
+/**
+ * Registers worktree management tools with the MCP server.
+ *
+ * Tools registered:
+ * - list_worktrees: List all worktrees with status, task associations, and resource usage
+ * - cleanup_worktrees: Clean up worktrees by status or force remove specific ones
+ * - get_worktree_status: Get detailed status of a specific worktree
+ *
+ * @param server - The MCP server instance
+ * @param logger - Logger for tool operations
+ * @param resourceManager - Optional ResourceManager for worktree metrics and cleanup
+ */
+export declare function registerWorktreeManagementTools(server: McpServer, logger: Logger, resourceManager?: ResourceManager): void;
+export { registerResolveConflictsTool } from "./resolve-conflicts.js";
+export { registerListWorktreesTool } from "./list-worktrees.js";
+export { registerCleanupWorktreesTool } from "./cleanup-worktrees.js";
+export { registerGetWorktreeStatusTool } from "./get-worktree-status.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/mcp/tools/worktree/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/worktree/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAWrE;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,EACjC,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,IAAI,CAYN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,GAChC,IAAI,CAiBN;AAMD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/mcp/tools/worktree/index.js

@@ -0,0 +1,69 @@
+/**
+ * Worktree Tools Index
+ *
+ * Exports all worktree-related MCP tool registration functions.
+ * These tools enable conflict resolution and worktree management.
+ */
+import { registerCleanupWorktreesTool } from "./cleanup-worktrees.js";
+import { registerGetWorktreeStatusTool } from "./get-worktree-status.js";
+import { registerListWorktreesTool } from "./list-worktrees.js";
+import { registerResolveConflictsTool } from "./resolve-conflicts.js";
+// ============================================================================
+// Convenience Registration
+// ============================================================================
+/**
+ * Registers all worktree-related tools with the MCP server.
+ *
+ * Tools registered:
+ * - resolve_conflicts: Resolve git merge conflicts using various strategies
+ *
+ * @param server - The MCP server instance
+ * @param logger - Logger for tool operations
+ * @param worktreeManager - WorktreeManager for git worktree operations
+ * @param stateCoordinator - Optional StateCoordinator for conflict state tracking
+ */
+export function registerWorktreeTools(server, logger, worktreeManager, stateCoordinator) {
+    logger.info("Registering worktree tools", {
+        worktreeSupport: !!worktreeManager,
+        stateCoordinatorAvailable: !!stateCoordinator,
+    });
+    // Register resolve_conflicts tool
+    registerResolveConflictsTool(server, logger, worktreeManager, stateCoordinator);
+    logger.info("Worktree tools registered successfully", {
+        tools: ["resolve_conflicts"],
+    });
+}
+/**
+ * Registers worktree management tools with the MCP server.
+ *
+ * Tools registered:
+ * - list_worktrees: List all worktrees with status, task associations, and resource usage
+ * - cleanup_worktrees: Clean up worktrees by status or force remove specific ones
+ * - get_worktree_status: Get detailed status of a specific worktree
+ *
+ * @param server - The MCP server instance
+ * @param logger - Logger for tool operations
+ * @param resourceManager - Optional ResourceManager for worktree metrics and cleanup
+ */
+export function registerWorktreeManagementTools(server, logger, resourceManager) {
+    logger.info("Registering worktree management tools", {
+        resourceManagerAvailable: !!resourceManager,
+    });
+    // Register list_worktrees tool
+    registerListWorktreesTool(server, logger, resourceManager);
+    // Register cleanup_worktrees tool
+    registerCleanupWorktreesTool(server, logger, resourceManager);
+    // Register get_worktree_status tool
+    registerGetWorktreeStatusTool(server, logger, resourceManager);
+    logger.info("Worktree management tools registered successfully", {
+        tools: ["list_worktrees", "cleanup_worktrees", "get_worktree_status"],
+    });
+}
+// ============================================================================
+// Exports
+// ============================================================================
+export { registerResolveConflictsTool } from "./resolve-conflicts.js";
+export { registerListWorktreesTool } from "./list-worktrees.js";
+export { registerCleanupWorktreesTool } from "./cleanup-worktrees.js";
+export { registerGetWorktreeStatusTool } from "./get-worktree-status.js";
+//# sourceMappingURL=index.js.map

package/dist/mcp/tools/worktree/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/mcp/tools/worktree/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,+EAA+E;AAC/E,2BAA2B;AAC3B,+EAA+E;AAE/E;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAiB,EACjB,MAAc,EACd,eAAiC,EACjC,gBAAmC;IAEnC,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE;QACxC,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,yBAAyB,EAAE,CAAC,CAAC,gBAAgB;KAC9C,CAAC,CAAC;IAEH,kCAAkC;IAClC,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAEhF,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;QACpD,KAAK,EAAE,CAAC,mBAAmB,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,+BAA+B,CAC7C,MAAiB,EACjB,MAAc,EACd,eAAiC;IAEjC,MAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE;QACnD,wBAAwB,EAAE,CAAC,CAAC,eAAe;KAC5C,CAAC,CAAC;IAEH,+BAA+B;IAC/B,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAE3D,kCAAkC;IAClC,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAE9D,oCAAoC;IACpC,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAE/D,MAAM,CAAC,IAAI,CAAC,mDAAmD,EAAE;QAC/D,KAAK,EAAE,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,qBAAqB,CAAC;KACtE,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/mcp/tools/worktree/list-worktrees.d.ts

@@ -0,0 +1,17 @@
+/**
+ * List Worktrees MCP Tool
+ *
+ * Lists all worktrees with their status, task associations, and resource usage.
+ */
+import { type McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Logger } from "../../../observability/logger.js";
+import type { ResourceManager } from "../../../worktrees/resource-manager.js";
+/**
+ * Register the list_worktrees MCP tool.
+ *
+ * @param server - MCP server instance
+ * @param logger - Logger instance for structured logging
+ * @param resourceManager - Optional ResourceManager for worktree metrics
+ */
+export declare function registerListWorktreesTool(server: McpServer, logger: Logger, resourceManager?: ResourceManager): void;
+//# sourceMappingURL=list-worktrees.d.ts.map

package/dist/mcp/tools/worktree/list-worktrees.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-worktrees.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/worktree/list-worktrees.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AA4D9E;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,GAChC,IAAI,CA8FN"}

package/dist/mcp/tools/worktree/list-worktrees.js

@@ -0,0 +1,136 @@
+/**
+ * List Worktrees MCP Tool
+ *
+ * Lists all worktrees with their status, task associations, and resource usage.
+ */
+import { z } from "zod";
+// ============================================================================
+// Constants
+// ============================================================================
+/**
+ * Tool description for list_worktrees
+ */
+const TOOL_DESCRIPTION = "List all worktrees with their status, task associations, and resource usage. " +
+    "Filter by status ('available', 'assigned', 'active', 'completing', 'conflict', 'stale', 'all') " +
+    "or by task ID.";
+// ============================================================================
+// Input Schema
+// ============================================================================
+/**
+ * Zod schema shape for list_worktrees input validation.
+ */
+const listWorktreesInputSchemaShape = {
+    status: z
+        .enum(["available", "assigned", "active", "completing", "conflict", "stale", "all"])
+        .optional()
+        .default("all")
+        .describe("Filter by worktree status"),
+    taskId: z.string().optional().describe("Filter by task ID"),
+};
+// ============================================================================
+// Helper Functions
+// ============================================================================
+/**
+ * Format age in human-readable form.
+ */
+function formatAge(ms) {
+    const hours = Math.floor(ms / (1000 * 60 * 60));
+    const minutes = Math.floor((ms % (1000 * 60 * 60)) / (1000 * 60));
+    if (hours > 24) {
+        const days = Math.floor(hours / 24);
+        return `${String(days)}d ${String(hours % 24)}h`;
+    }
+    if (hours > 0)
+        return `${String(hours)}h ${String(minutes)}m`;
+    return `${String(minutes)}m`;
+}
+// ============================================================================
+// Tool Registration
+// ============================================================================
+/**
+ * Register the list_worktrees MCP tool.
+ *
+ * @param server - MCP server instance
+ * @param logger - Logger instance for structured logging
+ * @param resourceManager - Optional ResourceManager for worktree metrics
+ */
+export function registerListWorktreesTool(server, logger, resourceManager) {
+    // Use type assertion to work around Zod version compatibility issues
+    /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    const inputSchema = listWorktreesInputSchemaShape;
+    server.registerTool("list_worktrees", {
+        title: "List Worktrees",
+        description: TOOL_DESCRIPTION,
+        inputSchema,
+    }, 
+    /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    async (args) => {
+        const input = args;
+        const { status, taskId } = input;
+        logger.info("list_worktrees called", { status, taskId });
+        if (!resourceManager) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "## Error\n\nWorktree management not enabled.",
+                    },
+                ],
+            };
+        }
+        try {
+            const metrics = await resourceManager.getAllWorktreeMetrics();
+            let filtered = metrics;
+            // Apply filters
+            if (status && status !== "all") {
+                filtered = filtered.filter((m) => m.status === status);
+            }
+            if (taskId) {
+                filtered = filtered.filter((m) => m.taskId === taskId);
+            }
+            // Format output
+            const lines = [];
+            lines.push("## Worktrees\n");
+            if (filtered.length === 0) {
+                lines.push("No worktrees found matching criteria.\n");
+            }
+            else {
+                lines.push("| ID | Status | Task | Branch | Disk (MB) | Age |");
+                lines.push("|:---|:-------|:-----|:-------|----------:|:----|");
+                const now = Date.now();
+                for (const m of filtered) {
+                    const age = formatAge(now - m.createdAt);
+                    const idShort = m.id.length > 12 ? `${m.id.slice(0, 12)}...` : m.id;
+                    lines.push(`| ${idShort} | ${m.status} | ${m.taskId ?? "-"} | ${m.branch} | ${String(m.diskUsageMB ?? 0)} | ${age} |`);
+                }
+            }
+            // Add summary
+            const usage = await resourceManager.getCurrentUsage();
+            lines.push("\n### Summary");
+            lines.push(`- **Total:** ${String(usage.currentWorktrees)}`);
+            lines.push(`- **Available Slots:** ${String(usage.availableSlots)}`);
+            lines.push(`- **Disk Usage:** ${String(usage.diskUsageMB)} MB`);
+            logger.info("list_worktrees completed", {
+                total: metrics.length,
+                filtered: filtered.length,
+            });
+            return {
+                content: [{ type: "text", text: lines.join("\n") }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.error("list_worktrees failed", { error: error instanceof Error ? error : undefined });
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `## Error\n\n${errorMessage}`,
+                    },
+                ],
+            };
+        }
+    });
+    logger.debug("Registered list_worktrees tool");
+}
+//# sourceMappingURL=list-worktrees.js.map

package/dist/mcp/tools/worktree/list-worktrees.js.map

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

package/dist/mcp/tools/worktree/resolve-conflicts.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Resolve Conflicts MCP Tool
+ *
+ * Allows users to resolve git merge conflicts in worktrees using various strategies.
+ */
+import { type McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Logger } from "../../../observability/logger.js";
+import type { StateCoordinator } from "../../../tasks/state-coordinator.js";
+import type { WorktreeManager } from "../../../worktrees/manager.js";
+/**
+ * Register the resolve_conflicts MCP tool.
+ *
+ * @param server - MCP server instance
+ * @param logger - Logger instance for structured logging
+ * @param worktreeManager - Optional WorktreeManager for git worktree operations
+ * @param stateCoordinator - Optional StateCoordinator for conflict state tracking
+ */
+export declare function registerResolveConflictsTool(server: McpServer, logger: Logger, worktreeManager?: WorktreeManager, stateCoordinator?: StateCoordinator): void;
+//# sourceMappingURL=resolve-conflicts.d.ts.map

package/dist/mcp/tools/worktree/resolve-conflicts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-conflicts.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/worktree/resolve-conflicts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAO5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAyKrE;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,EACjC,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,IAAI,CAwIN"}