@superblocksteam/vite-plugin-file-sync 2.0.51 → 2.0.52-next.1

package/dist/ai-service/agent/tools2/registry.js

@@ -1,4 +1,6 @@
-import { PermissionLevel, ToolExecutionError, } from "./types.js";
+import { OperationQueue } from "../../../util/operation-queue.js";
+import { ToolNamePermissionKeyStrategy, } from "./entity-permissions.js";
+import { PermissionLevel, ToolPermissionResponse, ToolExecutionError, } from "./types.js";
 /**
  * Central registry for tools with access control.
  *
@@ -14,6 +16,9 @@ export class ToolRegistry {
     accessRules = [];
     middleware = [];
     promptHandler;
+    promptQueue = new OperationQueue();
+    entityPermissionStore;
+    scopeStrategy = new ToolNamePermissionKeyStrategy();
     /**
      * Register a tool factory and optionally instantiate it immediately.
      *
@@ -183,7 +188,32 @@ export class ToolRegistry {
      * @param handler - Prompt handler function
      */
     setPromptHandler(handler) {
-        this.promptHandler = handler;
+        this.promptHandler = (tool, input, context) => this.promptQueue.enqueue(() => handler(tool, input, context));
+    }
+    /**
+     * Set entity permission store for tracking per-entity approvals.
+     *
+     * When set, tools with `extractEntities` defined will automatically
+     * check if extracted entities have been approved before execution.
+     * If any entity is not approved, the user will be prompted.
+     *
+     * @param store - Entity permission store instance
+     */
+    setEntityPermissionStore(store) {
+        this.entityPermissionStore = store;
+    }
+    /**
+     * Get permission scope for a tool.
+     *
+     * Computes the scope string using the configured strategy.
+     * This scope is used to isolate permissions between different tools/categories.
+     *
+     * @param tool - Tool to get scope for
+     * @returns Permission scope string
+     */
+    getToolPermissionScope(tool) {
+        const key = this.scopeStrategy.getToolPermissionKey(tool);
+        return this.scopeStrategy.formatScope(key);
     }
     /**
      * Check permission level for tool execution.
@@ -250,28 +280,41 @@ export class ToolRegistry {
         }
         // Handle PROMPT
         if (permission === PermissionLevel.PROMPT) {
-            if (!this.promptHandler) {
-                return {
-                    type: "error",
-                    error: new ToolExecutionError(`Tool "${toolName}" requires user confirmation but no prompt handler registered`, { toolName, input, context }),
-                };
-            }
-            const approved = await this.promptHandler(toolName, input, context);
-            if (!approved) {
-                return {
-                    type: "error",
-                    error: new ToolExecutionError(`Tool "${toolName}" execution rejected by user`, {
-                        toolName,
-                        input,
-                        context,
-                    }),
-                };
+            // Check if we need to prompt (or if entities are already approved)
+            const needsPrompt = this.shouldPromptForEntities(tool, input, context);
+            if (needsPrompt) {
+                // Ensure prompt handler exists
+                if (!this.promptHandler) {
+                    return {
+                        type: "error",
+                        error: new ToolExecutionError(`Tool "${toolName}" requires user confirmation but no prompt handler registered`, { toolName, input, context }),
+                    };
+                }
+                // Prompt user for approval
+                const response = await this.promptHandler(tool, input, context);
+                // Handle DENY
+                if (response === ToolPermissionResponse.DENY) {
+                    return {
+                        type: "error",
+                        error: new ToolExecutionError(`Tool "${toolName}" execution rejected by user`, { toolName, input, context }),
+                    };
+                }
+                // Handle ALWAYS_ALLOW - store entity approvals for future use
+                if (response === ToolPermissionResponse.ALWAYS_ALLOW) {
+                    this.approveEntitiesAfterPrompt(tool, input);
+                }
+                // Handle ALLOW - proceed to execution without storing permission
+                // (no special action needed, just continue to execution)
             }
+            // If !needsPrompt, all entities already approved - proceed to execution
         }
         // Validate input and execute
         try {
             const validated = tool.inputSchema.parse(input);
-            const output = await tool.execute(validated, options);
+            const output = await tool.execute(validated, options ?? {
+                toolCallId: "",
+                messages: [],
+            });
             return {
                 type: "success",
                 data: output,
@@ -289,6 +332,57 @@ export class ToolRegistry {
             };
         }
     }
+    /**
+     * Check if we need to prompt the user for a tool with PROMPT permission.
+     *
+     * For tools with entity extraction, returns false if all entities are already
+     * approved for this tool's scope (skipping the prompt). For tools without
+     * entity extraction, always returns true (standard prompting).
+     *
+     * @param tool - Tool to check
+     * @param input - Tool input to extract entities from
+     * @returns True if we should prompt user, false if we can skip
+     */
+    shouldPromptForEntities(tool, input, _context) {
+        // No entity system configured, use standard prompting
+        const entityPermissionStore = this.entityPermissionStore;
+        if (!tool.extractEntities || !entityPermissionStore) {
+            return true;
+        }
+        const entities = tool.extractEntities(input);
+        // No entities extracted, use standard prompting
+        if (entities.length === 0) {
+            return true;
+        }
+        // Compute scope for this tool
+        const scope = this.getToolPermissionScope(tool);
+        // Check if any entities are not approved for this scope
+        return entities.some((entity) => {
+            return !entityPermissionStore.isApproved(entity.type, entity.id, scope);
+        });
+    }
+    /**
+     * Store entity approvals after successful user prompt.
+     *
+     * Extracts entities from tool input and marks them as approved for this
+     * tool's scope in the entity permission store. No-op if entity system
+     * is not configured.
+     *
+     * @param tool - Tool that was approved
+     * @param input - Tool input to extract entities from
+     */
+    approveEntitiesAfterPrompt(tool, input) {
+        // No entity system configured
+        if (!tool.extractEntities || !this.entityPermissionStore) {
+            return;
+        }
+        // Compute scope for this tool
+        const scope = this.getToolPermissionScope(tool);
+        const entities = tool.extractEntities(input);
+        for (const entity of entities) {
+            this.entityPermissionStore.approve(entity.type, entity.id, scope);
+        }
+    }
     /**
      * Wrap a tool to enforce access control on execute().
      *
@@ -343,7 +437,9 @@ export class ToolRegistry {
         this.factories.clear();
         this.instances.clear();
         this.accessRules = [];
+        this.middleware = [];
         this.promptHandler = undefined;
+        this.entityPermissionStore = undefined;
     }
 }
 //# sourceMappingURL=registry.js.map

package/dist/ai-service/agent/tools2/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/ai-service/agent/tools2/registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/ai-service/agent/tools2/registry.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/agent/tools2/test-utils.d.ts

@@ -0,0 +1,7 @@
+import type { ToolCallOptions } from "ai";
+/**
+ * Helper to create dummy options for tests.
+ * Provides the required ToolCallOptions structure for tool execute calls.
+ */
+export declare const createDummyOptions: () => ToolCallOptions;
+//# sourceMappingURL=test-utils.d.ts.map

package/dist/ai-service/agent/tools2/test-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/agent/tools2/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAE1C;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAO,eAIpC,CAAC"}

package/dist/ai-service/agent/tools2/test-utils.js

@@ -0,0 +1,10 @@
+/**
+ * Helper to create dummy options for tests.
+ * Provides the required ToolCallOptions structure for tool execute calls.
+ */
+export const createDummyOptions = () => ({
+    toolCallId: "test-call-id",
+    messages: [],
+    abortSignal: new AbortController().signal,
+});
+//# sourceMappingURL=test-utils.js.map

package/dist/ai-service/agent/tools2/test-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../../../src/ai-service/agent/tools2/test-utils.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAoB,EAAE,CAAC,CAAC;IACxD,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC,MAAM;CAC1C,CAAC,CAAC"}

package/dist/ai-service/agent/tools2/tools/ask-multi-choice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ask-multi-choice.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/ask-multi-choice.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;;;;;GAsErC,CAAC"}
+{"version":3,"file":"ask-multi-choice.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/ask-multi-choice.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;;;;;GA8ErC,CAAC"}

package/dist/ai-service/agent/tools2/tools/ask-multi-choice.js

@@ -8,22 +8,30 @@ export const askMultiChoiceToolFactory = createToolFactory("askMultiChoice", (cl
     const { chatSessionStore } = services;
     return {
         description: `
-ALWAYS USE THIS TOOL when you need to ask the user ANY question.
-
 This tool presents the user with a question and multiple choice options.
-Even for seemingly open-ended questions, you should come up with 3-6 suggested choices to make it easier for the user.
+Even for seemingly open-ended questions, you should come up with 2-3 suggested choices to make it easier for the user.
 
 For open-ended questions:
-- Come up with 3-6 reasonable suggestions based on common patterns
-- Add a "Something else" or "Other" option as the last choice
-- The user will select from your suggestions, making the interaction faster
+- Come up with 2-3 reasonable suggestions based on common patterns
+- If there are many possible options, present the most common/relevant ones
+- If you need to present more choices, add "More choices" as the last option, which allows you to ask the same question again with a different set of choices
+- The user can also type their own response directly instead of selecting from the choices
+
+When NOT to use this tool:
+- If the user points out a mistake or bug, don't ask them how to fix it; instead, if in BUILD mode, fix it directly. If in PLAN mode, call exitPlanMode with a (very) brief plan to address it.
+- Don't ask the user for input on low-level implementation details.
 
 IMPORTANT: When asking about datasources/integrations:
 - FIRST use the searchIntegrations tool to discover what datasources are available
 - THEN present the available options to the user in your multi-choice question
 - DON'T ask the user about datasources without first checking what's available
+- DON'T ask the user about metadata/schemas without first checking what's available (use readIntegrationMetadata tool)
+- NEVER put a "custom" or "provide your own" option; this is redundant since the user can always type their own response
+
+After the user makes a selection:
+- ALWAYS acknowledge their selection in your next message (e.g., "Got it, I'll use PostgreSQL" or "Understood, I'll create a dashboard layout")
+- Then proceed with the task based on their choice
 
-NEVER ask the user to type out a response when you can provide clear options.
 The user will select one (or more) of the choices, and their selection will be sent back to you as a message.
 `,
         category: ToolCategory.GENERAL,
@@ -36,8 +44,8 @@ The user will select one (or more) of the choices, and their selection will be s
             choices: z
                 .array(z.string())
                 .min(2)
-                .max(6)
-                .describe("List of 2-6 choices for the user to select from. Each choice should be a clear, concise option. For open-ended questions, provide sensible suggestions and include 'Something else' or 'Other' as the last option."),
+                .max(3)
+                .describe("List of 2-3 choices for the user to select from. Each choice should be a clear, concise option. If there are more options to present, include 'More choices' as the last option to allow presenting additional choices in a follow-up question."),
             selectionType: z
                 .enum(["single", "multiple"])
                 .default("single")

package/dist/ai-service/agent/tools2/tools/ask-multi-choice.js.map

@@ -1 +1 @@
-{"version":3,"file":"ask-multi-choice.js","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/ask-multi-choice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI/E;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CACxD,gBAAgB,EAChB,CAAC,KAAY,EAAE,QAAiC,EAAE,EAAE;IAClD,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;IAEtC,OAAO;QACL,WAAW,EAAE;;;;;;;;;;;;;;;;;;CAkBlB;QACK,QAAQ,EAAE,YAAY,CAAC,OAAO;QAC9B,iBAAiB,EAAE,eAAe,CAAC,KAAK;QACxC,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;YACpB,QAAQ,EAAE,CAAC;iBACR,MAAM,EAAE;iBACR,QAAQ,CACP,6DAA6D,CAC9D;YACH,OAAO,EAAE,CAAC;iBACP,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;iBACjB,GAAG,CAAC,CAAC,CAAC;iBACN,GAAG,CAAC,CAAC,CAAC;iBACN,QAAQ,CACP,oNAAoN,CACrN;YACH,aAAa,EAAE,CAAC;iBACb,IAAI,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;iBAC5B,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,EAAE;iBACV,QAAQ,CACP,yHAAyH,CAC1H;SACJ,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;YACtD,2FAA2F;YAC3F,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,cAAuB;gBAC7B,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,OAAO;gBACd,OAAO;gBACP,aAAa;aACd,CAAC;YAEF,2EAA2E;YAC3E,MAAM,eAAe,GAAG,sBAAsB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;YACxE,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YAE/B,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,aAAa,OAAO,CAAC,MAAM,6CAA6C;aAClF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"ask-multi-choice.js","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/ask-multi-choice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI/E;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CACxD,gBAAgB,EAChB,CAAC,KAAY,EAAE,QAAiC,EAAE,EAAE;IAClD,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;IAEtC,OAAO;QACL,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BlB;QACK,QAAQ,EAAE,YAAY,CAAC,OAAO;QAC9B,iBAAiB,EAAE,eAAe,CAAC,KAAK;QACxC,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;YACpB,QAAQ,EAAE,CAAC;iBACR,MAAM,EAAE;iBACR,QAAQ,CACP,6DAA6D,CAC9D;YACH,OAAO,EAAE,CAAC;iBACP,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;iBACjB,GAAG,CAAC,CAAC,CAAC;iBACN,GAAG,CAAC,CAAC,CAAC;iBACN,QAAQ,CACP,iPAAiP,CAClP;YACH,aAAa,EAAE,CAAC;iBACb,IAAI,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;iBAC5B,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,EAAE;iBACV,QAAQ,CACP,yHAAyH,CAC1H;SACJ,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;YACtD,2FAA2F;YAC3F,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,cAAuB;gBAC7B,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,OAAO;gBACd,OAAO;gBACP,aAAa;aACd,CAAC;YAEF,2EAA2E;YAC3E,MAAM,eAAe,GAAG,sBAAsB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;YACxE,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YAE/B,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,aAAa,OAAO,CAAC,MAAM,6CAA6C;aAClF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CACF,CAAC"}

package/dist/ai-service/agent/tools2/tools/exit-plan-mode.d.ts

@@ -2,9 +2,12 @@
  * Exit Plan Mode - prompts the user to exit Plan mode when they have finished planning and are ready to code.
  */
 export declare const exitPlanModeToolFactory: import("../types.js").ToolFactory<import("../types.js").Tool<{
-    plan: string;
+    title: string;
+    complexity: "Small" | "Medium" | "Large" | "Extra Large";
+    integrationIds: string[];
 }, {
     success: boolean;
+    plan: string;
     message: string;
 }>>;
 //# sourceMappingURL=exit-plan-mode.d.ts.map

package/dist/ai-service/agent/tools2/tools/exit-plan-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exit-plan-mode.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/exit-plan-mode.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,eAAO,MAAM,uBAAuB;;;;;GAyEnC,CAAC"}
+{"version":3,"file":"exit-plan-mode.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/exit-plan-mode.ts"],"names":[],"mappings":"AAyFA;;GAEG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;GA+OnC,CAAC"}

package/dist/ai-service/agent/tools2/tools/exit-plan-mode.js

@@ -1,38 +1,89 @@
+import { smoothStream, tool } from "ai";
 import { z } from "zod";
+import { getErrorMeta, getLogger } from "../../../../util/logger.js";
+import { tracedStreamText } from "../../../llmobs/helpers.js";
 import { sendUserMessageChannel } from "../../../state-machine/helpers/peer.js";
+import { hasToolSuccess } from "../../../util/stop-condition.js";
 import { createToolFactory, PermissionLevel, ToolCategory } from "../types.js";
+const PlanComplexityLevels = [
+    "Small",
+    "Medium",
+    "Large",
+    "Extra Large",
+];
+const planComplexityToEstimate = {
+    Small: "2 minutes",
+    Medium: "4 minutes",
+    Large: "7 minutes",
+    "Extra Large": "10+ minutes",
+};
+function getTimeEstimateForComplexity(complexity) {
+    return planComplexityToEstimate[complexity];
+}
+function formatIntegrationMetadata(metadata) {
+    if (!metadata) {
+        return "";
+    }
+    const entries = Object.entries(metadata).filter(([, value]) => value !== undefined && value !== null && value !== "");
+    if (entries.length === 0) {
+        return "";
+    }
+    const formattedEntries = entries.slice(0, 5).map(([key, value]) => {
+        const serialized = typeof value === "string"
+            ? value
+            : (() => {
+                try {
+                    return JSON.stringify(value);
+                }
+                catch {
+                    return String(value);
+                }
+            })();
+        const condensed = serialized.replace(/\s+/g, " ").trim();
+        const truncated = condensed.length > 160
+            ? `${condensed.slice(0, 157).trimEnd()}...`
+            : condensed;
+        return `${key}: ${truncated}`;
+    });
+    if (entries.length > 5) {
+        formattedEntries.push("..."); // indicate additional metadata omitted for brevity
+    }
+    return formattedEntries.join("; ");
+}
+function formatIntegrationForPlanPrompt(integration) {
+    const { name, id, type, metadata } = integration;
+    const metadataSummary = formatIntegrationMetadata(metadata);
+    let details = `- ${name}\n  tag: @${name}[id=${id}]\n  type: ${type}`;
+    if (metadataSummary) {
+        details += `\n  metadata: ${metadataSummary}`;
+    }
+    return details;
+}
 /**
  * Exit Plan Mode - prompts the user to exit Plan mode when they have finished planning and are ready to code.
  */
 export const exitPlanModeToolFactory = createToolFactory("exitPlanMode", (clark, services) => {
-    const { chatSessionStore } = services;
     return {
         description: `
-Use this tool to present a specific, actionable plan to the user in Plan mode.
-The plan should be in the style of a PRD (Product Requirements Document), enumerating the functional requirements
-for the coding task in clear, concise language, and noting any important implementation details.
-
-DO NOT give low-level implementation details - the plan should focus on WHAT to build, not HOW to build it.
-
-This tool presents your plan with a "Build It" button that allows the user to switch to Build mode.
+Use this tool to delegate to a planning expert who will generate a plan and present it to the user.
+This tool presents a plan with a "Build It" button that allows the user to switch to Build mode.
 NEVER output a plan directly as text - ALWAYS use this tool to present plans properly.
 
 IMPORTANT: Only use this tool AFTER you have gathered enough information to create a specific plan.
-You must ask at least 3 clarifying questions using askMultiChoice before presenting a plan.
 
 Before presenting a plan:
 - If the user's request is ambiguous or has multiple interpretations, use askMultiChoice to clarify
 - If there are unknowns about requirements, preferences, or approach, use askMultiChoice first
 - If design decisions need to be made, ask the user for their preferences first
 - Gather enough context to create a concrete, specific plan
+- IMPORTANT: Check metadata for relevant integrations to validate feasibility and inform the plan
 
 When to use this tool:
 - You are in Plan mode
 - You have a clear understanding of the user's requirements
 - You have resolved any ambiguities through askMultiChoice
 - You have asked at least 3 clarifying questions
-- You have a specific, actionable plan for implementing a coding task
-- The plan outlines concrete implementation steps
+- You have checked relevant integration metadata to inform the plan
 
 When NOT to use:
 - When there are still unknowns or ambiguities - use askMultiChoice instead
@@ -40,34 +91,181 @@ When NOT to use:
 - For research tasks (gathering information, searching files, understanding codebase)
 - When answering questions without a coding plan
 - When you're already in Build mode
+- When you haven't checked relevant integration metadata
+
+You must provide an estimate of the plan complexity when calling this tool.
+There are four levels of complexity:
+1. Small: For small tweaks and bug fixes, such as changing a filter or fixing a component bug.
+2. Medium: For moderate features or enhancements, such as adding a new data-driven component to a page.
+3. Large: For significant features or multi-part tasks, such as creating or overhauling a page and associated components and APIs.
+4. Extra Large: For major projects or overhauls, such as building a new application section with multiple pages, components, and backend services.
 
 After calling this tool, the user will either:
 - Click "Build It" to switch to Build mode and execute the plan
 - Provide feedback to refine the plan further
+
+Remember: Always use this tool to present plans - never output plans directly as text.
+IF THE TOOL CALL FAILS, DO NOT ATTEMPT TO GENERATE THE PLAN YOURSELF. Call the tool again.
 `,
         category: ToolCategory.PLAN,
         defaultPermission: PermissionLevel.ALLOW,
         readOnly: true,
         inputSchema: z.object({
-            plan: z
+            complexity: z
+                .enum(PlanComplexityLevels)
+                .describe("Your best estimate of the plan complexity"),
+            title: z
                 .string()
-                .describe("The plan to present to the user. Supports markdown formatting."),
+                .min(1, "Plan title is required")
+                .max(160, "Plan title must be 160 characters or fewer")
+                .describe("Title to display for the plan. Should be the name of the feature or fix, eg 'Executive orders dashboard', 'User login page', 'Fix data sync bug'"),
+            integrationIds: z
+                .array(z.string())
+                .describe("List of integration IDs that may be referenced in the plan."),
         }),
-        execute: async ({ plan }) => {
-            // Send plan message to user with special type for UI to render with "Build It" button
-            const payload = {
-                type: "plan",
-                text: plan,
-                group: "clark",
-            };
-            // Use sendUserMessageChannel to ensure ID is generated and shared properly
+        execute: async ({ complexity, title, integrationIds }, { messages, abortSignal }) => {
+            const { chatSessionStore, llmProvider } = services;
             const sendUserMessage = sendUserMessageChannel(clark, chatSessionStore);
-            await sendUserMessage(payload);
-            return {
-                success: true,
-                message: "Plan presented to user. Awaiting mode confirmation.",
-            };
+            try {
+                const availableIntegrations = clark.context.availableIntegrations ?? [];
+                const sanitizedTitle = title.trim() || "Plan";
+                const allowedIntegrationIds = new Set(integrationIds ?? []);
+                const filteredIntegrations = availableIntegrations.filter((integration) => allowedIntegrationIds.has(integration.id));
+                const unavailableRequestedIds = [...allowedIntegrationIds].filter((id) => !availableIntegrations.some((integration) => integration.id === id));
+                if (unavailableRequestedIds.length > 0) {
+                    getLogger().warn(`exitPlanMode: Requested integration IDs not available: ${unavailableRequestedIds.join(", ")}`);
+                }
+                const integrationGuidance = filteredIntegrations.length > 0
+                    ? `
+Only reference the integrations listed below when they are necessary. Use the exact tag shown for each integration within relevant plan steps (e.g. "Use @Integration[id=123] to ..."). Do not reference any other integrations.
+
+${filteredIntegrations
+                        .map((integration) => formatIntegrationForPlanPrompt(integration))
+                        .join("\n\n")}`
+                    : "";
+                await sendUserMessage({
+                    type: "plan",
+                    text: "",
+                    group: "clark",
+                    title: sanitizedTitle,
+                    integrations: filteredIntegrations,
+                    streaming: true,
+                });
+                // Use plan prompt from context if available, otherwise use default
+                const baseInstructions = clark.context.planContext?.instructions ?? planPromptText;
+                if (!clark.context.planContext?.instructions) {
+                    getLogger().info("Using default plan prompt for plan generation");
+                }
+                else {
+                    getLogger().info("Using custom plan prompt from context; appending integration guidance");
+                }
+                const planInstructions = [
+                    baseInstructions.trim(),
+                    `Plan title: ${sanitizedTitle}`,
+                    "NEVER include a different title in your response. Begin directly with the plan content. Start with an Overview heading if applicable.",
+                    integrationGuidance.trim(),
+                    `The task complexity has been assessed to be '${complexity}`,
+                ]
+                    .filter((section) => section.length > 0)
+                    .join("\n\n")
+                    .trim();
+                // Append plan generation prompt
+                const planPrompt = {
+                    role: "user",
+                    content: planInstructions.trim(),
+                };
+                const planMessages = [...messages, planPrompt];
+                getLogger().info(`Starting plan generation stream. complexity: ${complexity}`);
+                // Stream plan generation
+                let fullPlanText = "";
+                const model = llmProvider.modelForClassification("broad_edit");
+                const stream = tracedStreamText({
+                    model,
+                    messages: planMessages,
+                    tools: {
+                        done: tool({
+                            description: "Call this tool when you have finished generating the plan.",
+                            inputSchema: z.object({}),
+                            execute: async (_params) => {
+                                if (fullPlanText.trim().length === 0) {
+                                    throw new Error("Cannot stop plan generation before any plan content has been generated.");
+                                }
+                                getLogger().info("Stop tool called - ending plan generation");
+                                return {};
+                            },
+                        }),
+                    },
+                    stopWhen: hasToolSuccess("done"),
+                    experimental_transform: smoothStream({ chunking: "line" }),
+                    abortSignal,
+                }, clark.tracer, clark.logger);
+                // Stream plan deltas to UI
+                for await (const text of stream.textStream) {
+                    await sendUserMessage({
+                        type: "plan-delta",
+                        text,
+                        group: "clark",
+                    });
+                    fullPlanText += text;
+                }
+                if (!fullPlanText.trim()) {
+                    throw new Error("Generated plan is empty. Please try again.");
+                }
+                getLogger().info(`Plan generation stream completed. Length: ${fullPlanText.length}`);
+                // Send complete plan message for persistence and UI state
+                const timeEstimate = getTimeEstimateForComplexity(complexity);
+                await sendUserMessage({
+                    type: "plan",
+                    text: fullPlanText,
+                    group: "clark",
+                    timeEstimate,
+                    integrations: filteredIntegrations,
+                    title: sanitizedTitle,
+                });
+                clark.updateContext((context) => ({
+                    ...context,
+                    planContext: {
+                        instructions: context.planContext?.instructions ?? baseInstructions,
+                        plan: fullPlanText,
+                        integrations: filteredIntegrations,
+                        approved: false,
+                        title: sanitizedTitle,
+                    },
+                }));
+                return {
+                    success: true,
+                    plan: fullPlanText,
+                    message: "Plan presented to user. Awaiting mode confirmation.",
+                };
+            }
+            catch (error) {
+                getLogger().error("Failed to generate plan", getErrorMeta(error));
+                throw error;
+            }
         },
     };
 });
+// This is the prompt used to generate the plan
+const planPromptText = `
+Based on our conversation and the information gathered, create a specific, actionable plan.
+
+A good format for bug fixes is:
+- Problem
+- Solution
+- Edge cases
+- Success criteria
+
+A good format for features/new functionality is:
+- Overview
+- Requirements
+- Design (if applicable)
+- Data flow (if applicable)
+- Success criteria
+
+Focus on WHAT to build, not HOW to build it. Focus mainly on functional requirements and only very high-level implementation details.
+Assume the user is non-technical and avoid technical jargon. They only care about what the final outcome will be in terms of functionality and design.
+
+Format your response in markdown with clear sections.
+When you are finished, call the 'done'.
+`;
 //# sourceMappingURL=exit-plan-mode.js.map