From de53b8e3422cf537a8ddfec5b5fe71b1400b52a7 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Fri, 7 Nov 2025 18:00:29 -0500 Subject: [PATCH 01/58] refactor: agent behaviors, objectives generalized, abstracted + agentic coding agent implemented - Abstracted behaviors and objectives - Behavior and Objectives are bot h AgentComponent - CodeGeneratorAgent (Agent DO) houses common business logic - Implemented agentic coding agent and and assistant --- .../assistants/agenticProjectBuilder.ts | 411 +++++++++ worker/agents/core/AgentComponent.ts | 89 ++ worker/agents/core/AgentCore.ts | 37 + worker/agents/core/behaviors/agentic.ts | 244 ++++++ .../core/{baseAgent.ts => behaviors/base.ts} | 787 +++--------------- .../behavior.ts => behaviors/phasic.ts} | 172 ++-- worker/agents/core/codingAgent.ts | 714 ++++++++++++++++ worker/agents/core/objectives/app.ts | 152 ++++ worker/agents/core/objectives/base.ts | 90 ++ worker/agents/core/objectives/presentation.ts | 62 ++ worker/agents/core/objectives/workflow.ts | 58 ++ worker/agents/core/smartGeneratorAgent.ts | 89 -- worker/agents/core/state.ts | 4 +- worker/agents/core/types.ts | 32 +- worker/agents/core/websocket.ts | 32 +- worker/agents/inferutils/config.ts | 7 + worker/agents/inferutils/config.types.ts | 1 + .../services/implementations/FileManager.ts | 4 +- .../services/implementations/StateManager.ts | 22 +- .../services/interfaces/ICodingAgent.ts | 4 +- .../services/interfaces/IStateManager.ts | 15 +- worker/agents/tools/toolkit/git.ts | 2 +- worker/index.ts | 3 +- 23 files changed, 2142 insertions(+), 889 deletions(-) create mode 100644 worker/agents/assistants/agenticProjectBuilder.ts create mode 100644 worker/agents/core/AgentComponent.ts create mode 100644 worker/agents/core/AgentCore.ts create mode 100644 worker/agents/core/behaviors/agentic.ts rename worker/agents/core/{baseAgent.ts => behaviors/base.ts} (64%) rename worker/agents/core/{phasic/behavior.ts => behaviors/phasic.ts} (84%) create mode 100644 worker/agents/core/codingAgent.ts create mode 100644 worker/agents/core/objectives/app.ts create mode 100644 worker/agents/core/objectives/base.ts create mode 100644 worker/agents/core/objectives/presentation.ts create mode 100644 worker/agents/core/objectives/workflow.ts delete mode 100644 worker/agents/core/smartGeneratorAgent.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts new file mode 100644 index 00000000..01ba66d8 --- /dev/null +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -0,0 +1,411 @@ +import Assistant from './assistant'; +import { + createSystemMessage, + createUserMessage, + Message, +} from '../inferutils/common'; +import { executeInference } from '../inferutils/infer'; +import { InferenceContext, ModelConfig } from '../inferutils/config.types'; +import { createObjectLogger } from '../../logger'; +import { AGENT_CONFIG } from '../inferutils/config'; +import { buildDebugTools } from '../tools/customTools'; +import { RenderToolCall } from '../operations/UserConversationProcessor'; +import { PROMPT_UTILS } from '../prompts'; +import { FileState } from '../core/state'; +import { ICodingAgent } from '../services/interfaces/ICodingAgent'; +import { ProjectType } from '../core/types'; +import { Blueprint } from '../schemas'; + +export type BuildSession = { + filesIndex: FileState[]; + agent: ICodingAgent; + projectType: ProjectType; +}; + +export type BuildInputs = { + query: string; + projectName: string; + blueprint?: Blueprint; +}; + +/** + * Get base system prompt with project type specific instructions + */ +const getSystemPrompt = (projectType: ProjectType): string => { + const baseInstructions = `You are an elite Autonomous Project Builder at Cloudflare, specialized in building complete, production-ready applications using an LLM-driven tool-calling approach. + +## CRITICAL: Communication Mode +**You have EXTREMELY HIGH reasoning capability. Use it strategically.** +- Conduct analysis and planning INTERNALLY +- Output should be CONCISE but informative: status updates, key decisions, and tool calls +- NO lengthy thought processes or verbose play-by-play narration +- Think deeply internally → Act decisively externally → Report progress clearly + +## Your Mission +Build a complete, functional, polished project from the user's requirements using available tools. You orchestrate the entire build process autonomously - from scaffolding to deployment to verification. + +## Platform Environment +- **Runtime**: Cloudflare Workers (V8 isolates, not Node.js) +- **Language**: TypeScript +- **Build Tool**: Vite (for frontend projects) +- **Deployment**: wrangler to Cloudflare edge +- **Testing**: Sandbox/Container preview with live reload + +## Platform Constraints +- **NEVER edit wrangler.jsonc or package.json** - these are locked +- **Only use dependencies from project's package.json** - no others exist +- All projects run in Cloudflare Workers environment +- **No Node.js APIs** (no fs, path, process, etc.) + +## Available Tools + +**File Management:** +- **generate_files**: Create new files or rewrite existing files + - Use for scaffolding components, utilities, API routes, pages + - Requires: phase_name, phase_description, requirements[], files[] + - Automatically commits changes to git + - This is your PRIMARY tool for building the project + +- **regenerate_file**: Make surgical fixes to existing files + - Use for targeted bug fixes and updates + - Requires: path, issues[] + - Files are automatically staged (need manual commit with git tool) + +- **read_files**: Read file contents (batch multiple for efficiency) + +**Deployment & Testing:** +- **deploy_preview**: Deploy to Cloudflare Workers preview + - REQUIRED before verification + - Use clearLogs=true to start fresh + - Deployment URL will be available for testing + +- **run_analysis**: Fast static analysis (lint + typecheck) + - Use FIRST for verification after generation + - No user interaction needed + - Catches syntax errors, type errors, import issues + +- **get_runtime_errors**: Recent runtime errors (requires user interaction with deployed app) +- **get_logs**: Cumulative logs (use sparingly, verbose, requires user interaction) + +**Commands & Git:** +- **exec_commands**: Execute shell commands from project root + - Use for installing dependencies (if needed), running tests, etc. + - Set shouldSave=true to persist changes + +- **git**: Version control (commit, log, show) + - Commit regularly with descriptive messages + - Use after significant milestones + +**Utilities:** +- **wait**: Sleep for N seconds (use after deploy to allow user interaction time) + +## Core Build Workflow + +1. **Understand Requirements**: Analyze user query and blueprint (if provided) +2. **Plan Structure**: Decide what files/components to create +3. **Scaffold Project**: Use generate_files to create initial structure +4. **Deploy & Test**: deploy_preview to verify in sandbox +5. **Verify Quality**: run_analysis for static checks +6. **Fix Issues**: Use regenerate_file or generate_files for corrections +7. **Commit Progress**: git commit with descriptive messages +8. **Iterate**: Repeat steps 4-7 until project is complete and polished +9. **Final Verification**: Comprehensive check before declaring complete + +## Critical Build Principles`; + + // Add project-type specific instructions + let typeSpecificInstructions = ''; + + if (projectType === 'app') { + typeSpecificInstructions = ` + +## Project Type: Full-Stack Web Application + +**Stack:** +- Frontend: React + Vite + TypeScript +- Backend: Cloudflare Workers (Durable Objects when needed) +- Styling: Tailwind CSS + shadcn/ui components +- State: Zustand for client state +- API: REST/JSON endpoints in Workers + +**CRITICAL: Visual Excellence Requirements** + +YOU MUST CREATE VISUALLY STUNNING APPLICATIONS. + +Every component must demonstrate: +- **Modern UI Design**: Clean, professional, beautiful interfaces +- **Perfect Spacing**: Harmonious padding, margins, and layout rhythm +- **Visual Hierarchy**: Clear information flow and structure +- **Interactive Polish**: Smooth hover states, transitions, micro-interactions +- **Responsive Excellence**: Flawless on mobile, tablet, and desktop +- **Professional Depth**: Thoughtful shadows, borders, and elevation +- **Color Harmony**: Consistent, accessible color schemes +- **Typography**: Clear hierarchy with perfect font sizes and weights + +${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} + +${PROMPT_UTILS.COMMON_PITFALLS} + +**Success Criteria for Apps:** +✅ All features work as specified +✅ Can be demoed immediately without errors +✅ Visually stunning and professional-grade +✅ Responsive across all device sizes +✅ No runtime errors or TypeScript issues +✅ Smooth interactions with proper feedback +✅ Code is clean, type-safe, and maintainable`; + + } else if (projectType === 'workflow') { + typeSpecificInstructions = ` + +## Project Type: Backend Workflow + +**Focus:** +- Backend-only Cloudflare Workers +- REST APIs, scheduled jobs, queue processing, webhooks, data pipelines +- No UI components needed +- Durable Objects for stateful workflows + +**Success Criteria for Workflows:** +✅ All endpoints/handlers work correctly +✅ Robust error handling and validation +✅ No runtime errors or TypeScript issues +✅ Clean, maintainable architecture +✅ Proper logging for debugging +✅ Type-safe throughout`; + + } else if (projectType === 'presentation') { + typeSpecificInstructions = ` + +## Project Type: Presentation/Slides + +**Stack:** +- Spectacle (React-based presentation library) +- Tailwind CSS for styling +- Web-based slides (can export to PDF) + +**Success Criteria for Presentations:** +✅ All slides implemented with content +✅ Visually stunning and engaging design +✅ Clear content hierarchy and flow +✅ Smooth transitions between slides +✅ No rendering or TypeScript errors +✅ Professional-grade visual polish`; + } + + const completionGuidelines = ` + +## Communication & Progress Updates + +**DO:** +- Report key milestones: "Scaffolding complete", "Deployment successful", "All tests passing" +- Explain critical decisions: "Using Zustand for state management because..." +- Share verification results: "Static analysis passed", "3 TypeScript errors found" +- Update on iterations: "Fixed rendering issue, redeploying..." + +**DON'T:** +- Output verbose thought processes +- Narrate every single step +- Repeat yourself unnecessarily +- Over-explain obvious actions + +## When You're Done + +**Success Completion:** +1. Write: "BUILD_COMPLETE: [brief summary]" +2. Provide final report: + - What was built (key files/features) + - Verification results (all checks passed) + - Deployment URL + - Any notes for the user +3. **CRITICAL: Once you write "BUILD_COMPLETE", IMMEDIATELY HALT with no more tool calls.** + +**If Stuck:** +1. State: "BUILD_STUCK: [reason]" + what you tried +2. **CRITICAL: Once you write "BUILD_STUCK", IMMEDIATELY HALT with no more tool calls.** + +## Working Style +- Use your internal reasoning capability - think deeply, output concisely +- Be decisive - analyze internally, act externally +- Focus on delivering working, polished results +- Quality through reasoning, not verbose output +- Build incrementally: scaffold → deploy → verify → fix → iterate + +The goal is a complete, functional, polished project. Think internally, act decisively, report progress.`; + + return baseInstructions + typeSpecificInstructions + completionGuidelines; +}; + +/** + * Build user prompt with all context + */ +const getUserPrompt = ( + inputs: BuildInputs, + session: BuildSession, + fileSummaries: string, + templateInfo?: string +): string => { + const { query, projectName, blueprint } = inputs; + const { projectType } = session; + + let projectTypeDescription = ''; + if (projectType === 'app') { + projectTypeDescription = 'Full-Stack Web Application (React + Vite + Cloudflare Workers)'; + } else if (projectType === 'workflow') { + projectTypeDescription = 'Backend Workflow (Cloudflare Workers)'; + } else if (projectType === 'presentation') { + projectTypeDescription = 'Presentation/Slides (Spectacle)'; + } + + return `## Build Task +**Project Name**: ${projectName} +**Project Type**: ${projectTypeDescription} +**User Request**: ${query} + +${blueprint ? `## Project Blueprint + +The following blueprint defines the structure, features, and requirements for this project: + +\`\`\`json +${JSON.stringify(blueprint, null, 2)} +\`\`\` + +**Use this blueprint to guide your implementation.** It outlines what needs to be built.` : `## Note + +No blueprint provided. Design the project structure based on the user request above.`} + +${templateInfo ? `## Template Context + +This project uses a preconfigured template: + +${templateInfo} + +**IMPORTANT:** Leverage existing components, utilities, and APIs from the template. Do not recreate what already exists.` : ''} + +${fileSummaries ? `## Current Codebase + +${fileSummaries}` : `## Starting Fresh + +This is a new project. Start from the template or scratch.`} + +## Your Mission + +Build a complete, production-ready, ${projectType === 'app' ? 'visually stunning full-stack web application' : projectType === 'workflow' ? 'robust backend workflow' : 'visually stunning presentation'} that fulfills the user's request. + +**Approach:** +1. Understand requirements deeply +2. Plan the architecture${projectType === 'app' ? ' (frontend + backend)' : ''} +3. Scaffold the ${projectType === 'app' ? 'application' : 'project'} structure with generate_files +4. Deploy and test with deploy_preview +5. Verify with run_analysis +6. Fix any issues found +7. Polish ${projectType === 'app' ? 'the UI' : 'the code'} to perfection +8. Commit your work with git +9. Repeat until complete + +**Remember:** +${projectType === 'app' ? '- Create stunning, modern UI that users love\n' : ''}- Write clean, type-safe, maintainable code +- Test thoroughly with deploy_preview and run_analysis +- Fix all issues before claiming completion +- Commit regularly with descriptive messages + +Begin building.`; +}; + +/** + * Summarize files for context + */ +function summarizeFiles(filesIndex: FileState[]): string { + if (!filesIndex || filesIndex.length === 0) { + return 'No files generated yet.'; + } + + const summary = filesIndex.map(f => { + const relativePath = f.filePath.startsWith('/') ? f.filePath.substring(1) : f.filePath; + const sizeKB = (f.fileContents.length / 1024).toFixed(1); + return `- ${relativePath} (${sizeKB} KB) - ${f.filePurpose}`; + }).join('\n'); + + return `Generated Files (${filesIndex.length} total):\n${summary}`; +} + +/** + * AgenticProjectBuilder + * + * Similar to DeepCodeDebugger but for building entire projects. + * Uses tool-calling approach to scaffold, deploy, verify, and iterate. + */ +export class AgenticProjectBuilder extends Assistant { + logger = createObjectLogger(this, 'AgenticProjectBuilder'); + modelConfigOverride?: ModelConfig; + + constructor( + env: Env, + inferenceContext: InferenceContext, + modelConfigOverride?: ModelConfig, + ) { + super(env, inferenceContext); + this.modelConfigOverride = modelConfigOverride; + } + + async run( + inputs: BuildInputs, + session: BuildSession, + streamCb?: (chunk: string) => void, + toolRenderer?: RenderToolCall, + ): Promise { + this.logger.info('Starting project build', { + projectName: inputs.projectName, + projectType: session.projectType, + hasBlueprint: !!inputs.blueprint, + }); + + // Get file summaries + const fileSummaries = summarizeFiles(session.filesIndex); + + // Get template details from agent + const operationOptions = session.agent.getOperationOptions(); + const templateInfo = operationOptions.context.templateDetails + ? PROMPT_UTILS.serializeTemplate(operationOptions.context.templateDetails) + : undefined; + + // Build prompts + const systemPrompt = getSystemPrompt(session.projectType); + const userPrompt = getUserPrompt(inputs, session, fileSummaries, templateInfo); + + const system = createSystemMessage(systemPrompt); + const user = createUserMessage(userPrompt); + const messages: Message[] = this.save([system, user]); + + // Prepare tools (same as debugger) + const tools = buildDebugTools(session, this.logger, toolRenderer); + + let output = ''; + + try { + const result = await executeInference({ + env: this.env, + context: this.inferenceContext, + agentActionName: 'agenticProjectBuilder', + modelConfig: this.modelConfigOverride || AGENT_CONFIG.agenticProjectBuilder, + messages, + tools, + stream: streamCb + ? { chunk_size: 64, onChunk: (c) => streamCb(c) } + : undefined, + }); + + output = result?.string || ''; + + this.logger.info('Project build completed', { + outputLength: output.length + }); + + } catch (error) { + this.logger.error('Project build failed', error); + throw error; + } + + return output; + } +} diff --git a/worker/agents/core/AgentComponent.ts b/worker/agents/core/AgentComponent.ts new file mode 100644 index 00000000..1179c66f --- /dev/null +++ b/worker/agents/core/AgentComponent.ts @@ -0,0 +1,89 @@ +import { AgentInfrastructure } from './AgentCore'; +import { StructuredLogger } from '../../logger'; +import { WebSocketMessageType } from '../../api/websocketTypes'; +import { WebSocketMessageData } from '../../api/websocketTypes'; +import { FileManager } from '../services/implementations/FileManager'; +import { DeploymentManager } from '../services/implementations/DeploymentManager'; +import { GitVersionControl } from '../git'; +import { AgentState, BaseProjectState } from './state'; +import { WebSocketMessageResponses } from '../constants'; + +/** + * Base class for all agent components (behaviors and objectives) + * + * Provides common infrastructure access patterns via protected helpers. + * + * Both BaseCodingBehavior and ProjectObjective extend this class to access: + * - Core infrastructure (state, env, sql, logger) + * - Services (fileManager, deploymentManager, git) + */ +export abstract class AgentComponent { + constructor(protected readonly infrastructure: AgentInfrastructure) {} + + // ========================================== + // PROTECTED HELPERS (Infrastructure access) + // ========================================== + + protected get env(): Env { + return this.infrastructure.env; + } + + get logger(): StructuredLogger { + return this.infrastructure.logger(); + } + + protected getAgentId(): string { + return this.infrastructure.getAgentId(); + } + + public getWebSockets(): WebSocket[] { + return this.infrastructure.getWebSockets(); + } + + protected get state(): TState { + return this.infrastructure.state; + } + + setState(state: TState): void { + try { + this.infrastructure.setState(state); + } catch (error) { + this.broadcastError("Error setting state", error); + this.logger.error("State details:", { + originalState: JSON.stringify(this.state, null, 2), + newState: JSON.stringify(state, null, 2) + }); + } + } + + // ========================================== + // PROTECTED HELPERS (Service access) + // ========================================== + + protected get fileManager(): FileManager { + return this.infrastructure.fileManager; + } + + protected get deploymentManager(): DeploymentManager { + return this.infrastructure.deploymentManager; + } + + public get git(): GitVersionControl { + return this.infrastructure.git; + } + + protected broadcast( + type: T, + data?: WebSocketMessageData + ): void { + this.infrastructure.broadcast(type, data); + } + + protected broadcastError(context: string, error: unknown): void { + const errorMessage = error instanceof Error ? error.message : String(error); + this.logger.error(`${context}:`, error); + this.broadcast(WebSocketMessageResponses.ERROR, { + error: `${context}: ${errorMessage}` + }); + } +} diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts new file mode 100644 index 00000000..77507fc0 --- /dev/null +++ b/worker/agents/core/AgentCore.ts @@ -0,0 +1,37 @@ +import { GitVersionControl } from "../git"; +import { DeploymentManager } from "../services/implementations/DeploymentManager"; +import { FileManager } from "../services/implementations/FileManager"; +import { StructuredLogger } from "../../logger"; +import { BaseProjectState } from "./state"; +import { WebSocketMessageType } from "../../api/websocketTypes"; +import { WebSocketMessageData } from "../../api/websocketTypes"; +import { ConversationMessage, ConversationState } from "../inferutils/common"; + +/** + * Infrastructure interface for agent implementations. + * Provides access to: + * - Core infrastructure (state, env, sql, logger) + * - Services (fileManager, deploymentManager, git) + */ +export interface AgentInfrastructure { + readonly state: TState; + setState(state: TState): void; + getWebSockets(): WebSocket[]; + broadcast( + type: T, + data?: WebSocketMessageData + ): void; + getAgentId(): string; + logger(): StructuredLogger; + readonly env: Env; + + setConversationState(state: ConversationState): void; + getConversationState(): ConversationState; + addConversationMessage(message: ConversationMessage): void; + clearConversation(): void; + + // Services + readonly fileManager: FileManager; + readonly deploymentManager: DeploymentManager; + readonly git: GitVersionControl; +} diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts new file mode 100644 index 00000000..8085351a --- /dev/null +++ b/worker/agents/core/behaviors/agentic.ts @@ -0,0 +1,244 @@ + +import { AgentInitArgs } from '../types'; +import { AgenticState } from '../state'; +import { WebSocketMessageResponses } from '../../constants'; +import { UserConversationProcessor } from '../../operations/UserConversationProcessor'; +import { GenerationContext, AgenticGenerationContext } from '../../domain/values/GenerationContext'; +import { PhaseImplementationOperation } from '../../operations/PhaseImplementation'; +import { FileRegenerationOperation } from '../../operations/FileRegeneration'; +import { AgenticProjectBuilder, BuildSession } from '../../assistants/agenticProjectBuilder'; +import { buildToolCallRenderer } from '../../operations/UserConversationProcessor'; +import { PhaseGenerationOperation } from '../../operations/PhaseGeneration'; +import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; +import { customizeTemplateFiles, generateProjectName } from '../../utils/templateCustomizer'; +import { generateBlueprint } from '../../planning/blueprint'; +import { IdGenerator } from '../../utils/idGenerator'; +import { generateNanoId } from '../../../utils/idGenerator'; +import { BaseCodingBehavior, BaseCodingOperations } from './base'; +import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; +import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; +import { OperationOptions } from 'worker/agents/operations/common'; + +interface AgenticOperations extends BaseCodingOperations { + generateNextPhase: PhaseGenerationOperation; + implementPhase: PhaseImplementationOperation; +} + +/** + * AgenticCodingBehavior + */ +export class AgenticCodingBehavior extends BaseCodingBehavior implements ICodingAgent { + protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; + + protected operations: AgenticOperations = { + regenerateFile: new FileRegenerationOperation(), + fastCodeFixer: new FastCodeFixerOperation(), + processUserMessage: new UserConversationProcessor(), + simpleGenerateFiles: new SimpleCodeGenerationOperation(), + generateNextPhase: new PhaseGenerationOperation(), + implementPhase: new PhaseImplementationOperation(), + }; + + /** + * Initialize the code generator with project blueprint and template + * Sets up services and begins deployment process + */ + async initialize( + initArgs: AgentInitArgs, + ..._args: unknown[] + ): Promise { + await super.initialize(initArgs); + + const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + + // Generate a blueprint + this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); + this.logger.info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); + + const blueprint = await generateBlueprint({ + env: this.env, + inferenceContext, + query, + language: language!, + frameworks: frameworks!, + templateDetails: templateInfo?.templateDetails, + templateMetaInfo: templateInfo?.selection, + images: initArgs.images, + stream: { + chunk_size: 256, + onChunk: (chunk) => { + initArgs.onBlueprintChunk(chunk); + } + } + }) + + const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + + const projectName = generateProjectName( + blueprint.projectName, + generateNanoId(), + AgenticCodingBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH + ); + + this.logger.info('Generated project name', { projectName }); + + this.setState({ + ...this.state, + projectName, + query, + blueprint, + templateName: templateInfo?.templateDetails.name || '', + sandboxInstanceId: undefined, + commandsHistory: [], + lastPackageJson: packageJson, + sessionId: sandboxSessionId!, + hostname, + inferenceContext, + }); + + if (templateInfo) { + // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) + const customizedFiles = customizeTemplateFiles( + templateInfo.templateDetails.allFiles, + { + projectName, + commandsHistory: [] // Empty initially, will be updated later + } + ); + + this.logger.info('Customized template files', { + files: Object.keys(customizedFiles) + }); + + // Save customized files to git + const filesToSave = Object.entries(customizedFiles).map(([filePath, content]) => ({ + filePath, + fileContents: content, + filePurpose: 'Project configuration file' + })); + + await this.fileManager.saveGeneratedFiles( + filesToSave, + 'Initialize project configuration files' + ); + + this.logger.info('Committed customized template files to git'); + } + + this.initializeAsync().catch((error: unknown) => { + this.broadcastError("Initialization failed", error); + }); + this.logger.info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); + return this.state; + } + + async onStart(props?: Record | undefined): Promise { + await super.onStart(props); + } + + getOperationOptions(): OperationOptions { + return { + env: this.env, + agentId: this.getAgentId(), + context: GenerationContext.from(this.state, this.getTemplateDetails(), this.logger) as AgenticGenerationContext, + logger: this.logger, + inferenceContext: this.getInferenceContext(), + agent: this + }; + } + + async build(): Promise { + await this.executeGeneration(); + } + + /** + * Execute the project generation + */ + private async executeGeneration(): Promise { + this.logger.info('Starting project generation', { + query: this.state.query, + projectName: this.state.projectName + }); + + // Generate unique conversation ID for this build session + const buildConversationId = IdGenerator.generateConversationId(); + + // Broadcast generation started + this.broadcast(WebSocketMessageResponses.GENERATION_STARTED, { + message: 'Starting project generation...', + totalFiles: 1 + }); + + // Send initial message to frontend + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: 'Initializing project builder...', + conversationId: buildConversationId, + isStreaming: false + }); + + try { + const generator = new AgenticProjectBuilder( + this.env, + this.state.inferenceContext + ); + + // Create build session for tools + // Note: AgenticCodingBehavior is currently used for 'app' type projects + const session: BuildSession = { + agent: this, + filesIndex: Object.values(this.state.generatedFilesMap), + projectType: 'app' + }; + + // Create tool renderer for UI feedback + const toolCallRenderer = buildToolCallRenderer( + (message: string, conversationId: string, isStreaming: boolean, tool?) => { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message, + conversationId, + isStreaming, + tool + }); + }, + buildConversationId + ); + + // Run the assistant with streaming and tool rendering + await generator.run( + { + query: this.state.query, + projectName: this.state.projectName, + blueprint: this.state.blueprint + }, + session, + // Stream callback - sends text chunks to frontend + (chunk: string) => { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: chunk, + conversationId: buildConversationId, + isStreaming: true + }); + }, + // Tool renderer for visual feedback on tool calls + toolCallRenderer + ); + + this.broadcast(WebSocketMessageResponses.GENERATION_COMPLETED, { + message: 'Project generation completed', + filesGenerated: Object.keys(this.state.generatedFilesMap).length + }); + + this.logger.info('Project generation completed'); + + } catch (error) { + this.logger.error('Project generation failed', error); + this.broadcast(WebSocketMessageResponses.ERROR, { + error: error instanceof Error ? error.message : 'Unknown error during generation' + }); + throw error; + } finally { + this.generationPromise = null; + this.clearAbortController(); + } + } +} diff --git a/worker/agents/core/baseAgent.ts b/worker/agents/core/behaviors/base.ts similarity index 64% rename from worker/agents/core/baseAgent.ts rename to worker/agents/core/behaviors/base.ts index 60daad52..e25d31e2 100644 --- a/worker/agents/core/baseAgent.ts +++ b/worker/agents/core/behaviors/base.ts @@ -3,80 +3,53 @@ import { FileConceptType, FileOutputType, Blueprint, -} from '../schemas'; -import { ExecuteCommandsResponse, GitHubPushRequest, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../services/sandbox/sandboxTypes'; -import { GitHubExportResult } from '../../services/github/types'; -import { GitHubService } from '../../services/github/GitHubService'; -import { BaseProjectState } from './state'; -import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType } from './types'; -import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../constants'; -import { broadcastToConnections, handleWebSocketClose, handleWebSocketMessage, sendToConnection } from './websocket'; -import { StructuredLogger } from '../../logger'; -import { ProjectSetupAssistant } from '../assistants/projectsetup'; -import { UserConversationProcessor, RenderToolCall } from '../operations/UserConversationProcessor'; -import { FileManager } from '../services/implementations/FileManager'; -import { StateManager } from '../services/implementations/StateManager'; -import { DeploymentManager } from '../services/implementations/DeploymentManager'; -import { FileRegenerationOperation } from '../operations/FileRegeneration'; +} from '../../schemas'; +import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; +import { BaseProjectState } from '../state'; +import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType } from '../types'; +import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; +import { ProjectSetupAssistant } from '../../assistants/projectsetup'; +import { UserConversationProcessor, RenderToolCall } from '../../operations/UserConversationProcessor'; +import { FileRegenerationOperation } from '../../operations/FileRegeneration'; // Database schema imports removed - using zero-storage OAuth flow -import { BaseSandboxService } from '../../services/sandbox/BaseSandboxService'; -import { WebSocketMessageData, WebSocketMessageType } from '../../api/websocketTypes'; -import { InferenceContext, AgentActionKey } from '../inferutils/config.types'; -import { AGENT_CONFIG } from '../inferutils/config'; -import { ModelConfigService } from '../../database/services/ModelConfigService'; -import { fixProjectIssues } from '../../services/code-fixer'; -import { GitVersionControl, SqlExecutor } from '../git'; -import { FastCodeFixerOperation } from '../operations/PostPhaseCodeFixer'; -import { looksLikeCommand, validateAndCleanBootstrapCommands } from '../utils/common'; -import { customizeTemplateFiles, generateBootstrapScript } from '../utils/templateCustomizer'; -import { AppService } from '../../database'; +import { BaseSandboxService } from '../../../services/sandbox/BaseSandboxService'; +import { WebSocketMessageData, WebSocketMessageType } from '../../../api/websocketTypes'; +import { InferenceContext, AgentActionKey } from '../../inferutils/config.types'; +import { AGENT_CONFIG } from '../../inferutils/config'; +import { ModelConfigService } from '../../../database/services/ModelConfigService'; +import { fixProjectIssues } from '../../../services/code-fixer'; +import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; +import { looksLikeCommand, validateAndCleanBootstrapCommands } from '../../utils/common'; +import { customizeTemplateFiles, generateBootstrapScript } from '../../utils/templateCustomizer'; +import { AppService } from '../../../database'; import { RateLimitExceededError } from 'shared/types/errors'; -import { ImageAttachment, type ProcessedImageAttachment } from '../../types/image-attachment'; -import { OperationOptions } from '../operations/common'; +import { ImageAttachment, type ProcessedImageAttachment } from '../../../types/image-attachment'; +import { OperationOptions } from '../../operations/common'; import { ImageType, uploadImage } from 'worker/utils/images'; -import { ConversationMessage, ConversationState } from '../inferutils/common'; -import { DeepCodeDebugger } from '../assistants/codeDebugger'; -import { DeepDebugResult } from './types'; -import { updatePackageJson } from '../utils/packageSyncer'; -import { ICodingAgent } from '../services/interfaces/ICodingAgent'; -import { SimpleCodeGenerationOperation } from '../operations/SimpleCodeGeneration'; - -const DEFAULT_CONVERSATION_SESSION_ID = 'default'; - -/** - * Infrastructure interface for agent implementations. - * Enables portability across different backends: - * - Durable Objects (current) - * - In-memory (testing) - * - Custom implementations - */ -export interface AgentInfrastructure { - readonly state: TState; - setState(state: TState): void; - readonly sql: SqlExecutor; - getWebSockets(): WebSocket[]; - getAgentId(): string; - logger(): StructuredLogger; - readonly env: Env; -} - -export interface BaseAgentOperations { +import { DeepCodeDebugger } from '../../assistants/codeDebugger'; +import { DeepDebugResult } from '../types'; +import { updatePackageJson } from '../../utils/packageSyncer'; +import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; +import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; +import { AgentComponent } from '../AgentComponent'; +import type { AgentInfrastructure } from '../AgentCore'; +import { sendToConnection } from '../websocket'; + +export interface BaseCodingOperations { regenerateFile: FileRegenerationOperation; fastCodeFixer: FastCodeFixerOperation; processUserMessage: UserConversationProcessor; simpleGenerateFiles: SimpleCodeGenerationOperation; } -export abstract class BaseAgentBehavior implements ICodingAgent { +/** + * Base class for all coding behaviors + */ +export abstract class BaseCodingBehavior + extends AgentComponent implements ICodingAgent { protected static readonly MAX_COMMANDS_HISTORY = 10; - protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; protected projectSetupAssistant: ProjectSetupAssistant | undefined; - protected stateManager!: StateManager; - protected fileManager!: FileManager; - - protected deploymentManager!: DeploymentManager; - protected git: GitVersionControl; protected previewUrlCache: string = ''; protected templateDetailsCache: TemplateDetails | null = null; @@ -87,98 +60,33 @@ export abstract class BaseAgentBehavior impleme protected currentAbortController?: AbortController; protected deepDebugPromise: Promise<{ transcript: string } | { error: string }> | null = null; protected deepDebugConversationId: string | null = null; - - // GitHub token cache (ephemeral, lost on DO eviction) - protected githubTokenCache: { - token: string; - username: string; - expiresAt: number; - } | null = null; - - protected operations: BaseAgentOperations = { + protected operations: BaseCodingOperations = { regenerateFile: new FileRegenerationOperation(), fastCodeFixer: new FastCodeFixerOperation(), processUserMessage: new UserConversationProcessor(), simpleGenerateFiles: new SimpleCodeGenerationOperation(), }; - protected _boundSql: SqlExecutor; - - logger(): StructuredLogger { - return this.infrastructure.logger(); - } - - getAgentId(): string { - return this.infrastructure.getAgentId(); - } - - get sql(): SqlExecutor { - return this._boundSql; - } - - get env(): Env { - return this.infrastructure.env; - } - - get state(): TState { - return this.infrastructure.state; - } - - setState(state: TState): void { - this.infrastructure.setState(state); - } - - getWebSockets(): WebSocket[] { - return this.infrastructure.getWebSockets(); - } - getBehavior(): BehaviorType { return this.state.behaviorType; } - /** - * Update state with partial changes (type-safe) - */ - updateState(updates: Partial): void { - this.setState({ ...this.state, ...updates } as TState); - } - - constructor(public readonly infrastructure: AgentInfrastructure) { - this._boundSql = this.infrastructure.sql.bind(this.infrastructure); - - // Initialize StateManager - this.stateManager = new StateManager( - () => this.state, - (s) => this.setState(s) - ); - - // Initialize GitVersionControl (bind sql to preserve 'this' context) - this.git = new GitVersionControl(this.sql.bind(this)); - - // Initialize FileManager - this.fileManager = new FileManager(this.stateManager, () => this.getTemplateDetails(), this.git); - - // Initialize DeploymentManager first (manages sandbox client caching) - // DeploymentManager will use its own getClient() override for caching - this.deploymentManager = new DeploymentManager( - { - stateManager: this.stateManager, - fileManager: this.fileManager, - getLogger: () => this.logger(), - env: this.env - }, - BaseAgentBehavior.MAX_COMMANDS_HISTORY - ); + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); } public async initialize( _initArgs: AgentInitArgs, ..._args: unknown[] ): Promise { - this.logger().info("Initializing agent"); + this.logger.info("Initializing agent"); return this.state; } + onStart(_props?: Record | undefined): Promise { + return Promise.resolve(); + } + protected async initializeAsync(): Promise { try { const [, setupCommands] = await Promise.all([ @@ -186,73 +94,18 @@ export abstract class BaseAgentBehavior impleme this.getProjectSetupAssistant().generateSetupCommands(), this.generateReadme() ]); - this.logger().info("Deployment to sandbox service and initial commands predictions completed successfully"); + this.logger.info("Deployment to sandbox service and initial commands predictions completed successfully"); await this.executeCommands(setupCommands.commands); - this.logger().info("Initial commands executed successfully"); + this.logger.info("Initial commands executed successfully"); } catch (error) { - this.logger().error("Error during async initialization:", error); + this.logger.error("Error during async initialization:", error); // throw error; } } - - async isInitialized() { - return this.getAgentId() ? true : false - } - - async onStart(props?: Record | undefined): Promise { - this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart`, { props }); - - // Ignore if agent not initialized - if (!this.state.query) { - this.logger().warn(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart ignored, agent not initialized`); - return; - } - - // Ensure state is migrated for any previous versions - this.migrateStateIfNeeded(); - - // Check if this is a read-only operation - const readOnlyMode = props?.readOnlyMode === true; - - if (readOnlyMode) { - this.logger().info(`Agent ${this.getAgentId()} starting in READ-ONLY mode - skipping expensive initialization`); - return; - } - - // Just in case - await this.gitInit(); - - await this.ensureTemplateDetails(); - this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart processed successfully`); - } - - protected async gitInit() { - try { - await this.git.init(); - this.logger().info("Git initialized successfully"); - // Check if there is any commit - const head = await this.git.getHead(); - - if (!head) { - this.logger().info("No commits found, creating initial commit"); - // get all generated files and commit them - const generatedFiles = this.fileManager.getGeneratedFiles(); - if (generatedFiles.length === 0) { - this.logger().info("No generated files found, skipping initial commit"); - return; - } - await this.git.commit(generatedFiles, "Initial commit"); - this.logger().info("Initial commit created successfully"); - } - } catch (error) { - this.logger().error("Error during git init:", error); - } - } - onStateUpdate(_state: TState, _source: "server" | Connection) {} onConnect(connection: Connection, ctx: ConnectionContext) { - this.logger().info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); + this.logger.info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); sendToConnection(connection, 'agent_connected', { state: this.state, templateDetails: this.getTemplateDetails() @@ -261,7 +114,7 @@ export abstract class BaseAgentBehavior impleme async ensureTemplateDetails() { if (!this.templateDetailsCache) { - this.logger().info(`Loading template details for: ${this.state.templateName}`); + this.logger.info(`Loading template details for: ${this.state.templateName}`); const results = await BaseSandboxService.getTemplateDetails(this.state.templateName); if (!results.success || !results.templateDetails) { throw new Error(`Failed to get template details for: ${this.state.templateName}`); @@ -271,7 +124,7 @@ export abstract class BaseAgentBehavior impleme const customizedAllFiles = { ...templateDetails.allFiles }; - this.logger().info('Customizing template files for older app'); + this.logger.info('Customizing template files for older app'); const customizedFiles = customizeTemplateFiles( templateDetails.allFiles, { @@ -285,12 +138,12 @@ export abstract class BaseAgentBehavior impleme ...templateDetails, allFiles: customizedAllFiles }; - this.logger().info('Template details loaded and customized'); + this.logger.info('Template details loaded and customized'); } return this.templateDetailsCache; } - protected getTemplateDetails(): TemplateDetails { + public getTemplateDetails(): TemplateDetails { if (!this.templateDetailsCache) { this.ensureTemplateDetails(); throw new Error('Template details not loaded. Call ensureTemplateDetails() first.'); @@ -322,132 +175,12 @@ export abstract class BaseAgentBehavior impleme 'chore: Update bootstrap script with latest commands' ); - this.logger().info('Updated bootstrap script with commands', { + this.logger.info('Updated bootstrap script with commands', { commandCount: commandsHistory.length, commands: commandsHistory }); } - /* - * Each DO has 10 gb of sqlite storage. However, the way agents sdk works, it stores the 'state' object of the agent as a single row - * in the cf_agents_state table. And row size has a much smaller limit in sqlite. Thus, we only keep current compactified conversation - * in the agent's core state and store the full conversation in a separate DO table. - */ - getConversationState(id: string = DEFAULT_CONVERSATION_SESSION_ID): ConversationState { - const currentConversation = this.state.conversationMessages; - const rows = this.sql<{ messages: string, id: string }>`SELECT * FROM full_conversations WHERE id = ${id}`; - let fullHistory: ConversationMessage[] = []; - if (rows.length > 0 && rows[0].messages) { - try { - const parsed = JSON.parse(rows[0].messages); - if (Array.isArray(parsed)) { - fullHistory = parsed as ConversationMessage[]; - } - } catch (_e) {} - } - if (fullHistory.length === 0) { - fullHistory = currentConversation; - } - // Load compact (running) history from sqlite with fallback to in-memory state for migration - const compactRows = this.sql<{ messages: string, id: string }>`SELECT * FROM compact_conversations WHERE id = ${id}`; - let runningHistory: ConversationMessage[] = []; - if (compactRows.length > 0 && compactRows[0].messages) { - try { - const parsed = JSON.parse(compactRows[0].messages); - if (Array.isArray(parsed)) { - runningHistory = parsed as ConversationMessage[]; - } - } catch (_e) {} - } - if (runningHistory.length === 0) { - runningHistory = currentConversation; - } - - // Remove duplicates - const deduplicateMessages = (messages: ConversationMessage[]): ConversationMessage[] => { - const seen = new Set(); - return messages.filter(msg => { - if (seen.has(msg.conversationId)) { - return false; - } - seen.add(msg.conversationId); - return true; - }); - }; - - runningHistory = deduplicateMessages(runningHistory); - fullHistory = deduplicateMessages(fullHistory); - - return { - id: id, - runningHistory, - fullHistory, - }; - } - - setConversationState(conversations: ConversationState) { - const serializedFull = JSON.stringify(conversations.fullHistory); - const serializedCompact = JSON.stringify(conversations.runningHistory); - try { - this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`); - this.sql`INSERT OR REPLACE INTO compact_conversations (id, messages) VALUES (${conversations.id}, ${serializedCompact})`; - this.sql`INSERT OR REPLACE INTO full_conversations (id, messages) VALUES (${conversations.id}, ${serializedFull})`; - } catch (error) { - this.logger().error(`Failed to save conversation state ${conversations.id}`, error); - } - } - - addConversationMessage(message: ConversationMessage) { - const conversationState = this.getConversationState(); - if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { - conversationState.runningHistory.push(message); - } else { - conversationState.runningHistory = conversationState.runningHistory.map(msg => { - if (msg.conversationId === message.conversationId) { - return message; - } - return msg; - }); - } - if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { - conversationState.fullHistory.push(message); - } else { - conversationState.fullHistory = conversationState.fullHistory.map(msg => { - if (msg.conversationId === message.conversationId) { - return message; - } - return msg; - }); - } - this.setConversationState(conversationState); - } - - protected async saveToDatabase() { - this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); - // Save the app to database (authenticated users only) - const appService = new AppService(this.env); - await appService.createApp({ - id: this.state.inferenceContext.agentId, - userId: this.state.inferenceContext.userId, - sessionToken: null, - title: this.state.blueprint.title || this.state.query.substring(0, 100), - description: this.state.blueprint.description, - originalPrompt: this.state.query, - finalPrompt: this.state.query, - framework: this.state.blueprint.frameworks.join(','), - visibility: 'private', - status: 'generating', - createdAt: new Date(), - updatedAt: new Date() - }); - this.logger().info(`App saved successfully to database for agent ${this.state.inferenceContext.agentId}`, { - agentId: this.state.inferenceContext.agentId, - userId: this.state.inferenceContext.userId, - visibility: 'private' - }); - this.logger().info(`Agent initialized successfully for agent ${this.state.inferenceContext.agentId}`); - } - getPreviewUrlCache() { return this.previewUrlCache; } @@ -474,10 +207,6 @@ export abstract class BaseAgentBehavior impleme return this.deploymentManager.getClient(); } - getGit(): GitVersionControl { - return this.git; - } - isCodeGenerating(): boolean { return this.generationPromise !== null; } @@ -505,7 +234,7 @@ export abstract class BaseAgentBehavior impleme */ public cancelCurrentInference(): boolean { if (this.currentAbortController) { - this.logger().info('Cancelling current inference operation'); + this.logger.info('Cancelling current inference operation'); this.currentAbortController.abort(); this.currentAbortController = undefined; return true; @@ -533,19 +262,11 @@ export abstract class BaseAgentBehavior impleme }; } - protected broadcastError(context: string, error: unknown): void { - const errorMessage = error instanceof Error ? error.message : String(error); - this.logger().error(`${context}:`, error); - this.broadcast(WebSocketMessageResponses.ERROR, { - error: `${context}: ${errorMessage}` - }); - } - async generateReadme() { - this.logger().info('Generating README.md'); + this.logger.info('Generating README.md'); // Only generate if it doesn't exist if (this.fileManager.fileExists('README.md')) { - this.logger().info('README.md already exists'); + this.logger.info('README.md already exists'); return; } @@ -563,7 +284,7 @@ export abstract class BaseAgentBehavior impleme message: 'README.md generated successfully', file: readme }); - this.logger().info('README.md generated successfully'); + this.logger.info('README.md generated successfully'); } async queueUserRequest(request: string, images?: ProcessedImageAttachment[]): Promise { @@ -572,7 +293,7 @@ export abstract class BaseAgentBehavior impleme pendingUserInputs: [...this.state.pendingUserInputs, request] }); if (images && images.length > 0) { - this.logger().info('Storing user images in-memory for phase generation', { + this.logger.info('Storing user images in-memory for phase generation', { imageCount: images.length, }); this.pendingUserImages = [...this.pendingUserImages, ...images]; @@ -596,11 +317,11 @@ export abstract class BaseAgentBehavior impleme */ async generateAllFiles(): Promise { if (this.state.mvpGenerated && this.state.pendingUserInputs.length === 0) { - this.logger().info("Code generation already completed and no user inputs pending"); + this.logger.info("Code generation already completed and no user inputs pending"); return; } if (this.isCodeGenerating()) { - this.logger().info("Code generation already in progress"); + this.logger.info("Code generation already in progress"); return; } this.generationPromise = this.buildWrapper(); @@ -612,7 +333,7 @@ export abstract class BaseAgentBehavior impleme message: 'Starting code generation', totalFiles: this.getTotalFiles() }); - this.logger().info('Starting code generation', { + this.logger.info('Starting code generation', { totalFiles: this.getTotalFiles() }); await this.ensureTemplateDetails(); @@ -620,7 +341,7 @@ export abstract class BaseAgentBehavior impleme await this.build(); } catch (error) { if (error instanceof RateLimitExceededError) { - this.logger().error("Error in state machine:", error); + this.logger.error("Error in state machine:", error); this.broadcast(WebSocketMessageResponses.RATE_LIMIT_ERROR, { error }); } else { this.broadcastError("Error during generation", error); @@ -656,7 +377,6 @@ export abstract class BaseAgentBehavior impleme streamCb: (chunk: string) => void, focusPaths?: string[], ): Promise { - const debugPromise = (async () => { try { const previousTranscript = this.state.lastDeepDebugTranscript ?? undefined; @@ -689,7 +409,7 @@ export abstract class BaseAgentBehavior impleme return { success: true as const, transcript: out }; } catch (e) { - this.logger().error('Deep debugger failed', e); + this.logger.error('Deep debugger failed', e); return { success: false as const, error: `Deep debugger failed: ${String(e)}` }; } finally{ this.deepDebugPromise = null; @@ -760,7 +480,7 @@ export abstract class BaseAgentBehavior impleme defaultConfigs }; } catch (error) { - this.logger().error('Error fetching model configs info:', error); + this.logger.error('Error fetching model configs info:', error); throw error; } } @@ -782,7 +502,7 @@ export abstract class BaseAgentBehavior impleme return this.state; } - protected migrateStateIfNeeded(): void { + migrateStateIfNeeded(): void { // no-op, only older phasic agents need this, for now. } @@ -808,7 +528,7 @@ export abstract class BaseAgentBehavior impleme return errors; } catch (error) { - this.logger().error("Exception fetching runtime errors:", error); + this.logger.error("Exception fetching runtime errors:", error); // If fetch fails, initiate redeploy this.deployToSandbox(); const message = ""; @@ -845,7 +565,7 @@ export abstract class BaseAgentBehavior impleme // Get static analysis and do deterministic fixes const staticAnalysis = await this.runStaticAnalysisCode(); if (staticAnalysis.typecheck.issues.length == 0) { - this.logger().info("No typecheck issues found, skipping deterministic fixes"); + this.logger.info("No typecheck issues found, skipping deterministic fixes"); return staticAnalysis; // So that static analysis is not repeated again } const typeCheckIssues = staticAnalysis.typecheck.issues; @@ -854,7 +574,7 @@ export abstract class BaseAgentBehavior impleme issues: typeCheckIssues }); - this.logger().info(`Attempting to fix ${typeCheckIssues.length} TypeScript issues using deterministic code fixer`); + this.logger.info(`Attempting to fix ${typeCheckIssues.length} TypeScript issues using deterministic code fixer`); const allFiles = this.fileManager.getAllFiles(); const fixResult = fixProjectIssues( @@ -886,13 +606,13 @@ export abstract class BaseAgentBehavior impleme const installCommands = moduleNames.map(moduleName => `bun install ${moduleName}`); await this.executeCommands(installCommands, false); - this.logger().info(`Deterministic code fixer installed missing modules: ${moduleNames.join(', ')}`); + this.logger.info(`Deterministic code fixer installed missing modules: ${moduleNames.join(', ')}`); } else { - this.logger().info(`Deterministic code fixer detected no external modules to install from unfixable TS2307 issues`); + this.logger.info(`Deterministic code fixer detected no external modules to install from unfixable TS2307 issues`); } } if (fixResult.modifiedFiles.length > 0) { - this.logger().info("Applying deterministic fixes to files, Fixes: ", JSON.stringify(fixResult, null, 2)); + this.logger.info("Applying deterministic fixes to files, Fixes: ", JSON.stringify(fixResult, null, 2)); const fixedFiles = fixResult.modifiedFiles.map(file => ({ filePath: file.filePath, filePurpose: allFiles.find(f => f.filePath === file.filePath)?.filePurpose || '', @@ -901,10 +621,10 @@ export abstract class BaseAgentBehavior impleme await this.fileManager.saveGeneratedFiles(fixedFiles, "fix: applied deterministic fixes"); await this.deployToSandbox(fixedFiles, false, "fix: applied deterministic fixes"); - this.logger().info("Deployed deterministic fixes to sandbox"); + this.logger.info("Deployed deterministic fixes to sandbox"); } } - this.logger().info(`Applied deterministic code fixes: ${JSON.stringify(fixResult, null, 2)}`); + this.logger.info(`Applied deterministic code fixes: ${JSON.stringify(fixResult, null, 2)}`); } catch (error) { this.broadcastError('Deterministic code fixer failed', error); } @@ -916,7 +636,7 @@ export abstract class BaseAgentBehavior impleme this.fetchRuntimeErrors(resetIssues), this.runStaticAnalysisCode() ]); - this.logger().info("Fetched all issues:", JSON.stringify({ runtimeErrors, staticAnalysis })); + this.logger.info("Fetched all issues:", JSON.stringify({ runtimeErrors, staticAnalysis })); return { runtimeErrors, staticAnalysis }; } @@ -943,7 +663,7 @@ export abstract class BaseAgentBehavior impleme const dbOk = await appService.updateApp(this.getAgentId(), { title: newName }); ok = ok && dbOk; } catch (error) { - this.logger().error('Error updating project name in database:', error); + this.logger.error('Error updating project name in database:', error); ok = false; } this.broadcast(WebSocketMessageResponses.PROJECT_NAME_UPDATED, { @@ -952,7 +672,7 @@ export abstract class BaseAgentBehavior impleme }); return ok; } catch (error) { - this.logger().error('Error updating project name:', error); + this.logger.error('Error updating project name:', error); return false; } } @@ -1014,7 +734,7 @@ export abstract class BaseAgentBehavior impleme } const resp = await this.getSandboxServiceClient().getFiles(sandboxInstanceId, paths); if (!resp.success) { - this.logger().warn('readFiles failed', { error: resp.error }); + this.logger.warn('readFiles failed', { error: resp.error }); return { files: [] }; } return { files: resp.files.map(f => ({ path: f.filePath, content: f.fileContents })) }; @@ -1094,7 +814,7 @@ export abstract class BaseAgentBehavior impleme requirements: string[], files: FileConceptType[] ): Promise<{ files: Array<{ path: string; purpose: string; diff: string }> }> { - this.logger().info('Generating files for deep debugger', { + this.logger.info('Generating files for deep debugger', { phaseName, requirementsCount: requirements.length, filesCount: files.length @@ -1143,7 +863,7 @@ export abstract class BaseAgentBehavior impleme `feat: ${phaseName}\n\n${phaseDescription}` ); - this.logger().info('Files generated and saved', { + this.logger.info('Files generated and saved', { fileCount: result.files.length }); @@ -1201,11 +921,11 @@ export abstract class BaseAgentBehavior impleme try { // Ensure sandbox instance exists first if (!this.state.sandboxInstanceId) { - this.logger().info('No sandbox instance, deploying to sandbox first'); + this.logger.info('No sandbox instance, deploying to sandbox first'); await this.deployToSandbox(); if (!this.state.sandboxInstanceId) { - this.logger().error('Failed to deploy to sandbox service'); + this.logger.error('Failed to deploy to sandbox service'); this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { message: 'Deployment failed: Failed to deploy to sandbox service', error: 'Sandbox service unavailable' @@ -1247,7 +967,7 @@ export abstract class BaseAgentBehavior impleme return result.deploymentUrl ? { deploymentUrl: result.deploymentUrl } : null; } catch (error) { - this.logger().error('Cloudflare deployment error:', error); + this.logger.error('Cloudflare deployment error:', error); this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { message: 'Deployment failed', error: error instanceof Error ? error.message : String(error) @@ -1260,12 +980,12 @@ export abstract class BaseAgentBehavior impleme if (this.generationPromise) { try { await this.generationPromise; - this.logger().info("Code generation completed successfully"); + this.logger.info("Code generation completed successfully"); } catch (error) { - this.logger().error("Error during code generation:", error); + this.logger.error("Error during code generation:", error); } } else { - this.logger().error("No generation process found"); + this.logger.error("No generation process found"); } } @@ -1284,9 +1004,9 @@ export abstract class BaseAgentBehavior impleme if (this.deepDebugPromise) { try { await this.deepDebugPromise; - this.logger().info("Deep debug session completed successfully"); + this.logger.info("Deep debug session completed successfully"); } catch (error) { - this.logger().error("Error during deep debug session:", error); + this.logger.error("Error during deep debug session:", error); } finally { // Clear promise after waiting completes this.deepDebugPromise = null; @@ -1294,58 +1014,6 @@ export abstract class BaseAgentBehavior impleme } } - /** - * Cache GitHub OAuth token in memory for subsequent exports - * Token is ephemeral - lost on DO eviction - */ - setGitHubToken(token: string, username: string, ttl: number = 3600000): void { - this.githubTokenCache = { - token, - username, - expiresAt: Date.now() + ttl - }; - this.logger().info('GitHub token cached', { - username, - expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() - }); - } - - /** - * Get cached GitHub token if available and not expired - */ - getGitHubToken(): { token: string; username: string } | null { - if (!this.githubTokenCache) { - return null; - } - - if (Date.now() >= this.githubTokenCache.expiresAt) { - this.logger().info('GitHub token expired, clearing cache'); - this.githubTokenCache = null; - return null; - } - - return { - token: this.githubTokenCache.token, - username: this.githubTokenCache.username - }; - } - - /** - * Clear cached GitHub token - */ - clearGitHubToken(): void { - this.githubTokenCache = null; - this.logger().info('GitHub token cleared'); - } - - async onMessage(connection: Connection, message: string): Promise { - handleWebSocketMessage(this, connection, message); - } - - async onClose(connection: Connection): Promise { - handleWebSocketClose(connection); - } - protected async onProjectUpdate(message: string): Promise { this.setState({ ...this.state, @@ -1370,7 +1038,7 @@ export abstract class BaseAgentBehavior impleme } this.onProjectUpdate(message); } - broadcastToConnections(this, msg, data || {} as WebSocketMessageData); + super.broadcast(msg, data); } protected getBootstrapCommands() { @@ -1381,7 +1049,7 @@ export abstract class BaseAgentBehavior impleme } protected async saveExecutedCommands(commands: string[]) { - this.logger().info('Saving executed commands', { commands }); + this.logger.info('Saving executed commands', { commands }); // Merge with existing history const mergedCommands = [...(this.state.commandsHistory || []), ...commands]; @@ -1391,7 +1059,7 @@ export abstract class BaseAgentBehavior impleme // Log what was filtered out if (invalidCommands.length > 0 || deduplicated > 0) { - this.logger().warn('[commands] Bootstrap commands cleaned', { + this.logger.warn('[commands] Bootstrap commands cleaned', { invalidCommands, invalidCount: invalidCommands.length, deduplicatedCount: deduplicated, @@ -1417,7 +1085,7 @@ export abstract class BaseAgentBehavior impleme ); if (hasDependencyCommands) { - this.logger().info('Dependency commands executed, syncing package.json from sandbox'); + this.logger.info('Dependency commands executed, syncing package.json from sandbox'); await this.syncPackageJsonFromSandbox(); } } @@ -1429,19 +1097,19 @@ export abstract class BaseAgentBehavior impleme protected async executeCommands(commands: string[], shouldRetry: boolean = true, chunkSize: number = 5): Promise { const state = this.state; if (!state.sandboxInstanceId) { - this.logger().warn('No sandbox instance available for executing commands'); + this.logger.warn('No sandbox instance available for executing commands'); return; } // Sanitize and prepare commands commands = commands.join('\n').split('\n').filter(cmd => cmd.trim() !== '').filter(cmd => looksLikeCommand(cmd) && !cmd.includes(' undefined')); if (commands.length === 0) { - this.logger().warn("No commands to execute"); + this.logger.warn("No commands to execute"); return; } commands = commands.map(cmd => cmd.trim().replace(/^\s*-\s*/, '').replace(/^npm/, 'bun')); - this.logger().info(`AI suggested ${commands.length} commands to run: ${commands.join(", ")}`); + this.logger.info(`AI suggested ${commands.length} commands to run: ${commands.join(", ")}`); // Remove duplicate commands commands = Array.from(new Set(commands)); @@ -1472,11 +1140,11 @@ export abstract class BaseAgentBehavior impleme currentChunk ); if (!resp.results || !resp.success) { - this.logger().error('Failed to execute commands', { response: resp }); + this.logger.error('Failed to execute commands', { response: resp }); // Check if instance is still running const status = await this.getSandboxServiceClient().getInstanceStatus(state.sandboxInstanceId); if (!status.success || !status.isHealthy) { - this.logger().error(`Instance ${state.sandboxInstanceId} is no longer running`); + this.logger.error(`Instance ${state.sandboxInstanceId} is no longer running`); return; } break; @@ -1489,19 +1157,19 @@ export abstract class BaseAgentBehavior impleme // Track successful commands if (successful.length > 0) { const successfulCmds = successful.map(r => r.command); - this.logger().info(`Successfully executed ${successful.length} commands: ${successfulCmds.join(", ")}`); + this.logger.info(`Successfully executed ${successful.length} commands: ${successfulCmds.join(", ")}`); successfulCommands.push(...successfulCmds); } // If all succeeded, move to next chunk if (failures.length === 0) { - this.logger().info(`All commands in chunk executed successfully`); + this.logger.info(`All commands in chunk executed successfully`); break; } // Handle failures const failedCommands = failures.map(r => r.command); - this.logger().warn(`${failures.length} commands failed: ${failedCommands.join(", ")}`); + this.logger.warn(`${failures.length} commands failed: ${failedCommands.join(", ")}`); // Only retry if shouldRetry is true if (!shouldRetry) { @@ -1522,14 +1190,14 @@ export abstract class BaseAgentBehavior impleme ); if (newCommands?.commands && newCommands.commands.length > 0) { - this.logger().info(`AI suggested ${newCommands.commands.length} alternative commands`); + this.logger.info(`AI suggested ${newCommands.commands.length} alternative commands`); this.broadcast(WebSocketMessageResponses.COMMAND_EXECUTING, { message: "Executing regenerated commands", commands: newCommands.commands }); currentChunk = newCommands.commands.filter(looksLikeCommand); } else { - this.logger().warn('AI could not generate alternative commands'); + this.logger.warn('AI could not generate alternative commands'); currentChunk = []; } } else { @@ -1537,7 +1205,7 @@ export abstract class BaseAgentBehavior impleme currentChunk = []; } } catch (error) { - this.logger().error('Error executing commands:', error); + this.logger.error('Error executing commands:', error); // Stop retrying on error break; } @@ -1550,7 +1218,7 @@ export abstract class BaseAgentBehavior impleme if (failedCommands.length > 0) { this.broadcastError('Failed to execute commands', new Error(failedCommands.join(", "))); } else { - this.logger().info(`All commands executed successfully: ${successfulCommands.join(", ")}`); + this.logger.info(`All commands executed successfully: ${successfulCommands.join(", ")}`); } this.saveExecutedCommands(successfulCommands); @@ -1562,17 +1230,17 @@ export abstract class BaseAgentBehavior impleme */ protected async syncPackageJsonFromSandbox(): Promise { try { - this.logger().info('Fetching current package.json from sandbox'); + this.logger.info('Fetching current package.json from sandbox'); const results = await this.readFiles(['package.json']); if (!results || !results.files || results.files.length === 0) { - this.logger().warn('Failed to fetch package.json from sandbox', { results }); + this.logger.warn('Failed to fetch package.json from sandbox', { results }); return; } const packageJsonContent = results.files[0].content; const { updated, packageJson } = updatePackageJson(this.state.lastPackageJson, packageJsonContent); if (!updated) { - this.logger().info('package.json has not changed, skipping sync'); + this.logger.info('package.json has not changed, skipping sync'); return; } // Update state with latest package.json @@ -1591,7 +1259,7 @@ export abstract class BaseAgentBehavior impleme 'chore: sync package.json dependencies from sandbox' ); - this.logger().info('Successfully synced package.json to git', { + this.logger.info('Successfully synced package.json to git', { filePath: fileState.filePath, }); @@ -1602,7 +1270,7 @@ export abstract class BaseAgentBehavior impleme }); } catch (error) { - this.logger().error('Failed to sync package.json from sandbox', error); + this.logger.error('Failed to sync package.json from sandbox', error); // Non-critical error - don't throw, just log } } @@ -1632,153 +1300,9 @@ export abstract class BaseAgentBehavior impleme this.fileManager.deleteFiles(filePaths); try { await this.executeCommands(deleteCommands, false); - this.logger().info(`Deleted ${filePaths.length} files: ${filePaths.join(", ")}`); - } catch (error) { - this.logger().error('Error deleting files:', error); - } - } - - /** - * Export generated code to a GitHub repository - */ - async pushToGitHub(options: GitHubPushRequest): Promise { - try { - this.logger().info('Starting GitHub export using DO git'); - - // Broadcast export started - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { - message: `Starting GitHub export to repository "${options.cloneUrl}"`, - repositoryName: options.repositoryHtmlUrl, - isPrivate: options.isPrivate - }); - - // Export git objects from DO - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Preparing git repository...', - step: 'preparing', - progress: 20 - }); - - const { gitObjects, query, templateDetails } = await this.exportGitObjects(); - - this.logger().info('Git objects exported', { - objectCount: gitObjects.length, - hasTemplate: !!templateDetails - }); - - // Get app createdAt timestamp for template base commit - let appCreatedAt: Date | undefined = undefined; - try { - const appId = this.getAgentId(); - if (appId) { - const appService = new AppService(this.env); - const app = await appService.getAppDetails(appId); - if (app && app.createdAt) { - appCreatedAt = new Date(app.createdAt); - this.logger().info('Using app createdAt for template base', { - createdAt: appCreatedAt.toISOString() - }); - } - } - } catch (error) { - this.logger().warn('Failed to get app createdAt, using current time', { error }); - appCreatedAt = new Date(); // Fallback to current time - } - - // Push to GitHub using new service - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Uploading to GitHub repository...', - step: 'uploading_files', - progress: 40 - }); - - const result = await GitHubService.exportToGitHub({ - gitObjects, - templateDetails, - appQuery: query, - appCreatedAt, - token: options.token, - repositoryUrl: options.repositoryHtmlUrl, - username: options.username, - email: options.email - }); - - if (!result.success) { - throw new Error(result.error || 'Failed to export to GitHub'); - } - - this.logger().info('GitHub export completed', { - commitSha: result.commitSha - }); - - // Cache token for subsequent exports - if (options.token && options.username) { - try { - this.setGitHubToken(options.token, options.username); - this.logger().info('GitHub token cached after successful export'); - } catch (cacheError) { - // Non-fatal - continue with finalization - this.logger().warn('Failed to cache GitHub token', { error: cacheError }); - } - } - - // Update database - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Finalizing GitHub export...', - step: 'finalizing', - progress: 90 - }); - - const agentId = this.getAgentId(); - this.logger().info('[DB Update] Updating app with GitHub repository URL', { - agentId, - repositoryUrl: options.repositoryHtmlUrl, - visibility: options.isPrivate ? 'private' : 'public' - }); - - const appService = new AppService(this.env); - const updateResult = await appService.updateGitHubRepository( - agentId || '', - options.repositoryHtmlUrl || '', - options.isPrivate ? 'private' : 'public' - ); - - this.logger().info('[DB Update] Database update result', { - agentId, - success: updateResult, - repositoryUrl: options.repositoryHtmlUrl - }); - - // Broadcast success - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { - message: `Successfully exported to GitHub repository: ${options.repositoryHtmlUrl}`, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl, - commitSha: result.commitSha - }); - - this.logger().info('GitHub export completed successfully', { - repositoryUrl: options.repositoryHtmlUrl, - commitSha: result.commitSha - }); - - return { - success: true, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; - + this.logger.info(`Deleted ${filePaths.length} files: ${filePaths.join(", ")}`); } catch (error) { - this.logger().error('GitHub export failed', error); - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { - message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, - error: error instanceof Error ? error.message : 'Unknown error' - }); - return { - success: false, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; + this.logger.error('Error deleting files:', error); } } @@ -1788,7 +1312,7 @@ export abstract class BaseAgentBehavior impleme */ async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { try { - this.logger().info('Processing user input message', { + this.logger.info('Processing user input message', { messageLength: userMessage.length, pendingInputsCount: this.state.pendingUserInputs.length, hasImages: !!images && images.length > 0, @@ -1801,8 +1325,10 @@ export abstract class BaseAgentBehavior impleme // Just fetch runtime errors const errors = await this.fetchRuntimeErrors(false, false); const projectUpdates = await this.getAndResetProjectUpdates(); - this.logger().info('Passing context to user conversation processor', { errors, projectUpdates }); + this.logger.info('Passing context to user conversation processor', { errors, projectUpdates }); + + const conversationState = this.infrastructure.getConversationState(); // If there are images, upload them and pass the URLs to the conversation processor let uploadedImages: ProcessedImageAttachment[] = []; if (images) { @@ -1810,14 +1336,14 @@ export abstract class BaseAgentBehavior impleme return await uploadImage(this.env, image, ImageType.UPLOADS); })); - this.logger().info('Uploaded images', { uploadedImages }); + this.logger.info('Uploaded images', { uploadedImages }); } // Process the user message using conversational assistant const conversationalResponse = await this.operations.processUserMessage.execute( { userMessage, - conversationState: this.getConversationState(), + conversationState, conversationResponseCallback: ( message: string, conversationId: string, @@ -1843,52 +1369,18 @@ export abstract class BaseAgentBehavior impleme this.getOperationOptions() ); - const { conversationResponse, conversationState } = conversationalResponse; - this.setConversationState(conversationState); - - if (!this.generationPromise) { - // If idle, start generation process - this.logger().info('User input during IDLE state, starting generation'); - this.generateAllFiles().catch(error => { - this.logger().error('Error starting generation from user input:', error); - }); - } - - this.logger().info('User input processed successfully', { + const { conversationResponse, conversationState: newConversationState } = conversationalResponse; + this.logger.info('User input processed successfully', { responseLength: conversationResponse.userResponse.length, }); + this.infrastructure.setConversationState(newConversationState); } catch (error) { - if (error instanceof RateLimitExceededError) { - this.logger().error('Rate limit exceeded:', error); - this.broadcast(WebSocketMessageResponses.RATE_LIMIT_ERROR, { - error - }); - return; - } - this.broadcastError('Error processing user input', error); + this.logger.error('Error processing user input', error); + throw error; } } - /** - * Clear conversation history - */ - public clearConversation(): void { - const messageCount = this.state.conversationMessages.length; - - // Clear conversation messages only from agent's running history - this.setState({ - ...this.state, - conversationMessages: [] - }); - - // Send confirmation response - this.broadcast(WebSocketMessageResponses.CONVERSATION_CLEARED, { - message: 'Conversation history cleared', - clearedMessageCount: messageCount - }); - } - /** * Capture screenshot of the given URL using Cloudflare Browser Rendering REST API */ @@ -1898,7 +1390,7 @@ export abstract class BaseAgentBehavior impleme ): Promise { if (!this.env.DB || !this.getAgentId()) { const error = 'Cannot capture screenshot: DB or agentId not available'; - this.logger().warn(error); + this.logger.warn(error); this.broadcast(WebSocketMessageResponses.SCREENSHOT_CAPTURE_ERROR, { error, configurationError: true @@ -1916,7 +1408,7 @@ export abstract class BaseAgentBehavior impleme throw new Error(error); } - this.logger().info('Capturing screenshot via REST API', { url, viewport }); + this.logger.info('Capturing screenshot via REST API', { url, viewport }); // Notify start of screenshot capture this.broadcast(WebSocketMessageResponses.SCREENSHOT_CAPTURE_STARTED, { @@ -2007,7 +1499,7 @@ export abstract class BaseAgentBehavior impleme throw new Error(error); } - this.logger().info('Screenshot captured and stored successfully', { + this.logger.info('Screenshot captured and stored successfully', { url, storage: uploadedImage.publicUrl.startsWith('data:') ? 'database' : (uploadedImage.publicUrl.includes('/api/screenshots/') ? 'r2' : 'images'), length: base64Screenshot.length @@ -2025,7 +1517,7 @@ export abstract class BaseAgentBehavior impleme return uploadedImage.publicUrl; } catch (error) { - this.logger().error('Failed to capture screenshot via REST API:', error); + this.logger.error('Failed to capture screenshot via REST API:', error); // Only broadcast if error wasn't already broadcast above const errorMessage = error instanceof Error ? error.message : 'Unknown error'; @@ -2040,35 +1532,4 @@ export abstract class BaseAgentBehavior impleme throw new Error(`Screenshot capture failed: ${error instanceof Error ? error.message : 'Unknown error'}`); } } - - /** - * Export git objects - * The route handler will build the repo with template rebasing - */ - async exportGitObjects(): Promise<{ - gitObjects: Array<{ path: string; data: Uint8Array }>; - query: string; - hasCommits: boolean; - templateDetails: TemplateDetails | null; - }> { - try { - // Export git objects efficiently (minimal DO memory usage) - const gitObjects = this.git.fs.exportGitObjects(); - - await this.gitInit(); - - // Ensure template details are available - await this.ensureTemplateDetails(); - - return { - gitObjects, - query: this.state.query || 'N/A', - hasCommits: gitObjects.length > 0, - templateDetails: this.templateDetailsCache - }; - } catch (error) { - this.logger().error('exportGitObjects failed', error); - throw error; - } - } } diff --git a/worker/agents/core/phasic/behavior.ts b/worker/agents/core/behaviors/phasic.ts similarity index 84% rename from worker/agents/core/phasic/behavior.ts rename to worker/agents/core/behaviors/phasic.ts index cf69d48e..658dff89 100644 --- a/worker/agents/core/phasic/behavior.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -10,7 +10,6 @@ import { CurrentDevState, MAX_PHASES, PhasicState } from '../state'; import { AllIssues, AgentInitArgs, PhaseExecutionResult, UserContext } from '../types'; import { WebSocketMessageResponses } from '../../constants'; import { UserConversationProcessor } from '../../operations/UserConversationProcessor'; -import { DeploymentManager } from '../../services/implementations/DeploymentManager'; // import { WebSocketBroadcaster } from '../services/implementations/WebSocketBroadcaster'; import { GenerationContext, PhasicGenerationContext } from '../../domain/values/GenerationContext'; import { IssueReport } from '../../domain/values/IssueReport'; @@ -25,22 +24,23 @@ import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; import { customizePackageJson, customizeTemplateFiles, generateProjectName } from '../../utils/templateCustomizer'; import { generateBlueprint } from '../../planning/blueprint'; import { RateLimitExceededError } from 'shared/types/errors'; -import { type ProcessedImageAttachment } from '../../../types/image-attachment'; +import { ImageAttachment, type ProcessedImageAttachment } from '../../../types/image-attachment'; import { OperationOptions } from '../../operations/common'; import { ConversationMessage } from '../../inferutils/common'; import { generateNanoId } from 'worker/utils/idGenerator'; import { IdGenerator } from '../../utils/idGenerator'; -import { BaseAgentBehavior, BaseAgentOperations } from '../baseAgent'; +import { BaseCodingBehavior, BaseCodingOperations } from './base'; import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; +import { StateMigration } from '../stateMigration'; -interface PhasicOperations extends BaseAgentOperations { +interface PhasicOperations extends BaseCodingOperations { generateNextPhase: PhaseGenerationOperation; implementPhase: PhaseImplementationOperation; } /** - * PhasicAgentBehavior - Deterministically orchestrated agent + * PhasicCodingBehavior - Deterministically orchestrated agent * * Manages the lifecycle of code generation including: * - Blueprint, phase generation, phase implementation, review cycles orchestrations @@ -48,7 +48,9 @@ interface PhasicOperations extends BaseAgentOperations { * - Code validation and error correction * - Deployment to sandbox service */ -export class PhasicAgentBehavior extends BaseAgentBehavior implements ICodingAgent { +export class PhasicCodingBehavior extends BaseCodingBehavior implements ICodingAgent { + protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; + protected operations: PhasicOperations = { regenerateFile: new FileRegenerationOperation(), fastCodeFixer: new FastCodeFixerOperation(), @@ -67,13 +69,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen ..._args: unknown[] ): Promise { await super.initialize(initArgs); - - const { query, language, frameworks, hostname, inferenceContext, templateInfo } = initArgs; - const sandboxSessionId = DeploymentManager.generateNewSessionId(); - + const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + // Generate a blueprint - this.logger().info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); - this.logger().info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); + this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); + this.logger.info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); const blueprint = await generateBlueprint({ env: this.env, @@ -81,30 +81,27 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen query, language: language!, frameworks: frameworks!, - templateDetails: templateInfo.templateDetails, - templateMetaInfo: templateInfo.selection, + templateDetails: templateInfo?.templateDetails, + templateMetaInfo: templateInfo?.selection, images: initArgs.images, stream: { chunk_size: 256, onChunk: (chunk) => { - // initArgs.writer.write({chunk}); initArgs.onBlueprintChunk(chunk); } } }) - - const packageJson = templateInfo.templateDetails?.allFiles['package.json']; - - this.templateDetailsCache = templateInfo.templateDetails; - + + const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + const projectName = generateProjectName( - blueprint?.projectName || templateInfo.templateDetails.name, + blueprint?.projectName || templateInfo?.templateDetails.name || '', generateNanoId(), - PhasicAgentBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH + PhasicCodingBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH ); - - this.logger().info('Generated project name', { projectName }); - + + this.logger.info('Generated project name', { projectName }); + this.setState({ ...this.state, projectName, @@ -115,23 +112,20 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen generatedPhases: [], commandsHistory: [], lastPackageJson: packageJson, - sessionId: sandboxSessionId, + sessionId: sandboxSessionId!, hostname, inferenceContext, }); - - await this.gitInit(); - // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) const customizedFiles = customizeTemplateFiles( templateInfo.templateDetails.allFiles, { projectName, - commandsHistory: [] // Empty initially, will be updated later + commandsHistory: [] } ); - this.logger().info('Customized template files', { + this.logger.info('Customized template files', { files: Object.keys(customizedFiles) }); @@ -147,18 +141,24 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen 'Initialize project configuration files' ); - this.logger().info('Committed customized template files to git'); + this.logger.info('Committed customized template files to git'); this.initializeAsync().catch((error: unknown) => { this.broadcastError("Initialization failed", error); }); - this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); - await this.saveToDatabase(); + this.logger.info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); return this.state; } async onStart(props?: Record | undefined): Promise { await super.onStart(props); + } + + migrateStateIfNeeded(): void { + const migratedState = StateMigration.migrateIfNeeded(this.state, this.logger); + if (migratedState) { + this.setState(migratedState); + } // migrate overwritten package.jsons const oldPackageJson = this.fileManager.getFile('package.json')?.fileContents || this.state.lastPackageJson; @@ -174,18 +174,6 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen } } - setState(state: PhasicState): void { - try { - super.setState(state); - } catch (error) { - this.broadcastError("Error setting state", error); - this.logger().error("State details:", { - originalState: JSON.stringify(this.state, null, 2), - newState: JSON.stringify(state, null, 2) - }); - } - } - rechargePhasesCounter(max_phases: number = MAX_PHASES): void { if (this.getPhasesCounter() <= max_phases) { this.setState({ @@ -212,8 +200,8 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen return { env: this.env, agentId: this.getAgentId(), - context: GenerationContext.from(this.state, this.getTemplateDetails(), this.logger()) as PhasicGenerationContext, - logger: this.logger(), + context: GenerationContext.from(this.state, this.getTemplateDetails(), this.logger) as PhasicGenerationContext, + logger: this.logger, inferenceContext: this.getInferenceContext(), agent: this }; @@ -228,14 +216,14 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen }] }) - this.logger().info("Created new incomplete phase:", JSON.stringify(this.state.generatedPhases, null, 2)); + this.logger.info("Created new incomplete phase:", JSON.stringify(this.state.generatedPhases, null, 2)); } private markPhaseComplete(phaseName: string) { // First find the phase const phases = this.state.generatedPhases; if (!phases.some(p => p.name === phaseName)) { - this.logger().warn(`Phase ${phaseName} not found in generatedPhases array, skipping save`); + this.logger.warn(`Phase ${phaseName} not found in generatedPhases array, skipping save`); return; } @@ -245,7 +233,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen generatedPhases: phases.map(p => p.name === phaseName ? { ...p, completed: true } : p) }); - this.logger().info("Completed phases:", JSON.stringify(phases, null, 2)); + this.logger.info("Completed phases:", JSON.stringify(phases, null, 2)); } async queueUserRequest(request: string, images?: ProcessedImageAttachment[]): Promise { @@ -258,7 +246,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen } private async launchStateMachine() { - this.logger().info("Launching state machine"); + this.logger.info("Launching state machine"); let currentDevState = CurrentDevState.PHASE_IMPLEMENTING; const generatedPhases = this.state.generatedPhases; @@ -266,17 +254,17 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen let phaseConcept : PhaseConceptType | undefined; if (incompletedPhases.length > 0) { phaseConcept = incompletedPhases[incompletedPhases.length - 1]; - this.logger().info('Resuming code generation from incompleted phase', { + this.logger.info('Resuming code generation from incompleted phase', { phase: phaseConcept }); } else if (generatedPhases.length > 0) { currentDevState = CurrentDevState.PHASE_GENERATING; - this.logger().info('Resuming code generation after generating all phases', { + this.logger.info('Resuming code generation after generating all phases', { phase: generatedPhases[generatedPhases.length - 1] }); } else { phaseConcept = this.state.blueprint.initialPhase; - this.logger().info('Starting code generation from initial phase', { + this.logger.info('Starting code generation from initial phase', { phase: phaseConcept }); this.createNewIncompletePhase(phaseConcept); @@ -289,7 +277,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen let executionResults: PhaseExecutionResult; // State machine loop - continues until IDLE state while (currentDevState !== CurrentDevState.IDLE) { - this.logger().info(`[generateAllFiles] Executing state: ${currentDevState}`); + this.logger.info(`[generateAllFiles] Executing state: ${currentDevState}`); switch (currentDevState) { case CurrentDevState.PHASE_GENERATING: executionResults = await this.executePhaseGeneration(); @@ -315,9 +303,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen } } - this.logger().info("State machine completed successfully"); + this.logger.info("State machine completed successfully"); } catch (error) { - this.logger().error("Error in state machine:", error); + this.logger.error("Error in state machine:", error); } } @@ -325,7 +313,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen * Execute phase generation state - generate next phase with user suggestions */ async executePhaseGeneration(): Promise { - this.logger().info("Executing PHASE_GENERATING state"); + this.logger.info("Executing PHASE_GENERATING state"); try { const currentIssues = await this.fetchAllIssues(); @@ -342,7 +330,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen if (userContext && userContext?.suggestions && userContext.suggestions.length > 0) { // Only reset pending user inputs if user suggestions were read - this.logger().info("Resetting pending user inputs", { + this.logger.info("Resetting pending user inputs", { userSuggestions: userContext.suggestions, hasImages: !!userContext.images, imageCount: userContext.images?.length || 0 @@ -350,7 +338,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Clear images after they're passed to phase generation if (userContext?.images && userContext.images.length > 0) { - this.logger().info('Clearing stored user images after passing to phase generation'); + this.logger.info('Clearing stored user images after passing to phase generation'); this.pendingUserImages = []; } } @@ -358,7 +346,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen const nextPhase = await this.generateNextPhase(currentIssues, userContext); if (!nextPhase) { - this.logger().info("No more phases to implement, transitioning to FINALIZING"); + this.logger.info("No more phases to implement, transitioning to FINALIZING"); return { currentDevState: CurrentDevState.FINALIZING, }; @@ -392,16 +380,16 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen */ async executePhaseImplementation(phaseConcept?: PhaseConceptType, staticAnalysis?: StaticAnalysisResponse, userContext?: UserContext): Promise<{currentDevState: CurrentDevState, staticAnalysis?: StaticAnalysisResponse}> { try { - this.logger().info("Executing PHASE_IMPLEMENTING state"); + this.logger.info("Executing PHASE_IMPLEMENTING state"); if (phaseConcept === undefined) { phaseConcept = this.state.currentPhase; if (phaseConcept === undefined) { - this.logger().error("No phase concept provided to implement, will call phase generation"); + this.logger.error("No phase concept provided to implement, will call phase generation"); const results = await this.executePhaseGeneration(); phaseConcept = results.result; if (phaseConcept === undefined) { - this.logger().error("No phase concept provided to implement, will return"); + this.logger.error("No phase concept provided to implement, will return"); return {currentDevState: CurrentDevState.FINALIZING}; } } @@ -432,14 +420,14 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Implement the phase with user context (suggestions and images) await this.implementPhase(phaseConcept, currentIssues, userContext); - this.logger().info(`Phase ${phaseConcept.name} completed, generating next phase`); + this.logger.info(`Phase ${phaseConcept.name} completed, generating next phase`); const phasesCounter = this.decrementPhasesCounter(); if ((phaseConcept.lastPhase || phasesCounter <= 0) && this.state.pendingUserInputs.length === 0) return {currentDevState: CurrentDevState.FINALIZING, staticAnalysis: staticAnalysis}; return {currentDevState: CurrentDevState.PHASE_GENERATING, staticAnalysis: staticAnalysis}; } catch (error) { - this.logger().error("Error implementing phase", error); + this.logger.error("Error implementing phase", error); if (error instanceof RateLimitExceededError) { throw error; } @@ -451,9 +439,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen * Execute review cycle state - review and cleanup */ async executeReviewCycle(): Promise { - this.logger().info("Executing REVIEWING state - review and cleanup"); + this.logger.info("Executing REVIEWING state - review and cleanup"); if (this.state.reviewingInitiated) { - this.logger().info("Reviewing already initiated, skipping"); + this.logger.info("Reviewing already initiated, skipping"); return CurrentDevState.IDLE; } this.setState({ @@ -464,14 +452,14 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // If issues/errors found, prompt user if they want to review and cleanup const issues = await this.fetchAllIssues(false); if (issues.runtimeErrors.length > 0 || issues.staticAnalysis.typecheck.issues.length > 0) { - this.logger().info("Reviewing stage - issues found, prompting user to review and cleanup"); + this.logger.info("Reviewing stage - issues found, prompting user to review and cleanup"); const message : ConversationMessage = { role: "assistant", content: `If the user responds with yes, launch the 'deep_debug' tool with the prompt to fix all the issues in the app\nThere might be some bugs in the app. Do you want me to try to fix them?`, conversationId: IdGenerator.generateConversationId(), } // Store the message in the conversation history so user's response can trigger the deep debug tool - this.addConversationMessage(message); + this.infrastructure.addConversationMessage(message); this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: message.content, @@ -487,11 +475,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen * Execute finalizing state - final review and cleanup (runs only once) */ async executeFinalizing(): Promise { - this.logger().info("Executing FINALIZING state - final review and cleanup"); + this.logger.info("Executing FINALIZING state - final review and cleanup"); // Only do finalizing stage if it wasn't done before if (this.state.mvpGenerated) { - this.logger().info("Finalizing stage already done"); + this.logger.info("Finalizing stage already done"); return CurrentDevState.REVIEWING; } this.setState({ @@ -514,7 +502,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen await this.implementPhase(phaseConcept, currentIssues); const numFilesGenerated = this.fileManager.getGeneratedFilePaths().length; - this.logger().info(`Finalization complete. Generated ${numFilesGenerated}/${this.getTotalFiles()} files.`); + this.logger.info(`Finalization complete. Generated ${numFilesGenerated}/${this.getTotalFiles()} files.`); // Transition to IDLE - generation complete return CurrentDevState.REVIEWING; @@ -558,12 +546,12 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Execute delete commands if any const filesToDelete = result.files.filter(f => f.changes?.toLowerCase().trim() === 'delete'); if (filesToDelete.length > 0) { - this.logger().info(`Deleting ${filesToDelete.length} files: ${filesToDelete.map(f => f.path).join(", ")}`); + this.logger.info(`Deleting ${filesToDelete.length} files: ${filesToDelete.map(f => f.path).join(", ")}`); this.deleteFiles(filesToDelete.map(f => f.path)); } if (result.files.length === 0) { - this.logger().info("No files generated for next phase"); + this.logger.info("No files generated for next phase"); // Notify phase generation complete this.broadcast(WebSocketMessageResponses.PHASE_GENERATED, { message: `No files generated for next phase`, @@ -654,11 +642,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Update state with completed phase await this.fileManager.saveGeneratedFiles(finalFiles, `feat: ${phase.name}\n\n${phase.description}`); - this.logger().info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); + this.logger.info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); // Execute commands if provided if (result.commands && result.commands.length > 0) { - this.logger().info("Phase implementation suggested install commands:", result.commands); + this.logger.info("Phase implementation suggested install commands:", result.commands); await this.executeCommands(result.commands, false); } @@ -679,9 +667,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen phase: phase }); - this.logger().info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); + this.logger.info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); - this.logger().info(`Validation complete for phase: ${phase.name}`); + this.logger.info(`Validation complete for phase: ${phase.name}`); // Notify phase completion this.broadcast(WebSocketMessageResponses.PHASE_IMPLEMENTED, { @@ -763,7 +751,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen defaultConfigs }; } catch (error) { - this.logger().error('Error fetching model configs info:', error); + this.logger.error('Error fetching model configs info:', error); throw error; } } @@ -775,11 +763,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen private async applyFastSmartCodeFixes() : Promise { try { const startTime = Date.now(); - this.logger().info("Applying fast smart code fixes"); + this.logger.info("Applying fast smart code fixes"); // Get static analysis and do deterministic fixes const staticAnalysis = await this.runStaticAnalysisCode(); if (staticAnalysis.typecheck.issues.length + staticAnalysis.lint.issues.length == 0) { - this.logger().info("No issues found, skipping fast smart code fixes"); + this.logger.info("No issues found, skipping fast smart code fixes"); return; } const issues = staticAnalysis.typecheck.issues.concat(staticAnalysis.lint.issues); @@ -794,9 +782,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen if (fastCodeFixer.length > 0) { await this.fileManager.saveGeneratedFiles(fastCodeFixer, "fix: Fast smart code fixes"); await this.deployToSandbox(fastCodeFixer); - this.logger().info("Fast smart code fixes applied successfully"); + this.logger.info("Fast smart code fixes applied successfully"); } - this.logger().info(`Fast smart code fixes applied in ${Date.now() - startTime}ms`); + this.logger.info(`Fast smart code fixes applied in ${Date.now() - startTime}ms`); } catch (error) { this.broadcastError("Failed to apply fast smart code fixes", error); return; @@ -809,7 +797,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen requirements: string[], files: FileConceptType[] ): Promise<{ files: Array<{ path: string; purpose: string; diff: string }> }> { - this.logger().info('Generating files for deep debugger', { + this.logger.info('Generating files for deep debugger', { phaseName, requirementsCount: requirements.length, filesCount: files.length @@ -849,4 +837,16 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen })) }; } + + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + const result = await super.handleUserInput(userMessage, images); + if (!this.generationPromise) { + // If idle, start generation process + this.logger.info('User input during IDLE state, starting generation'); + this.generateAllFiles().catch(error => { + this.logger.error('Error starting generation from user input:', error); + }); + } + return result; + } } diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts new file mode 100644 index 00000000..bd2c9b94 --- /dev/null +++ b/worker/agents/core/codingAgent.ts @@ -0,0 +1,714 @@ +import { Agent, AgentContext } from "agents"; +import { AgentInitArgs, BehaviorType } from "./types"; +import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; +import { BaseCodingBehavior } from "./behaviors/base"; +import { createObjectLogger, StructuredLogger } from '../../logger'; +import { InferenceContext } from "../inferutils/config.types"; +import { FileManager } from '../services/implementations/FileManager'; +import { DeploymentManager } from '../services/implementations/DeploymentManager'; +import { GitVersionControl } from '../git'; +import { StateManager } from '../services/implementations/StateManager'; +import { PhasicCodingBehavior } from './behaviors/phasic'; +import { AgenticCodingBehavior } from './behaviors/agentic'; +import { SqlExecutor } from '../git'; +import { AgentInfrastructure } from "./AgentCore"; +import { ProjectType } from './types'; +import { Connection } from 'agents'; +import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections } from './websocket'; +import { WebSocketMessageData, WebSocketMessageType } from "worker/api/websocketTypes"; +import { GitHubPushRequest, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; +import { GitHubExportResult, GitHubService } from "worker/services/github"; +import { WebSocketMessageResponses } from "../constants"; +import { AppService } from "worker/database"; +import { ConversationMessage, ConversationState } from "../inferutils/common"; +import { ImageAttachment } from "worker/types/image-attachment"; +import { RateLimitExceededError } from "shared/types/errors"; +import { ProjectObjective } from "./objectives/base"; +import { AppObjective } from "./objectives/app"; +import { WorkflowObjective } from "./objectives/workflow"; +import { PresentationObjective } from "./objectives/presentation"; + +const DEFAULT_CONVERSATION_SESSION_ID = 'default'; + +export class CodeGeneratorAgent extends Agent implements AgentInfrastructure { + public _logger: StructuredLogger | undefined; + private behavior: BaseCodingBehavior; + private objective: ProjectObjective; + protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; + + // GitHub token cache (ephemeral, lost on DO eviction) + protected githubTokenCache: { + token: string; + username: string; + expiresAt: number; + } | null = null; + + // Services + readonly fileManager: FileManager; + readonly deploymentManager: DeploymentManager; + readonly git: GitVersionControl; + + // Redeclare as public to satisfy AgentInfrastructure interface + declare public readonly env: Env; + declare public readonly sql: SqlExecutor; + + // ========================================== + // Initialization + // ========================================== + + initialState: AgentState = { + blueprint: {} as any, // Will be populated during initialization + projectName: "", + projectType: 'app', // Default project type + query: "", + generatedPhases: [], + generatedFilesMap: {}, + behaviorType: 'phasic', + sandboxInstanceId: undefined, + templateName: '', + commandsHistory: [], + lastPackageJson: '', + pendingUserInputs: [], + inferenceContext: {} as InferenceContext, + sessionId: '', + hostname: '', + conversationMessages: [], + currentDevState: CurrentDevState.IDLE, + phasesCounter: MAX_PHASES, + mvpGenerated: false, + shouldBeGenerating: false, + reviewingInitiated: false, + projectUpdatesAccumulator: [], + lastDeepDebugTranscript: null, + } as AgentState; + + constructor(ctx: AgentContext, env: Env) { + super(ctx, env); + + this.sql`CREATE TABLE IF NOT EXISTS full_conversations (id TEXT PRIMARY KEY, messages TEXT)`; + this.sql`CREATE TABLE IF NOT EXISTS compact_conversations (id TEXT PRIMARY KEY, messages TEXT)`; + + // Create StateManager + const stateManager = new StateManager( + () => this.state, + (s) => this.setState(s) + ); + + this.git = new GitVersionControl(this.sql.bind(this)); + this.fileManager = new FileManager( + stateManager, + () => this.behavior?.getTemplateDetails?.() || null, + this.git + ); + this.deploymentManager = new DeploymentManager( + { + stateManager, + fileManager: this.fileManager, + getLogger: () => this.logger(), + env: this.env + }, + 10 // MAX_COMMANDS_HISTORY + ); + + const behaviorTypeProp = (ctx.props as Record)?.behaviorType as BehaviorType | undefined; + const behaviorType = this.state.behaviorType || behaviorTypeProp || 'phasic'; + if (behaviorType === 'phasic') { + this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure); + } else { + this.behavior = new AgenticCodingBehavior(this as AgentInfrastructure); + } + + // Create objective based on project type + this.objective = this.createObjective(this.state.projectType || 'app'); + } + + /** + * Factory method to create the appropriate objective based on project type + */ + private createObjective(projectType: ProjectType): ProjectObjective { + const infrastructure = this as AgentInfrastructure; + + switch (projectType) { + case 'app': + return new AppObjective(infrastructure); + case 'workflow': + return new WorkflowObjective(infrastructure); + case 'presentation': + return new PresentationObjective(infrastructure); + default: + // Default to app for backward compatibility + return new AppObjective(infrastructure); + } + } + + /** + * Initialize the agent with project blueprint and template + * Only called once in an app's lifecycle + */ + async initialize( + initArgs: AgentInitArgs, + ..._args: unknown[] + ): Promise { + const { inferenceContext } = initArgs; + const sandboxSessionId = DeploymentManager.generateNewSessionId(); + this.initLogger(inferenceContext.agentId, inferenceContext.userId, sandboxSessionId); + + // Infrastructure setup + await this.gitInit(); + + // Let behavior handle all state initialization (blueprint, projectName, etc.) + await this.behavior.initialize({ + ...initArgs, + sandboxSessionId // Pass generated session ID to behavior + }); + + try { + await this.objective.onProjectCreated(); + } catch (error) { + this.logger().error('Lifecycle hook onProjectCreated failed:', error); + // Don't fail initialization if hook fails + } + await this.saveToDatabase(); + + return this.state; + } + + async isInitialized() { + return this.getAgentId() ? true : false + } + + /** + * Called evertime when agent is started or re-started + * @param props - Optional props + */ + async onStart(props?: Record | undefined): Promise { + this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart`, { props }); + + // Ignore if agent not initialized + if (!this.state.query) { + this.logger().warn(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart ignored, agent not initialized`); + return; + } + + this.behavior.onStart(props); + + // Ensure state is migrated for any previous versions + this.behavior.migrateStateIfNeeded(); + + // Check if this is a read-only operation + const readOnlyMode = props?.readOnlyMode === true; + + if (readOnlyMode) { + this.logger().info(`Agent ${this.getAgentId()} starting in READ-ONLY mode - skipping expensive initialization`); + return; + } + + // Just in case + await this.gitInit(); + + await this.behavior.ensureTemplateDetails(); + this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart processed successfully`); + } + + private initLogger(agentId: string, userId: string, sessionId?: string) { + this._logger = createObjectLogger(this, 'CodeGeneratorAgent'); + this._logger.setObjectId(agentId); + this._logger.setFields({ + agentId, + userId, + }); + if (sessionId) { + this._logger.setField('sessionId', sessionId); + } + return this._logger; + } + + // ========================================== + // Utilities + // ========================================== + + logger(): StructuredLogger { + if (!this._logger) { + this._logger = this.initLogger(this.getAgentId(), this.state.inferenceContext.userId, this.state.sessionId); + } + return this._logger; + } + + getAgentId() { + return this.state.inferenceContext.agentId; + } + + getWebSockets(): WebSocket[] { + return this.ctx.getWebSockets(); + } + + /** + * Get the project objective (defines what is being built) + */ + getObjective(): ProjectObjective { + return this.objective; + } + + /** + * Get the behavior (defines how code is generated) + */ + getBehavior(): BaseCodingBehavior { + return this.behavior; + } + + protected async saveToDatabase() { + this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); + // Save the app to database (authenticated users only) + const appService = new AppService(this.env); + await appService.createApp({ + id: this.state.inferenceContext.agentId, + userId: this.state.inferenceContext.userId, + sessionToken: null, + title: this.state.blueprint.title || this.state.query.substring(0, 100), + description: this.state.blueprint.description, + originalPrompt: this.state.query, + finalPrompt: this.state.query, + framework: this.state.blueprint.frameworks.join(','), + visibility: 'private', + status: 'generating', + createdAt: new Date(), + updatedAt: new Date() + }); + this.logger().info(`App saved successfully to database for agent ${this.state.inferenceContext.agentId}`, { + agentId: this.state.inferenceContext.agentId, + userId: this.state.inferenceContext.userId, + visibility: 'private' + }); + this.logger().info(`Agent initialized successfully for agent ${this.state.inferenceContext.agentId}`); + } + + // ========================================== + // Conversation Management + // ========================================== + + /* + * Each DO has 10 gb of sqlite storage. However, the way agents sdk works, it stores the 'state' object of the agent as a single row + * in the cf_agents_state table. And row size has a much smaller limit in sqlite. Thus, we only keep current compactified conversation + * in the agent's core state and store the full conversation in a separate DO table. + */ + getConversationState(id: string = DEFAULT_CONVERSATION_SESSION_ID): ConversationState { + const currentConversation = this.state.conversationMessages; + const rows = this.sql<{ messages: string, id: string }>`SELECT * FROM full_conversations WHERE id = ${id}`; + let fullHistory: ConversationMessage[] = []; + if (rows.length > 0 && rows[0].messages) { + try { + const parsed = JSON.parse(rows[0].messages); + if (Array.isArray(parsed)) { + fullHistory = parsed as ConversationMessage[]; + } + } catch (_e) {} + } + if (fullHistory.length === 0) { + fullHistory = currentConversation; + } + // Load compact (running) history from sqlite with fallback to in-memory state for migration + const compactRows = this.sql<{ messages: string, id: string }>`SELECT * FROM compact_conversations WHERE id = ${id}`; + let runningHistory: ConversationMessage[] = []; + if (compactRows.length > 0 && compactRows[0].messages) { + try { + const parsed = JSON.parse(compactRows[0].messages); + if (Array.isArray(parsed)) { + runningHistory = parsed as ConversationMessage[]; + } + } catch (_e) {} + } + if (runningHistory.length === 0) { + runningHistory = currentConversation; + } + + // Remove duplicates + const deduplicateMessages = (messages: ConversationMessage[]): ConversationMessage[] => { + const seen = new Set(); + return messages.filter(msg => { + if (seen.has(msg.conversationId)) { + return false; + } + seen.add(msg.conversationId); + return true; + }); + }; + + runningHistory = deduplicateMessages(runningHistory); + fullHistory = deduplicateMessages(fullHistory); + + return { + id: id, + runningHistory, + fullHistory, + }; + } + + setConversationState(conversations: ConversationState) { + const serializedFull = JSON.stringify(conversations.fullHistory); + const serializedCompact = JSON.stringify(conversations.runningHistory); + try { + this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`); + this.sql`INSERT OR REPLACE INTO compact_conversations (id, messages) VALUES (${conversations.id}, ${serializedCompact})`; + this.sql`INSERT OR REPLACE INTO full_conversations (id, messages) VALUES (${conversations.id}, ${serializedFull})`; + } catch (error) { + this.logger().error(`Failed to save conversation state ${conversations.id}`, error); + } + } + + addConversationMessage(message: ConversationMessage) { + const conversationState = this.getConversationState(); + if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + conversationState.runningHistory.push(message); + } else { + conversationState.runningHistory = conversationState.runningHistory.map(msg => { + if (msg.conversationId === message.conversationId) { + return message; + } + return msg; + }); + } + if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { + conversationState.fullHistory.push(message); + } else { + conversationState.fullHistory = conversationState.fullHistory.map(msg => { + if (msg.conversationId === message.conversationId) { + return message; + } + return msg; + }); + } + this.setConversationState(conversationState); + } + + /** + * Clear conversation history + */ + public clearConversation(): void { + const messageCount = this.state.conversationMessages.length; + + // Clear conversation messages only from agent's running history + this.setState({ + ...this.state, + conversationMessages: [] + }); + + // Send confirmation response + this.broadcast(WebSocketMessageResponses.CONVERSATION_CLEARED, { + message: 'Conversation history cleared', + clearedMessageCount: messageCount + }); + } + + /** + * Handle user input during conversational code generation + * Processes user messages and updates pendingUserInputs state + */ + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + try { + this.logger().info('Processing user input message', { + messageLength: userMessage.length, + pendingInputsCount: this.state.pendingUserInputs.length, + hasImages: !!images && images.length > 0, + imageCount: images?.length || 0 + }); + + await this.behavior.handleUserInput(userMessage, images); + + } catch (error) { + if (error instanceof RateLimitExceededError) { + this.logger().error('Rate limit exceeded:', error); + this.broadcast(WebSocketMessageResponses.RATE_LIMIT_ERROR, { + error + }); + return; + } + this.broadcastError('Error processing user input', error); + } + } + // ========================================== + // WebSocket Management + // ========================================== + + /** + * Handle WebSocket message - Agent owns WebSocket lifecycle + * Delegates to centralized handler which can access both behavior and objective + */ + async onMessage(connection: Connection, message: string): Promise { + handleWebSocketMessage(this, connection, message); + } + + /** + * Handle WebSocket close - Agent owns WebSocket lifecycle + */ + async onClose(connection: Connection): Promise { + handleWebSocketClose(connection); + } + + /** + * Broadcast message to all connected WebSocket clients + * Type-safe version using proper WebSocket message types + */ + public broadcast( + type: T, + data?: WebSocketMessageData + ): void { + broadcastToConnections(this, type, data || {} as WebSocketMessageData); + } + + protected broadcastError(context: string, error: unknown): void { + const errorMessage = error instanceof Error ? error.message : String(error); + this.logger().error(`${context}:`, error); + this.broadcast(WebSocketMessageResponses.ERROR, { + error: `${context}: ${errorMessage}` + }); + } + // ========================================== + // Git Management + // ========================================== + + protected async gitInit() { + try { + await this.git.init(); + this.logger().info("Git initialized successfully"); + // Check if there is any commit + const head = await this.git.getHead(); + + if (!head) { + this.logger().info("No commits found, creating initial commit"); + // get all generated files and commit them + const generatedFiles = this.fileManager.getGeneratedFiles(); + if (generatedFiles.length === 0) { + this.logger().info("No generated files found, skipping initial commit"); + return; + } + await this.git.commit(generatedFiles, "Initial commit"); + this.logger().info("Initial commit created successfully"); + } + } catch (error) { + this.logger().error("Error during git init:", error); + } + } + + /** + * Export git objects + * The route handler will build the repo with template rebasing + */ + async exportGitObjects(): Promise<{ + gitObjects: Array<{ path: string; data: Uint8Array }>; + query: string; + hasCommits: boolean; + templateDetails: TemplateDetails | null; + }> { + try { + // Export git objects efficiently (minimal DO memory usage) + const gitObjects = this.git.fs.exportGitObjects(); + + await this.gitInit(); + + // Ensure template details are available + await this.behavior.ensureTemplateDetails(); + + const templateDetails = this.behavior.getTemplateDetails(); + + return { + gitObjects, + query: this.state.query || 'N/A', + hasCommits: gitObjects.length > 0, + templateDetails + }; + } catch (error) { + this.logger().error('exportGitObjects failed', error); + throw error; + } + } + + /** + * Cache GitHub OAuth token in memory for subsequent exports + * Token is ephemeral - lost on DO eviction + */ + setGitHubToken(token: string, username: string, ttl: number = 3600000): void { + this.githubTokenCache = { + token, + username, + expiresAt: Date.now() + ttl + }; + this.logger().info('GitHub token cached', { + username, + expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() + }); + } + + /** + * Get cached GitHub token if available and not expired + */ + getGitHubToken(): { token: string; username: string } | null { + if (!this.githubTokenCache) { + return null; + } + + if (Date.now() >= this.githubTokenCache.expiresAt) { + this.logger().info('GitHub token expired, clearing cache'); + this.githubTokenCache = null; + return null; + } + + return { + token: this.githubTokenCache.token, + username: this.githubTokenCache.username + }; + } + + /** + * Clear cached GitHub token + */ + clearGitHubToken(): void { + this.githubTokenCache = null; + this.logger().info('GitHub token cleared'); + } + + + /** + * Export generated code to a GitHub repository + */ + async pushToGitHub(options: GitHubPushRequest): Promise { + try { + this.logger().info('Starting GitHub export using DO git'); + + // Broadcast export started + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { + message: `Starting GitHub export to repository "${options.cloneUrl}"`, + repositoryName: options.repositoryHtmlUrl, + isPrivate: options.isPrivate + }); + + // Export git objects from DO + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Preparing git repository...', + step: 'preparing', + progress: 20 + }); + + const { gitObjects, query, templateDetails } = await this.exportGitObjects(); + + this.logger().info('Git objects exported', { + objectCount: gitObjects.length, + hasTemplate: !!templateDetails + }); + + // Get app createdAt timestamp for template base commit + let appCreatedAt: Date | undefined = undefined; + try { + const appId = this.getAgentId(); + if (appId) { + const appService = new AppService(this.env); + const app = await appService.getAppDetails(appId); + if (app && app.createdAt) { + appCreatedAt = new Date(app.createdAt); + this.logger().info('Using app createdAt for template base', { + createdAt: appCreatedAt.toISOString() + }); + } + } + } catch (error) { + this.logger().warn('Failed to get app createdAt, using current time', { error }); + appCreatedAt = new Date(); // Fallback to current time + } + + // Push to GitHub using new service + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Uploading to GitHub repository...', + step: 'uploading_files', + progress: 40 + }); + + const result = await GitHubService.exportToGitHub({ + gitObjects, + templateDetails, + appQuery: query, + appCreatedAt, + token: options.token, + repositoryUrl: options.repositoryHtmlUrl, + username: options.username, + email: options.email + }); + + if (!result.success) { + throw new Error(result.error || 'Failed to export to GitHub'); + } + + this.logger().info('GitHub export completed', { + commitSha: result.commitSha + }); + + // Cache token for subsequent exports + if (options.token && options.username) { + try { + this.setGitHubToken(options.token, options.username); + this.logger().info('GitHub token cached after successful export'); + } catch (cacheError) { + // Non-fatal - continue with finalization + this.logger().warn('Failed to cache GitHub token', { error: cacheError }); + } + } + + // Update database + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Finalizing GitHub export...', + step: 'finalizing', + progress: 90 + }); + + const agentId = this.getAgentId(); + this.logger().info('[DB Update] Updating app with GitHub repository URL', { + agentId, + repositoryUrl: options.repositoryHtmlUrl, + visibility: options.isPrivate ? 'private' : 'public' + }); + + const appService = new AppService(this.env); + const updateResult = await appService.updateGitHubRepository( + agentId || '', + options.repositoryHtmlUrl || '', + options.isPrivate ? 'private' : 'public' + ); + + this.logger().info('[DB Update] Database update result', { + agentId, + success: updateResult, + repositoryUrl: options.repositoryHtmlUrl + }); + + // Broadcast success + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { + message: `Successfully exported to GitHub repository: ${options.repositoryHtmlUrl}`, + repositoryUrl: options.repositoryHtmlUrl, + cloneUrl: options.cloneUrl, + commitSha: result.commitSha + }); + + this.logger().info('GitHub export completed successfully', { + repositoryUrl: options.repositoryHtmlUrl, + commitSha: result.commitSha + }); + + return { + success: true, + repositoryUrl: options.repositoryHtmlUrl, + cloneUrl: options.cloneUrl + }; + + } catch (error) { + this.logger().error('GitHub export failed', error); + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { + message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, + error: error instanceof Error ? error.message : 'Unknown error' + }); + return { + success: false, + repositoryUrl: options.repositoryHtmlUrl, + cloneUrl: options.cloneUrl + }; + } + } + +} \ No newline at end of file diff --git a/worker/agents/core/objectives/app.ts b/worker/agents/core/objectives/app.ts new file mode 100644 index 00000000..911ea404 --- /dev/null +++ b/worker/agents/core/objectives/app.ts @@ -0,0 +1,152 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { WebSocketMessageResponses, PREVIEW_EXPIRED_ERROR } from '../../constants'; +import { AppService } from '../../../database/services/AppService'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * AppObjective - Full-Stack Web Applications + * + * Produces: React + Vite + Cloudflare Workers full-stack applications + * Runtime: Cloudflare Containers (sandbox) + * Template: R2-backed React templates + * Export: Deploy to Cloudflare Workers for platform (and soon User's personal Cloudflare account) + * + * This is the EXISTING, ORIGINAL project type. + * All current production apps are AppObjective. + */ +export class AppObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // IDENTITY + // ========================================== + + getType(): ProjectType { + return 'app'; + } + + // ========================================== + // RUNTIME & INFRASTRUCTURE + // ========================================== + + getRuntime(): RuntimeType { + return 'sandbox'; + } + + needsTemplate(): boolean { + return true; + } + + getTemplateType(): string | null { + return this.state.templateName; + } + + // ========================================== + // LIFECYCLE HOOKS + // ========================================== + + /** + * After code generation, auto-deploy to sandbox for preview + */ + async onCodeGenerated(): Promise { + this.logger.info('AppObjective: Code generation complete, auto-deploying to sandbox'); + + try { + await this.deploymentManager.deployToSandbox(); + this.logger.info('AppObjective: Auto-deployment to sandbox successful'); + } catch (error) { + this.logger.error('AppObjective: Auto-deployment to sandbox failed', error); + // Don't throw - generation succeeded even if deployment failed + } + } + + // ========================================== + // EXPORT/DEPLOYMENT + // ========================================== + + async export(_options?: ExportOptions): Promise { + try { + this.logger.info('Exporting app to Cloudflare Workers + Pages'); + + // Ensure sandbox instance exists first + if (!this.state.sandboxInstanceId) { + this.logger.info('No sandbox instance, deploying to sandbox first'); + await this.deploymentManager.deployToSandbox(); + + if (!this.state.sandboxInstanceId) { + this.logger.error('Failed to deploy to sandbox service'); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Deployment failed: Failed to deploy to sandbox service', + error: 'Sandbox service unavailable' + }); + return { + success: false, + error: 'Failed to deploy to sandbox service' + }; + } + } + + // Deploy to Cloudflare Workers + Pages + const result = await this.deploymentManager.deployToCloudflare({ + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + }, + onPreviewExpired: () => { + // Re-deploy sandbox and broadcast error + this.deploymentManager.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } + }); + + // Update database with deployment ID if successful + if (result.deploymentUrl && result.deploymentId) { + const appService = new AppService(this.env); + await appService.updateDeploymentId( + this.getAgentId(), + result.deploymentId + ); + + this.logger.info('Updated app deployment ID in database', { + agentId: this.getAgentId(), + deploymentId: result.deploymentId + }); + } + + return { + success: !!result.deploymentUrl, + url: result.deploymentUrl || undefined, + metadata: { + deploymentId: result.deploymentId, + workersUrl: result.deploymentUrl + } + }; + + } catch (error) { + this.logger.error('Cloudflare deployment error:', error); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Deployment failed', + error: error instanceof Error ? error.message : String(error) + }); + + return { + success: false, + error: error instanceof Error ? error.message : 'Unknown deployment error' + }; + } + } +} diff --git a/worker/agents/core/objectives/base.ts b/worker/agents/core/objectives/base.ts new file mode 100644 index 00000000..2939a7df --- /dev/null +++ b/worker/agents/core/objectives/base.ts @@ -0,0 +1,90 @@ +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { AgentComponent } from '../AgentComponent'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * Abstract base class for project objectives + * + * Defines WHAT is being built (app, workflow, presentation, etc.) + * + * Design principles: + * - Defines project identity (type, name, description) + * - Defines runtime requirements (sandbox, worker, none) + * - Defines template needs + * - Implements export/deployment logic + * - Provides lifecycle hooks + */ +export abstract class ProjectObjective + extends AgentComponent { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // ABSTRACT METHODS (Must be implemented) + // ========================================== + + /** + * Get project type identifier + */ + abstract getType(): ProjectType; + + /** + * Get runtime type (where it runs during development) + */ + abstract getRuntime(): RuntimeType; + + /** + * Does this project need a template? + */ + abstract needsTemplate(): boolean; + + /** + * Get template type if needed + */ + abstract getTemplateType(): string | null; + + /** + * Export/deploy project to target platform + * + * This is where objective-specific deployment logic lives: + * - AppObjective: Deploy to Cloudflare Workers + Pages + * - WorkflowObjective: Deploy to Cloudflare Workers only + * - PresentationObjective: Export to PDF/Google Slides/PowerPoint + */ + abstract export(options?: ExportOptions): Promise; + + // ========================================== + // OPTIONAL LIFECYCLE HOOKS + // ========================================== + + /** + * Called after project is created and initialized + * Override for project-specific setup + */ + async onProjectCreated(): Promise { + // Default: no-op + } + + /** + * Called after code generation completes + * Override for project-specific post-generation actions + */ + async onCodeGenerated(): Promise { + // Default: no-op + } + + // ========================================== + // OPTIONAL VALIDATION + // ========================================== + + /** + * Validate project configuration and state + * Override for project-specific validation + */ + async validate(): Promise<{ valid: boolean; errors?: string[] }> { + return { valid: true }; + } +} diff --git a/worker/agents/core/objectives/presentation.ts b/worker/agents/core/objectives/presentation.ts new file mode 100644 index 00000000..b5411427 --- /dev/null +++ b/worker/agents/core/objectives/presentation.ts @@ -0,0 +1,62 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * WIP - PresentationObjective - Slides/Docs/Marketing Materials + * + * Produces: Spectacle-based presentations + * Runtime: Sandbox + * Template: Spectacle template (R2-backed) + * Export: PDF, Google Slides, PowerPoint + * + */ +export class PresentationObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // IDENTITY + // ========================================== + + getType(): ProjectType { + return 'presentation'; + } + + // ========================================== + // RUNTIME & INFRASTRUCTURE + // ========================================== + + getRuntime(): RuntimeType { + return 'sandbox'; + } + + needsTemplate(): boolean { + return true; + } + + getTemplateType(): string | null { + return 'spectacle'; // New template to be created + } + + // ========================================== + // EXPORT/DEPLOYMENT + // ========================================== + + async export(options?: ExportOptions): Promise { + const format = (options?.format as 'pdf' | 'googleslides' | 'pptx') || 'pdf'; + this.logger.info('Presentation export requested but not yet implemented', { format }); + + return { + success: false, + error: 'Presentation export not yet implemented - coming in Phase 3', + metadata: { + requestedFormat: format + } + }; + } +} diff --git a/worker/agents/core/objectives/workflow.ts b/worker/agents/core/objectives/workflow.ts new file mode 100644 index 00000000..f455ba8b --- /dev/null +++ b/worker/agents/core/objectives/workflow.ts @@ -0,0 +1,58 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * WIP! + * WorkflowObjective - Backend-Only Workflows + * + * Produces: Cloudflare Workers without UI (APIs, scheduled jobs, queues) + * Runtime: Sandbox for now, Dynamic Worker Loaders in the future + * Template: In-memory (no R2) + * Export: Deploy to Cloudflare Workers in user's account + */ +export class WorkflowObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // IDENTITY + // ========================================== + + getType(): ProjectType { + return 'workflow'; + } + + // ========================================== + // RUNTIME & INFRASTRUCTURE + // ========================================== + + getRuntime(): RuntimeType { + return 'worker'; + } + + needsTemplate(): boolean { + return false; // In-memory templates + } + + getTemplateType(): string | null { + return null; + } + + // ========================================== + // EXPORT/DEPLOYMENT + // ========================================== + + async export(_options?: ExportOptions): Promise { + this.logger.info('Workflow export requested but not yet implemented'); + + return { + success: false, + error: 'Workflow deployment not yet implemented' + }; + } +} diff --git a/worker/agents/core/smartGeneratorAgent.ts b/worker/agents/core/smartGeneratorAgent.ts deleted file mode 100644 index 6b9f0998..00000000 --- a/worker/agents/core/smartGeneratorAgent.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { Agent, AgentContext } from "agents"; -import { AgentInitArgs, BehaviorType } from "./types"; -import { AgentState, CurrentDevState, MAX_PHASES } from "./state"; -import { AgentInfrastructure, BaseAgentBehavior } from "./baseAgent"; -import { createObjectLogger, StructuredLogger } from '../../logger'; -import { Blueprint } from "../schemas"; -import { InferenceContext } from "../inferutils/config.types"; - -export class CodeGeneratorAgent extends Agent implements AgentInfrastructure { - public _logger: StructuredLogger | undefined; - private behavior: BaseAgentBehavior; - private onStartDeferred?: { props?: Record; resolve: () => void }; - - - initialState: AgentState = { - blueprint: {} as Blueprint, - projectName: "", - query: "", - generatedPhases: [], - generatedFilesMap: {}, - behaviorType: 'phasic', - sandboxInstanceId: undefined, - templateName: '', - commandsHistory: [], - lastPackageJson: '', - pendingUserInputs: [], - inferenceContext: {} as InferenceContext, - sessionId: '', - hostname: '', - conversationMessages: [], - currentDevState: CurrentDevState.IDLE, - phasesCounter: MAX_PHASES, - mvpGenerated: false, - shouldBeGenerating: false, - reviewingInitiated: false, - projectUpdatesAccumulator: [], - lastDeepDebugTranscript: null, - }; - - constructor(ctx: AgentContext, env: Env) { - super(ctx, env); - - this.sql`CREATE TABLE IF NOT EXISTS full_conversations (id TEXT PRIMARY KEY, messages TEXT)`; - this.sql`CREATE TABLE IF NOT EXISTS compact_conversations (id TEXT PRIMARY KEY, messages TEXT)`; - - const behaviorTypeProp = (ctx.props as Record)?.behaviorType as BehaviorType | undefined; - const behaviorType = this.state.behaviorType || behaviorTypeProp || 'phasic'; - if (behaviorType === 'phasic') { - this.behavior = new PhasicAgentBehavior(this); - } else { - this.behavior = new AgenticAgentBehavior(this); - } - } - - async initialize( - initArgs: AgentInitArgs, - ..._args: unknown[] - ): Promise { - const { inferenceContext } = initArgs; - this.initLogger(inferenceContext.agentId, inferenceContext.userId); - - await this.behavior.initialize(initArgs); - return this.behavior.state; - } - - private initLogger(agentId: string, userId: string, sessionId?: string) { - this._logger = createObjectLogger(this, 'CodeGeneratorAgent'); - this._logger.setObjectId(agentId); - this._logger.setFields({ - agentId, - userId, - }); - if (sessionId) { - this._logger.setField('sessionId', sessionId); - } - return this._logger; - } - - logger(): StructuredLogger { - if (!this._logger) { - this._logger = this.initLogger(this.getAgentId(), this.state.inferenceContext.userId, this.state.sessionId); - } - return this._logger; - } - - getAgentId() { - return this.state.inferenceContext.agentId; - } -} \ No newline at end of file diff --git a/worker/agents/core/state.ts b/worker/agents/core/state.ts index f8c3a5e3..52ed110f 100644 --- a/worker/agents/core/state.ts +++ b/worker/agents/core/state.ts @@ -5,7 +5,7 @@ import type { PhasicBlueprint, AgenticBlueprint, PhaseConceptType , // import type { ScreenshotData } from './types'; import type { ConversationMessage } from '../inferutils/common'; import type { InferenceContext } from '../inferutils/config.types'; -import { BehaviorType, Plan } from './types'; +import { BehaviorType, Plan, ProjectType } from './types'; export interface FileState extends FileOutputType { lastDiff: string; @@ -29,6 +29,8 @@ export const MAX_PHASES = 12; /** Common state fields for all agent behaviors */ export interface BaseProjectState { behaviorType: BehaviorType; + projectType: ProjectType; + // Identity projectName: string; query: string; diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index 4ab3ba65..cb55be77 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -10,6 +10,16 @@ import { ProcessedImageAttachment } from 'worker/types/image-attachment'; export type BehaviorType = 'phasic' | 'agentic'; +export type ProjectType = 'app' | 'workflow' | 'presentation'; + +/** + * Runtime type - WHERE it runs during dev + * - sandbox: Cloudflare Containers (full apps with UI) + * - worker: Dynamic Worker Loaders (backend only) + * - none: No runtime (static export only) + */ +export type RuntimeType = 'sandbox' | 'worker' | 'none'; + /** Base initialization arguments shared by all agents */ interface BaseAgentInitArgs { query: string; @@ -19,6 +29,7 @@ interface BaseAgentInitArgs { frameworks?: string[]; images?: ProcessedImageAttachment[]; onBlueprintChunk: (chunk: string) => void; + sandboxSessionId?: string; // Generated by CodeGeneratorAgent, passed to behavior } /** Phasic agent initialization arguments */ @@ -85,4 +96,23 @@ export interface PhaseExecutionResult { */ export type DeepDebugResult = | { success: true; transcript: string } - | { success: false; error: string }; \ No newline at end of file + | { success: false; error: string }; + +/** + * Result of project export/deployment operation + */ +export interface ExportResult { + success: boolean; + url?: string; + error?: string; + metadata?: Record; +} + +/** + * Options for project export/deployment + */ +export interface ExportOptions { + format?: string; + token?: string; + [key: string]: unknown; +} \ No newline at end of file diff --git a/worker/agents/core/websocket.ts b/worker/agents/core/websocket.ts index be655701..71551e8e 100644 --- a/worker/agents/core/websocket.ts +++ b/worker/agents/core/websocket.ts @@ -3,13 +3,12 @@ import { createLogger } from '../../logger'; import { WebSocketMessageRequests, WebSocketMessageResponses } from '../constants'; import { WebSocketMessage, WebSocketMessageData, WebSocketMessageType } from '../../api/websocketTypes'; import { MAX_IMAGES_PER_MESSAGE, MAX_IMAGE_SIZE_BYTES } from '../../types/image-attachment'; -import { BaseProjectState } from './state'; -import { BaseAgentBehavior } from './baseAgent'; +import type { CodeGeneratorAgent } from './codingAgent'; const logger = createLogger('CodeGeneratorWebSocket'); -export function handleWebSocketMessage( - agent: BaseAgentBehavior, +export function handleWebSocketMessage( + agent: CodeGeneratorAgent, connection: Connection, message: string ): void { @@ -26,7 +25,7 @@ export function handleWebSocketMessage( }); // Check if generation is already active to avoid duplicate processes - if (agent.isCodeGenerating()) { + if (agent.getBehavior().isCodeGenerating()) { logger.info('Generation already in progress, skipping duplicate request'); // sendToConnection(connection, WebSocketMessageResponses.GENERATION_STARTED, { // message: 'Code generation is already in progress' @@ -36,13 +35,13 @@ export function handleWebSocketMessage( // Start generation process logger.info('Starting code generation process'); - agent.generateAllFiles().catch(error => { + agent.getBehavior().generateAllFiles().catch(error => { logger.error('Error during code generation:', error); sendError(connection, `Error generating files: ${error instanceof Error ? error.message : String(error)}`); }).finally(() => { // Only clear shouldBeGenerating on successful completion // (errors might want to retry, so this could be handled differently) - if (!agent.isCodeGenerating()) { + if (!agent.getBehavior().isCodeGenerating()) { agent.setState({ ...agent.state, shouldBeGenerating: false @@ -51,7 +50,8 @@ export function handleWebSocketMessage( }); break; case WebSocketMessageRequests.DEPLOY: - agent.deployToCloudflare().then((deploymentResult) => { + // Use objective.export() for deployment (project-specific logic) + agent.getObjective().export({ type: 'cloudflare' }).then((deploymentResult) => { if (!deploymentResult) { logger.error('Failed to deploy to Cloudflare Workers'); return; @@ -64,14 +64,14 @@ export function handleWebSocketMessage( case WebSocketMessageRequests.PREVIEW: // Deploy current state for preview logger.info('Deploying for preview'); - agent.deployToSandbox().then((deploymentResult) => { + agent.getBehavior().deployToSandbox().then((deploymentResult) => { logger.info(`Preview deployed successfully!, deploymentResult:`, deploymentResult); }).catch((error: unknown) => { logger.error('Error during preview deployment:', error); }); break; case WebSocketMessageRequests.CAPTURE_SCREENSHOT: - agent.captureScreenshot(parsedMessage.data.url, parsedMessage.data.viewport).then((screenshotResult) => { + agent.getBehavior().captureScreenshot(parsedMessage.data.url, parsedMessage.data.viewport).then((screenshotResult) => { if (!screenshotResult) { logger.error('Failed to capture screenshot'); return; @@ -85,7 +85,7 @@ export function handleWebSocketMessage( logger.info('User requested to stop generation'); // Cancel current inference operation - const wasCancelled = agent.cancelCurrentInference(); + const wasCancelled = agent.getBehavior().cancelCurrentInference(); // Clear shouldBeGenerating flag agent.setState({ @@ -107,11 +107,11 @@ export function handleWebSocketMessage( shouldBeGenerating: true }); - if (!agent.isCodeGenerating()) { + if (!agent.getBehavior().isCodeGenerating()) { sendToConnection(connection, WebSocketMessageResponses.GENERATION_RESUMED, { message: 'Code generation resumed' }); - agent.generateAllFiles().catch(error => { + agent.getBehavior().generateAllFiles().catch(error => { logger.error('Error resuming code generation:', error); sendError(connection, `Error resuming generation: ${error instanceof Error ? error.message : String(error)}`); }); @@ -158,14 +158,14 @@ export function handleWebSocketMessage( } } - agent.handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { + agent.getBehavior().handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { logger.error('Error handling user suggestion:', error); sendError(connection, `Error processing user suggestion: ${error instanceof Error ? error.message : String(error)}`); }); break; case WebSocketMessageRequests.GET_MODEL_CONFIGS: logger.info('Fetching model configurations'); - agent.getModelConfigsInfo().then(configsInfo => { + agent.getBehavior().getModelConfigsInfo().then(configsInfo => { sendToConnection(connection, WebSocketMessageResponses.MODEL_CONFIGS_INFO, { message: 'Model configurations retrieved', configs: configsInfo @@ -182,7 +182,7 @@ export function handleWebSocketMessage( case WebSocketMessageRequests.GET_CONVERSATION_STATE: try { const state = agent.getConversationState(); - const debugState = agent.getDeepDebugSessionState(); + const debugState = agent.getBehavior().getDeepDebugSessionState(); logger.info('Conversation state retrieved', state); sendToConnection(connection, WebSocketMessageResponses.CONVERSATION_STATE, { state, diff --git a/worker/agents/inferutils/config.ts b/worker/agents/inferutils/config.ts index 482eff75..85136dec 100644 --- a/worker/agents/inferutils/config.ts +++ b/worker/agents/inferutils/config.ts @@ -160,6 +160,13 @@ export const AGENT_CONFIG: AgentConfig = { temperature: 0.1, fallbackModel: AIModels.GEMINI_2_5_FLASH, }, + agenticProjectBuilder: { + name: AIModels.GEMINI_2_5_PRO, + reasoning_effort: 'high', + max_tokens: 8000, + temperature: 0.7, + fallbackModel: AIModels.GEMINI_2_5_FLASH, + }, }; diff --git a/worker/agents/inferutils/config.types.ts b/worker/agents/inferutils/config.types.ts index a3b12007..26f3be6c 100644 --- a/worker/agents/inferutils/config.types.ts +++ b/worker/agents/inferutils/config.types.ts @@ -67,6 +67,7 @@ export interface AgentConfig { fastCodeFixer: ModelConfig; conversationalResponse: ModelConfig; deepDebugger: ModelConfig; + agenticProjectBuilder: ModelConfig; } // Provider and reasoning effort types for validation diff --git a/worker/agents/services/implementations/FileManager.ts b/worker/agents/services/implementations/FileManager.ts index 3ad856d4..5959d923 100644 --- a/worker/agents/services/implementations/FileManager.ts +++ b/worker/agents/services/implementations/FileManager.ts @@ -3,7 +3,7 @@ import { IFileManager } from '../interfaces/IFileManager'; import { IStateManager } from '../interfaces/IStateManager'; import { FileOutputType } from '../../schemas'; import { FileProcessing } from '../../domain/pure/FileProcessing'; -import { FileState } from 'worker/agents/core/state'; +import { BaseProjectState, FileState } from 'worker/agents/core/state'; import { TemplateDetails } from '../../../services/sandbox/sandboxTypes'; import { GitVersionControl } from 'worker/agents/git'; @@ -13,7 +13,7 @@ import { GitVersionControl } from 'worker/agents/git'; */ export class FileManager implements IFileManager { constructor( - private stateManager: IStateManager, + private stateManager: IStateManager, private getTemplateDetailsFunc: () => TemplateDetails, private git: GitVersionControl ) { diff --git a/worker/agents/services/implementations/StateManager.ts b/worker/agents/services/implementations/StateManager.ts index 388d6c61..25d56261 100644 --- a/worker/agents/services/implementations/StateManager.ts +++ b/worker/agents/services/implementations/StateManager.ts @@ -1,37 +1,29 @@ +import { BaseProjectState } from 'worker/agents/core/state'; import { IStateManager } from '../interfaces/IStateManager'; -import { CodeGenState } from '../../core/state'; /** * State manager implementation for Durable Objects * Works with the Agent's state management */ -export class StateManager implements IStateManager { +export class StateManager implements IStateManager { constructor( - private getStateFunc: () => CodeGenState, - private setStateFunc: (state: CodeGenState) => void + private getStateFunc: () => TState, + private setStateFunc: (state: TState) => void ) {} - getState(): Readonly { + getState(): Readonly { return this.getStateFunc(); } - setState(newState: CodeGenState): void { + setState(newState: TState): void { this.setStateFunc(newState); } - updateField(field: K, value: CodeGenState[K]): void { + updateField(field: K, value: TState[K]): void { const currentState = this.getState(); this.setState({ ...currentState, [field]: value }); } - - batchUpdate(updates: Partial): void { - const currentState = this.getState(); - this.setState({ - ...currentState, - ...updates - }); - } } \ No newline at end of file diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index 547dba07..2cea62f3 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -25,8 +25,6 @@ export interface ICodingAgent { deployPreview(clearLogs?: boolean, forceRedeploy?: boolean): Promise; - clearConversation(): void; - updateProjectName(newName: string): Promise; getOperationOptions(): OperationOptions; @@ -63,7 +61,7 @@ export interface ICodingAgent { focusPaths?: string[], ): Promise; - getGit(): GitVersionControl; + get git(): GitVersionControl; getSandboxServiceClient(): BaseSandboxService; } diff --git a/worker/agents/services/interfaces/IStateManager.ts b/worker/agents/services/interfaces/IStateManager.ts index 935e3be2..8c51767d 100644 --- a/worker/agents/services/interfaces/IStateManager.ts +++ b/worker/agents/services/interfaces/IStateManager.ts @@ -1,27 +1,22 @@ -import { CodeGenState } from '../../core/state'; +import { BaseProjectState } from "worker/agents/core/state"; /** * Interface for state management * Abstracts state persistence and updates */ -export interface IStateManager { +export interface IStateManager { /** * Get current state */ - getState(): Readonly; + getState(): Readonly; /** * Update state immutably */ - setState(newState: CodeGenState): void; + setState(newState: TState): void; /** * Update specific field */ - updateField(field: K, value: CodeGenState[K]): void; - - /** - * Batch update multiple fields - */ - batchUpdate(updates: Partial): void; + updateField(field: K, value: TState[K]): void; } \ No newline at end of file diff --git a/worker/agents/tools/toolkit/git.ts b/worker/agents/tools/toolkit/git.ts index f1f5206c..7aeba29e 100644 --- a/worker/agents/tools/toolkit/git.ts +++ b/worker/agents/tools/toolkit/git.ts @@ -65,7 +65,7 @@ export function createGitTool( }, implementation: async ({ command, message, limit, oid, includeDiff }: GitToolArgs) => { try { - const gitInstance = agent.getGit(); + const gitInstance = agent.git; switch (command) { case 'commit': { diff --git a/worker/index.ts b/worker/index.ts index 449b5a05..eb8560be 100644 --- a/worker/index.ts +++ b/worker/index.ts @@ -1,5 +1,4 @@ import { createLogger } from './logger'; -import { SmartCodeGeneratorAgent } from './agents/core/smartGeneratorAgent'; import { isDispatcherAvailable } from './utils/dispatcherUtils'; import { createApp } from './app'; // import * as Sentry from '@sentry/cloudflare'; @@ -13,10 +12,10 @@ import { handleGitProtocolRequest, isGitProtocolRequest } from './api/handlers/g // Durable Object and Service exports export { UserAppSandboxService, DeployerService } from './services/sandbox/sandboxSdkClient'; +export { CodeGeneratorAgent } from './agents/core/codingAgent'; // export const CodeGeneratorAgent = Sentry.instrumentDurableObjectWithSentry(sentryOptions, SmartCodeGeneratorAgent); // export const DORateLimitStore = Sentry.instrumentDurableObjectWithSentry(sentryOptions, BaseDORateLimitStore); -export const CodeGeneratorAgent = SmartCodeGeneratorAgent; export const DORateLimitStore = BaseDORateLimitStore; // Logger for the main application and handlers From 5685c7d6aa3de016954e09beea6ede46cb1911fd Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Sun, 9 Nov 2025 13:20:55 -0500 Subject: [PATCH 02/58] feat: finish most refactor and get it to build --- src/api-types.ts | 4 +- src/routes/chat/chat.tsx | 13 +- src/routes/chat/components/blueprint.tsx | 47 +-- .../chat/utils/handle-websocket-message.ts | 11 +- worker/agents/core/AgentCore.ts | 9 + worker/agents/core/behaviors/agentic.ts | 1 + worker/agents/core/behaviors/base.ts | 76 +++-- worker/agents/core/behaviors/phasic.ts | 41 ++- worker/agents/core/codingAgent.ts | 298 +++++------------- worker/agents/core/objectives/app.ts | 200 ++++++++++-- worker/agents/core/objectives/base.ts | 67 +++- worker/agents/core/objectives/presentation.ts | 87 ++++- worker/agents/core/objectives/workflow.ts | 67 +++- worker/agents/core/stateMigration.ts | 37 ++- worker/agents/core/types.ts | 27 +- worker/agents/core/websocket.ts | 11 +- worker/agents/index.ts | 53 +++- worker/agents/planning/blueprint.ts | 26 +- .../implementations/BaseAgentService.ts | 11 +- .../services/implementations/CodingAgent.ts | 8 +- .../implementations/DeploymentManager.ts | 18 +- .../services/interfaces/ICodingAgent.ts | 7 +- .../services/interfaces/IDeploymentManager.ts | 6 +- .../services/interfaces/IServiceOptions.ts | 5 +- .../agents/tools/toolkit/regenerate-file.ts | 2 +- worker/api/controllers/agent/controller.ts | 28 +- worker/api/controllers/agent/types.ts | 7 +- .../controllers/githubExporter/controller.ts | 18 +- worker/api/websocketTypes.ts | 8 +- worker/index.ts | 2 +- worker/services/sandbox/BaseSandboxService.ts | 5 +- .../services/sandbox/remoteSandboxService.ts | 10 +- worker/services/sandbox/sandboxSdkClient.ts | 51 +-- 33 files changed, 823 insertions(+), 438 deletions(-) diff --git a/src/api-types.ts b/src/api-types.ts index 2fc92e8d..96845105 100644 --- a/src/api-types.ts +++ b/src/api-types.ts @@ -138,13 +138,15 @@ export type { // Agent/Generator Types export type { Blueprint as BlueprintType, + PhasicBlueprint, CodeReviewOutputType, FileConceptType, FileOutputType as GeneratedFile, } from 'worker/agents/schemas'; export type { - CodeGenState + AgentState, + PhasicState } from 'worker/agents/core/state'; export type { diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index a7dda364..0383df32 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -21,7 +21,7 @@ import { ViewModeSwitch } from './components/view-mode-switch'; import { DebugPanel, type DebugMessage } from './components/debug-panel'; import { DeploymentControls } from './components/deployment-controls'; import { useChat, type FileType } from './hooks/use-chat'; -import { type ModelConfigsData, type BlueprintType, SUPPORTED_IMAGE_MIME_TYPES } from '@/api-types'; +import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES } from '@/api-types'; import { Copy } from './components/copy'; import { useFileContentStream } from './hooks/use-file-content-stream'; import { logger } from '@/utils/logger'; @@ -42,6 +42,9 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigge import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'; import { sendWebSocketMessage } from './utils/websocket-helpers'; +const isPhasicBlueprint = (blueprint?: BlueprintType | null): blueprint is PhasicBlueprint => + !!blueprint && 'implementationRoadmap' in blueprint; + export default function Chat() { const { chatId: urlChatId } = useParams(); @@ -492,11 +495,13 @@ export default function Chat() { const completedPhases = phaseTimeline.filter(p => p.status === 'completed').length; // Get predicted phase count from blueprint, fallback to current phase count - const predictedPhaseCount = blueprint?.implementationRoadmap?.length || 0; + const predictedPhaseCount = isPhasicBlueprint(blueprint) + ? blueprint.implementationRoadmap.length + : 0; const totalPhases = Math.max(predictedPhaseCount, phaseTimeline.length, 1); return [completedPhases, totalPhases]; - }, [phaseTimeline, blueprint?.implementationRoadmap]); + }, [phaseTimeline, blueprint]); if (import.meta.env.DEV) { logger.debug({ @@ -1262,4 +1267,4 @@ export default function Chat() { )} ); -} \ No newline at end of file +} diff --git a/src/routes/chat/components/blueprint.tsx b/src/routes/chat/components/blueprint.tsx index 64d1c4e4..40fc6e0c 100644 --- a/src/routes/chat/components/blueprint.tsx +++ b/src/routes/chat/components/blueprint.tsx @@ -1,7 +1,10 @@ -import type { BlueprintType } from '@/api-types'; +import type { BlueprintType, PhasicBlueprint } from '@/api-types'; import clsx from 'clsx'; import { Markdown } from './messages'; +const isPhasicBlueprint = (blueprint: BlueprintType): blueprint is PhasicBlueprint => + 'views' in blueprint; + export function Blueprint({ blueprint, className, @@ -11,6 +14,8 @@ export function Blueprint({ }) { if (!blueprint) return null; + const phasicBlueprint = isPhasicBlueprint(blueprint) ? blueprint : null; + return (
@@ -84,13 +89,13 @@ export function Blueprint({
{/* Views */} - {Array.isArray(blueprint.views) && blueprint.views.length > 0 && ( + {phasicBlueprint && phasicBlueprint.views.length > 0 && (

Views

- {blueprint.views.map((view, index) => ( + {phasicBlueprint.views.map((view, index) => (

{view.name} @@ -105,41 +110,41 @@ export function Blueprint({ )} {/* User Flow */} - {blueprint.userFlow && ( + {phasicBlueprint?.userFlow && (

User Flow

- {blueprint.userFlow?.uiLayout && ( + {phasicBlueprint.userFlow.uiLayout && (

UI Layout

- {blueprint.userFlow.uiLayout} + {phasicBlueprint.userFlow.uiLayout}
)} - {blueprint.userFlow?.uiDesign && ( + {phasicBlueprint.userFlow.uiDesign && (

UI Design

- {blueprint.userFlow.uiDesign} + {phasicBlueprint.userFlow.uiDesign}
)} - {blueprint.userFlow?.userJourney && ( + {phasicBlueprint.userFlow.userJourney && (

User Journey

- {blueprint.userFlow?.userJourney} + {phasicBlueprint.userFlow.userJourney}
)} @@ -148,25 +153,25 @@ export function Blueprint({ )} {/* Data Flow */} - {(blueprint.dataFlow || blueprint.architecture?.dataFlow) && ( + {phasicBlueprint && (phasicBlueprint.dataFlow || phasicBlueprint.architecture?.dataFlow) && (

Data Flow

- {blueprint.dataFlow || blueprint.architecture?.dataFlow} + {phasicBlueprint.dataFlow || phasicBlueprint.architecture?.dataFlow}
)} {/* Implementation Roadmap */} - {Array.isArray(blueprint.implementationRoadmap) && blueprint.implementationRoadmap.length > 0 && ( + {phasicBlueprint && phasicBlueprint.implementationRoadmap.length > 0 && (

Implementation Roadmap

- {blueprint.implementationRoadmap.map((roadmapItem, index) => ( + {phasicBlueprint.implementationRoadmap.map((roadmapItem, index) => (

Phase {index + 1}: {roadmapItem.phase} @@ -181,7 +186,7 @@ export function Blueprint({ )} {/* Initial Phase */} - {blueprint.initialPhase && ( + {phasicBlueprint?.initialPhase && (

Initial Phase @@ -189,18 +194,18 @@ export function Blueprint({

- {blueprint.initialPhase.name} + {phasicBlueprint.initialPhase.name}

- {blueprint.initialPhase.description} + {phasicBlueprint.initialPhase.description} - {Array.isArray(blueprint.initialPhase.files) && blueprint.initialPhase.files.length > 0 && ( + {Array.isArray(phasicBlueprint.initialPhase.files) && phasicBlueprint.initialPhase.files.length > 0 && (
Files to be created:
- {blueprint.initialPhase.files.map((file, fileIndex) => ( + {phasicBlueprint.initialPhase.files.map((file, fileIndex) => (
{file.path}
{file.purpose}
@@ -215,14 +220,14 @@ export function Blueprint({ )} {/* Pitfalls */} - {Array.isArray(blueprint.pitfalls) && blueprint.pitfalls.length > 0 && ( + {phasicBlueprint && phasicBlueprint.pitfalls.length > 0 && (

Pitfalls

    - {blueprint.pitfalls?.map((pitfall, index) => ( + {phasicBlueprint.pitfalls.map((pitfall, index) => (
  • {pitfall}
    • diff --git a/src/routes/chat/utils/handle-websocket-message.ts b/src/routes/chat/utils/handle-websocket-message.ts index 3636aef7..944272bf 100644 --- a/src/routes/chat/utils/handle-websocket-message.ts +++ b/src/routes/chat/utils/handle-websocket-message.ts @@ -1,5 +1,5 @@ import type { WebSocket } from 'partysocket'; -import type { WebSocketMessage, BlueprintType, ConversationMessage } from '@/api-types'; +import type { WebSocketMessage, BlueprintType, ConversationMessage, AgentState, PhasicState } from '@/api-types'; import { deduplicateMessages, isAssistantMessageDuplicate } from './deduplicate-messages'; import { logger } from '@/utils/logger'; import { getFileType } from '@/utils/string'; @@ -23,6 +23,9 @@ import { sendWebSocketMessage } from './websocket-helpers'; import type { FileType, PhaseTimelineItem } from '../hooks/use-chat'; import { toast } from 'sonner'; +const isPhasicState = (state: AgentState): state is PhasicState => + state.behaviorType === 'phasic'; + export interface HandleMessageDeps { // State setters setFiles: React.Dispatch>; @@ -191,12 +194,12 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { ); } - if (state.generatedPhases && state.generatedPhases.length > 0 && phaseTimeline.length === 0) { + if (isPhasicState(state) && state.generatedPhases.length > 0 && phaseTimeline.length === 0) { logger.debug('📋 Restoring phase timeline:', state.generatedPhases); // If not actively generating, mark incomplete phases as cancelled (they were interrupted) const isActivelyGenerating = state.shouldBeGenerating === true; - const timeline = state.generatedPhases.map((phase: any, index: number) => { + const timeline = state.generatedPhases.map((phase, index: number) => { // Determine phase status: // - completed if explicitly marked complete // - cancelled if incomplete and not actively generating (interrupted) @@ -212,7 +215,7 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { name: phase.name, description: phase.description, status: phaseStatus, - files: phase.files.map((filesConcept: any) => { + files: phase.files.map(filesConcept => { const file = state.generatedFilesMap?.[filesConcept.path]; // File status: // - completed if it exists in generated files diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts index 77507fc0..1a6c98b9 100644 --- a/worker/agents/core/AgentCore.ts +++ b/worker/agents/core/AgentCore.ts @@ -6,6 +6,7 @@ import { BaseProjectState } from "./state"; import { WebSocketMessageType } from "../../api/websocketTypes"; import { WebSocketMessageData } from "../../api/websocketTypes"; import { ConversationMessage, ConversationState } from "../inferutils/common"; +import { TemplateDetails } from "worker/services/sandbox/sandboxTypes"; /** * Infrastructure interface for agent implementations. @@ -34,4 +35,12 @@ export interface AgentInfrastructure { readonly fileManager: FileManager; readonly deploymentManager: DeploymentManager; readonly git: GitVersionControl; + + // Git export infrastructure + exportGitObjects(): Promise<{ + gitObjects: Array<{ path: string; data: Uint8Array }>; + query: string; + hasCommits: boolean; + templateDetails: TemplateDetails | null; + }>; } diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 8085351a..dd478cca 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -61,6 +61,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl query, language: language!, frameworks: frameworks!, + projectType: this.state.projectType, templateDetails: templateInfo?.templateDetails, templateMetaInfo: templateInfo?.selection, images: initArgs.images, diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index e25d31e2..3124937b 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -5,8 +5,9 @@ import { Blueprint, } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; -import { BaseProjectState } from '../state'; -import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType } from '../types'; +import { AgentState, BaseProjectState } from '../state'; +import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget } from '../types'; +import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; import { ProjectSetupAssistant } from '../../assistants/projectsetup'; import { UserConversationProcessor, RenderToolCall } from '../../operations/UserConversationProcessor'; @@ -34,6 +35,7 @@ import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGenera import { AgentComponent } from '../AgentComponent'; import type { AgentInfrastructure } from '../AgentCore'; import { sendToConnection } from '../websocket'; +import { GitVersionControl } from '../../git'; export interface BaseCodingOperations { regenerateFile: FileRegenerationOperation; @@ -107,7 +109,7 @@ export abstract class BaseCodingBehavior onConnect(connection: Connection, ctx: ConnectionContext) { this.logger.info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); sendToConnection(connection, 'agent_connected', { - state: this.state, + state: this.state as unknown as AgentState, templateDetails: this.getTemplateDetails() }); } @@ -311,6 +313,15 @@ export abstract class BaseCodingBehavior return inputs; } + clearConversation(): void { + this.infrastructure.clearConversation(); + } + + getGit(): GitVersionControl { + return this.git; + } + + /** * State machine controller for code generation with user interaction support * Executes phases sequentially with review cycles and proper state transitions @@ -446,8 +457,9 @@ export abstract class BaseCodingBehavior description: config.description })); - const userConfigs: Record = {}; - const defaultConfigs: Record = {}; + type ModelConfigInfo = ModelConfig & { isUserOverride?: boolean }; + const userConfigs: Record = {}; + const defaultConfigs: Record = {}; for (const [actionKey, mergedConfig] of Object.entries(userConfigsRecord)) { if (mergedConfig.isUserOverride) { @@ -460,8 +472,7 @@ export abstract class BaseCodingBehavior isUserOverride: true }; } - - // Always include default config + const defaultConfig = AGENT_CONFIG[actionKey as AgentActionKey]; if (defaultConfig) { defaultConfigs[actionKey] = { @@ -867,14 +878,16 @@ export abstract class BaseCodingBehavior fileCount: result.files.length }); - // Return files with diffs from FileState - return { - files: result.files.map(f => ({ + const savedFiles = result.files.map(f => { + const fileState = this.state.generatedFilesMap[f.filePath]; + return { path: f.filePath, purpose: f.filePurpose || '', - diff: (f as any).lastDiff || '' // FileState has lastDiff - })) - }; + diff: fileState?.lastDiff || '' + }; + }); + + return { files: savedFiles }; } // A wrapper for LLM tool to deploy to sandbox @@ -917,7 +930,7 @@ export abstract class BaseCodingBehavior /** * Deploy the generated code to Cloudflare Workers */ - async deployToCloudflare(): Promise<{ deploymentUrl?: string; workersUrl?: string } | null> { + async deployToCloudflare(target: DeploymentTarget = 'platform'): Promise<{ deploymentUrl?: string; workersUrl?: string } | null> { try { // Ensure sandbox instance exists first if (!this.state.sandboxInstanceId) { @@ -936,22 +949,25 @@ export abstract class BaseCodingBehavior // Call service - handles orchestration, callbacks for broadcasting const result = await this.deploymentManager.deployToCloudflare({ - onStarted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); - }, - onCompleted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); - }, - onError: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); - }, - onPreviewExpired: () => { - // Re-deploy sandbox and broadcast error - this.deployToSandbox(); - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { - message: PREVIEW_EXPIRED_ERROR, - error: PREVIEW_EXPIRED_ERROR - }); + target, + callbacks: { + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + }, + onPreviewExpired: () => { + // Re-deploy sandbox and broadcast error + this.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } } }); diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 658dff89..72c48ab3 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -8,6 +8,7 @@ import { import { StaticAnalysisResponse } from '../../../services/sandbox/sandboxTypes'; import { CurrentDevState, MAX_PHASES, PhasicState } from '../state'; import { AllIssues, AgentInitArgs, PhaseExecutionResult, UserContext } from '../types'; +import { ModelConfig } from '../../inferutils/config.types'; import { WebSocketMessageResponses } from '../../constants'; import { UserConversationProcessor } from '../../operations/UserConversationProcessor'; // import { WebSocketBroadcaster } from '../services/implementations/WebSocketBroadcaster'; @@ -70,6 +71,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem ): Promise { await super.initialize(initArgs); const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + const projectType = initArgs.projectType || this.state.projectType || 'app'; // Generate a blueprint this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); @@ -84,6 +86,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem templateDetails: templateInfo?.templateDetails, templateMetaInfo: templateInfo?.selection, images: initArgs.images, + projectType, stream: { chunk_size: 256, onChunk: (chunk) => { @@ -102,7 +105,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem this.logger.info('Generated project name', { projectName }); - this.setState({ + const nextState: PhasicState = { ...this.state, projectName, query, @@ -115,7 +118,9 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem sessionId: sandboxSessionId!, hostname, inferenceContext, - }); + projectType, + }; + this.setState(nextState); // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) const customizedFiles = customizeTemplateFiles( templateInfo.templateDetails.allFiles, @@ -155,7 +160,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem } migrateStateIfNeeded(): void { - const migratedState = StateMigration.migrateIfNeeded(this.state, this.logger); + const migratedState = StateMigration.migrateIfNeeded(this.state, this.logger) as PhasicState | null; if (migratedState) { this.setState(migratedState); } @@ -717,8 +722,9 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem description: config.description })); - const userConfigs: Record = {}; - const defaultConfigs: Record = {}; + type ModelConfigInfo = ModelConfig & { isUserOverride?: boolean }; + const userConfigs: Record = {}; + const defaultConfigs: Record = {}; for (const [actionKey, mergedConfig] of Object.entries(userConfigsRecord)) { if (mergedConfig.isUserOverride) { @@ -731,8 +737,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem isUserOverride: true }; } - - // Always include default config + const defaultConfig = AGENT_CONFIG[actionKey as AgentActionKey]; if (defaultConfig) { defaultConfigs[actionKey] = { @@ -817,10 +822,10 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem phase, { runtimeErrors: [], - staticAnalysis: { - success: true, - lint: { issues: [] }, - typecheck: { issues: [] } + staticAnalysis: { + success: true, + lint: { issues: [] }, + typecheck: { issues: [] } }, }, { suggestions: requirements }, @@ -828,14 +833,16 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem false // postPhaseFixing = false (skip auto-fixes) ); - // Return files with diffs from FileState - return { - files: result.files.map(f => ({ + const savedFiles = result.files.map(f => { + const fileState = this.state.generatedFilesMap[f.filePath]; + return { path: f.filePath, purpose: f.filePurpose || '', - diff: (f as any).lastDiff || '' // FileState has lastDiff - })) - }; + diff: fileState?.lastDiff || '' + }; + }); + + return { files: savedFiles }; } async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index bd2c9b94..e1023278 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -1,6 +1,7 @@ import { Agent, AgentContext } from "agents"; -import { AgentInitArgs, BehaviorType } from "./types"; +import { AgentInitArgs, AgentSummary, BehaviorType, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget } from "./types"; import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; +import { Blueprint } from "../schemas"; import { BaseCodingBehavior } from "./behaviors/base"; import { createObjectLogger, StructuredLogger } from '../../logger'; import { InferenceContext } from "../inferutils/config.types"; @@ -16,8 +17,7 @@ import { ProjectType } from './types'; import { Connection } from 'agents'; import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections } from './websocket'; import { WebSocketMessageData, WebSocketMessageType } from "worker/api/websocketTypes"; -import { GitHubPushRequest, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; -import { GitHubExportResult, GitHubService } from "worker/services/github"; +import { PreviewType, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; import { WebSocketMessageResponses } from "../constants"; import { AppService } from "worker/database"; import { ConversationMessage, ConversationState } from "../inferutils/common"; @@ -27,22 +27,20 @@ import { ProjectObjective } from "./objectives/base"; import { AppObjective } from "./objectives/app"; import { WorkflowObjective } from "./objectives/workflow"; import { PresentationObjective } from "./objectives/presentation"; +import { FileOutputType } from "../schemas"; const DEFAULT_CONVERSATION_SESSION_ID = 'default'; +interface AgentBootstrapProps { + behaviorType?: BehaviorType; + projectType?: ProjectType; +} + export class CodeGeneratorAgent extends Agent implements AgentInfrastructure { public _logger: StructuredLogger | undefined; - private behavior: BaseCodingBehavior; - private objective: ProjectObjective; + private behavior!: BaseCodingBehavior; + private objective!: ProjectObjective; protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; - - // GitHub token cache (ephemeral, lost on DO eviction) - protected githubTokenCache: { - token: string; - username: string; - expiresAt: number; - } | null = null; - // Services readonly fileManager: FileManager; readonly deploymentManager: DeploymentManager; @@ -56,30 +54,30 @@ export class CodeGeneratorAgent extends Agent implements AgentI // Initialization // ========================================== - initialState: AgentState = { - blueprint: {} as any, // Will be populated during initialization + initialState = { + behaviorType: 'phasic', + projectType: 'app', projectName: "", - projectType: 'app', // Default project type query: "", - generatedPhases: [], + sessionId: '', + hostname: '', + blueprint: {} as unknown as Blueprint, + templateName: '', generatedFilesMap: {}, - behaviorType: 'phasic', + conversationMessages: [], + inferenceContext: {} as InferenceContext, + shouldBeGenerating: false, sandboxInstanceId: undefined, - templateName: '', commandsHistory: [], lastPackageJson: '', pendingUserInputs: [], - inferenceContext: {} as InferenceContext, - sessionId: '', - hostname: '', - conversationMessages: [], - currentDevState: CurrentDevState.IDLE, - phasesCounter: MAX_PHASES, - mvpGenerated: false, - shouldBeGenerating: false, - reviewingInitiated: false, projectUpdatesAccumulator: [], lastDeepDebugTranscript: null, + mvpGenerated: false, + reviewingInitiated: false, + generatedPhases: [], + currentDevState: CurrentDevState.IDLE, + phasesCounter: MAX_PHASES, } as AgentState; constructor(ctx: AgentContext, env: Env) { @@ -110,8 +108,19 @@ export class CodeGeneratorAgent extends Agent implements AgentI 10 // MAX_COMMANDS_HISTORY ); - const behaviorTypeProp = (ctx.props as Record)?.behaviorType as BehaviorType | undefined; - const behaviorType = this.state.behaviorType || behaviorTypeProp || 'phasic'; + const props = (ctx.props as AgentBootstrapProps) || {}; + const isInitialized = Boolean(this.state.query); + const behaviorType = isInitialized + ? this.state.behaviorType + : props.behaviorType ?? this.state.behaviorType ?? 'phasic'; + const projectType = isInitialized + ? this.state.projectType + : props.projectType ?? this.state.projectType ?? 'app'; + + if (isInitialized && this.state.behaviorType !== behaviorType) { + throw new Error(`State behaviorType mismatch: expected ${behaviorType}, got ${this.state.behaviorType}`); + } + if (behaviorType === 'phasic') { this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure); } else { @@ -119,7 +128,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI } // Create objective based on project type - this.objective = this.createObjective(this.state.projectType || 'app'); + this.objective = this.createObjective(projectType); } /** @@ -252,9 +261,42 @@ export class CodeGeneratorAgent extends Agent implements AgentI /** * Get the behavior (defines how code is generated) */ - getBehavior(): BaseCodingBehavior { + getBehavior(): BaseCodingBehavior { return this.behavior; } + + async getFullState(): Promise { + return await this.behavior.getFullState(); + } + + async getSummary(): Promise { + return this.behavior.getSummary(); + } + + getPreviewUrlCache(): string { + return this.behavior.getPreviewUrlCache(); + } + + deployToSandbox( + files: FileOutputType[] = [], + redeploy: boolean = false, + commitMessage?: string, + clearLogs: boolean = false + ): Promise { + return this.behavior.deployToSandbox(files, redeploy, commitMessage, clearLogs); + } + + deployToCloudflare(target?: DeploymentTarget): Promise<{ deploymentUrl?: string; workersUrl?: string } | null> { + return this.behavior.deployToCloudflare(target); + } + + deployProject(options?: DeployOptions): Promise { + return this.objective.deploy(options); + } + + exportProject(options: ExportOptions): Promise { + return this.objective.export(options); + } protected async saveToDatabase() { this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); @@ -521,194 +563,4 @@ export class CodeGeneratorAgent extends Agent implements AgentI throw error; } } - - /** - * Cache GitHub OAuth token in memory for subsequent exports - * Token is ephemeral - lost on DO eviction - */ - setGitHubToken(token: string, username: string, ttl: number = 3600000): void { - this.githubTokenCache = { - token, - username, - expiresAt: Date.now() + ttl - }; - this.logger().info('GitHub token cached', { - username, - expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() - }); - } - - /** - * Get cached GitHub token if available and not expired - */ - getGitHubToken(): { token: string; username: string } | null { - if (!this.githubTokenCache) { - return null; - } - - if (Date.now() >= this.githubTokenCache.expiresAt) { - this.logger().info('GitHub token expired, clearing cache'); - this.githubTokenCache = null; - return null; - } - - return { - token: this.githubTokenCache.token, - username: this.githubTokenCache.username - }; - } - - /** - * Clear cached GitHub token - */ - clearGitHubToken(): void { - this.githubTokenCache = null; - this.logger().info('GitHub token cleared'); - } - - - /** - * Export generated code to a GitHub repository - */ - async pushToGitHub(options: GitHubPushRequest): Promise { - try { - this.logger().info('Starting GitHub export using DO git'); - - // Broadcast export started - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { - message: `Starting GitHub export to repository "${options.cloneUrl}"`, - repositoryName: options.repositoryHtmlUrl, - isPrivate: options.isPrivate - }); - - // Export git objects from DO - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Preparing git repository...', - step: 'preparing', - progress: 20 - }); - - const { gitObjects, query, templateDetails } = await this.exportGitObjects(); - - this.logger().info('Git objects exported', { - objectCount: gitObjects.length, - hasTemplate: !!templateDetails - }); - - // Get app createdAt timestamp for template base commit - let appCreatedAt: Date | undefined = undefined; - try { - const appId = this.getAgentId(); - if (appId) { - const appService = new AppService(this.env); - const app = await appService.getAppDetails(appId); - if (app && app.createdAt) { - appCreatedAt = new Date(app.createdAt); - this.logger().info('Using app createdAt for template base', { - createdAt: appCreatedAt.toISOString() - }); - } - } - } catch (error) { - this.logger().warn('Failed to get app createdAt, using current time', { error }); - appCreatedAt = new Date(); // Fallback to current time - } - - // Push to GitHub using new service - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Uploading to GitHub repository...', - step: 'uploading_files', - progress: 40 - }); - - const result = await GitHubService.exportToGitHub({ - gitObjects, - templateDetails, - appQuery: query, - appCreatedAt, - token: options.token, - repositoryUrl: options.repositoryHtmlUrl, - username: options.username, - email: options.email - }); - - if (!result.success) { - throw new Error(result.error || 'Failed to export to GitHub'); - } - - this.logger().info('GitHub export completed', { - commitSha: result.commitSha - }); - - // Cache token for subsequent exports - if (options.token && options.username) { - try { - this.setGitHubToken(options.token, options.username); - this.logger().info('GitHub token cached after successful export'); - } catch (cacheError) { - // Non-fatal - continue with finalization - this.logger().warn('Failed to cache GitHub token', { error: cacheError }); - } - } - - // Update database - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Finalizing GitHub export...', - step: 'finalizing', - progress: 90 - }); - - const agentId = this.getAgentId(); - this.logger().info('[DB Update] Updating app with GitHub repository URL', { - agentId, - repositoryUrl: options.repositoryHtmlUrl, - visibility: options.isPrivate ? 'private' : 'public' - }); - - const appService = new AppService(this.env); - const updateResult = await appService.updateGitHubRepository( - agentId || '', - options.repositoryHtmlUrl || '', - options.isPrivate ? 'private' : 'public' - ); - - this.logger().info('[DB Update] Database update result', { - agentId, - success: updateResult, - repositoryUrl: options.repositoryHtmlUrl - }); - - // Broadcast success - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { - message: `Successfully exported to GitHub repository: ${options.repositoryHtmlUrl}`, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl, - commitSha: result.commitSha - }); - - this.logger().info('GitHub export completed successfully', { - repositoryUrl: options.repositoryHtmlUrl, - commitSha: result.commitSha - }); - - return { - success: true, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; - - } catch (error) { - this.logger().error('GitHub export failed', error); - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { - message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, - error: error instanceof Error ? error.message : 'Unknown error' - }); - return { - success: false, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; - } - } - -} \ No newline at end of file +} diff --git a/worker/agents/core/objectives/app.ts b/worker/agents/core/objectives/app.ts index 911ea404..04631afc 100644 --- a/worker/agents/core/objectives/app.ts +++ b/worker/agents/core/objectives/app.ts @@ -1,9 +1,10 @@ import { ProjectObjective } from './base'; import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import { WebSocketMessageResponses, PREVIEW_EXPIRED_ERROR } from '../../constants'; import { AppService } from '../../../database/services/AppService'; import type { AgentInfrastructure } from '../AgentCore'; +import { GitHubService } from '../../../services/github'; /** * AppObjective - Full-Stack Web Applications @@ -67,12 +68,19 @@ export class AppObjective } // ========================================== - // EXPORT/DEPLOYMENT + // DEPLOYMENT & EXPORT // ========================================== - async export(_options?: ExportOptions): Promise { + async deploy(options?: DeployOptions): Promise { + const target = options?.target ?? 'platform'; + if (target !== 'platform') { + const message = `Unsupported deployment target "${target}" for app projects`; + this.logger.error(message); + return { success: false, target, error: message }; + } + try { - this.logger.info('Exporting app to Cloudflare Workers + Pages'); + this.logger.info('Deploying app to Workers for Platforms'); // Ensure sandbox instance exists first if (!this.state.sandboxInstanceId) { @@ -87,29 +95,32 @@ export class AppObjective }); return { success: false, + target, error: 'Failed to deploy to sandbox service' }; } } - // Deploy to Cloudflare Workers + Pages + // Deploy to Cloudflare Workers for Platforms const result = await this.deploymentManager.deployToCloudflare({ - onStarted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); - }, - onCompleted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); - }, - onError: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); - }, - onPreviewExpired: () => { - // Re-deploy sandbox and broadcast error - this.deploymentManager.deployToSandbox(); - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { - message: PREVIEW_EXPIRED_ERROR, - error: PREVIEW_EXPIRED_ERROR - }); + target, + callbacks: { + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + }, + onPreviewExpired: () => { + this.deploymentManager.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } } }); @@ -129,6 +140,7 @@ export class AppObjective return { success: !!result.deploymentUrl, + target, url: result.deploymentUrl || undefined, metadata: { deploymentId: result.deploymentId, @@ -145,8 +157,154 @@ export class AppObjective return { success: false, + target, error: error instanceof Error ? error.message : 'Unknown deployment error' }; } } + + async export(options: ExportOptions): Promise { + if (options.kind !== 'github' || !options.github) { + const error = 'App export requires GitHub context'; + this.logger.error(error, { kind: options.kind }); + return { success: false, error }; + } + + const githubOptions = options.github; + + try { + this.logger.info('Starting GitHub export using DO git'); + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { + message: `Starting GitHub export to repository "${githubOptions.cloneUrl}"`, + repositoryName: githubOptions.repositoryHtmlUrl, + isPrivate: githubOptions.isPrivate + }); + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Preparing git repository...', + step: 'preparing', + progress: 20 + }); + + const { gitObjects, query, templateDetails } = await this.infrastructure.exportGitObjects(); + + this.logger.info('Git objects exported', { + objectCount: gitObjects.length, + hasTemplate: !!templateDetails + }); + + let appCreatedAt: Date | undefined = undefined; + try { + const agentId = this.getAgentId(); + if (agentId) { + const appService = new AppService(this.env); + const app = await appService.getAppDetails(agentId); + if (app && app.createdAt) { + appCreatedAt = new Date(app.createdAt); + this.logger.info('Using app createdAt for template base', { + createdAt: appCreatedAt.toISOString() + }); + } + } + } catch (error) { + this.logger.warn('Failed to get app createdAt, using current time', { error }); + appCreatedAt = new Date(); + } + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Uploading to GitHub repository...', + step: 'uploading_files', + progress: 40 + }); + + const result = await GitHubService.exportToGitHub({ + gitObjects, + templateDetails, + appQuery: query, + appCreatedAt, + token: githubOptions.token, + repositoryUrl: githubOptions.repositoryHtmlUrl, + username: githubOptions.username, + email: githubOptions.email + }); + + if (!result.success) { + throw new Error(result.error || 'Failed to export to GitHub'); + } + + this.logger.info('GitHub export completed', { + commitSha: result.commitSha + }); + + if (githubOptions.token && githubOptions.username) { + try { + this.setGitHubToken(githubOptions.token, githubOptions.username); + this.logger.info('GitHub token cached after successful export'); + } catch (cacheError) { + this.logger.warn('Failed to cache GitHub token', { error: cacheError }); + } + } + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Finalizing GitHub export...', + step: 'finalizing', + progress: 90 + }); + + const agentId = this.getAgentId(); + this.logger.info('[DB Update] Updating app with GitHub repository URL', { + agentId, + repositoryUrl: githubOptions.repositoryHtmlUrl, + visibility: githubOptions.isPrivate ? 'private' : 'public' + }); + + const appService = new AppService(this.env); + const updateResult = await appService.updateGitHubRepository( + agentId || '', + githubOptions.repositoryHtmlUrl || '', + githubOptions.isPrivate ? 'private' : 'public' + ); + + this.logger.info('[DB Update] Database update result', { + agentId, + success: updateResult, + repositoryUrl: githubOptions.repositoryHtmlUrl + }); + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { + message: `Successfully exported to GitHub repository: ${githubOptions.repositoryHtmlUrl}`, + repositoryUrl: githubOptions.repositoryHtmlUrl, + cloneUrl: githubOptions.cloneUrl, + commitSha: result.commitSha + }); + + this.logger.info('GitHub export completed successfully', { + repositoryUrl: githubOptions.repositoryHtmlUrl, + commitSha: result.commitSha + }); + + return { + success: true, + url: githubOptions.repositoryHtmlUrl, + metadata: { + repositoryUrl: githubOptions.repositoryHtmlUrl, + cloneUrl: githubOptions.cloneUrl, + commitSha: result.commitSha + } + }; + + } catch (error) { + this.logger.error('GitHub export failed', error); + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { + message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, + error: error instanceof Error ? error.message : 'Unknown error' + }); + return { + success: false, + url: options.github.repositoryHtmlUrl, + error: error instanceof Error ? error.message : 'Unknown error' + }; + } + } } diff --git a/worker/agents/core/objectives/base.ts b/worker/agents/core/objectives/base.ts index 2939a7df..4ee3f4db 100644 --- a/worker/agents/core/objectives/base.ts +++ b/worker/agents/core/objectives/base.ts @@ -1,5 +1,5 @@ import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import { AgentComponent } from '../AgentComponent'; import type { AgentInfrastructure } from '../AgentCore'; @@ -17,6 +17,13 @@ import type { AgentInfrastructure } from '../AgentCore'; */ export abstract class ProjectObjective extends AgentComponent { + + // GitHub token cache (ephemeral, lost on DO eviction) + protected githubTokenCache: { + token: string; + username: string; + expiresAt: number; + } | null = null; constructor(infrastructure: AgentInfrastructure) { super(infrastructure); @@ -47,14 +54,14 @@ export abstract class ProjectObjective; + abstract deploy(options?: DeployOptions): Promise; + + /** + * Export project artifacts (GitHub repo, PDF, etc.) + */ + abstract export(options: ExportOptions): Promise; // ========================================== // OPTIONAL LIFECYCLE HOOKS @@ -87,4 +94,48 @@ export abstract class ProjectObjective { return { valid: true }; } + + /** + * Cache GitHub OAuth token in memory for subsequent exports + * Token is ephemeral - lost on DO eviction + */ + setGitHubToken(token: string, username: string, ttl: number = 3600000): void { + this.githubTokenCache = { + token, + username, + expiresAt: Date.now() + ttl + }; + this.logger.info('GitHub token cached', { + username, + expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() + }); + } + + /** + * Get cached GitHub token if available and not expired + */ + getGitHubToken(): { token: string; username: string } | null { + if (!this.githubTokenCache) { + return null; + } + + if (Date.now() >= this.githubTokenCache.expiresAt) { + this.logger.info('GitHub token expired, clearing cache'); + this.githubTokenCache = null; + return null; + } + + return { + token: this.githubTokenCache.token, + username: this.githubTokenCache.username + }; + } + + /** + * Clear cached GitHub token + */ + clearGitHubToken(): void { + this.githubTokenCache = null; + this.logger.info('GitHub token cleared'); + } } diff --git a/worker/agents/core/objectives/presentation.ts b/worker/agents/core/objectives/presentation.ts index b5411427..d0a91cfb 100644 --- a/worker/agents/core/objectives/presentation.ts +++ b/worker/agents/core/objectives/presentation.ts @@ -1,7 +1,9 @@ import { ProjectObjective } from './base'; import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import type { AgentInfrastructure } from '../AgentCore'; +import { WebSocketMessageResponses, PREVIEW_EXPIRED_ERROR } from '../../constants'; +import { AppService } from '../../../database/services/AppService'; /** * WIP - PresentationObjective - Slides/Docs/Marketing Materials @@ -44,19 +46,86 @@ export class PresentationObjective { - const format = (options?.format as 'pdf' | 'googleslides' | 'pptx') || 'pdf'; - this.logger.info('Presentation export requested but not yet implemented', { format }); - + async deploy(options?: DeployOptions): Promise { + const target = options?.target ?? 'platform'; + if (target !== 'platform') { + const error = `Unsupported deployment target "${target}" for presentations`; + this.logger.error(error); + return { success: false, target, error }; + } + + try { + this.logger.info('Deploying presentation to Workers for Platforms'); + + if (!this.state.sandboxInstanceId) { + await this.deploymentManager.deployToSandbox(); + + if (!this.state.sandboxInstanceId) { + const error = 'Failed to deploy to sandbox service'; + this.logger.error(error); + return { success: false, target, error }; + } + } + + const result = await this.deploymentManager.deployToCloudflare({ + target, + callbacks: { + onStarted: (data) => this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data), + onCompleted: (data) => this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data), + onError: (data) => this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data), + onPreviewExpired: () => { + this.deploymentManager.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } + } + }); + + if (result.deploymentUrl && result.deploymentId) { + const appService = new AppService(this.env); + await appService.updateDeploymentId(this.getAgentId(), result.deploymentId); + } + + return { + success: !!result.deploymentUrl, + target, + url: result.deploymentUrl || undefined, + metadata: { + deploymentId: result.deploymentId, + workersUrl: result.deploymentUrl + } + }; + } catch (error) { + const message = error instanceof Error ? error.message : 'Unknown presentation deployment error'; + this.logger.error('Presentation deployment error:', error); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Deployment failed', + error: message + }); + return { success: false, target, error: message }; + } + } + + async export(options: ExportOptions): Promise { + const allowedKinds: Array = ['pdf', 'pptx', 'googleslides']; + if (!allowedKinds.includes(options.kind)) { + const error = `Unsupported presentation export kind "${options.kind}"`; + this.logger.warn(error); + return { success: false, error }; + } + + const format = options.format || options.kind; + this.logger.info('Presentation export requested', { format }); + return { success: false, error: 'Presentation export not yet implemented - coming in Phase 3', - metadata: { - requestedFormat: format - } + metadata: { format } }; } } diff --git a/worker/agents/core/objectives/workflow.ts b/worker/agents/core/objectives/workflow.ts index f455ba8b..e53def58 100644 --- a/worker/agents/core/objectives/workflow.ts +++ b/worker/agents/core/objectives/workflow.ts @@ -1,7 +1,8 @@ import { ProjectObjective } from './base'; import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import type { AgentInfrastructure } from '../AgentCore'; +import { WebSocketMessageResponses } from '../../constants'; /** * WIP! @@ -44,15 +45,69 @@ export class WorkflowObjective { - this.logger.info('Workflow export requested but not yet implemented'); + async deploy(options?: DeployOptions): Promise { + const target = options?.target ?? 'user'; + try { + this.logger.info('Deploying workflow to Cloudflare Workers (user account)', { target }); + + const result = await this.deploymentManager.deployToCloudflare({ + target, + callbacks: { + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + } + } + }); + + return { + success: !!result.deploymentUrl, + target, + url: result.deploymentUrl || undefined, + deploymentId: result.deploymentId, + metadata: { + deploymentId: result.deploymentId, + workersUrl: result.deploymentUrl + } + }; + } catch (error) { + const message = error instanceof Error ? error.message : 'Unknown workflow deployment error'; + this.logger.error('Workflow deployment failed', error); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Workflow deployment failed', + error: message + }); + + return { + success: false, + target, + error: message + }; + } + } + + async export(options: ExportOptions): Promise { + if (options.kind !== 'workflow') { + const error = 'Workflow export must be invoked with kind="workflow"'; + this.logger.warn(error, { kind: options.kind }); + return { success: false, error }; + } + + const deployResult = await this.deploy(options); return { - success: false, - error: 'Workflow deployment not yet implemented' + success: deployResult.success, + url: deployResult.url, + error: deployResult.error, + metadata: deployResult.metadata }; } } diff --git a/worker/agents/core/stateMigration.ts b/worker/agents/core/stateMigration.ts index b8228872..e6a7bac9 100644 --- a/worker/agents/core/stateMigration.ts +++ b/worker/agents/core/stateMigration.ts @@ -1,12 +1,13 @@ -import { CodeGenState, FileState } from './state'; +import { AgentState, FileState } from './state'; import { StructuredLogger } from '../../logger'; import { TemplateDetails } from 'worker/services/sandbox/sandboxTypes'; import { generateNanoId } from '../../utils/idGenerator'; import { generateProjectName } from '../utils/templateCustomizer'; export class StateMigration { - static migrateIfNeeded(state: CodeGenState, logger: StructuredLogger): CodeGenState | null { + static migrateIfNeeded(state: AgentState, logger: StructuredLogger): AgentState | null { let needsMigration = false; + const legacyState = state as unknown as Record; //------------------------------------------------------------------------------------ // Migrate files from old schema @@ -170,6 +171,27 @@ export class StateMigration { logger.info('Generating missing projectName', { projectName: migratedProjectName }); } + let migratedProjectType = state.projectType; + if (!('projectType' in legacyState) || !migratedProjectType) { + migratedProjectType = 'app'; + needsMigration = true; + logger.info('Adding default projectType for legacy state', { projectType: migratedProjectType }); + } + + let migratedBehaviorType = state.behaviorType; + if ('agentMode' in legacyState) { + const legacyAgentMode = (legacyState as { agentMode?: string }).agentMode; + const nextBehaviorType = legacyAgentMode === 'smart' ? 'agentic' : 'phasic'; + if (nextBehaviorType !== migratedBehaviorType) { + migratedBehaviorType = nextBehaviorType; + needsMigration = true; + } + logger.info('Migrating behaviorType from agentMode', { + legacyAgentMode, + behaviorType: migratedBehaviorType + }); + } + if (needsMigration) { logger.info('Migrating state: schema format, conversation cleanup, security fixes, and bootstrap setup', { generatedFilesCount: Object.keys(migratedFilesMap).length, @@ -177,15 +199,17 @@ export class StateMigration { removedUserApiKeys: state.inferenceContext && 'userApiKeys' in state.inferenceContext, }); - const newState = { + const newState: AgentState = { ...state, generatedFilesMap: migratedFilesMap, conversationMessages: migratedConversationMessages, inferenceContext: migratedInferenceContext, projectUpdatesAccumulator: [], templateName: migratedTemplateName, - projectName: migratedProjectName - }; + projectName: migratedProjectName, + projectType: migratedProjectType, + behaviorType: migratedBehaviorType + } as AgentState; // Remove deprecated fields if (stateHasDeprecatedProps) { @@ -194,6 +218,9 @@ export class StateMigration { if (hasTemplateDetails) { delete (newState as any).templateDetails; } + if ('agentMode' in legacyState) { + delete (newState as any).agentMode; + } return newState; } diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index cb55be77..381881fa 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -1,5 +1,5 @@ -import type { RuntimeError, StaticAnalysisResponse } from '../../services/sandbox/sandboxTypes'; +import type { RuntimeError, StaticAnalysisResponse, GitHubPushRequest } from '../../services/sandbox/sandboxTypes'; import type { FileOutputType, PhaseConceptType } from '../schemas'; import type { ConversationMessage } from '../inferutils/common'; import type { InferenceContext } from '../inferutils/config.types'; @@ -30,6 +30,8 @@ interface BaseAgentInitArgs { images?: ProcessedImageAttachment[]; onBlueprintChunk: (chunk: string) => void; sandboxSessionId?: string; // Generated by CodeGeneratorAgent, passed to behavior + behaviorType?: BehaviorType; + projectType?: ProjectType; } /** Phasic agent initialization arguments */ @@ -98,6 +100,23 @@ export type DeepDebugResult = | { success: true; transcript: string } | { success: false; error: string }; +export type DeploymentTarget = 'platform' | 'user'; + +export interface DeployResult { + success: boolean; + target: DeploymentTarget; + url?: string; + deploymentId?: string; + error?: string; + metadata?: Record; +} + +export interface DeployOptions { + target?: DeploymentTarget; + token?: string; + metadata?: Record; +} + /** * Result of project export/deployment operation */ @@ -112,7 +131,9 @@ export interface ExportResult { * Options for project export/deployment */ export interface ExportOptions { + kind: 'github' | 'pdf' | 'pptx' | 'googleslides' | 'workflow'; format?: string; token?: string; - [key: string]: unknown; -} \ No newline at end of file + github?: GitHubPushRequest; + metadata?: Record; +} diff --git a/worker/agents/core/websocket.ts b/worker/agents/core/websocket.ts index 71551e8e..666a2124 100644 --- a/worker/agents/core/websocket.ts +++ b/worker/agents/core/websocket.ts @@ -50,13 +50,12 @@ export function handleWebSocketMessage( }); break; case WebSocketMessageRequests.DEPLOY: - // Use objective.export() for deployment (project-specific logic) - agent.getObjective().export({ type: 'cloudflare' }).then((deploymentResult) => { - if (!deploymentResult) { - logger.error('Failed to deploy to Cloudflare Workers'); + agent.deployProject().then((deploymentResult) => { + if (!deploymentResult.success) { + logger.error('Deployment failed', deploymentResult); return; } - logger.info('Successfully deployed to Cloudflare Workers!', deploymentResult); + logger.info('Deployment completed', deploymentResult); }).catch((error: unknown) => { logger.error('Error during deployment:', error); }); @@ -256,4 +255,4 @@ export function sendToConnection( export function sendError(connection: WebSocket, errorMessage: string): void { sendToConnection(connection, 'error', { error: errorMessage }); -} \ No newline at end of file +} diff --git a/worker/agents/index.ts b/worker/agents/index.ts index 102298c0..b4aacc21 100644 --- a/worker/agents/index.ts +++ b/worker/agents/index.ts @@ -8,42 +8,63 @@ import { TemplateDetails } from '../services/sandbox/sandboxTypes'; import { TemplateSelection } from './schemas'; import type { ImageAttachment } from '../types/image-attachment'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; +import { AgentState, CurrentDevState } from './core/state'; +import { CodeGeneratorAgent } from './core/codingAgent'; +import { BehaviorType, ProjectType } from './core/types'; -export async function getAgentStub(env: Env, agentId: string) : Promise> { - return getAgentByName(env.CodeGenObject, agentId); +type AgentStubProps = { + behaviorType?: BehaviorType; + projectType?: ProjectType; +}; + +export async function getAgentStub( + env: Env, + agentId: string, + props?: AgentStubProps +) : Promise> { + const options = props ? { props } : undefined; + return getAgentByName(env.CodeGenObject, agentId, options); } -export async function getAgentStubLightweight(env: Env, agentId: string) : Promise> { - return getAgentByName(env.CodeGenObject, agentId, { +export async function getAgentStubLightweight(env: Env, agentId: string) : Promise> { + return getAgentByName(env.CodeGenObject, agentId, { // props: { readOnlyMode: true } }); } -export async function getAgentState(env: Env, agentId: string) : Promise { +export async function getAgentState(env: Env, agentId: string) : Promise { const agentInstance = await getAgentStub(env, agentId); - return await agentInstance.getFullState() as CodeGenState; + return await agentInstance.getFullState() as AgentState; } -export async function cloneAgent(env: Env, agentId: string) : Promise<{newAgentId: string, newAgent: DurableObjectStub}> { +export async function cloneAgent(env: Env, agentId: string) : Promise<{newAgentId: string, newAgent: DurableObjectStub}> { const agentInstance = await getAgentStub(env, agentId); if (!agentInstance || !await agentInstance.isInitialized()) { throw new Error(`Agent ${agentId} not found`); } const newAgentId = generateId(); - const newAgent = await getAgentStub(env, newAgentId); - const originalState = await agentInstance.getFullState() as CodeGenState; - const newState = { + const originalState = await agentInstance.getFullState(); + + const newState: AgentState = { ...originalState, sessionId: newAgentId, sandboxInstanceId: undefined, pendingUserInputs: [], - currentDevState: 0, - generationPromise: undefined, shouldBeGenerating: false, - // latestScreenshot: undefined, - clientReportedErrors: [], - }; + projectUpdatesAccumulator: [], + reviewingInitiated: false, + mvpGenerated: false, + ...(originalState.behaviorType === 'phasic' ? { + generatedPhases: [], + currentDevState: CurrentDevState.IDLE, + } : {}), + } as AgentState; + + const newAgent = await getAgentStub(env, newAgentId, { + behaviorType: originalState.behaviorType, + projectType: originalState.projectType, + }); await newAgent.setState(newState); return {newAgentId, newAgent}; @@ -90,4 +111,4 @@ export async function getTemplateForQuery( const templateDetails = templateDetailsResponse.templateDetails; return { templateDetails, selection: analyzeQueryResponse }; -} \ No newline at end of file +} diff --git a/worker/agents/planning/blueprint.ts b/worker/agents/planning/blueprint.ts index e319aff6..fa2123b7 100644 --- a/worker/agents/planning/blueprint.ts +++ b/worker/agents/planning/blueprint.ts @@ -10,6 +10,7 @@ import z from 'zod'; import { imagesToBase64 } from 'worker/utils/images'; import { ProcessedImageAttachment } from 'worker/types/image-attachment'; import { getTemplateImportantFiles } from 'worker/services/sandbox/utils'; +import { ProjectType } from '../core/types'; const logger = createLogger('Blueprint'); @@ -225,12 +226,31 @@ Preinstalled dependencies: {{dependencies}} `; +const PROJECT_TYPE_BLUEPRINT_GUIDANCE: Record = { + app: '', + workflow: `## Workflow Project Context +- Focus entirely on backend flows running on Cloudflare Workers (no UI/screens) +- Describe REST endpoints, scheduled jobs, queue consumers, Durable Objects, and data storage bindings in detail +- User flow should outline request/response shapes and operational safeguards +- Implementation roadmap must mention testing strategies (unit tests, integration tests) and deployment validation steps.`, + presentation: `## Presentation Project Context +- Design a Spectacle-based slide deck with a cohesive narrative arc (intro, problem, solution, showcase, CTA) +- Produce visually rich slides with precise layout, typography, imagery, and animation guidance +- User flow should actually be a \"story flow\" describing slide order, transitions, interactions, and speaker cues +- Implementation roadmap must reference Spectacle features (themes, deck index, slide components, animations, print/external export mode) +- Prioritize static data and storytelling polish; avoid backend complexity entirely.`, +}; + +const getProjectTypeGuidance = (projectType: ProjectType): string => + PROJECT_TYPE_BLUEPRINT_GUIDANCE[projectType] || ''; + interface BaseBlueprintGenerationArgs { env: Env; inferenceContext: InferenceContext; query: string; language: string; frameworks: string[]; + projectType: ProjectType; images?: ProcessedImageAttachment[]; stream?: { chunk_size: number; @@ -256,7 +276,7 @@ export async function generateBlueprint(args: AgenticBlueprintGenerationArgs): P export async function generateBlueprint( args: PhasicBlueprintGenerationArgs | AgenticBlueprintGenerationArgs ): Promise { - const { env, inferenceContext, query, language, frameworks, templateDetails, templateMetaInfo, images, stream } = args; + const { env, inferenceContext, query, language, frameworks, templateDetails, templateMetaInfo, images, stream, projectType } = args; const isAgentic = !templateDetails || !templateMetaInfo; try { @@ -277,6 +297,10 @@ export async function generateBlueprint( const fileTreeText = PROMPT_UTILS.serializeTreeNodes(templateDetails.fileTree); systemPrompt = systemPrompt.replace('{{filesText}}', filesText).replace('{{fileTreeText}}', fileTreeText); } + const projectGuidance = getProjectTypeGuidance(projectType); + if (projectGuidance) { + systemPrompt = `${systemPrompt}\n\n${projectGuidance}`; + } const systemPromptMessage = createSystemMessage(generalSystemPromptBuilder(systemPrompt, { query, diff --git a/worker/agents/services/implementations/BaseAgentService.ts b/worker/agents/services/implementations/BaseAgentService.ts index 38de6b7b..5a512998 100644 --- a/worker/agents/services/implementations/BaseAgentService.ts +++ b/worker/agents/services/implementations/BaseAgentService.ts @@ -2,18 +2,19 @@ import { IStateManager } from '../interfaces/IStateManager'; import { IFileManager } from '../interfaces/IFileManager'; import { StructuredLogger } from '../../../logger'; import { ServiceOptions } from '../interfaces/IServiceOptions'; +import { BaseProjectState } from '../../core/state'; /** * Base class for all agent services * Provides common dependencies and DO-compatible access patterns */ -export abstract class BaseAgentService { - protected readonly stateManager: IStateManager; +export abstract class BaseAgentService { + protected readonly stateManager: IStateManager; protected readonly fileManager: IFileManager; protected readonly getLogger: () => StructuredLogger; protected readonly env: Env; - constructor(options: ServiceOptions) { + constructor(options: ServiceOptions) { this.stateManager = options.stateManager; this.fileManager = options.fileManager; this.getLogger = options.getLogger; @@ -23,14 +24,14 @@ export abstract class BaseAgentService { /** * Get current agent state */ - protected getState() { + protected getState(): Readonly { return this.stateManager.getState(); } /** * Update agent state */ - protected setState(newState: ReturnType) { + protected setState(newState: TState) { this.stateManager.setState(newState); } diff --git a/worker/agents/services/implementations/CodingAgent.ts b/worker/agents/services/implementations/CodingAgent.ts index 93f11150..d82db3c1 100644 --- a/worker/agents/services/implementations/CodingAgent.ts +++ b/worker/agents/services/implementations/CodingAgent.ts @@ -3,7 +3,7 @@ import { Blueprint, FileConceptType } from "worker/agents/schemas"; import { ExecuteCommandsResponse, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { ICodingAgent } from "../interfaces/ICodingAgent"; import { OperationOptions } from "worker/agents/operations/common"; -import { DeepDebugResult } from "worker/agents/core/types"; +import { DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; import { WebSocketMessageResponses } from "worker/agents/constants"; @@ -35,8 +35,8 @@ export class CodingAgentInterface { } } - async deployToCloudflare(): Promise { - const response = await this.agentStub.deployToCloudflare(); + async deployToCloudflare(target?: DeploymentTarget): Promise { + const response = await this.agentStub.deployToCloudflare(target); if (response && response.deploymentUrl) { return `Deployment successful: ${response.deploymentUrl}`; } else { @@ -57,7 +57,7 @@ export class CodingAgentInterface { } getGit() { - return this.agentStub.getGit(); + return this.agentStub.git; } updateProjectName(newName: string): Promise { diff --git a/worker/agents/services/implementations/DeploymentManager.ts b/worker/agents/services/implementations/DeploymentManager.ts index 52fe6183..6f2ff022 100644 --- a/worker/agents/services/implementations/DeploymentManager.ts +++ b/worker/agents/services/implementations/DeploymentManager.ts @@ -14,6 +14,8 @@ import { ServiceOptions } from '../interfaces/IServiceOptions'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; import { getSandboxService } from '../../../services/sandbox/factory'; import { validateAndCleanBootstrapCommands } from 'worker/agents/utils/common'; +import { DeploymentTarget } from '../../core/types'; +import { BaseProjectState } from '../../core/state'; const PER_ATTEMPT_TIMEOUT_MS = 60000; // 60 seconds per individual attempt const MASTER_DEPLOYMENT_TIMEOUT_MS = 300000; // 5 minutes total @@ -24,13 +26,13 @@ const HEALTH_CHECK_INTERVAL_MS = 30000; * Handles instance creation, file deployment, analysis, and GitHub/Cloudflare export * Also manages sessionId and health check intervals */ -export class DeploymentManager extends BaseAgentService implements IDeploymentManager { +export class DeploymentManager extends BaseAgentService implements IDeploymentManager { private healthCheckInterval: ReturnType | null = null; private currentDeploymentPromise: Promise | null = null; private cachedSandboxClient: BaseSandboxService | null = null; constructor( - options: ServiceOptions, + options: ServiceOptions, private maxCommandsHistory: number ) { super(options); @@ -622,10 +624,15 @@ export class DeploymentManager extends BaseAgentService implements IDeploymentMa * Deploy to Cloudflare Workers * Returns deployment URL and deployment ID for database updates */ - async deployToCloudflare(callbacks?: CloudflareDeploymentCallbacks): Promise<{ deploymentUrl: string | null; deploymentId?: string }> { + async deployToCloudflare(request?: { + target?: DeploymentTarget; + callbacks?: CloudflareDeploymentCallbacks; + }): Promise<{ deploymentUrl: string | null; deploymentId?: string }> { const state = this.getState(); const logger = this.getLog(); const client = this.getClient(); + const target = request?.target ?? 'platform'; + const callbacks = request?.callbacks; await this.waitForPreview(); @@ -634,7 +641,7 @@ export class DeploymentManager extends BaseAgentService implements IDeploymentMa instanceId: state.sandboxInstanceId ?? '' }); - logger.info('Starting Cloudflare deployment'); + logger.info('Starting Cloudflare deployment', { target }); // Check if we have generated files if (!state.generatedFilesMap || Object.keys(state.generatedFilesMap).length === 0) { @@ -660,7 +667,8 @@ export class DeploymentManager extends BaseAgentService implements IDeploymentMa // Deploy to Cloudflare const deploymentResult = await client.deployToCloudflareWorkers( - state.sandboxInstanceId + state.sandboxInstanceId, + target ); logger.info('Deployment result:', deploymentResult); diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index 2cea62f3..c27bd7d9 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -2,7 +2,7 @@ import { FileOutputType, FileConceptType, Blueprint } from "worker/agents/schema import { BaseSandboxService } from "worker/services/sandbox/BaseSandboxService"; import { ExecuteCommandsResponse, PreviewType, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { ProcessedImageAttachment } from "worker/types/image-attachment"; -import { BehaviorType, DeepDebugResult } from "worker/agents/core/types"; +import { BehaviorType, DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; import { WebSocketMessageType, WebSocketMessageData } from "worker/api/websocketTypes"; import { GitVersionControl } from "worker/agents/git/git"; @@ -19,10 +19,12 @@ export interface ICodingAgent { broadcast(msg: T, data?: WebSocketMessageData): void; - deployToCloudflare(): Promise<{ deploymentUrl?: string; workersUrl?: string } | null>; + deployToCloudflare(target?: DeploymentTarget): Promise<{ deploymentUrl?: string; workersUrl?: string } | null>; queueUserRequest(request: string, images?: ProcessedImageAttachment[]): void; + clearConversation(): void; + deployPreview(clearLogs?: boolean, forceRedeploy?: boolean): Promise; updateProjectName(newName: string): Promise; @@ -62,6 +64,7 @@ export interface ICodingAgent { ): Promise; get git(): GitVersionControl; + getGit(): GitVersionControl; getSandboxServiceClient(): BaseSandboxService; } diff --git a/worker/agents/services/interfaces/IDeploymentManager.ts b/worker/agents/services/interfaces/IDeploymentManager.ts index eab92211..32dc0b93 100644 --- a/worker/agents/services/interfaces/IDeploymentManager.ts +++ b/worker/agents/services/interfaces/IDeploymentManager.ts @@ -2,6 +2,7 @@ import { FileOutputType } from '../../schemas'; import { StaticAnalysisResponse, RuntimeError, PreviewType } from '../../../services/sandbox/sandboxTypes'; import { DeploymentStartedMessage, DeploymentCompletedMessage, DeploymentFailedMessage } from '../../../api/websocketTypes'; import { CloudflareDeploymentStartedMessage, CloudflareDeploymentCompletedMessage, CloudflareDeploymentErrorMessage } from '../../../api/websocketTypes'; +import { DeploymentTarget } from '../../core/types'; /** * Callbacks for sandbox deployment events @@ -97,6 +98,9 @@ export interface IDeploymentManager { * Deploy to Cloudflare Workers * Returns deployment URL and deployment ID for database updates */ - deployToCloudflare(callbacks?: CloudflareDeploymentCallbacks): Promise<{ deploymentUrl: string | null; deploymentId?: string }>; + deployToCloudflare(request?: { + target?: DeploymentTarget; + callbacks?: CloudflareDeploymentCallbacks; + }): Promise<{ deploymentUrl: string | null; deploymentId?: string }>; } diff --git a/worker/agents/services/interfaces/IServiceOptions.ts b/worker/agents/services/interfaces/IServiceOptions.ts index aa5275f7..596fef9c 100644 --- a/worker/agents/services/interfaces/IServiceOptions.ts +++ b/worker/agents/services/interfaces/IServiceOptions.ts @@ -1,13 +1,14 @@ import { IStateManager } from './IStateManager'; import { IFileManager } from './IFileManager'; import { StructuredLogger } from '../../../logger'; +import { BaseProjectState } from '../../core/state'; /** * Common options for all agent services */ -export interface ServiceOptions { +export interface ServiceOptions { env: Env, - stateManager: IStateManager; + stateManager: IStateManager; fileManager: IFileManager; getLogger: () => StructuredLogger; } diff --git a/worker/agents/tools/toolkit/regenerate-file.ts b/worker/agents/tools/toolkit/regenerate-file.ts index 2fcde525..5be23f99 100644 --- a/worker/agents/tools/toolkit/regenerate-file.ts +++ b/worker/agents/tools/toolkit/regenerate-file.ts @@ -38,7 +38,7 @@ CRITICAL: Provide detailed, specific issues - not vague descriptions. See system path, issuesCount: issues.length, }); - return await agent.regenerateFile(path, issues); + return await agent.regenerateFileByPath(path, issues); } catch (error) { return { error: diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index b40454f0..9b1ae22d 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -1,7 +1,8 @@ import { WebSocketMessageResponses } from '../../../agents/constants'; import { BaseController } from '../baseController'; import { generateId } from '../../../utils/idGenerator'; -import { CodeGenState } from '../../../agents/core/state'; +import { AgentState } from '../../../agents/core/state'; +import { BehaviorType, ProjectType } from '../../../agents/core/types'; import { getAgentStub, getTemplateForQuery } from '../../../agents'; import { AgentConnectionData, AgentPreviewResponse, CodeGenArgs } from './types'; import { ApiResponse, ControllerResponse } from '../types'; @@ -22,6 +23,19 @@ const defaultCodeGenArgs: CodeGenArgs = { frameworks: ['react', 'vite'], selectedTemplate: 'auto', agentMode: 'deterministic', + behaviorType: 'phasic', + projectType: 'app', +}; + +const resolveBehaviorType = (body: CodeGenArgs): BehaviorType => { + if (body.behaviorType) { + return body.behaviorType; + } + return body.agentMode === 'smart' ? 'agentic' : 'phasic'; +}; + +const resolveProjectType = (body: CodeGenArgs): ProjectType => { + return body.projectType || defaultCodeGenArgs.projectType || 'app'; }; @@ -77,11 +91,13 @@ export class CodingAgentController extends BaseController { const agentId = generateId(); const modelConfigService = new ModelConfigService(env); + const behaviorType = resolveBehaviorType(body); + const projectType = resolveProjectType(body); // Fetch all user model configs, api keys and agent instance at once const [userConfigsRecord, agentInstance] = await Promise.all([ modelConfigService.getUserModelConfigs(user.id), - getAgentStub(env, agentId) + getAgentStub(env, agentId, { behaviorType, projectType }) ]); // Convert Record to Map and extract only ModelConfig properties @@ -144,9 +160,11 @@ export class CodingAgentController extends BaseController { onBlueprintChunk: (chunk: string) => { writer.write({chunk}); }, + behaviorType, + projectType, templateInfo: { templateDetails, selection }, - }, body.agentMode || defaultCodeGenArgs.agentMode) as Promise; - agentPromise.then(async (_state: CodeGenState) => { + }) as Promise; + agentPromise.then(async (_state: AgentState) => { writer.write("terminate"); writer.close(); this.logger.info(`Agent ${agentId} terminated successfully`); @@ -335,4 +353,4 @@ export class CodingAgentController extends BaseController { return appError; } } -} \ No newline at end of file +} diff --git a/worker/api/controllers/agent/types.ts b/worker/api/controllers/agent/types.ts index 42b8ae6e..3966dcda 100644 --- a/worker/api/controllers/agent/types.ts +++ b/worker/api/controllers/agent/types.ts @@ -1,12 +1,15 @@ import { PreviewType } from "../../../services/sandbox/sandboxTypes"; import type { ImageAttachment } from '../../../types/image-attachment'; +import type { BehaviorType, ProjectType } from '../../../agents/core/types'; export interface CodeGenArgs { query: string; language?: string; frameworks?: string[]; selectedTemplate?: string; - agentMode: 'deterministic' | 'smart'; + agentMode?: 'deterministic' | 'smart'; + behaviorType?: BehaviorType; + projectType?: ProjectType; images?: ImageAttachment[]; } @@ -20,4 +23,4 @@ export interface AgentConnectionData { export interface AgentPreviewResponse extends PreviewType { } - \ No newline at end of file + diff --git a/worker/api/controllers/githubExporter/controller.ts b/worker/api/controllers/githubExporter/controller.ts index ae8057f1..3825325e 100644 --- a/worker/api/controllers/githubExporter/controller.ts +++ b/worker/api/controllers/githubExporter/controller.ts @@ -5,6 +5,7 @@ import { GitHubExporterOAuthProvider } from '../../../services/oauth/github-expo import { getAgentStub } from '../../../agents'; import { createLogger } from '../../../logger'; import { AppService } from '../../../database/services/AppService'; +import { ExportResult } from 'worker/agents/core/types'; export interface GitHubExportData { success: boolean; @@ -164,13 +165,16 @@ export class GitHubExporterController extends BaseController { this.logger.info('Pushing files to repository', { agentId, repositoryUrl }); const agentStub = await getAgentStub(env, agentId); - const pushResult = await agentStub.pushToGitHub({ - cloneUrl, - repositoryHtmlUrl: repositoryUrl, - isPrivate, - token, - email: 'vibesdk-bot@cloudflare.com', - username + const pushResult: ExportResult = await agentStub.exportProject({ + kind: 'github', + github: { + cloneUrl, + repositoryHtmlUrl: repositoryUrl, + isPrivate, + token, + email: 'vibesdk-bot@cloudflare.com', + username + } }); if (!pushResult?.success) { diff --git a/worker/api/websocketTypes.ts b/worker/api/websocketTypes.ts index 6831ab55..450a6fc9 100644 --- a/worker/api/websocketTypes.ts +++ b/worker/api/websocketTypes.ts @@ -1,5 +1,5 @@ import type { CodeReviewOutputType, FileConceptType, FileOutputType } from "../agents/schemas"; -import type { CodeGenState } from "../agents/core/state"; +import type { AgentState } from "../agents/core/state"; import type { ConversationState } from "../agents/inferutils/common"; import type { CodeIssue, RuntimeError, StaticAnalysisResponse, TemplateDetails } from "../services/sandbox/sandboxTypes"; import type { CodeFixResult } from "../services/code-fixer"; @@ -13,12 +13,12 @@ type ErrorMessage = { type StateMessage = { type: 'cf_agent_state'; - state: CodeGenState; + state: AgentState; }; type AgentConnectedMessage = { type: 'agent_connected'; - state: CodeGenState; + state: AgentState; templateDetails: TemplateDetails; }; @@ -478,4 +478,4 @@ type WebSocketMessagePayload = Extract = Omit, 'type'>; \ No newline at end of file +export type WebSocketMessageData = Omit, 'type'>; diff --git a/worker/index.ts b/worker/index.ts index eb8560be..d0a0bbe4 100644 --- a/worker/index.ts +++ b/worker/index.ts @@ -14,7 +14,7 @@ import { handleGitProtocolRequest, isGitProtocolRequest } from './api/handlers/g export { UserAppSandboxService, DeployerService } from './services/sandbox/sandboxSdkClient'; export { CodeGeneratorAgent } from './agents/core/codingAgent'; -// export const CodeGeneratorAgent = Sentry.instrumentDurableObjectWithSentry(sentryOptions, SmartCodeGeneratorAgent); +// export const CodeGeneratorAgent = Sentry.instrumentDurableObjectWithSentry(sentryOptions, CodeGeneratorAgent); // export const DORateLimitStore = Sentry.instrumentDurableObjectWithSentry(sentryOptions, BaseDORateLimitStore); export const DORateLimitStore = BaseDORateLimitStore; diff --git a/worker/services/sandbox/BaseSandboxService.ts b/worker/services/sandbox/BaseSandboxService.ts index f1056391..f69eaa23 100644 --- a/worker/services/sandbox/BaseSandboxService.ts +++ b/worker/services/sandbox/BaseSandboxService.ts @@ -34,6 +34,7 @@ import { createObjectLogger, StructuredLogger } from '../../logger'; import { env } from 'cloudflare:workers' import { ZipExtractor } from './zipExtractor'; import { FileTreeBuilder } from './fileTreeBuilder'; +import { DeploymentTarget } from 'worker/agents/core/types'; /** * Streaming event for enhanced command execution @@ -305,10 +306,10 @@ export abstract class BaseSandboxService { * Deploy instance to Cloudflare Workers * Returns: { success: boolean, message: string, deployedUrl?: string, deploymentId?: string, error?: string } */ - abstract deployToCloudflareWorkers(instanceId: string): Promise; + abstract deployToCloudflareWorkers(instanceId: string, target?: DeploymentTarget): Promise; // ========================================== // GITHUB INTEGRATION (Required) // ========================================== -} \ No newline at end of file +} diff --git a/worker/services/sandbox/remoteSandboxService.ts b/worker/services/sandbox/remoteSandboxService.ts index 42f06085..b52ce8cd 100644 --- a/worker/services/sandbox/remoteSandboxService.ts +++ b/worker/services/sandbox/remoteSandboxService.ts @@ -31,6 +31,7 @@ import { GitHubPushResponseSchema, } from './sandboxTypes'; import { BaseSandboxService } from "./BaseSandboxService"; +import { DeploymentTarget } from 'worker/agents/core/types'; import { env } from 'cloudflare:workers' import z from 'zod'; import { FileOutputType } from 'worker/agents/schemas'; @@ -193,7 +194,14 @@ export class RemoteSandboxServiceClient extends BaseSandboxService{ * @param instanceId The ID of the runner instance to deploy * @param credentials Optional Cloudflare deployment credentials */ - async deployToCloudflareWorkers(instanceId: string): Promise { + async deployToCloudflareWorkers(instanceId: string, target: DeploymentTarget = 'platform'): Promise { + if (target === 'user') { + return { + success: false, + message: 'User-targeted deployments are not available with remote sandbox runner', + error: 'unsupported_target' + }; + } return this.makeRequest(`/instances/${instanceId}/deploy`, 'POST', DeploymentResultSchema); } diff --git a/worker/services/sandbox/sandboxSdkClient.ts b/worker/services/sandbox/sandboxSdkClient.ts index e987e209..068f1d3e 100644 --- a/worker/services/sandbox/sandboxSdkClient.ts +++ b/worker/services/sandbox/sandboxSdkClient.ts @@ -32,6 +32,7 @@ import { buildDeploymentConfig, parseWranglerConfig, deployToDispatch, + deployWorker, } from '../deployer/deploy'; import { createAssetManifest @@ -43,6 +44,7 @@ import { ResourceProvisioningResult } from './types'; import { getPreviewDomain } from '../../utils/urls'; import { isDev } from 'worker/utils/envs' import { FileTreeBuilder } from './fileTreeBuilder'; +import { DeploymentTarget } from 'worker/agents/core/types'; // Export the Sandbox class in your Worker export { Sandbox as UserAppSandboxService, Sandbox as DeployerService} from "@cloudflare/sandbox"; @@ -1058,8 +1060,6 @@ export class SandboxSdkClient extends BaseSandboxService { instanceId = `i-${generateId()}`; } this.logger.info('Creating sandbox instance', { instanceId, templateName, projectName }); - - let results: {previewURL: string, tunnelURL: string, processId: string, allocatedPort: number} | undefined; await this.ensureTemplateExists(templateName); const [donttouchFiles, redactedFiles] = await Promise.all([ @@ -1080,17 +1080,16 @@ export class SandboxSdkClient extends BaseSandboxService { error: 'Failed to setup instance' }; } - results = setupResult; // Store instance metadata const metadata = { templateName: templateName, projectName: projectName, startTime: new Date().toISOString(), webhookUrl: webhookUrl, - previewURL: results?.previewURL, - processId: results?.processId, - tunnelURL: results?.tunnelURL, - allocatedPort: results?.allocatedPort, + previewURL: setupResult?.previewURL, + processId: setupResult?.processId, + tunnelURL: setupResult?.tunnelURL, + allocatedPort: setupResult?.allocatedPort, donttouch_files: donttouchFiles, redacted_files: redactedFiles, }; @@ -1100,9 +1099,9 @@ export class SandboxSdkClient extends BaseSandboxService { success: true, runId: instanceId, message: `Successfully created instance from template ${templateName}`, - previewURL: results?.previewURL, - tunnelURL: results?.tunnelURL, - processId: results?.processId, + previewURL: setupResult?.previewURL, + tunnelURL: setupResult?.tunnelURL, + processId: setupResult?.processId, }; } catch (error) { this.logger.error('createInstance', error, { templateName: templateName, projectName: projectName }); @@ -1574,8 +1573,6 @@ export class SandboxSdkClient extends BaseSandboxService { async clearInstanceErrors(instanceId: string): Promise { try { - let clearedCount = 0; - // Try enhanced error system first - clear ALL errors try { const cmd = `timeout 10s monitor-cli errors clear -i ${instanceId} --confirm`; @@ -1600,11 +1597,11 @@ export class SandboxSdkClient extends BaseSandboxService { this.logger.warn('Error clearing unavailable, falling back to legacy', enhancedError); } - this.logger.info(`Cleared ${clearedCount} errors for instance ${instanceId}`); + this.logger.info(`Cleared errors for instance ${instanceId}`); return { success: true, - message: `Cleared ${clearedCount} errors` + message: `Cleared errors` }; } catch (error) { this.logger.error('clearInstanceErrors', error, { instanceId }); @@ -1785,7 +1782,7 @@ export class SandboxSdkClient extends BaseSandboxService { // ========================================== // DEPLOYMENT // ========================================== - async deployToCloudflareWorkers(instanceId: string): Promise { + async deployToCloudflareWorkers(instanceId: string, target: DeploymentTarget = 'platform'): Promise { try { this.logger.info('Starting deployment', { instanceId }); @@ -1819,7 +1816,7 @@ export class SandboxSdkClient extends BaseSandboxService { // Step 2: Parse wrangler config from KV this.logger.info('Reading wrangler configuration from KV'); - let wranglerConfigContent = await env.VibecoderStore.get(this.getWranglerKVKey(instanceId)); + const wranglerConfigContent = await env.VibecoderStore.get(this.getWranglerKVKey(instanceId)); if (!wranglerConfigContent) { // This should never happen unless KV itself has some issues @@ -1925,8 +1922,14 @@ export class SandboxSdkClient extends BaseSandboxService { ); // Step 7: Deploy using pure function - this.logger.info('Deploying to Cloudflare'); - if ('DISPATCH_NAMESPACE' in env) { + const useDispatch = target === 'platform'; + this.logger.info('Deploying to Cloudflare', { target }); + + if (useDispatch) { + if (!('DISPATCH_NAMESPACE' in env)) { + throw new Error('DISPATCH_NAMESPACE not found in environment variables, cannot deploy without dispatch namespace'); + } + this.logger.info('Using dispatch namespace', { dispatchNamespace: env.DISPATCH_NAMESPACE }); await deployToDispatch( { @@ -1939,7 +1942,13 @@ export class SandboxSdkClient extends BaseSandboxService { config.assets ); } else { - throw new Error('DISPATCH_NAMESPACE not found in environment variables, cannot deploy without dispatch namespace'); + await deployWorker( + deployConfig, + fileContents, + additionalModules, + config.migrations, + config.assets + ); } // Step 8: Determine deployment URL @@ -1950,7 +1959,7 @@ export class SandboxSdkClient extends BaseSandboxService { instanceId, deployedUrl, deploymentId, - mode: 'dispatch-namespace' + mode: useDispatch ? 'dispatch-namespace' : 'user-worker' }); return { @@ -2041,4 +2050,4 @@ export class SandboxSdkClient extends BaseSandboxService { } return 'https'; } -} \ No newline at end of file +} From 2aea3c7ab3ddad9e20847567bc67960b155f7cef Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:04:09 -0500 Subject: [PATCH 03/58] feat: add ai-based project type detection and workflow support - Implemented AI-powered project type prediction (app/workflow/presentation) with confidence scoring and auto-detection when projectType is 'auto' - Enhanced template selection to filter by project type and skip AI selection for single-template scenarios in workflow/presentation types - Added GitHub token caching in CodeGeneratorAgent for persistent OAuth sessions across exports - Updated commitlint config to allow longer commit messages ( --- commitlint.config.js | 6 +- worker/agents/core/behaviors/agentic.ts | 3 +- worker/agents/core/behaviors/base.ts | 4 +- worker/agents/core/behaviors/phasic.ts | 5 +- worker/agents/core/codingAgent.ts | 26 ++- worker/agents/core/types.ts | 2 - worker/agents/index.ts | 6 +- worker/agents/planning/templateSelector.ts | 203 +++++++++++++++--- worker/agents/schemas.ts | 9 +- worker/api/controllers/agent/controller.ts | 15 +- worker/services/sandbox/BaseSandboxService.ts | 14 +- worker/services/sandbox/sandboxTypes.ts | 1 + 12 files changed, 230 insertions(+), 64 deletions(-) diff --git a/commitlint.config.js b/commitlint.config.js index 2f1da49f..522de8ef 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -22,10 +22,10 @@ export default { 'type-empty': [2, 'never'], 'subject-empty': [2, 'never'], 'subject-full-stop': [2, 'never', '.'], - 'header-max-length': [2, 'always', 100], + 'header-max-length': [2, 'always', 150], 'body-leading-blank': [1, 'always'], - 'body-max-line-length': [2, 'always', 100], + 'body-max-line-length': [2, 'always', 200], 'footer-leading-blank': [1, 'always'], - 'footer-max-line-length': [2, 'always', 100], + 'footer-max-line-length': [2, 'always', 200], }, }; diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index dd478cca..18f4dd53 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -184,11 +184,10 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl ); // Create build session for tools - // Note: AgenticCodingBehavior is currently used for 'app' type projects const session: BuildSession = { agent: this, filesIndex: Object.values(this.state.generatedFilesMap), - projectType: 'app' + projectType: this.state.projectType || 'app' }; // Create tool renderer for UI feedback diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 3124937b..d95997db 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -6,7 +6,7 @@ import { } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; import { AgentState, BaseProjectState } from '../state'; -import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget } from '../types'; +import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; import { ProjectSetupAssistant } from '../../assistants/projectsetup'; @@ -73,7 +73,7 @@ export abstract class BaseCodingBehavior return this.state.behaviorType; } - constructor(infrastructure: AgentInfrastructure) { + constructor(infrastructure: AgentInfrastructure, protected projectType: ProjectType) { super(infrastructure); } diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 72c48ab3..49eb0cca 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -71,7 +71,6 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem ): Promise { await super.initialize(initArgs); const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; - const projectType = initArgs.projectType || this.state.projectType || 'app'; // Generate a blueprint this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); @@ -86,7 +85,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem templateDetails: templateInfo?.templateDetails, templateMetaInfo: templateInfo?.selection, images: initArgs.images, - projectType, + projectType: this.projectType, stream: { chunk_size: 256, onChunk: (chunk) => { @@ -118,7 +117,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem sessionId: sandboxSessionId!, hostname, inferenceContext, - projectType, + projectType: this.projectType, }; this.setState(nextState); // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index e1023278..dd4761ab 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -122,9 +122,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI } if (behaviorType === 'phasic') { - this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure); + this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure, projectType); } else { - this.behavior = new AgenticCodingBehavior(this as AgentInfrastructure); + this.behavior = new AgenticCodingBehavior(this as AgentInfrastructure, projectType); } // Create objective based on project type @@ -563,4 +563,26 @@ export class CodeGeneratorAgent extends Agent implements AgentI throw error; } } + + /** + * Cache GitHub OAuth token in memory for subsequent exports + * Token is ephemeral - lost on DO eviction + */ + setGitHubToken(token: string, username: string, ttl: number = 3600000): void { + this.objective.setGitHubToken(token, username, ttl); + } + + /** + * Get cached GitHub token if available and not expired + */ + getGitHubToken(): { token: string; username: string } | null { + return this.objective.getGitHubToken(); + } + + /** + * Clear cached GitHub token + */ + clearGitHubToken(): void { + this.objective.clearGitHubToken(); + } } diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index 381881fa..d0152ed2 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -30,8 +30,6 @@ interface BaseAgentInitArgs { images?: ProcessedImageAttachment[]; onBlueprintChunk: (chunk: string) => void; sandboxSessionId?: string; // Generated by CodeGeneratorAgent, passed to behavior - behaviorType?: BehaviorType; - projectType?: ProjectType; } /** Phasic agent initialization arguments */ diff --git a/worker/agents/index.ts b/worker/agents/index.ts index b4aacc21..26cb1091 100644 --- a/worker/agents/index.ts +++ b/worker/agents/index.ts @@ -74,9 +74,10 @@ export async function getTemplateForQuery( env: Env, inferenceContext: InferenceContext, query: string, + projectType: ProjectType | 'auto', images: ImageAttachment[] | undefined, logger: StructuredLogger, -) : Promise<{templateDetails: TemplateDetails, selection: TemplateSelection}> { +) : Promise<{templateDetails: TemplateDetails, selection: TemplateSelection, projectType: ProjectType}> { // Fetch available templates const templatesResponse = await SandboxSdkClient.listTemplates(); if (!templatesResponse || !templatesResponse.success) { @@ -87,6 +88,7 @@ export async function getTemplateForQuery( env, inferenceContext, query, + projectType, availableTemplates: templatesResponse.templates, images, }); @@ -110,5 +112,5 @@ export async function getTemplateForQuery( } const templateDetails = templateDetailsResponse.templateDetails; - return { templateDetails, selection: analyzeQueryResponse }; + return { templateDetails, selection: analyzeQueryResponse, projectType: analyzeQueryResponse.projectType }; } diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index c2bea73f..fecbaae7 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -1,47 +1,115 @@ import { createSystemMessage, createUserMessage, createMultiModalUserMessage } from '../inferutils/common'; -import { TemplateListResponse} from '../../services/sandbox/sandboxTypes'; +import { TemplateInfo } from '../../services/sandbox/sandboxTypes'; import { createLogger } from '../../logger'; import { executeInference } from '../inferutils/infer'; import { InferenceContext } from '../inferutils/config.types'; import { RateLimitExceededError, SecurityError } from 'shared/types/errors'; -import { TemplateSelection, TemplateSelectionSchema } from '../../agents/schemas'; +import { TemplateSelection, TemplateSelectionSchema, ProjectTypePredictionSchema } from '../../agents/schemas'; import { generateSecureToken } from 'worker/utils/cryptoUtils'; import type { ImageAttachment } from '../../types/image-attachment'; +import { ProjectType } from '../core/types'; const logger = createLogger('TemplateSelector'); interface SelectTemplateArgs { env: Env; query: string; - availableTemplates: TemplateListResponse['templates']; + projectType?: ProjectType | 'auto'; + availableTemplates: TemplateInfo[]; inferenceContext: InferenceContext; images?: ImageAttachment[]; } /** - * Uses AI to select the most suitable template for a given query. + * Predicts the project type from the user query */ -export async function selectTemplate({ env, query, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { - if (availableTemplates.length === 0) { - logger.info("No templates available for selection."); - return { selectedTemplateName: null, reasoning: "No templates were available to choose from.", useCase: null, complexity: null, styleSelection: null, projectName: '' }; - } - +async function predictProjectType( + env: Env, + query: string, + inferenceContext: InferenceContext, + images?: ImageAttachment[] +): Promise { try { - logger.info(`Asking AI to select a template for the ${retryCount} time`, { - query, - queryLength: query.length, - imagesCount: images?.length || 0, - availableTemplates: availableTemplates.map(t => t.name), - templateCount: availableTemplates.length + logger.info('Predicting project type from query', { queryLength: query.length }); + + const systemPrompt = `You are an Expert Project Type Classifier at Cloudflare. Your task is to analyze user requests and determine what type of project they want to build. + +## PROJECT TYPES: + +**app** - Full-stack web applications +- Interactive websites with frontend and backend +- Dashboards, games, social platforms, e-commerce sites +- Any application requiring user interface and interactivity +- Examples: "Build a todo app", "Create a gaming dashboard", "Make a blog platform" + +**workflow** - Backend workflows and APIs +- Server-side logic without UI +- API endpoints, cron jobs, webhooks +- Data processing, automation tasks +- Examples: "Create an API to process payments", "Build a webhook handler", "Automate data sync" + +**presentation** - Slides and presentation decks +- Slide-based content for presentations +- Marketing decks, pitch decks, educational slides +- Visual storytelling with slides +- Examples: "Create slides about AI", "Make a product pitch deck", "Build a presentation on climate change" + +## RULES: +- Default to 'app' when uncertain +- Choose 'workflow' only when explicitly about APIs, automation, or backend-only tasks +- Choose 'presentation' only when explicitly about slides, decks, or presentations +- Consider the presence of UI/visual requirements as indicator for 'app' +- High confidence when keywords are explicit, medium/low when inferring`; + + const userPrompt = `**User Request:** "${query}" + +**Task:** Determine the project type and provide: +1. Project type (app, workflow, or presentation) +2. Reasoning for your classification +3. Confidence level (high, medium, low) + +Analyze the request carefully and classify accordingly.`; + + const userMessage = images && images.length > 0 + ? createMultiModalUserMessage( + userPrompt, + images.map(img => `data:${img.mimeType};base64,${img.base64Data}`), + 'high' + ) + : createUserMessage(userPrompt); + + const messages = [ + createSystemMessage(systemPrompt), + userMessage + ]; + + const { object: prediction } = await executeInference({ + env, + messages, + agentActionName: "templateSelection", // Reuse existing agent action + schema: ProjectTypePredictionSchema, + context: inferenceContext, + maxTokens: 500, + }); + + logger.info(`Predicted project type: ${prediction.projectType} (${prediction.confidence} confidence)`, { + reasoning: prediction.reasoning }); - const validTemplateNames = availableTemplates.map(t => t.name); + return prediction.projectType; - const templateDescriptions = availableTemplates.map((t, index) => - `### Template #${index + 1} \n Name - ${t.name} \n Language: ${t.language}, Frameworks: ${t.frameworks?.join(', ') || 'None'}\n Description: \`\`\`${t.description.selection}\`\`\`` - ).join('\n\n'); + } catch (error) { + logger.error("Error predicting project type, defaulting to 'app':", error); + return 'app'; + } +} - const systemPrompt = `You are an Expert Software Architect at Cloudflare specializing in template selection for rapid development. Your task is to select the most suitable starting template based on user requirements. +/** + * Generates appropriate system prompt based on project type + */ +function getSystemPromptForProjectType(projectType: ProjectType): string { + if (projectType === 'app') { + // Keep the detailed, original prompt for apps + return `You are an Expert Software Architect at Cloudflare specializing in template selection for rapid development. Your task is to select the most suitable starting template based on user requirements. ## SELECTION EXAMPLES: @@ -85,7 +153,83 @@ Reasoning: "Social template provides user interactions, content sharing, and com - Ignore misleading template names - analyze actual features - **ONLY** Choose from the list of available templates - Focus on functionality over naming conventions -- Provide clear, specific reasoning for selection` +- Provide clear, specific reasoning for selection`; + } + + // Simpler, more general prompts for workflow and presentation + return `You are an Expert Template Selector at Cloudflare. Your task is to select the most suitable ${projectType} template based on user requirements. + +## PROJECT TYPE: ${projectType.toUpperCase()} + +## SELECTION CRITERIA: +1. **Best Match** - Template that best fits the user's requirements +2. **Feature Alignment** - Templates with relevant functionality +3. **Minimal Modification** - Template requiring least customization + +## RULES: +- ALWAYS select a template from the available list +- Analyze template descriptions carefully +- **ONLY** Choose from the provided templates +- Provide clear reasoning for your selection`; +} + +/** + * Uses AI to select the most suitable template for a given query. + */ +export async function selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { + // Step 1: Predict project type if 'auto' + let actualProjectType: ProjectType = projectType === 'auto' + ? await predictProjectType(env, query, inferenceContext, images) + : (projectType || 'app') as ProjectType; + + logger.info(`Using project type: ${actualProjectType}${projectType === 'auto' ? ' (auto-detected)' : ''}`); + + // Step 2: Filter templates by project type + const filteredTemplates = availableTemplates.filter(t => t.projectType === actualProjectType); + + if (filteredTemplates.length === 0) { + logger.warn(`No templates available for project type: ${actualProjectType}`); + return { + selectedTemplateName: null, + reasoning: `No templates were available for project type: ${actualProjectType}`, + useCase: null, + complexity: null, + styleSelection: null, + projectType: actualProjectType || 'app' + }; + } + + // Step 3: Skip template selection if only 1 template for workflow/presentation + if ((actualProjectType === 'workflow' || actualProjectType === 'presentation') && filteredTemplates.length === 1) { + logger.info(`Only one ${actualProjectType} template available, auto-selecting: ${filteredTemplates[0].name}`); + return { + selectedTemplateName: filteredTemplates[0].name, + reasoning: `Auto-selected the only available ${actualProjectType} template`, + useCase: 'General', + complexity: 'simple', + styleSelection: null, + projectType: actualProjectType + }; + } + + try { + logger.info(`Asking AI to select a template for the ${retryCount} time`, { + query, + projectType: actualProjectType, + queryLength: query.length, + imagesCount: images?.length || 0, + availableTemplates: filteredTemplates.map(t => t.name), + templateCount: filteredTemplates.length + }); + + const validTemplateNames = filteredTemplates.map(t => t.name); + + const templateDescriptions = filteredTemplates.map((t, index) => + `### Template #${index + 1} \n Name - ${t.name} \n Language: ${t.language}, Frameworks: ${t.frameworks?.join(', ') || 'None'}\n Description: \`\`\`${t.description.selection}\`\`\`` + ).join('\n\n'); + + // Step 4: Perform AI-based template selection + const systemPrompt = getSystemPromptForProjectType(actualProjectType as ProjectType) const userPrompt = `**User Request:** "${query}" @@ -97,8 +241,8 @@ Template detail: ${templateDescriptions} **Task:** Select the most suitable template and provide: 1. Template name (exact match from list) 2. Clear reasoning for why it fits the user's needs -3. Appropriate style for the project type. Try to come up with unique styles that might look nice and unique. Be creative about your choices. But don't pick brutalist all the time. -4. Descriptive project name +${actualProjectType === 'app' ? '3. Appropriate style for the project type. Try to come up with unique styles that might look nice and unique. Be creative about your choices. But don\'t pick brutalist all the time.' : ''} +${actualProjectType === 'app' ? '4' : '3'}. Descriptive project name Analyze each template's features, frameworks, and architecture to make the best match. ${images && images.length > 0 ? `\n**Note:** User provided ${images.length} image(s) - consider visual requirements and UI style from the images.` : ''} @@ -128,7 +272,12 @@ ENTROPY SEED: ${generateSecureToken(64)} - for unique results`; }); logger.info(`AI template selection result: ${selection.selectedTemplateName || 'None'}, Reasoning: ${selection.reasoning}`); - return selection; + + // Ensure projectType is set correctly + return { + ...selection, + projectType: actualProjectType + }; } catch (error) { logger.error("Error during AI template selection:", error); @@ -137,9 +286,9 @@ ENTROPY SEED: ${generateSecureToken(64)} - for unique results`; } if (retryCount > 0) { - return selectTemplate({ env, query, availableTemplates, inferenceContext, images }, retryCount - 1); + return selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }, retryCount - 1); } // Fallback to no template selection in case of error - return { selectedTemplateName: null, reasoning: "An error occurred during the template selection process.", useCase: null, complexity: null, styleSelection: null, projectName: '' }; + return { selectedTemplateName: null, reasoning: "An error occurred during the template selection process.", useCase: null, complexity: null, styleSelection: null, projectType: actualProjectType }; } } \ No newline at end of file diff --git a/worker/agents/schemas.ts b/worker/agents/schemas.ts index 7ba540fe..48122085 100644 --- a/worker/agents/schemas.ts +++ b/worker/agents/schemas.ts @@ -1,5 +1,12 @@ import z from 'zod'; +// Schema for AI project type prediction +export const ProjectTypePredictionSchema = z.object({ + projectType: z.enum(['app', 'workflow', 'presentation']).describe('The predicted type of project based on the user query'), + reasoning: z.string().describe('Brief explanation for why this project type was selected'), + confidence: z.enum(['high', 'medium', 'low']).describe('Confidence level in the prediction'), +}); + // Schema for AI template selection output export const TemplateSelectionSchema = z.object({ selectedTemplateName: z.string().nullable().describe('The name of the most suitable template, or null if none are suitable.'), @@ -7,7 +14,7 @@ export const TemplateSelectionSchema = z.object({ useCase: z.enum(['SaaS Product Website', 'Dashboard', 'Blog', 'Portfolio', 'E-Commerce', 'General', 'Other']).describe('The use case for which the template is selected, if applicable.').nullable(), complexity: z.enum(['simple', 'moderate', 'complex']).describe('The complexity of developing the project based on the the user query').nullable(), styleSelection: z.enum(['Minimalist Design', 'Brutalism', 'Retro', 'Illustrative', 'Kid_Playful', 'Custom']).describe('Pick a style relevant to the user query').nullable(), - projectName: z.string().describe('The name of the project based on the user query'), + projectType: z.enum(['app', 'workflow', 'presentation']).default('app').describe('The type of project based on the user query'), }); export const FileOutputSchema = z.object({ diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index 9b1ae22d..e6fe7144 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -34,8 +34,8 @@ const resolveBehaviorType = (body: CodeGenArgs): BehaviorType => { return body.agentMode === 'smart' ? 'agentic' : 'phasic'; }; -const resolveProjectType = (body: CodeGenArgs): ProjectType => { - return body.projectType || defaultCodeGenArgs.projectType || 'app'; +const resolveProjectType = (body: CodeGenArgs): ProjectType | 'auto' => { + return body.projectType || defaultCodeGenArgs.projectType || 'auto'; }; @@ -95,10 +95,7 @@ export class CodingAgentController extends BaseController { const projectType = resolveProjectType(body); // Fetch all user model configs, api keys and agent instance at once - const [userConfigsRecord, agentInstance] = await Promise.all([ - modelConfigService.getUserModelConfigs(user.id), - getAgentStub(env, agentId, { behaviorType, projectType }) - ]); + const userConfigsRecord = await modelConfigService.getUserModelConfigs(user.id); // Convert Record to Map and extract only ModelConfig properties const userModelConfigs = new Map(); @@ -126,8 +123,9 @@ export class CodingAgentController extends BaseController { this.logger.info(`Initialized inference context for user ${user.id}`, { modelConfigsCount: Object.keys(userModelConfigs).length, }); + this.logger.info(`Creating project of type: ${projectType}`); - const { templateDetails, selection } = await getTemplateForQuery(env, inferenceContext, query, body.images, this.logger); + const { templateDetails, selection, projectType: finalProjectType } = await getTemplateForQuery(env, inferenceContext, query, projectType, body.images, this.logger); const websocketUrl = `${url.protocol === 'https:' ? 'wss:' : 'ws:'}//${url.host}/api/agent/${agentId}/ws`; const httpStatusUrl = `${url.origin}/api/agent/${agentId}`; @@ -149,6 +147,7 @@ export class CodingAgentController extends BaseController { files: getTemplateImportantFiles(templateDetails), } }); + const agentInstance = await getAgentStub(env, agentId, { behaviorType, projectType: finalProjectType }); const agentPromise = agentInstance.initialize({ query, @@ -160,8 +159,6 @@ export class CodingAgentController extends BaseController { onBlueprintChunk: (chunk: string) => { writer.write({chunk}); }, - behaviorType, - projectType, templateInfo: { templateDetails, selection }, }) as Promise; agentPromise.then(async (_state: AgentState) => { diff --git a/worker/services/sandbox/BaseSandboxService.ts b/worker/services/sandbox/BaseSandboxService.ts index f69eaa23..317c04c5 100644 --- a/worker/services/sandbox/BaseSandboxService.ts +++ b/worker/services/sandbox/BaseSandboxService.ts @@ -28,6 +28,7 @@ import { GetLogsResponse, ListInstancesResponse, TemplateDetails, + TemplateInfo, } from './sandboxTypes'; import { createObjectLogger, StructuredLogger } from '../../logger'; @@ -46,16 +47,6 @@ export interface StreamEvent { error?: string; timestamp: Date; } - -export interface TemplateInfo { - name: string; - language?: string; - frameworks?: string[]; - description: { - selection: string; - usage: string; - }; -} const templateDetailsCache: Record = {}; @@ -101,7 +92,8 @@ export abstract class BaseSandboxService { name: t.name, language: t.language, frameworks: t.frameworks || [], - description: t.description + description: t.description, + projectType: t.projectType || 'app' })), count: filteredTemplates.length }; diff --git a/worker/services/sandbox/sandboxTypes.ts b/worker/services/sandbox/sandboxTypes.ts index a5ab96ab..29000152 100644 --- a/worker/services/sandbox/sandboxTypes.ts +++ b/worker/services/sandbox/sandboxTypes.ts @@ -102,6 +102,7 @@ export const TemplateInfoSchema = z.object({ name: z.string(), language: z.string().optional(), frameworks: z.array(z.string()).optional(), + projectType: z.enum(['app', 'workflow', 'presentation']).default('app'), description: z.object({ selection: z.string(), usage: z.string(), From e8d07affe902bab37aa585ce58d3915b08139893 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:19:19 -0500 Subject: [PATCH 04/58] fix: template initialization - Initialize template cache during agent setup to avoid redundant fetches - Remove redundant project name prompt from template selection - Clean up default projectType fallback logic --- worker/agents/core/behaviors/base.ts | 7 ++++++- worker/agents/git/git.ts | 2 +- worker/agents/planning/templateSelector.ts | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index d95997db..48ac0ac8 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -78,10 +78,15 @@ export abstract class BaseCodingBehavior } public async initialize( - _initArgs: AgentInitArgs, + initArgs: AgentInitArgs, ..._args: unknown[] ): Promise { this.logger.info("Initializing agent"); + const {templateInfo} = initArgs; + if (templateInfo) { + this.templateDetailsCache = templateInfo.templateDetails; + } + await this.ensureTemplateDetails(); return this.state; } diff --git a/worker/agents/git/git.ts b/worker/agents/git/git.ts index f9e79c9c..29a5acd9 100644 --- a/worker/agents/git/git.ts +++ b/worker/agents/git/git.ts @@ -93,7 +93,7 @@ export class GitVersionControl { } } - console.log(`[Git] Staged ${files.length} files`, files); + console.log(`[Git] Staged ${files.length} files: ${files.map(f => f.filePath).join(', ')}`); } private normalizePath(path: string): string { diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index fecbaae7..0660b040 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -195,7 +195,7 @@ export async function selectTemplate({ env, query, projectType, availableTemplat useCase: null, complexity: null, styleSelection: null, - projectType: actualProjectType || 'app' + projectType: actualProjectType }; } @@ -242,7 +242,6 @@ Template detail: ${templateDescriptions} 1. Template name (exact match from list) 2. Clear reasoning for why it fits the user's needs ${actualProjectType === 'app' ? '3. Appropriate style for the project type. Try to come up with unique styles that might look nice and unique. Be creative about your choices. But don\'t pick brutalist all the time.' : ''} -${actualProjectType === 'app' ? '4' : '3'}. Descriptive project name Analyze each template's features, frameworks, and architecture to make the best match. ${images && images.length > 0 ? `\n**Note:** User provided ${images.length} image(s) - consider visual requirements and UI style from the images.` : ''} From 40ab40ec472d68f0f6bc1ffb3460593d5b94aa92 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:33:40 -0500 Subject: [PATCH 05/58] fix: wire up onConnect to coding agent --- worker/agents/core/behaviors/base.ts | 13 ++----------- worker/agents/core/codingAgent.ts | 12 ++++++++++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 48ac0ac8..3e2da3b6 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -1,11 +1,11 @@ -import { Connection, ConnectionContext } from 'agents'; +import { Connection } from 'agents'; import { FileConceptType, FileOutputType, Blueprint, } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; -import { AgentState, BaseProjectState } from '../state'; +import { BaseProjectState } from '../state'; import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; @@ -34,7 +34,6 @@ import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; import { AgentComponent } from '../AgentComponent'; import type { AgentInfrastructure } from '../AgentCore'; -import { sendToConnection } from '../websocket'; import { GitVersionControl } from '../../git'; export interface BaseCodingOperations { @@ -111,14 +110,6 @@ export abstract class BaseCodingBehavior } onStateUpdate(_state: TState, _source: "server" | Connection) {} - onConnect(connection: Connection, ctx: ConnectionContext) { - this.logger.info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); - sendToConnection(connection, 'agent_connected', { - state: this.state as unknown as AgentState, - templateDetails: this.getTemplateDetails() - }); - } - async ensureTemplateDetails() { if (!this.templateDetailsCache) { this.logger.info(`Loading template details for: ${this.state.templateName}`); diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index dd4761ab..ae574b5c 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -1,4 +1,4 @@ -import { Agent, AgentContext } from "agents"; +import { Agent, AgentContext, ConnectionContext } from "agents"; import { AgentInitArgs, AgentSummary, BehaviorType, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget } from "./types"; import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; import { Blueprint } from "../schemas"; @@ -15,7 +15,7 @@ import { SqlExecutor } from '../git'; import { AgentInfrastructure } from "./AgentCore"; import { ProjectType } from './types'; import { Connection } from 'agents'; -import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections } from './websocket'; +import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections, sendToConnection } from './websocket'; import { WebSocketMessageData, WebSocketMessageType } from "worker/api/websocketTypes"; import { PreviewType, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; import { WebSocketMessageResponses } from "../constants"; @@ -218,6 +218,14 @@ export class CodeGeneratorAgent extends Agent implements AgentI await this.behavior.ensureTemplateDetails(); this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart processed successfully`); } + + onConnect(connection: Connection, ctx: ConnectionContext) { + this.logger().info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); + sendToConnection(connection, 'agent_connected', { + state: this.state, + templateDetails: this.behavior.getTemplateDetails() + }); + } private initLogger(agentId: string, userId: string, sessionId?: string) { this._logger = createObjectLogger(this, 'CodeGeneratorAgent'); From 740bf1c383f5221ab141fa9b93a6183b65906b2f Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:39:26 -0500 Subject: [PATCH 06/58] feat: improve GitHub Actions workflow reliability - Added concurrency control to prevent duplicate workflow runs on the same PR - Replaced Claude-based comment cleanup with direct GitHub API deletion for better reliability - Enhanced code debugger instructions to handle Vite dev server restarts and config file restrictions --- .github/workflows/claude-reviews.yml | 65 ++++++++++-------------- worker/agents/assistants/codeDebugger.ts | 3 +- 2 files changed, 29 insertions(+), 39 deletions(-) diff --git a/.github/workflows/claude-reviews.yml b/.github/workflows/claude-reviews.yml index f85694c1..3db866ad 100644 --- a/.github/workflows/claude-reviews.yml +++ b/.github/workflows/claude-reviews.yml @@ -8,6 +8,10 @@ on: pull_request_review_comment: types: [created] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: comprehensive-review: name: PR Description & Code Review @@ -30,6 +34,29 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + + - name: Delete Previous Claude Comments + run: | + echo "🧹 Deleting previous Claude comments from github-actions bot..." + + # Get all comments from github-actions bot containing 'Claude' + CLAUDE_COMMENTS=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments \ + --jq '[.[] | select(.user.login == "github-actions[bot]") | select(.body | contains("Claude")) | .id]') + + if [ "$CLAUDE_COMMENTS" = "[]" ] || [ -z "$CLAUDE_COMMENTS" ]; then + echo "No previous Claude comments found" + else + echo "Found Claude comments to delete:" + echo "$CLAUDE_COMMENTS" | jq -r '.[]' | while read comment_id; do + echo "Deleting comment $comment_id" + gh api repos/${{ github.repository }}/issues/comments/$comment_id -X DELETE || echo "Failed to delete comment $comment_id" + done + echo "✅ Deleted previous Claude comments" + fi + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + continue-on-error: true + - name: Detect Critical Paths id: critical_paths run: | @@ -147,41 +174,3 @@ jobs: --max-turns ${{ steps.critical_paths.outputs.is_critical == 'true' && '90' || '65' }} --model claude-sonnet-4-5-20250929 - - name: Intelligent Comment Cleanup - uses: anthropics/claude-code-action@v1 - if: always() - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} - prompt: | - Clean up stale bot comments on PR #${{ github.event.pull_request.number }}. - - **Task:** - 1. Fetch all comments on this PR - 2. Identify bot comments (users ending in [bot]) that are stale/outdated: - - Old reviews superseded by newer ones - - Old PR description suggestions - - Previously collapsed/outdated markers - - Progress/status comments from previous workflow runs - 3. Keep only the most recent comment per category per bot - 4. DELETE all stale comments (do not collapse) - - **Get all comments:** - ```bash - gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments --jq '.[] | {id, user: .user.login, body, created_at}' - ``` - - **Delete a comment:** - ```bash - gh api repos/${{ github.repository }}/issues/comments/COMMENT_ID -X DELETE - ``` - - Be intelligent: - - Preserve the newest useful comment in each category - - Delete everything else that's redundant or stale - - If unsure, keep the comment (conservative approach) - - claude_args: | - --allowed-tools "Bash(gh api repos/*/issues/*/comments:*),Bash(gh api repos/*/issues/comments/*:*)" - --max-turns 8 - --model claude-haiku-4-5-20251001 diff --git a/worker/agents/assistants/codeDebugger.ts b/worker/agents/assistants/codeDebugger.ts index 45157ad8..586f3541 100644 --- a/worker/agents/assistants/codeDebugger.ts +++ b/worker/agents/assistants/codeDebugger.ts @@ -360,6 +360,7 @@ deploy_preview({ clearLogs: true }) - Always check timestamps vs. your deploy times - Cross-reference with get_runtime_errors and actual code - Don't fix issues that were already resolved + - Ignore server restarts - It is a vite dev server running, so it will restart on every source modification. This is normal. - **Before regenerate_file**: Read current code to confirm bug exists - **After regenerate_file**: Check diff to verify correctness @@ -396,7 +397,7 @@ deploy_preview({ clearLogs: true }) - **React**: render loops (state-in-render, missing deps, unstable Zustand selectors) - **Import/export**: named vs default inconsistency - **Type safety**: maintain strict TypeScript compliance -- **Configuration files**: Never try to edit wrangler.jsonc or package.json +- **Configuration files**: Never try to edit wrangler.jsonc, vite.config.ts or package.json **⚠️ CRITICAL: Do NOT "Optimize" Zustand Selectors** If you see this pattern - **LEAVE IT ALONE** (it's already optimal): From a25e72fb5739e3d1e19b8ea3d9158397099ad9fa Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 11:38:09 -0500 Subject: [PATCH 07/58] refactor: improve type safety in state migration logic - Replaced unsafe type assertions with proper type guards for legacy state detection - Added explicit type definitions for deprecated state fields and legacy file formats - Eliminated all 'any' types while maintaining backward compatibility with legacy states --- worker/agents/core/behaviors/base.ts | 2 +- worker/agents/core/stateMigration.ts | 75 ++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 3e2da3b6..0886c7c1 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -750,7 +750,7 @@ export abstract class BaseCodingBehavior async execCommands(commands: string[], shouldSave: boolean, timeout?: number): Promise { const { sandboxInstanceId } = this.state; if (!sandboxInstanceId) { - return { success: false, results: [], error: 'No sandbox instance' } as any; + return { success: false, results: [], error: 'No sandbox instance' }; } const result = await this.getSandboxServiceClient().executeCommands(sandboxInstanceId, commands, timeout); if (shouldSave) { diff --git a/worker/agents/core/stateMigration.ts b/worker/agents/core/stateMigration.ts index e6a7bac9..d77dd2dc 100644 --- a/worker/agents/core/stateMigration.ts +++ b/worker/agents/core/stateMigration.ts @@ -4,25 +4,53 @@ import { TemplateDetails } from 'worker/services/sandbox/sandboxTypes'; import { generateNanoId } from '../../utils/idGenerator'; import { generateProjectName } from '../utils/templateCustomizer'; +// Type guards for legacy state detection +type LegacyFileFormat = { + file_path?: string; + file_contents?: string; + file_purpose?: string; +}; + +type StateWithDeprecatedFields = AgentState & { + latestScreenshot?: unknown; + templateDetails?: TemplateDetails; + agentMode?: string; +}; + +function hasLegacyFileFormat(file: unknown): file is LegacyFileFormat { + if (typeof file !== 'object' || file === null) return false; + return 'file_path' in file || 'file_contents' in file || 'file_purpose' in file; +} + +function hasField(state: AgentState, key: K): state is AgentState & Record { + return key in state; +} + +function isStateWithTemplateDetails(state: AgentState): state is StateWithDeprecatedFields & { templateDetails: TemplateDetails } { + return 'templateDetails' in state; +} + +function isStateWithAgentMode(state: AgentState): state is StateWithDeprecatedFields & { agentMode: string } { + return 'agentMode' in state; +} + export class StateMigration { static migrateIfNeeded(state: AgentState, logger: StructuredLogger): AgentState | null { let needsMigration = false; - const legacyState = state as unknown as Record; //------------------------------------------------------------------------------------ // Migrate files from old schema //------------------------------------------------------------------------------------ - const migrateFile = (file: any): any => { - const hasOldFormat = 'file_path' in file || 'file_contents' in file || 'file_purpose' in file; - - if (hasOldFormat) { + const migrateFile = (file: FileState | unknown): FileState => { + if (hasLegacyFileFormat(file)) { return { - filePath: file.filePath || file.file_path, - fileContents: file.fileContents || file.file_contents, - filePurpose: file.filePurpose || file.file_purpose, + filePath: (file as FileState).filePath || file.file_path || '', + fileContents: (file as FileState).fileContents || file.file_contents || '', + filePurpose: (file as FileState).filePurpose || file.file_purpose || '', + lastDiff: (file as FileState).lastDiff || '', }; } - return file; + return file as FileState; }; const migratedFilesMap: Record = {}; @@ -127,19 +155,21 @@ export class StateMigration { ...migratedInferenceContext }; - delete (migratedInferenceContext as any).userApiKeys; + // Remove the deprecated field using type assertion + const contextWithLegacyField = migratedInferenceContext as unknown as Record; + delete contextWithLegacyField.userApiKeys; needsMigration = true; } //------------------------------------------------------------------------------------ // Migrate deprecated props //------------------------------------------------------------------------------------ - const stateHasDeprecatedProps = 'latestScreenshot' in (state as any); + const stateHasDeprecatedProps = hasField(state, 'latestScreenshot'); if (stateHasDeprecatedProps) { needsMigration = true; } - const stateHasProjectUpdatesAccumulator = 'projectUpdatesAccumulator' in (state as any); + const stateHasProjectUpdatesAccumulator = hasField(state, 'projectUpdatesAccumulator'); if (!stateHasProjectUpdatesAccumulator) { needsMigration = true; } @@ -148,10 +178,9 @@ export class StateMigration { // Migrate templateDetails -> templateName //------------------------------------------------------------------------------------ let migratedTemplateName = state.templateName; - const hasTemplateDetails = 'templateDetails' in (state as any); + const hasTemplateDetails = isStateWithTemplateDetails(state); if (hasTemplateDetails) { - const templateDetails = (state as any).templateDetails; - migratedTemplateName = (templateDetails as TemplateDetails).name; + migratedTemplateName = state.templateDetails.name; needsMigration = true; logger.info('Migrating templateDetails to templateName', { templateName: migratedTemplateName }); } @@ -172,15 +201,16 @@ export class StateMigration { } let migratedProjectType = state.projectType; - if (!('projectType' in legacyState) || !migratedProjectType) { + const hasProjectType = hasField(state, 'projectType'); + if (!hasProjectType || !migratedProjectType) { migratedProjectType = 'app'; needsMigration = true; logger.info('Adding default projectType for legacy state', { projectType: migratedProjectType }); } let migratedBehaviorType = state.behaviorType; - if ('agentMode' in legacyState) { - const legacyAgentMode = (legacyState as { agentMode?: string }).agentMode; + if (isStateWithAgentMode(state)) { + const legacyAgentMode = state.agentMode; const nextBehaviorType = legacyAgentMode === 'smart' ? 'agentic' : 'phasic'; if (nextBehaviorType !== migratedBehaviorType) { migratedBehaviorType = nextBehaviorType; @@ -212,14 +242,15 @@ export class StateMigration { } as AgentState; // Remove deprecated fields + const stateWithDeprecated = newState as StateWithDeprecatedFields; if (stateHasDeprecatedProps) { - delete (newState as any).latestScreenshot; + delete stateWithDeprecated.latestScreenshot; } if (hasTemplateDetails) { - delete (newState as any).templateDetails; + delete stateWithDeprecated.templateDetails; } - if ('agentMode' in legacyState) { - delete (newState as any).agentMode; + if (isStateWithAgentMode(state)) { + delete stateWithDeprecated.agentMode; } return newState; From bb09d9207a715476025accfed8d4fae36143b513 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 11:46:59 -0500 Subject: [PATCH 08/58] fix: add optional chaining to prevent runtime errors in blueprint rendering --- src/routes/chat/components/blueprint.tsx | 12 ++++++------ worker/agents/assistants/agenticProjectBuilder.ts | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/routes/chat/components/blueprint.tsx b/src/routes/chat/components/blueprint.tsx index 40fc6e0c..bf8bf40c 100644 --- a/src/routes/chat/components/blueprint.tsx +++ b/src/routes/chat/components/blueprint.tsx @@ -89,13 +89,13 @@ export function Blueprint({
{/* Views */} - {phasicBlueprint && phasicBlueprint.views.length > 0 && ( + {phasicBlueprint && phasicBlueprint.views?.length > 0 && (

Views

- {phasicBlueprint.views.map((view, index) => ( + {phasicBlueprint.views?.map((view, index) => (

{view.name} @@ -165,13 +165,13 @@ export function Blueprint({ )} {/* Implementation Roadmap */} - {phasicBlueprint && phasicBlueprint.implementationRoadmap.length > 0 && ( + {phasicBlueprint && phasicBlueprint.implementationRoadmap?.length > 0 && (

Implementation Roadmap

- {phasicBlueprint.implementationRoadmap.map((roadmapItem, index) => ( + {phasicBlueprint.implementationRoadmap?.map((roadmapItem, index) => (

Phase {index + 1}: {roadmapItem.phase} @@ -220,14 +220,14 @@ export function Blueprint({ )} {/* Pitfalls */} - {phasicBlueprint && phasicBlueprint.pitfalls.length > 0 && ( + {phasicBlueprint && phasicBlueprint.pitfalls?.length > 0 && (

Pitfalls

    - {phasicBlueprint.pitfalls.map((pitfall, index) => ( + {phasicBlueprint.pitfalls?.map((pitfall, index) => (
  • {pitfall}
    • diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 01ba66d8..9c22fdf1 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -52,7 +52,6 @@ Build a complete, functional, polished project from the user's requirements usin - **Testing**: Sandbox/Container preview with live reload ## Platform Constraints -- **NEVER edit wrangler.jsonc or package.json** - these are locked - **Only use dependencies from project's package.json** - no others exist - All projects run in Cloudflare Workers environment - **No Node.js APIs** (no fs, path, process, etc.) From 5e4ebb2e86f7094978499de6796bf3891b19a6ef Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 00:10:51 -0500 Subject: [PATCH 09/58] feat: general agent --- .../assistants/agenticProjectBuilder.ts | 335 ++++++------------ worker/agents/core/behaviors/agentic.ts | 44 +-- worker/agents/core/behaviors/base.ts | 91 ++++- worker/agents/core/behaviors/phasic.ts | 8 +- worker/agents/core/codingAgent.ts | 54 +-- worker/agents/core/objectives/general.ts | 38 ++ worker/agents/core/types.ts | 2 +- worker/agents/index.ts | 20 +- worker/agents/planning/blueprint.ts | 5 + worker/agents/planning/templateSelector.ts | 13 +- worker/agents/schemas.ts | 4 +- .../services/interfaces/ICodingAgent.ts | 8 +- worker/agents/tools/customTools.ts | 82 +++-- .../agents/tools/toolkit/alter-blueprint.ts | 99 +++--- .../tools/toolkit/generate-blueprint.ts | 56 +++ .../agents/tools/toolkit/generate-images.ts | 35 ++ .../agents/tools/toolkit/initialize-slides.ts | 46 +++ worker/agents/utils/templates.ts | 21 ++ worker/api/controllers/agent/controller.ts | 47 ++- worker/api/controllers/agent/types.ts | 6 +- 20 files changed, 623 insertions(+), 391 deletions(-) create mode 100644 worker/agents/core/objectives/general.ts create mode 100644 worker/agents/tools/toolkit/generate-blueprint.ts create mode 100644 worker/agents/tools/toolkit/generate-images.ts create mode 100644 worker/agents/tools/toolkit/initialize-slides.ts create mode 100644 worker/agents/utils/templates.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 9c22fdf1..e5c665a6 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -8,13 +8,13 @@ import { executeInference } from '../inferutils/infer'; import { InferenceContext, ModelConfig } from '../inferutils/config.types'; import { createObjectLogger } from '../../logger'; import { AGENT_CONFIG } from '../inferutils/config'; -import { buildDebugTools } from '../tools/customTools'; +import { buildAgenticBuilderTools } from '../tools/customTools'; import { RenderToolCall } from '../operations/UserConversationProcessor'; import { PROMPT_UTILS } from '../prompts'; import { FileState } from '../core/state'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { ProjectType } from '../core/types'; -import { Blueprint } from '../schemas'; +import { Blueprint, AgenticBlueprint } from '../schemas'; export type BuildSession = { filesIndex: FileState[]; @@ -29,210 +29,77 @@ export type BuildInputs = { }; /** - * Get base system prompt with project type specific instructions + * Build a rich, dynamic system prompt similar in rigor to DeepCodeDebugger, + * but oriented for autonomous building. Avoids leaking internal taxonomy. */ -const getSystemPrompt = (projectType: ProjectType): string => { - const baseInstructions = `You are an elite Autonomous Project Builder at Cloudflare, specialized in building complete, production-ready applications using an LLM-driven tool-calling approach. - -## CRITICAL: Communication Mode -**You have EXTREMELY HIGH reasoning capability. Use it strategically.** -- Conduct analysis and planning INTERNALLY -- Output should be CONCISE but informative: status updates, key decisions, and tool calls -- NO lengthy thought processes or verbose play-by-play narration -- Think deeply internally → Act decisively externally → Report progress clearly - -## Your Mission -Build a complete, functional, polished project from the user's requirements using available tools. You orchestrate the entire build process autonomously - from scaffolding to deployment to verification. - -## Platform Environment -- **Runtime**: Cloudflare Workers (V8 isolates, not Node.js) -- **Language**: TypeScript -- **Build Tool**: Vite (for frontend projects) -- **Deployment**: wrangler to Cloudflare edge -- **Testing**: Sandbox/Container preview with live reload - -## Platform Constraints -- **Only use dependencies from project's package.json** - no others exist -- All projects run in Cloudflare Workers environment -- **No Node.js APIs** (no fs, path, process, etc.) - -## Available Tools - -**File Management:** -- **generate_files**: Create new files or rewrite existing files - - Use for scaffolding components, utilities, API routes, pages - - Requires: phase_name, phase_description, requirements[], files[] - - Automatically commits changes to git - - This is your PRIMARY tool for building the project - -- **regenerate_file**: Make surgical fixes to existing files - - Use for targeted bug fixes and updates - - Requires: path, issues[] - - Files are automatically staged (need manual commit with git tool) - -- **read_files**: Read file contents (batch multiple for efficiency) - -**Deployment & Testing:** -- **deploy_preview**: Deploy to Cloudflare Workers preview - - REQUIRED before verification - - Use clearLogs=true to start fresh - - Deployment URL will be available for testing - -- **run_analysis**: Fast static analysis (lint + typecheck) - - Use FIRST for verification after generation - - No user interaction needed - - Catches syntax errors, type errors, import issues - -- **get_runtime_errors**: Recent runtime errors (requires user interaction with deployed app) -- **get_logs**: Cumulative logs (use sparingly, verbose, requires user interaction) - -**Commands & Git:** -- **exec_commands**: Execute shell commands from project root - - Use for installing dependencies (if needed), running tests, etc. - - Set shouldSave=true to persist changes - -- **git**: Version control (commit, log, show) - - Commit regularly with descriptive messages - - Use after significant milestones - -**Utilities:** -- **wait**: Sleep for N seconds (use after deploy to allow user interaction time) - -## Core Build Workflow - -1. **Understand Requirements**: Analyze user query and blueprint (if provided) -2. **Plan Structure**: Decide what files/components to create -3. **Scaffold Project**: Use generate_files to create initial structure -4. **Deploy & Test**: deploy_preview to verify in sandbox -5. **Verify Quality**: run_analysis for static checks -6. **Fix Issues**: Use regenerate_file or generate_files for corrections -7. **Commit Progress**: git commit with descriptive messages -8. **Iterate**: Repeat steps 4-7 until project is complete and polished -9. **Final Verification**: Comprehensive check before declaring complete - -## Critical Build Principles`; - - // Add project-type specific instructions - let typeSpecificInstructions = ''; - - if (projectType === 'app') { - typeSpecificInstructions = ` - -## Project Type: Full-Stack Web Application - -**Stack:** -- Frontend: React + Vite + TypeScript -- Backend: Cloudflare Workers (Durable Objects when needed) -- Styling: Tailwind CSS + shadcn/ui components -- State: Zustand for client state -- API: REST/JSON endpoints in Workers - -**CRITICAL: Visual Excellence Requirements** - -YOU MUST CREATE VISUALLY STUNNING APPLICATIONS. - -Every component must demonstrate: -- **Modern UI Design**: Clean, professional, beautiful interfaces -- **Perfect Spacing**: Harmonious padding, margins, and layout rhythm -- **Visual Hierarchy**: Clear information flow and structure -- **Interactive Polish**: Smooth hover states, transitions, micro-interactions -- **Responsive Excellence**: Flawless on mobile, tablet, and desktop -- **Professional Depth**: Thoughtful shadows, borders, and elevation -- **Color Harmony**: Consistent, accessible color schemes -- **Typography**: Clear hierarchy with perfect font sizes and weights - -${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} - -${PROMPT_UTILS.COMMON_PITFALLS} - -**Success Criteria for Apps:** -✅ All features work as specified -✅ Can be demoed immediately without errors -✅ Visually stunning and professional-grade -✅ Responsive across all device sizes -✅ No runtime errors or TypeScript issues -✅ Smooth interactions with proper feedback -✅ Code is clean, type-safe, and maintainable`; - - } else if (projectType === 'workflow') { - typeSpecificInstructions = ` - -## Project Type: Backend Workflow - -**Focus:** -- Backend-only Cloudflare Workers -- REST APIs, scheduled jobs, queue processing, webhooks, data pipelines -- No UI components needed -- Durable Objects for stateful workflows - -**Success Criteria for Workflows:** -✅ All endpoints/handlers work correctly -✅ Robust error handling and validation -✅ No runtime errors or TypeScript issues -✅ Clean, maintainable architecture -✅ Proper logging for debugging -✅ Type-safe throughout`; - - } else if (projectType === 'presentation') { - typeSpecificInstructions = ` - -## Project Type: Presentation/Slides - -**Stack:** -- Spectacle (React-based presentation library) -- Tailwind CSS for styling -- Web-based slides (can export to PDF) - -**Success Criteria for Presentations:** -✅ All slides implemented with content -✅ Visually stunning and engaging design -✅ Clear content hierarchy and flow -✅ Smooth transitions between slides -✅ No rendering or TypeScript errors -✅ Professional-grade visual polish`; - } - - const completionGuidelines = ` - -## Communication & Progress Updates - -**DO:** -- Report key milestones: "Scaffolding complete", "Deployment successful", "All tests passing" -- Explain critical decisions: "Using Zustand for state management because..." -- Share verification results: "Static analysis passed", "3 TypeScript errors found" -- Update on iterations: "Fixed rendering issue, redeploying..." - -**DON'T:** -- Output verbose thought processes -- Narrate every single step -- Repeat yourself unnecessarily -- Over-explain obvious actions - -## When You're Done - -**Success Completion:** -1. Write: "BUILD_COMPLETE: [brief summary]" -2. Provide final report: - - What was built (key files/features) - - Verification results (all checks passed) - - Deployment URL - - Any notes for the user -3. **CRITICAL: Once you write "BUILD_COMPLETE", IMMEDIATELY HALT with no more tool calls.** - -**If Stuck:** -1. State: "BUILD_STUCK: [reason]" + what you tried -2. **CRITICAL: Once you write "BUILD_STUCK", IMMEDIATELY HALT with no more tool calls.** - -## Working Style -- Use your internal reasoning capability - think deeply, output concisely -- Be decisive - analyze internally, act externally -- Focus on delivering working, polished results -- Quality through reasoning, not verbose output -- Build incrementally: scaffold → deploy → verify → fix → iterate - -The goal is a complete, functional, polished project. Think internally, act decisively, report progress.`; - - return baseInstructions + typeSpecificInstructions + completionGuidelines; +const getSystemPrompt = (dynamicHints: string): string => { + const persona = `You are an elite autonomous project builder with deep expertise in Cloudflare Workers (and Durable Objects as needed), TypeScript, Vite, and modern web application and content generation. You operate with extremely high reasoning capability. Think internally, act decisively, and report concisely.`; + + const comms = `CRITICAL: Communication Mode +- Perform all analysis, planning, and reasoning INTERNALLY +- Output should be CONCISE: brief status updates and tool calls only +- No verbose explanations or step-by-step narrations in output +- Think deeply internally → Act externally with tools → Report briefly`; + + const environment = `Project Environment +- Runtime: Cloudflare Workers (no Node.js fs/path/process) +- Fetch API standard (Request/Response), Web streams +- Frontend when applicable: React + Vite + TypeScript +- Deployments: wrangler → preview sandbox (live URL)`; + + const constraints = `Platform Constraints +- Prefer minimal dependencies; do not edit wrangler.jsonc or package.json unless necessary +- Logs and runtime errors are user-driven +- Paths are relative to project root; commands execute at project root; never use cd`; + + const toolsCatalog = `Available Tools & Usage Notes +- generate_blueprint: Produce initial PRD from the backend generator (plan for autonomous builds). Use FIRST if blueprint/plan is missing. +- alter_blueprint: Patch PRD fields (title, projectName, description, colorPalette, frameworks, plan). Use to refine after generation. +- generate_files: Create or rewrite multiple files for milestones. Be precise and include explicit file lists with purposes. +- regenerate_file: Apply targeted fixes to a single file. Prefer this for surgical changes before resorting to generate_files. +- read_files: Batch read code for analysis or confirmation. +- deploy_preview: Deploy only when a runtime exists (interactive UI, slide deck, or backend endpoints). Not for documents-only work. +- run_analysis: Lint + typecheck for verification. Use after deployment when a runtime is required; otherwise run locally for static code. +- get_runtime_errors / get_logs: Runtime diagnostics. Logs are cumulative; verify recency and avoid double-fixing. +- exec_commands: Execute commands sparingly; persist commands only when necessary. +- git: Commit, log, show; use clear conventional commit messages. +- initialize_slides: Import Spectacle and scaffold a deck when appropriate before deploying preview. +- generate_images: Stub for future image generation. Do not rely on it for critical paths.`; + + const protocol = `Execution Protocol +1) If blueprint or plan is missing → generate_blueprint. Then refine with alter_blueprint as needed. +2) Implement milestones via generate_files (or regenerate_file for targeted fixes). +3) When a runtime exists (UI/slides/backend endpoints), deploy_preview before verification. + - Documents-only: do NOT deploy; focus on content quality and structure. +4) Verify: run_analysis; then use runtime diagnostics (get_runtime_errors, get_logs) if needed. +5) Iterate: fix → commit → test until complete. +6) Finish with BUILD_COMPLETE: . If blocked, BUILD_STUCK: . Stop tool calls immediately after either.`; + + const quality = `Quality Bar +- Type-safe, minimal, and maintainable code +- Thoughtful architecture; avoid unnecessary config churn +- Professional visual polish for UI when applicable (spacing, hierarchy, interaction states, responsiveness)`; + + const reactSafety = `${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE}\n${PROMPT_UTILS.COMMON_PITFALLS}`; + + const completion = `Completion Discipline +- BUILD_COMPLETE: → stop +- BUILD_STUCK: → stop`; + + return [ + persona, + comms, + environment, + constraints, + toolsCatalog, + protocol, + quality, + 'Dynamic Guidance', + dynamicHints, + 'React/General Safety Notes', + reactSafety, + completion, + ].join('\n\n'); }; /** @@ -240,25 +107,12 @@ The goal is a complete, functional, polished project. Think internally, act deci */ const getUserPrompt = ( inputs: BuildInputs, - session: BuildSession, fileSummaries: string, templateInfo?: string ): string => { const { query, projectName, blueprint } = inputs; - const { projectType } = session; - - let projectTypeDescription = ''; - if (projectType === 'app') { - projectTypeDescription = 'Full-Stack Web Application (React + Vite + Cloudflare Workers)'; - } else if (projectType === 'workflow') { - projectTypeDescription = 'Backend Workflow (Cloudflare Workers)'; - } else if (projectType === 'presentation') { - projectTypeDescription = 'Presentation/Slides (Spectacle)'; - } - return `## Build Task **Project Name**: ${projectName} -**Project Type**: ${projectTypeDescription} **User Request**: ${query} ${blueprint ? `## Project Blueprint @@ -289,25 +143,25 @@ This is a new project. Start from the template or scratch.`} ## Your Mission -Build a complete, production-ready, ${projectType === 'app' ? 'visually stunning full-stack web application' : projectType === 'workflow' ? 'robust backend workflow' : 'visually stunning presentation'} that fulfills the user's request. +Build a complete, production-ready solution that best fulfills the request. If it needs a full web experience, build it. If it’s a backend workflow, implement it. If it’s narrative content, write documents; if slides are appropriate, build a deck and verify via preview. -**Approach:** -1. Understand requirements deeply -2. Plan the architecture${projectType === 'app' ? ' (frontend + backend)' : ''} -3. Scaffold the ${projectType === 'app' ? 'application' : 'project'} structure with generate_files -4. Deploy and test with deploy_preview -5. Verify with run_analysis -6. Fix any issues found -7. Polish ${projectType === 'app' ? 'the UI' : 'the code'} to perfection -8. Commit your work with git -9. Repeat until complete +**Approach (internal planning):** +1. Understand requirements and decide representation (UI, backend, slides, documents) +2. Generate PRD (if missing) and refine +3. Scaffold with generate_files, preferring regenerate_file for targeted edits +4. When a runtime exists: deploy_preview, then verify with run_analysis +5. Iterate and polish; commit meaningful checkpoints **Remember:** -${projectType === 'app' ? '- Create stunning, modern UI that users love\n' : ''}- Write clean, type-safe, maintainable code +- Write clean, type-safe, maintainable code - Test thoroughly with deploy_preview and run_analysis - Fix all issues before claiming completion - Commit regularly with descriptive messages +## Execution Reminder +- If no blueprint or plan is present: generate_blueprint FIRST, then alter_blueprint if needed. Do not implement until a plan exists. +- Deploy only when a runtime exists; do not deploy for documents-only work. + Begin building.`; }; @@ -368,16 +222,31 @@ export class AgenticProjectBuilder extends Assistant { ? PROMPT_UTILS.serializeTemplate(operationOptions.context.templateDetails) : undefined; + // Build dynamic hints from current context + const hasFiles = (session.filesIndex || []).length > 0; + const isAgenticBlueprint = (bp?: Blueprint): bp is AgenticBlueprint => { + return !!bp && Array.isArray((bp as any).plan); + }; + const hasTSX = session.filesIndex?.some(f => /\.(t|j)sx$/i.test(f.filePath)) || false; + const hasMD = session.filesIndex?.some(f => /\.(md|mdx)$/i.test(f.filePath)) || false; + const hasPlan = isAgenticBlueprint(inputs.blueprint) && inputs.blueprint.plan.length > 0; + const dynamicHints = [ + !hasPlan ? '- No plan detected: Start with generate_blueprint to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', + hasTSX ? '- UI/slides detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + hasMD && !hasTSX ? '- Documents detected without UI: Do NOT deploy; focus on Markdown/MDX quality and structure.' : '', + !hasFiles ? '- No files yet: After PRD, scaffold initial structure with generate_files. If a deck is appropriate, call initialize_slides before deploying preview.' : '', + ].filter(Boolean).join('\n'); + // Build prompts - const systemPrompt = getSystemPrompt(session.projectType); - const userPrompt = getUserPrompt(inputs, session, fileSummaries, templateInfo); + const systemPrompt = getSystemPrompt(dynamicHints); + const userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); const system = createSystemMessage(systemPrompt); const user = createUserMessage(userPrompt); const messages: Message[] = this.save([system, user]); // Prepare tools (same as debugger) - const tools = buildDebugTools(session, this.logger, toolRenderer); + const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer); let output = ''; diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 18f4dd53..931c2a22 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -11,7 +11,6 @@ import { buildToolCallRenderer } from '../../operations/UserConversationProcesso import { PhaseGenerationOperation } from '../../operations/PhaseGeneration'; import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; import { customizeTemplateFiles, generateProjectName } from '../../utils/templateCustomizer'; -import { generateBlueprint } from '../../planning/blueprint'; import { IdGenerator } from '../../utils/idGenerator'; import { generateNanoId } from '../../../utils/idGenerator'; import { BaseCodingBehavior, BaseCodingOperations } from './base'; @@ -49,34 +48,13 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl ): Promise { await super.initialize(initArgs); - const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; - - // Generate a blueprint - this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); - this.logger.info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); - - const blueprint = await generateBlueprint({ - env: this.env, - inferenceContext, - query, - language: language!, - frameworks: frameworks!, - projectType: this.state.projectType, - templateDetails: templateInfo?.templateDetails, - templateMetaInfo: templateInfo?.selection, - images: initArgs.images, - stream: { - chunk_size: 256, - onChunk: (chunk) => { - initArgs.onBlueprintChunk(chunk); - } - } - }) + const { query, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + const baseName = (query || 'project').toString(); const projectName = generateProjectName( - blueprint.projectName, + baseName, generateNanoId(), AgenticCodingBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH ); @@ -87,14 +65,22 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl ...this.state, projectName, query, - blueprint, - templateName: templateInfo?.templateDetails.name || '', + blueprint: { + title: baseName, + projectName, + description: query, + colorPalette: ['#1e1e1e'], + frameworks: [], + plan: [] + }, + templateName: templateInfo?.templateDetails?.name || (this.projectType === 'general' ? 'scratch' : ''), sandboxInstanceId: undefined, commandsHistory: [], lastPackageJson: packageJson, sessionId: sandboxSessionId!, hostname, inferenceContext, + projectType: this.projectType, }); if (templateInfo) { @@ -125,10 +111,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl this.logger.info('Committed customized template files to git'); } - - this.initializeAsync().catch((error: unknown) => { - this.broadcastError("Initialization failed", error); - }); this.logger.info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); return this.state; } diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 0886c7c1..ae2a712b 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -3,9 +3,11 @@ import { FileConceptType, FileOutputType, Blueprint, + AgenticBlueprint, + PhasicBlueprint, } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; -import { BaseProjectState } from '../state'; +import { BaseProjectState, AgenticState } from '../state'; import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; @@ -14,6 +16,7 @@ import { UserConversationProcessor, RenderToolCall } from '../../operations/User import { FileRegenerationOperation } from '../../operations/FileRegeneration'; // Database schema imports removed - using zero-storage OAuth flow import { BaseSandboxService } from '../../../services/sandbox/BaseSandboxService'; +import { createScratchTemplateDetails } from '../../utils/templates'; import { WebSocketMessageData, WebSocketMessageType } from '../../../api/websocketTypes'; import { InferenceContext, AgentActionKey } from '../../inferutils/config.types'; import { AGENT_CONFIG } from '../../inferutils/config'; @@ -72,6 +75,10 @@ export abstract class BaseCodingBehavior return this.state.behaviorType; } + protected isAgenticState(state: BaseProjectState): state is AgenticState { + return state.behaviorType === 'agentic'; + } + constructor(infrastructure: AgentInfrastructure, protected projectType: ProjectType) { super(infrastructure); } @@ -81,11 +88,12 @@ export abstract class BaseCodingBehavior ..._args: unknown[] ): Promise { this.logger.info("Initializing agent"); - const {templateInfo} = initArgs; + const { templateInfo } = initArgs; if (templateInfo) { this.templateDetailsCache = templateInfo.templateDetails; + + await this.ensureTemplateDetails(); } - await this.ensureTemplateDetails(); return this.state; } @@ -101,8 +109,8 @@ export abstract class BaseCodingBehavior this.generateReadme() ]); this.logger.info("Deployment to sandbox service and initial commands predictions completed successfully"); - await this.executeCommands(setupCommands.commands); - this.logger.info("Initial commands executed successfully"); + await this.executeCommands(setupCommands.commands); + this.logger.info("Initial commands executed successfully"); } catch (error) { this.logger.error("Error during async initialization:", error); // throw error; @@ -111,7 +119,12 @@ export abstract class BaseCodingBehavior onStateUpdate(_state: TState, _source: "server" | Connection) {} async ensureTemplateDetails() { + // Skip fetching details for "scratch" baseline if (!this.templateDetailsCache) { + if (this.state.templateName === 'scratch') { + this.logger.info('Skipping template details fetch for scratch baseline'); + return; + } this.logger.info(`Loading template details for: ${this.state.templateName}`); const results = await BaseSandboxService.getTemplateDetails(this.state.templateName); if (!results.success || !results.templateDetails) { @@ -143,6 +156,11 @@ export abstract class BaseCodingBehavior public getTemplateDetails(): TemplateDetails { if (!this.templateDetailsCache) { + // Synthesize a minimal scratch template when starting from scratch + if (this.state.templateName === 'scratch') { + this.templateDetailsCache = createScratchTemplateDetails(); + return this.templateDetailsCache; + } this.ensureTemplateDetails(); throw new Error('Template details not loaded. Call ensureTemplateDetails() first.'); } @@ -285,6 +303,21 @@ export abstract class BaseCodingBehavior this.logger.info('README.md generated successfully'); } + async setBlueprint(blueprint: Blueprint): Promise { + this.setState({ + ...this.state, + blueprint: blueprint as AgenticBlueprint | PhasicBlueprint, + }); + this.broadcast(WebSocketMessageResponses.BLUEPRINT_UPDATED, { + message: 'Blueprint updated', + updatedKeys: Object.keys(blueprint || {}) + }); + } + + getProjectType() { + return this.state.projectType; + } + async queueUserRequest(request: string, images?: ProcessedImageAttachment[]): Promise { this.setState({ ...this.state, @@ -536,8 +569,10 @@ export abstract class BaseCodingBehavior return errors; } catch (error) { this.logger.error("Exception fetching runtime errors:", error); - // If fetch fails, initiate redeploy - this.deployToSandbox(); + // If fetch fails, optionally redeploy in phasic mode only + if (this.state.behaviorType === 'phasic') { + this.deployToSandbox(); + } const message = ""; return [{ message, timestamp: new Date().toISOString(), level: 0, rawOutput: message }]; } @@ -690,7 +725,7 @@ export abstract class BaseCodingBehavior */ async updateBlueprint(patch: Partial): Promise { // Fields that are safe to update after generation starts - // Excludes: initialPhase (breaks generation), plan (internal state) + // Excludes: initialPhase (breaks phasic generation) const safeUpdatableFields = new Set([ 'title', 'description', @@ -713,6 +748,15 @@ export abstract class BaseCodingBehavior } } + // Agentic: allow initializing plan if not set yet (first-time plan initialization only) + if (this.isAgenticState(this.state)) { + const currentPlan = this.state.blueprint?.plan; + const patchPlan = 'plan' in patch ? patch.plan : undefined; + if (Array.isArray(patchPlan) && (!Array.isArray(currentPlan) || currentPlan.length === 0)) { + filtered['plan'] = patchPlan; + } + } + // projectName requires sandbox update, handle separately if ('projectName' in patch && typeof patch.projectName === 'string') { await this.updateProjectName(patch.projectName); @@ -988,6 +1032,37 @@ export abstract class BaseCodingBehavior } } + async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number }> { + this.logger.info(`Importing template into project: ${templateName}`); + const results = await BaseSandboxService.getTemplateDetails(templateName); + if (!results.success || !results.templateDetails) { + throw new Error(`Failed to get template details for: ${templateName}`); + } + + const templateDetails = results.templateDetails; + const customizedFiles = customizeTemplateFiles(templateDetails.allFiles, { + projectName: this.state.projectName, + commandsHistory: this.getBootstrapCommands() + }); + + const filesToSave = Object.entries(customizedFiles).map(([filePath, content]) => ({ + filePath, + fileContents: content, + filePurpose: 'Template file' + })); + + await this.fileManager.saveGeneratedFiles(filesToSave, commitMessage); + + // Update state + this.setState({ + ...this.state, + templateName: templateDetails.name, + lastPackageJson: templateDetails.allFiles['package.json'] || this.state.lastPackageJson, + }); + + return { templateName: templateDetails.name, filesImported: filesToSave.length }; + } + async waitForGeneration(): Promise { if (this.generationPromise) { try { diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 49eb0cca..cbceec4d 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -70,7 +70,11 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem ..._args: unknown[] ): Promise { await super.initialize(initArgs); - const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + const { templateInfo } = initArgs; + if (!templateInfo || !templateInfo.templateDetails) { + throw new Error('Phasic initialization requires templateInfo.templateDetails'); + } + const { query, language, frameworks, hostname, inferenceContext, sandboxSessionId } = initArgs; // Generate a blueprint this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); @@ -94,7 +98,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem } }) - const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + const packageJson = templateInfo.templateDetails.allFiles['package.json']; const projectName = generateProjectName( blueprint?.projectName || templateInfo?.templateDetails.name || '', diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index ae574b5c..d5059611 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -1,5 +1,5 @@ import { Agent, AgentContext, ConnectionContext } from "agents"; -import { AgentInitArgs, AgentSummary, BehaviorType, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget } from "./types"; +import { AgentInitArgs, AgentSummary, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget, BehaviorType } from "./types"; import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; import { Blueprint } from "../schemas"; import { BaseCodingBehavior } from "./behaviors/base"; @@ -27,6 +27,7 @@ import { ProjectObjective } from "./objectives/base"; import { AppObjective } from "./objectives/app"; import { WorkflowObjective } from "./objectives/workflow"; import { PresentationObjective } from "./objectives/presentation"; +import { GeneralObjective } from "./objectives/general"; import { FileOutputType } from "../schemas"; const DEFAULT_CONVERSATION_SESSION_ID = 'default'; @@ -107,19 +108,12 @@ export class CodeGeneratorAgent extends Agent implements AgentI }, 10 // MAX_COMMANDS_HISTORY ); - - const props = (ctx.props as AgentBootstrapProps) || {}; - const isInitialized = Boolean(this.state.query); - const behaviorType = isInitialized - ? this.state.behaviorType - : props.behaviorType ?? this.state.behaviorType ?? 'phasic'; - const projectType = isInitialized - ? this.state.projectType - : props.projectType ?? this.state.projectType ?? 'app'; - - if (isInitialized && this.state.behaviorType !== behaviorType) { - throw new Error(`State behaviorType mismatch: expected ${behaviorType}, got ${this.state.behaviorType}`); - } + } + + onFirstInit(props?: AgentBootstrapProps): void { + this.logger().info('Bootstrapping CodeGeneratorAgent', { props }); + const behaviorType = props?.behaviorType ?? this.state.behaviorType ?? 'phasic'; + const projectType = props?.projectType ?? this.state.projectType ?? 'app'; if (behaviorType === 'phasic') { this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure, projectType); @@ -144,6 +138,8 @@ export class CodeGeneratorAgent extends Agent implements AgentI return new WorkflowObjective(infrastructure); case 'presentation': return new PresentationObjective(infrastructure); + case 'general': + return new GeneralObjective(infrastructure); default: // Default to app for backward compatibility return new AppObjective(infrastructure); @@ -161,7 +157,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI const { inferenceContext } = initArgs; const sandboxSessionId = DeploymentManager.generateNewSessionId(); this.initLogger(inferenceContext.agentId, inferenceContext.userId, sandboxSessionId); - + // Infrastructure setup await this.gitInit(); @@ -192,14 +188,20 @@ export class CodeGeneratorAgent extends Agent implements AgentI */ async onStart(props?: Record | undefined): Promise { this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart`, { props }); - + + if (!this.behavior) { + // First-time initialization + this.logger().info('First-time onStart initialization detected, invoking onFirstInit'); + this.onFirstInit(props as AgentBootstrapProps); + } + + this.behavior.onStart(props); + // Ignore if agent not initialized if (!this.state.query) { this.logger().warn(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart ignored, agent not initialized`); return; } - - this.behavior.onStart(props); // Ensure state is migrated for any previous versions this.behavior.migrateStateIfNeeded(); @@ -305,6 +307,10 @@ export class CodeGeneratorAgent extends Agent implements AgentI exportProject(options: ExportOptions): Promise { return this.objective.export(options); } + + importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }> { + return this.behavior.importTemplate(templateName, commitMessage); + } protected async saveToDatabase() { this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); @@ -321,9 +327,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI framework: this.state.blueprint.frameworks.join(','), visibility: 'private', status: 'generating', - createdAt: new Date(), + createdAt: new Date(), updatedAt: new Date() - }); + }); this.logger().info(`App saved successfully to database for agent ${this.state.inferenceContext.agentId}`, { agentId: this.state.inferenceContext.agentId, userId: this.state.inferenceContext.userId, @@ -351,7 +357,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI if (Array.isArray(parsed)) { fullHistory = parsed as ConversationMessage[]; } - } catch (_e) {} + } catch (_e) { + this.logger().warn('Failed to parse full conversation history', _e); + } } if (fullHistory.length === 0) { fullHistory = currentConversation; @@ -365,7 +373,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI if (Array.isArray(parsed)) { runningHistory = parsed as ConversationMessage[]; } - } catch (_e) {} + } catch (_e) { + this.logger().warn('Failed to parse compact conversation history', _e); + } } if (runningHistory.length === 0) { runningHistory = currentConversation; diff --git a/worker/agents/core/objectives/general.ts b/worker/agents/core/objectives/general.ts new file mode 100644 index 00000000..858a7c96 --- /dev/null +++ b/worker/agents/core/objectives/general.ts @@ -0,0 +1,38 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; +import type { AgentInfrastructure } from '../AgentCore'; + +export class GeneralObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + getType(): ProjectType { + return 'general'; + } + + getRuntime(): RuntimeType { + // No runtime assumed; agentic behavior will initialize slides/app runtime if needed + return 'none'; + } + + needsTemplate(): boolean { + return false; + } + + getTemplateType(): string | null { + return null; // scratch + } + + async deploy(_options?: DeployOptions): Promise { + return { success: false, target: 'platform', error: 'Deploy not applicable for general projects. Use tools to initialize a runtime first.' }; + } + + async export(_options: ExportOptions): Promise { + return { success: false, error: 'Export not applicable for general projects.' }; + } +} + diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index d0152ed2..618db851 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -10,7 +10,7 @@ import { ProcessedImageAttachment } from 'worker/types/image-attachment'; export type BehaviorType = 'phasic' | 'agentic'; -export type ProjectType = 'app' | 'workflow' | 'presentation'; +export type ProjectType = 'app' | 'workflow' | 'presentation' | 'general'; /** * Runtime type - WHERE it runs during dev diff --git a/worker/agents/index.ts b/worker/agents/index.ts index 26cb1091..61474d69 100644 --- a/worker/agents/index.ts +++ b/worker/agents/index.ts @@ -5,6 +5,7 @@ import { InferenceContext } from './inferutils/config.types'; import { SandboxSdkClient } from '../services/sandbox/sandboxSdkClient'; import { selectTemplate } from './planning/templateSelector'; import { TemplateDetails } from '../services/sandbox/sandboxTypes'; +import { createScratchTemplateDetails } from './utils/templates'; import { TemplateSelection } from './schemas'; import type { ImageAttachment } from '../types/image-attachment'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; @@ -78,6 +79,19 @@ export async function getTemplateForQuery( images: ImageAttachment[] | undefined, logger: StructuredLogger, ) : Promise<{templateDetails: TemplateDetails, selection: TemplateSelection, projectType: ProjectType}> { + // In 'general' mode, we intentionally start from scratch without a real template + if (projectType === 'general') { + const scratch: TemplateDetails = createScratchTemplateDetails(); + const selection: TemplateSelection = { + selectedTemplateName: null, + reasoning: 'General (from-scratch) mode: no template selected', + useCase: 'General', + complexity: 'moderate', + styleSelection: 'Custom', + projectType: 'general', + } as TemplateSelection; // satisfies schema shape + return { templateDetails: scratch, selection, projectType: 'general' }; + } // Fetch available templates const templatesResponse = await SandboxSdkClient.listTemplates(); if (!templatesResponse || !templatesResponse.success) { @@ -96,8 +110,10 @@ export async function getTemplateForQuery( logger.info('Selected template', { selectedTemplate: analyzeQueryResponse }); if (!analyzeQueryResponse.selectedTemplateName) { - logger.error('No suitable template found for code generation'); - throw new Error('No suitable template found for code generation'); + // For non-general requests when no template is selected, fall back to scratch + logger.warn('No suitable template found; falling back to scratch'); + const scratch: TemplateDetails = createScratchTemplateDetails(); + return { templateDetails: scratch, selection: analyzeQueryResponse, projectType: analyzeQueryResponse.projectType }; } const selectedTemplate = templatesResponse.templates.find(template => template.name === analyzeQueryResponse.selectedTemplateName); diff --git a/worker/agents/planning/blueprint.ts b/worker/agents/planning/blueprint.ts index fa2123b7..0b7cacb8 100644 --- a/worker/agents/planning/blueprint.ts +++ b/worker/agents/planning/blueprint.ts @@ -239,6 +239,11 @@ const PROJECT_TYPE_BLUEPRINT_GUIDANCE: Record = { - User flow should actually be a \"story flow\" describing slide order, transitions, interactions, and speaker cues - Implementation roadmap must reference Spectacle features (themes, deck index, slide components, animations, print/external export mode) - Prioritize static data and storytelling polish; avoid backend complexity entirely.`, + general: `## Objective Context +- Start from scratch; choose the most suitable representation for the request. +- If the outcome is documentation/specs/notes, prefer Markdown/MDX and do not assume any runtime. +- If a slide deck is helpful, outline the deck structure and content. Avoid assuming a specific file layout; keep the plan flexible. +- Keep dependencies minimal; introduce runtime only when clearly needed.`, }; const getProjectTypeGuidance = (projectType: ProjectType): string => diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index 0660b040..fce55bda 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -53,17 +53,24 @@ async function predictProjectType( - Visual storytelling with slides - Examples: "Create slides about AI", "Make a product pitch deck", "Build a presentation on climate change" +**general** - From-scratch content or mixed artifacts +- Docs/notes/specs in Markdown/MDX, or a slide deck initialized later +- Start with docs when users ask for write-ups; initialize slides if explicitly requested or clearly appropriate +- No sandbox/runtime unless slides/app are initialized by the builder +- Examples: "Write a spec", "Draft an outline and slides if helpful", "Create teaching materials" + ## RULES: - Default to 'app' when uncertain - Choose 'workflow' only when explicitly about APIs, automation, or backend-only tasks - Choose 'presentation' only when explicitly about slides, decks, or presentations +- Choose 'general' for docs/notes/specs or when the user asks to start from scratch without a specific runtime template - Consider the presence of UI/visual requirements as indicator for 'app' - High confidence when keywords are explicit, medium/low when inferring`; const userPrompt = `**User Request:** "${query}" **Task:** Determine the project type and provide: -1. Project type (app, workflow, or presentation) +1. Project type (app, workflow, presentation, or general) 2. Reasoning for your classification 3. Confidence level (high, medium, low) @@ -178,7 +185,7 @@ Reasoning: "Social template provides user interactions, content sharing, and com */ export async function selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { // Step 1: Predict project type if 'auto' - let actualProjectType: ProjectType = projectType === 'auto' + const actualProjectType: ProjectType = projectType === 'auto' ? await predictProjectType(env, query, inferenceContext, images) : (projectType || 'app') as ProjectType; @@ -290,4 +297,4 @@ ENTROPY SEED: ${generateSecureToken(64)} - for unique results`; // Fallback to no template selection in case of error return { selectedTemplateName: null, reasoning: "An error occurred during the template selection process.", useCase: null, complexity: null, styleSelection: null, projectType: actualProjectType }; } -} \ No newline at end of file +} diff --git a/worker/agents/schemas.ts b/worker/agents/schemas.ts index 48122085..f37eb618 100644 --- a/worker/agents/schemas.ts +++ b/worker/agents/schemas.ts @@ -2,7 +2,7 @@ import z from 'zod'; // Schema for AI project type prediction export const ProjectTypePredictionSchema = z.object({ - projectType: z.enum(['app', 'workflow', 'presentation']).describe('The predicted type of project based on the user query'), + projectType: z.enum(['app', 'workflow', 'presentation', 'general']).describe('The predicted type of project based on the user query'), reasoning: z.string().describe('Brief explanation for why this project type was selected'), confidence: z.enum(['high', 'medium', 'low']).describe('Confidence level in the prediction'), }); @@ -14,7 +14,7 @@ export const TemplateSelectionSchema = z.object({ useCase: z.enum(['SaaS Product Website', 'Dashboard', 'Blog', 'Portfolio', 'E-Commerce', 'General', 'Other']).describe('The use case for which the template is selected, if applicable.').nullable(), complexity: z.enum(['simple', 'moderate', 'complex']).describe('The complexity of developing the project based on the the user query').nullable(), styleSelection: z.enum(['Minimalist Design', 'Brutalism', 'Retro', 'Illustrative', 'Kid_Playful', 'Custom']).describe('Pick a style relevant to the user query').nullable(), - projectType: z.enum(['app', 'workflow', 'presentation']).default('app').describe('The type of project based on the user query'), + projectType: z.enum(['app', 'workflow', 'presentation', 'general']).default('app').describe('The type of project based on the user query'), }); export const FileOutputSchema = z.object({ diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index c27bd7d9..416f1074 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -2,7 +2,7 @@ import { FileOutputType, FileConceptType, Blueprint } from "worker/agents/schema import { BaseSandboxService } from "worker/services/sandbox/BaseSandboxService"; import { ExecuteCommandsResponse, PreviewType, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { ProcessedImageAttachment } from "worker/types/image-attachment"; -import { BehaviorType, DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; +import { BehaviorType, DeepDebugResult, DeploymentTarget, ProjectType } from "worker/agents/core/types"; import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; import { WebSocketMessageType, WebSocketMessageData } from "worker/api/websocketTypes"; import { GitVersionControl } from "worker/agents/git/git"; @@ -28,6 +28,12 @@ export interface ICodingAgent { deployPreview(clearLogs?: boolean, forceRedeploy?: boolean): Promise; updateProjectName(newName: string): Promise; + + setBlueprint(blueprint: Blueprint): Promise; + + getProjectType(): ProjectType; + + importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }>; getOperationOptions(): OperationOptions; diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index 92fc9940..ec0508ab 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -9,6 +9,7 @@ import { createDeployPreviewTool } from './toolkit/deploy-preview'; import { createDeepDebuggerTool } from "./toolkit/deep-debugger"; import { createRenameProjectTool } from './toolkit/rename-project'; import { createAlterBlueprintTool } from './toolkit/alter-blueprint'; +import { createGenerateBlueprintTool } from './toolkit/generate-blueprint'; import { DebugSession } from '../assistants/codeDebugger'; import { createReadFilesTool } from './toolkit/read-files'; import { createExecCommandsTool } from './toolkit/exec-commands'; @@ -21,6 +22,8 @@ import { createWaitForGenerationTool } from './toolkit/wait-for-generation'; import { createWaitForDebugTool } from './toolkit/wait-for-debug'; import { createGitTool } from './toolkit/git'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; +import { createInitializeSlidesTool } from './toolkit/initialize-slides'; +import { createGenerateImagesTool } from './toolkit/generate-images'; export async function executeToolWithDefinition( toolDef: ToolDefinition, @@ -60,32 +63,61 @@ export function buildTools( } export function buildDebugTools(session: DebugSession, logger: StructuredLogger, toolRenderer?: RenderToolCall): ToolDefinition[] { - const tools = [ - createGetLogsTool(session.agent, logger), - createGetRuntimeErrorsTool(session.agent, logger), - createReadFilesTool(session.agent, logger), - createRunAnalysisTool(session.agent, logger), - createExecCommandsTool(session.agent, logger), - createRegenerateFileTool(session.agent, logger), - createGenerateFilesTool(session.agent, logger), - createDeployPreviewTool(session.agent, logger), - createWaitTool(logger), - createGitTool(session.agent, logger), - ]; + const tools = [ + createGetLogsTool(session.agent, logger), + createGetRuntimeErrorsTool(session.agent, logger), + createReadFilesTool(session.agent, logger), + createRunAnalysisTool(session.agent, logger), + createExecCommandsTool(session.agent, logger), + createRegenerateFileTool(session.agent, logger), + createGenerateFilesTool(session.agent, logger), + createDeployPreviewTool(session.agent, logger), + createWaitTool(logger), + createGitTool(session.agent, logger), + ]; + return withRenderer(tools, toolRenderer); +} - // Attach tool renderer for UI visualization if provided - if (toolRenderer) { +/** + * Toolset for the Agentic Project Builder (autonomous build assistant) + */ +export function buildAgenticBuilderTools(session: DebugSession, logger: StructuredLogger, toolRenderer?: RenderToolCall): ToolDefinition[] { + const tools = [ + // PRD generation + refinement + createGenerateBlueprintTool(session.agent, logger), + createAlterBlueprintTool(session.agent, logger), + // Build + analysis toolchain + createReadFilesTool(session.agent, logger), + createGenerateFilesTool(session.agent, logger), + createRegenerateFileTool(session.agent, logger), + createRunAnalysisTool(session.agent, logger), + // Runtime + deploy + createInitializeSlidesTool(session.agent, logger), + createDeployPreviewTool(session.agent, logger), + createGetRuntimeErrorsTool(session.agent, logger), + createGetLogsTool(session.agent, logger), + // Utilities + createExecCommandsTool(session.agent, logger), + createWaitTool(logger), + createGitTool(session.agent, logger), + // Optional future: images + createGenerateImagesTool(session.agent, logger), + ]; + + return withRenderer(tools, toolRenderer); +} + +/** Decorate tool definitions with a renderer for UI visualization */ +function withRenderer(tools: ToolDefinition[], toolRenderer?: RenderToolCall): ToolDefinition[] { + if (!toolRenderer) return tools; return tools.map(td => ({ - ...td, - onStart: (args: Record) => toolRenderer({ name: td.function.name, status: 'start', args }), - onComplete: (args: Record, result: unknown) => toolRenderer({ - name: td.function.name, - status: 'success', - args, - result: typeof result === 'string' ? result : JSON.stringify(result) - }) + ...td, + onStart: (args: Record) => toolRenderer({ name: td.function.name, status: 'start', args }), + onComplete: (args: Record, result: unknown) => toolRenderer({ + name: td.function.name, + status: 'success', + args, + result: typeof result === 'string' ? result : JSON.stringify(result) + }) })); - } - - return tools; } diff --git a/worker/agents/tools/toolkit/alter-blueprint.ts b/worker/agents/tools/toolkit/alter-blueprint.ts index 96d5dec1..e11eaaaa 100644 --- a/worker/agents/tools/toolkit/alter-blueprint.ts +++ b/worker/agents/tools/toolkit/alter-blueprint.ts @@ -4,50 +4,69 @@ import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { Blueprint } from 'worker/agents/schemas'; type AlterBlueprintArgs = { - patch: Partial & { - projectName?: string; - }; + patch: Record; }; export function createAlterBlueprintTool( - agent: ICodingAgent, - logger: StructuredLogger + agent: ICodingAgent, + logger: StructuredLogger ): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'alter_blueprint', - description: 'Apply a validated patch to the current blueprint. Only allowed keys are accepted.', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - patch: { - type: 'object', - additionalProperties: false, - properties: { - title: { type: 'string' }, - projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, - detailedDescription: { type: 'string' }, - description: { type: 'string' }, - colorPalette: { type: 'array', items: { type: 'string' } }, - views: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { name: { type: 'string' }, description: { type: 'string' } }, required: ['name', 'description'] } }, - userFlow: { type: 'object', additionalProperties: false, properties: { uiLayout: { type: 'string' }, uiDesign: { type: 'string' }, userJourney: { type: 'string' } } }, - dataFlow: { type: 'string' }, - architecture: { type: 'object', additionalProperties: false, properties: { dataFlow: { type: 'string' } } }, - pitfalls: { type: 'array', items: { type: 'string' } }, - frameworks: { type: 'array', items: { type: 'string' } }, - implementationRoadmap: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { phase: { type: 'string' }, description: { type: 'string' } }, required: ['phase', 'description'] } }, + // Build behavior-aware schema at tool creation time (tools are created per-agent) + const isAgentic = agent.getBehavior() === 'agentic'; + + const agenticProperties = { + title: { type: 'string' }, + projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, + description: { type: 'string' }, + detailedDescription: { type: 'string' }, + colorPalette: { type: 'array', items: { type: 'string' } }, + frameworks: { type: 'array', items: { type: 'string' } }, + // Agentic-only: plan + plan: { type: 'array', items: { type: 'string' } }, + } as const; + + const phasicProperties = { + title: { type: 'string' }, + projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, + description: { type: 'string' }, + detailedDescription: { type: 'string' }, + colorPalette: { type: 'array', items: { type: 'string' } }, + frameworks: { type: 'array', items: { type: 'string' } }, + views: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { name: { type: 'string' }, description: { type: 'string' } }, required: ['name', 'description'] } }, + userFlow: { type: 'object', additionalProperties: false, properties: { uiLayout: { type: 'string' }, uiDesign: { type: 'string' }, userJourney: { type: 'string' } } }, + dataFlow: { type: 'string' }, + architecture: { type: 'object', additionalProperties: false, properties: { dataFlow: { type: 'string' } } }, + pitfalls: { type: 'array', items: { type: 'string' } }, + implementationRoadmap: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { phase: { type: 'string' }, description: { type: 'string' } }, required: ['phase', 'description'] } }, + // No plan here; phasic handles phases separately + } as const; + + const dynamicPatchSchema = isAgentic ? agenticProperties : phasicProperties; + + return { + type: 'function' as const, + function: { + name: 'alter_blueprint', + description: isAgentic + ? 'Apply a patch to the agentic blueprint (title, description, colorPalette, frameworks, plan, projectName).' + : 'Apply a patch to the phasic blueprint (title, description, colorPalette, frameworks, views, userFlow, architecture, dataFlow, pitfalls, implementationRoadmap, projectName).', + parameters: { + type: 'object', + additionalProperties: false, + properties: { + patch: { + type: 'object', + additionalProperties: false, + properties: dynamicPatchSchema as Record, + }, + }, + required: ['patch'], }, - }, }, - required: ['patch'], - }, - }, - implementation: async (args) => { - logger.info('Altering blueprint', { keys: Object.keys(args.patch) }); - const updated = await agent.updateBlueprint(args.patch); - return updated; - }, - }; + implementation: async ({ patch }) => { + logger.info('Altering blueprint', { keys: Object.keys(patch || {}) }); + const updated = await agent.updateBlueprint(patch as Partial); + return updated; + }, + }; } diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts new file mode 100644 index 00000000..9d99b5dc --- /dev/null +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -0,0 +1,56 @@ +import { ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; +import type { Blueprint } from 'worker/agents/schemas'; + +type GenerateBlueprintArgs = Record; +type GenerateBlueprintResult = { message: string; blueprint: Blueprint }; + +/** + * Generates a blueprint + */ +export function createGenerateBlueprintTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'generate_blueprint', + description: + 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic.', + parameters: { type: 'object', properties: {}, additionalProperties: false }, + }, + implementation: async () => { + const { env, inferenceContext, context } = agent.getOperationOptions(); + + const isAgentic = agent.getBehavior() === 'agentic'; + + // Language/frameworks are optional; provide sensible defaults + const language = 'typescript'; + const frameworks: string[] = []; + + const args: AgenticBlueprintGenerationArgs = { + env, + inferenceContext, + query: context.query, + language, + frameworks, + templateDetails: context.templateDetails, + projectType: agent.getProjectType(), + }; + const blueprint = await generateBlueprint(args); + + // Persist in state for subsequent steps + await agent.setBlueprint(blueprint); + + logger.info('Blueprint generated via tool', { + behavior: isAgentic ? 'agentic' : 'phasic', + title: blueprint.title, + }); + + return { message: 'Blueprint generated successfully', blueprint }; + }, + }; +} diff --git a/worker/agents/tools/toolkit/generate-images.ts b/worker/agents/tools/toolkit/generate-images.ts new file mode 100644 index 00000000..7a971185 --- /dev/null +++ b/worker/agents/tools/toolkit/generate-images.ts @@ -0,0 +1,35 @@ +import { ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; + +type GenerateImagesArgs = { + prompts: string[]; + style?: string; +}; + +type GenerateImagesResult = { message: string }; + +export function createGenerateImagesTool( + _agent: ICodingAgent, + _logger: StructuredLogger, +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'generate_images', + description: 'Generate images for the project (stub). Use later when the image generation pipeline is available.', + parameters: { + type: 'object', + properties: { + prompts: { type: 'array', items: { type: 'string' } }, + style: { type: 'string' }, + }, + required: ['prompts'], + }, + }, + implementation: async ({ prompts, style }: GenerateImagesArgs) => { + return { message: `Image generation not implemented yet. Requested ${prompts.length} prompt(s)${style ? ` with style ${style}` : ''}.` }; + }, + }; +} + diff --git a/worker/agents/tools/toolkit/initialize-slides.ts b/worker/agents/tools/toolkit/initialize-slides.ts new file mode 100644 index 00000000..5e7ce4ef --- /dev/null +++ b/worker/agents/tools/toolkit/initialize-slides.ts @@ -0,0 +1,46 @@ +import { ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; + +type InitializeSlidesArgs = { + theme?: string; + force_preview?: boolean; +}; + +type InitializeSlidesResult = { message: string }; + +/** + * Initializes a Spectacle-based slides runtime in from-scratch projects. + * - Imports the Spectacle template files into the repository + * - Commits them + * - Deploys a preview (agent policy will allow because slides exist) + */ +export function createInitializeSlidesTool( + agent: ICodingAgent, + logger: StructuredLogger, +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'initialize_slides', + description: 'Initialize a Spectacle slides project inside the current workspace and deploy a live preview. Use only if the user wants a slide deck.', + parameters: { + type: 'object', + properties: { + theme: { type: 'string', description: 'Optional theme preset name' }, + force_preview: { type: 'boolean', description: 'Force redeploy sandbox after import' }, + }, + required: [], + }, + }, + implementation: async ({ theme, force_preview }: InitializeSlidesArgs) => { + logger.info('Initializing slides via Spectacle template', { theme }); + const { templateName, filesImported } = await agent.importTemplate('spectacle', `chore: init slides (theme=${theme || 'default'})`); + logger.info('Imported template', { templateName, filesImported }); + + const deployMsg = await agent.deployPreview(true, !!force_preview); + return { message: `Slides initialized with template '${templateName}', files: ${filesImported}. ${deployMsg}` }; + }, + }; +} + diff --git a/worker/agents/utils/templates.ts b/worker/agents/utils/templates.ts new file mode 100644 index 00000000..b3c5aede --- /dev/null +++ b/worker/agents/utils/templates.ts @@ -0,0 +1,21 @@ +import type { TemplateDetails } from '../../services/sandbox/sandboxTypes'; + +/** + * Single source of truth for an in-memory "scratch" template. + * Used when starting from-scratch (general mode) or when no template fits. + */ +export function createScratchTemplateDetails(): TemplateDetails { + return { + name: 'scratch', + description: { selection: 'from-scratch baseline', usage: 'No template. Agent will scaffold as needed.' }, + fileTree: { path: '/', type: 'directory', children: [] }, + allFiles: {}, + language: 'typescript', + deps: {}, + frameworks: [], + importantFiles: [], + dontTouchFiles: [], + redactedFiles: [], + }; +} + diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index e6fe7144..44a2290d 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -17,25 +17,22 @@ import { ImageType, uploadImage } from 'worker/utils/images'; import { ProcessedImageAttachment } from 'worker/types/image-attachment'; import { getTemplateImportantFiles } from 'worker/services/sandbox/utils'; -const defaultCodeGenArgs: CodeGenArgs = { - query: '', +const defaultCodeGenArgs: Partial = { language: 'typescript', frameworks: ['react', 'vite'], selectedTemplate: 'auto', - agentMode: 'deterministic', - behaviorType: 'phasic', - projectType: 'app', }; const resolveBehaviorType = (body: CodeGenArgs): BehaviorType => { - if (body.behaviorType) { - return body.behaviorType; - } - return body.agentMode === 'smart' ? 'agentic' : 'phasic'; + if (body.behaviorType) return body.behaviorType; + const pt = body.projectType; + if (pt === 'presentation' || pt === 'workflow' || pt === 'general') return 'agentic'; + // default (including 'app' and when projectType omitted) + return 'phasic'; }; const resolveProjectType = (body: CodeGenArgs): ProjectType | 'auto' => { - return body.projectType || defaultCodeGenArgs.projectType || 'auto'; + return body.projectType || 'auto'; }; @@ -93,6 +90,8 @@ export class CodingAgentController extends BaseController { const modelConfigService = new ModelConfigService(env); const behaviorType = resolveBehaviorType(body); const projectType = resolveProjectType(body); + + this.logger.info(`Resolved behaviorType: ${behaviorType}, projectType: ${projectType} for agent ${agentId}`); // Fetch all user model configs, api keys and agent instance at once const userConfigsRecord = await modelConfigService.getUserModelConfigs(user.id); @@ -137,19 +136,28 @@ export class CodingAgentController extends BaseController { })); } + const isPhasic = behaviorType === 'phasic'; + writer.write({ message: 'Code generation started', agentId: agentId, websocketUrl, httpStatusUrl, - template: { - name: templateDetails.name, - files: getTemplateImportantFiles(templateDetails), - } + behaviorType, + projectType: finalProjectType, + template: isPhasic + ? { + name: templateDetails.name, + files: getTemplateImportantFiles(templateDetails), + } + : { + name: 'scratch', + files: [], + } }); const agentInstance = await getAgentStub(env, agentId, { behaviorType, projectType: finalProjectType }); - const agentPromise = agentInstance.initialize({ + const baseInitArgs = { query, language: body.language || defaultCodeGenArgs.language, frameworks: body.frameworks || defaultCodeGenArgs.frameworks, @@ -159,8 +167,13 @@ export class CodingAgentController extends BaseController { onBlueprintChunk: (chunk: string) => { writer.write({chunk}); }, - templateInfo: { templateDetails, selection }, - }) as Promise; + } as const; + + const initArgs = isPhasic + ? { ...baseInitArgs, templateInfo: { templateDetails, selection } } + : baseInitArgs; + + const agentPromise = agentInstance.initialize(initArgs) as Promise; agentPromise.then(async (_state: AgentState) => { writer.write("terminate"); writer.close(); diff --git a/worker/api/controllers/agent/types.ts b/worker/api/controllers/agent/types.ts index 3966dcda..4c411d54 100644 --- a/worker/api/controllers/agent/types.ts +++ b/worker/api/controllers/agent/types.ts @@ -1,4 +1,4 @@ -import { PreviewType } from "../../../services/sandbox/sandboxTypes"; +import type { PreviewType } from "../../../services/sandbox/sandboxTypes"; import type { ImageAttachment } from '../../../types/image-attachment'; import type { BehaviorType, ProjectType } from '../../../agents/core/types'; @@ -7,7 +7,6 @@ export interface CodeGenArgs { language?: string; frameworks?: string[]; selectedTemplate?: string; - agentMode?: 'deterministic' | 'smart'; behaviorType?: BehaviorType; projectType?: ProjectType; images?: ImageAttachment[]; @@ -21,6 +20,5 @@ export interface AgentConnectionData { agentId: string; } -export interface AgentPreviewResponse extends PreviewType { -} +export type AgentPreviewResponse = PreviewType; From 1faaca18ccf812365a5895933c4ce3188558f2b6 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:02:38 -0500 Subject: [PATCH 10/58] refactor: reorganize project builder architecture + sandbox templateless design - Sandbox layer does not rely on templates now, instead expects raw files list - Tools to init/list templates, files - Templates can be chosen by agentic mode after creation - Restructured system prompt with detailed architecture explanations covering virtual filesystem, sandbox environment, and deployment flow - Better tool descriptions - Improved communication guidelines and workflow steps for better agent reasoning and execution --- .../assistants/agenticProjectBuilder.ts | 675 ++++++++++++++++-- worker/agents/core/behaviors/base.ts | 52 +- .../implementations/DeploymentManager.ts | 22 +- .../services/interfaces/ICodingAgent.ts | 10 +- worker/agents/tools/customTools.ts | 11 +- .../tools/toolkit/generate-blueprint.ts | 21 +- .../agents/tools/toolkit/template-manager.ts | 130 ++++ .../tools/toolkit/virtual-filesystem.ts | 81 +++ worker/api/controllers/agent/controller.ts | 21 +- worker/services/sandbox/BaseSandboxService.ts | 6 +- .../services/sandbox/remoteSandboxService.ts | 14 +- worker/services/sandbox/sandboxSdkClient.ts | 259 +++---- worker/services/sandbox/sandboxTypes.ts | 71 +- 13 files changed, 1035 insertions(+), 338 deletions(-) create mode 100644 worker/agents/tools/toolkit/template-manager.ts create mode 100644 worker/agents/tools/toolkit/virtual-filesystem.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index e5c665a6..1744a94b 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -20,6 +20,7 @@ export type BuildSession = { filesIndex: FileState[]; agent: ICodingAgent; projectType: ProjectType; + selectedTemplate?: string; // Template chosen by agent (minimal-vite, etc.) }; export type BuildInputs = { @@ -28,77 +29,613 @@ export type BuildInputs = { blueprint?: Blueprint; }; -/** - * Build a rich, dynamic system prompt similar in rigor to DeepCodeDebugger, - * but oriented for autonomous building. Avoids leaking internal taxonomy. - */ const getSystemPrompt = (dynamicHints: string): string => { - const persona = `You are an elite autonomous project builder with deep expertise in Cloudflare Workers (and Durable Objects as needed), TypeScript, Vite, and modern web application and content generation. You operate with extremely high reasoning capability. Think internally, act decisively, and report concisely.`; - - const comms = `CRITICAL: Communication Mode -- Perform all analysis, planning, and reasoning INTERNALLY -- Output should be CONCISE: brief status updates and tool calls only -- No verbose explanations or step-by-step narrations in output -- Think deeply internally → Act externally with tools → Report briefly`; - - const environment = `Project Environment -- Runtime: Cloudflare Workers (no Node.js fs/path/process) -- Fetch API standard (Request/Response), Web streams -- Frontend when applicable: React + Vite + TypeScript -- Deployments: wrangler → preview sandbox (live URL)`; - - const constraints = `Platform Constraints -- Prefer minimal dependencies; do not edit wrangler.jsonc or package.json unless necessary -- Logs and runtime errors are user-driven -- Paths are relative to project root; commands execute at project root; never use cd`; - - const toolsCatalog = `Available Tools & Usage Notes -- generate_blueprint: Produce initial PRD from the backend generator (plan for autonomous builds). Use FIRST if blueprint/plan is missing. -- alter_blueprint: Patch PRD fields (title, projectName, description, colorPalette, frameworks, plan). Use to refine after generation. -- generate_files: Create or rewrite multiple files for milestones. Be precise and include explicit file lists with purposes. -- regenerate_file: Apply targeted fixes to a single file. Prefer this for surgical changes before resorting to generate_files. -- read_files: Batch read code for analysis or confirmation. -- deploy_preview: Deploy only when a runtime exists (interactive UI, slide deck, or backend endpoints). Not for documents-only work. -- run_analysis: Lint + typecheck for verification. Use after deployment when a runtime is required; otherwise run locally for static code. -- get_runtime_errors / get_logs: Runtime diagnostics. Logs are cumulative; verify recency and avoid double-fixing. -- exec_commands: Execute commands sparingly; persist commands only when necessary. -- git: Commit, log, show; use clear conventional commit messages. -- initialize_slides: Import Spectacle and scaffold a deck when appropriate before deploying preview. -- generate_images: Stub for future image generation. Do not rely on it for critical paths.`; - - const protocol = `Execution Protocol -1) If blueprint or plan is missing → generate_blueprint. Then refine with alter_blueprint as needed. -2) Implement milestones via generate_files (or regenerate_file for targeted fixes). -3) When a runtime exists (UI/slides/backend endpoints), deploy_preview before verification. - - Documents-only: do NOT deploy; focus on content quality and structure. -4) Verify: run_analysis; then use runtime diagnostics (get_runtime_errors, get_logs) if needed. -5) Iterate: fix → commit → test until complete. -6) Finish with BUILD_COMPLETE: . If blocked, BUILD_STUCK: . Stop tool calls immediately after either.`; - - const quality = `Quality Bar -- Type-safe, minimal, and maintainable code -- Thoughtful architecture; avoid unnecessary config churn -- Professional visual polish for UI when applicable (spacing, hierarchy, interaction states, responsiveness)`; - - const reactSafety = `${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE}\n${PROMPT_UTILS.COMMON_PITFALLS}`; - - const completion = `Completion Discipline -- BUILD_COMPLETE: → stop -- BUILD_STUCK: → stop`; + const identity = `# Identity +You are an elite autonomous project builder with deep expertise in Cloudflare Workers, Durable Objects, TypeScript, React, Vite, and modern web applications. You operate with EXTREMELY HIGH reasoning capability.`; + + const comms = `# CRITICAL: Communication Mode +- Perform ALL analysis, planning, and reasoning INTERNALLY using your high reasoning capability +- Your output should be CONCISE: brief status updates and tool calls ONLY +- NO verbose explanations, NO step-by-step narrations in your output +- Think deeply internally → Act externally with precise tool calls → Report results briefly +- This is NOT negotiable - verbose output wastes tokens and degrades user experience`; + + const architecture = `# System Architecture (CRITICAL - Understand This) + +## How Your Environment Works + +**You operate in a Durable Object with TWO distinct layers:** + +### 1. Virtual Filesystem (Your Workspace) +- Lives in Durable Object storage (persistent) +- Managed by FileManager + Git (isomorphic-git with SQLite) +- ALL files you generate go here FIRST +- Files exist in memory/DO storage, NOT in actual sandbox yet +- Full git history maintained (commits, diffs, log, show) +- This is YOUR primary working area + +### 2. Sandbox Environment (Execution Layer) +- Separate container running Bun + Vite dev server +- Has its own filesystem (NOT directly accessible to you) +- Created when deploy_preview is called +- Runs 'bun run dev' and exposes preview URL +- THIS is where code actually executes + +## The Deploy Process (What deploy_preview Does) + +When you call deploy_preview: +1. Checks if sandbox instance exists +2. If NOT: Creates new sandbox instance + - Template mode: Downloads template from R2, sets it up + - Virtual-first mode: Uses minimal-vite + your virtual files as overlay + - Runs: bun install → bun run dev + - Exposes port → preview URL +3. If YES: Uses existing sandbox +4. Syncs ALL virtual files → sandbox filesystem (writeFiles) +5. Returns preview URL + +**KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. + +## File Flow Diagram +\`\`\` +You (LLM) + → generate_files / regenerate_file + → Virtual Filesystem (FileManager + Git) + → [Files stored in DO, committed to git] + +deploy_preview called + → DeploymentManager.deployToSandbox() + → Checks if sandbox exists + → If not: createNewInstance() + → Syncs virtual files → Sandbox filesystem + → Sandbox runs: bun run dev + → Preview URL returned +\`\`\` + +## Common Failure Scenarios & What They Mean + +**"No sandbox instance available"** +- Sandbox was never created OR crashed +- Solution: Call deploy_preview to create/recreate + +**"Failed to install dependencies"** +- package.json has issues (missing deps, wrong format) +- Sandbox can't run 'bun install' +- Solution: Fix package.json, redeploy + +**"Preview URL not responding"** +- Dev server failed to start +- Usually: Missing vite.config.js OR 'bun run dev' script broken +- Solution: Check package.json scripts, ensure vite configured + +**"Type errors after deploy"** +- Virtual files are fine, but TypeScript fails in sandbox +- Solution: Run run_analysis to catch before deploy + +**"Runtime errors in logs"** +- Code deployed but crashes when executed +- Check with get_runtime_errors, fix issues, redeploy + +**"File not found in sandbox"** +- You generated file in virtual filesystem +- But forgot to call deploy_preview to sync +- Solution: Always deploy after generating files + +## State Persistence + +**What Persists:** +- Virtual filesystem (all generated files) +- Git history (commits, branches) +- Blueprint +- Conversation messages +- Sandbox instance ID (once created) + +**What Doesn't Persist:** +- Sandbox filesystem state (unless you writeFiles) +- Running processes (dev server restarts on redeploy) +- Logs (cumulative but can be cleared) + +## When Things Break + +**Sandbox becomes unhealthy:** +- DeploymentManager auto-detects via health checks +- Will auto-redeploy after failures +- You may see retry messages - this is normal + +**Need fresh start:** +- Use force_redeploy=true in deploy_preview +- Destroys current sandbox, creates new one +- Expensive operation - only when truly stuck + +## Troubleshooting Workflow + +**Problem: "I generated files but preview shows old code"** +→ You forgot to deploy_preview after generating files +→ Solution: Call deploy_preview to sync virtual → sandbox + +**Problem: "run_analysis says file doesn't exist"** +→ File is in virtual FS but not synced to sandbox yet +→ Solution: deploy_preview first, then run_analysis + +**Problem: "exec_commands fails with 'no instance'"** +→ Sandbox doesn't exist yet +→ Solution: deploy_preview first to create sandbox + +**Problem: "get_logs returns empty"** +→ User hasn't interacted with preview yet, OR logs were cleared +→ Solution: Wait for user interaction or check timestamps + +**Problem: "Same error keeps appearing after fix"** +→ Logs are cumulative - you're seeing old errors +→ Solution: Clear logs with deploy_preview(clearLogs=true) + +**Problem: "Types look correct but still errors"** +→ You're reading from virtual FS, but sandbox has old versions +→ Solution: deploy_preview to sync latest changes`; + + const environment = `# Project Environment +- Runtime: Cloudflare Workers (NO Node.js fs/path/process APIs available) +- Fetch API standard (Request/Response), Web Streams API +- Frontend: React 19 + Vite + TypeScript + TailwindCSS +- Build tool: Bun (commands: bun run dev/build/lint/deploy) +- All projects MUST be Cloudflare Worker projects with wrangler.jsonc`; + + const constraints = `# Platform Constraints +- NO Node.js APIs (fs, path, process, etc.) - Workers runtime only +- Logs and errors are user-driven; check recency before fixing +- Paths are ALWAYS relative to project root +- Commands execute at project root - NEVER use cd +- NEVER modify wrangler.jsonc or package.json unless absolutely necessary`; + + const workflow = `# Your Workflow (Execute This Rigorously) + +## Step 1: Understand Requirements +- Read user request carefully +- Identify project type: app, presentation, documentation, tool, workflow +- Determine if clarifying questions are needed (rare - usually requirements are clear) + +## Step 2: Determine Approach +**Static Content** (documentation, guides, markdown): +- Generate files in docs/ directory structure +- NO sandbox needed +- Focus on content quality, organization, formatting + +**Interactive Projects** (apps, presentations, APIs, tools): +- Require sandbox with template +- Must have runtime environment +- Will use deploy_preview for testing + +## Step 3: Template Selection (Interactive Projects Only) +CRITICAL - Read this carefully: + +**TWO APPROACHES:** + +**A) Template-based (Recommended for most cases):** +- DEFAULT: Use 'minimal-vite' template (99% of cases) + - Minimal Vite+Bun+Cloudflare Worker boilerplate + - Has wrangler.jsonc and vite.config.js pre-configured + - Supports: bun run dev/build/lint/deploy + - CRITICAL: 'bun run dev' MUST work or sandbox creation FAILS +- Alternative templates: Use template_manager(command: "list") to see options +- Template switching allowed but STRONGLY DISCOURAGED + +**B) Virtual-first (Advanced - for custom setups):** +- Skip template selection entirely +- Generate all required config files yourself: + - package.json (with dependencies, scripts: dev/build/lint) + - wrangler.jsonc (Cloudflare Worker config) + - vite.config.js (Vite configuration) +- When you call deploy_preview, sandbox will be created with minimal-vite + your files +- ONLY use this if you have very specific config needs +- DEFAULT to template-based approach unless necessary + +## Step 4: Generate Blueprint +- Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) +- Blueprint defines: title, description, features, architecture, plan +- Refine with alter_blueprint if needed +- NEVER start building without a plan + +## Step 5: Build Incrementally +- Use generate_files for new features/components (goes to virtual FS) +- Use regenerate_file for surgical fixes to existing files (goes to virtual FS) +- Commit frequently with clear messages (git operates on virtual FS) +- For interactive projects: + - After generating files: deploy_preview (syncs virtual → sandbox) + - Then verify with run_analysis or runtime tools + - Fix issues → iterate +- **Remember**: Files in virtual FS won't execute until you deploy_preview + +## Step 6: Verification & Polish +- run_analysis for type checking and linting +- get_runtime_errors / get_logs for runtime issues +- Fix all issues before completion +- Ensure professional quality and polish`; + + const tools = `# Available Tools (Detailed Reference) + +## Planning & Architecture + +**generate_blueprint** - Create structured project plan (Product Requirements Document) + +**What it is:** +- Your planning tool - creates a PRD defining WHAT to build before you start +- Becomes the source of truth for implementation +- Stored in agent state (persists across all requests) +- Accepts optional **prompt** parameter for providing additional context beyond user's initial request + +**What it generates:** +- title: Project name +- projectName: Technical identifier +- description: What the project does +- colorPalette: Brand colors for UI +- frameworks: Tech stack being used +- plan[]: Phased implementation roadmap with requirements per phase + +**When to call:** +- ✅ FIRST STEP when no blueprint exists +- ✅ User provides vague requirements (you need to design structure) +- ✅ Complex project needing phased approach + +**When NOT to call:** +- ❌ Blueprint already exists (use alter_blueprint to modify) +- ❌ Simple one-file tasks (just generate directly) + +**Optional prompt parameter:** +- Use to provide additional context, clarifications, or refined specifications +- If omitted, uses user's original request +- Useful when you've learned more through conversation + +**CRITICAL After-Effects:** +1. Blueprint stored in agent state +2. You now have clear plan to follow +3. Use plan phases to guide generate_files calls +4. **Do NOT start building without blueprint** (fundamental rule) + +**Example workflow:** +\`\`\` +User: "Build a todo app" + ↓ +You: generate_blueprint (creates PRD with phases) + ↓ +Review blueprint, refine with alter_blueprint if needed + ↓ +Follow phases: generate_files for phase-1, then phase-2, etc. +\`\`\` + +**alter_blueprint** +- Patch specific fields in existing blueprint +- Use to refine after generation or requirements change +- Surgical updates only - don't regenerate entire blueprint + +## Template Management +**template_manager** - Unified template operations with command parameter + +Commands available: +- **"list"**: Browse available template catalog +- **"select"**: Choose a template for your project (requires templateName parameter) + +**What templates are:** +- Pre-built project scaffolds with working configs +- Each has wrangler.jsonc, vite.config.js, package.json already set up +- When you select a template, it becomes the BASE layer when sandbox is created +- Your generated files OVERLAY on top of template files + +**How it works:** +\`\`\` +You call: template_manager(command: "select", templateName: "minimal-vite") + ↓ +Template marked for use + ↓ +You call: deploy_preview + ↓ +Template downloaded and extracted to sandbox + ↓ +Your generated files synced on top + ↓ +Sandbox runs 'bun run dev' from template +\`\`\` + +**Default choice: "minimal-vite"** (use for 99% of cases) +- Vite + Bun + Cloudflare Worker boilerplate +- Has working 'bun run dev' script (CRITICAL - sandbox fails without this) +- Includes wrangler.jsonc and vite.config.js pre-configured +- Template choice persists for entire session + +**CRITICAL Caveat:** +- If template selected, deploy_preview REQUIRES that template's 'bun run dev' works +- If template broken, sandbox creation FAILS completely +- Template switching allowed but DISCOURAGED (requires sandbox recreation) + +**When to use templates:** +- ✅ Interactive apps (need dev server, hot reload) +- ✅ Want pre-configured build setup +- ✅ Need Cloudflare Worker or Durable Object scaffolding + +**When NOT to use templates:** +- ❌ Static documentation (no runtime needed) +- ❌ Want full control over every config file (use virtual-first mode) + +## File Operations (Understanding Your Two-Layer System) + +**CRITICAL: Where Your Files Live** + +You work with TWO separate filesystems: + +1. **Virtual Filesystem** (Your persistent workspace) + - Lives in Durable Object storage + - Managed by git (full commit history) + - Files here do NOT execute - just stored + - Persists across all requests/sessions + +2. **Sandbox Filesystem** (Where code runs) + - Separate container running Bun + Vite dev server + - Files here CAN execute and be tested + - Created when you call deploy_preview + - Destroyed/recreated on redeploy + +**The File Flow You Control:** +\`\`\` +You call: generate_files or regenerate_file + ↓ +Files written to VIRTUAL filesystem (Durable Object storage) + ↓ +Auto-committed to git (generate_files) or staged (regenerate_file) + ↓ +[Files NOT in sandbox yet - sandbox can't see them] + ↓ +You call: deploy_preview + ↓ +Files synced from virtual filesystem → sandbox filesystem + ↓ +Now sandbox can execute your code +\`\`\` + +--- + +**virtual_filesystem** - List and read files from your persistent workspace + +Commands available: +- **"list"**: See all files in your virtual filesystem +- **"read"**: Read file contents by paths (requires paths parameter) + +**What it does:** +- Lists/reads from your persistent workspace (template files + generated files) +- Shows you what exists BEFORE deploying to sandbox +- Useful for: discovering files, verifying changes, understanding structure + +**Where it reads from (priority order):** +1. Your generated/modified files (highest priority) +2. Template files (if template selected) +3. Returns empty if file doesn't exist + +**When to use:** +- ✅ Before editing (understand what exists) +- ✅ After generate_files/regenerate_file (verify changes worked) +- ✅ Exploring template structure +- ✅ Checking if file exists before regenerating + +**CRITICAL Caveat:** +- Reads from VIRTUAL filesystem, not sandbox +- Sandbox may have older versions if you haven't called deploy_preview +- If sandbox behaving weird, check if virtual FS and sandbox are in sync + +--- + +**generate_files** - Create or completely rewrite files + +**What it does:** +- Generates complete file contents from scratch +- Can create multiple files in one call (batch operation) +- Automatically commits to git with descriptive message +- **Where files go**: Virtual filesystem only (not in sandbox yet) + +**When to use:** +- ✅ Creating brand new files that don't exist +- ✅ Scaffolding features requiring multiple coordinated files +- ✅ When regenerate_file failed 2+ times (file too broken to patch) +- ✅ Initial project structure + +**When NOT to use:** +- ❌ Small fixes to existing files (use regenerate_file - faster) +- ❌ Tweaking single functions (use regenerate_file) + +**CRITICAL After-Effects:** +1. Files now exist in virtual filesystem +2. Automatically committed to git +3. Sandbox does NOT see them yet +4. **You MUST call deploy_preview to sync virtual → sandbox** +5. Only after deploy_preview can you test or run_analysis + +--- + +**regenerate_file** - Surgical fixes to single existing file + +**What it does:** +- Applies minimal, targeted changes to one file +- Uses smart pattern matching internally +- Makes multiple passes (up to 3) to fix issues +- Returns diff showing exactly what changed +- **Where files go**: Virtual filesystem only + +**When to use:** +- ✅ Fixing TypeScript/JavaScript errors +- ✅ Adding missing imports or exports +- ✅ Patching bugs or logic errors +- ✅ Small feature additions to existing components + +**When NOT to use:** +- ❌ File doesn't exist yet (use generate_files) +- ❌ File is too broken to patch (use generate_files to rewrite) +- ❌ Haven't read the file yet (read it first!) + +**How to describe issues (CRITICAL for success):** +- BE SPECIFIC: Include exact error messages, line numbers +- ONE PROBLEM PER ISSUE: Don't combine unrelated problems +- PROVIDE CONTEXT: Explain what's broken and why +- SUGGEST SOLUTION: Share your best idea for fixing it + +**CRITICAL After-Effects:** +1. File updated in virtual filesystem +2. Changes are STAGED (git add) but NOT committed +3. **You MUST manually call git commit** (unlike generate_files) +4. Sandbox does NOT see changes yet +5. **You MUST call deploy_preview to sync virtual → sandbox** + +**PARALLEL EXECUTION:** +- You can call regenerate_file on MULTIPLE different files simultaneously +- Much faster than sequential calls + +## Deployment & Testing +**deploy_preview** +- Deploy to sandbox and get preview URL +- Only for interactive projects (apps, presentations, APIs) +- NOT for static documentation +- Creates sandbox on first call if needed +- TWO MODES: + 1. **Template-based**: If you called template_manager(command: "select"), uses that template + 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with minimal-vite + your files as overlay +- Syncs all files from virtual filesystem to sandbox + +**run_analysis** +- TypeScript checking + ESLint +- **Where**: Runs in sandbox on deployed files +- **Requires**: Sandbox must exist +- Run after changes to catch errors early +- Much faster than runtime testing +- Analyzes files you specify (or all generated files) + +**get_runtime_errors** +- Fetch runtime exceptions from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running, user has interacted with app +- Check recency - logs are cumulative +- Use after deploy_preview for verification +- Errors only appear when code actually executes + +**get_logs** +- Get console logs from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running +- Cumulative - check timestamps +- Useful for debugging runtime behavior +- Logs appear when user interacts with preview + +## Utilities +**exec_commands** +- Execute shell commands in sandbox +- **Where**: Sandbox environment (NOT virtual filesystem) +- **Requires**: Sandbox must exist (call deploy_preview first) +- Use sparingly - most needs covered by other tools +- Commands run at project root +- Examples: bun add package, custom build scripts + +**git** +- Operations: commit, log, show +- **Where**: Virtual filesystem (isomorphic-git on DO storage) +- Commit frequently with conventional messages +- Use for: saving progress, reviewing changes +- Full git history maintained +- **Note**: This is YOUR git, not sandbox git + +**generate_images** +- Future image generation capability +- Currently a stub - do NOT rely on this`; + + const staticVsSandbox = `# CRITICAL: Static vs Sandbox Detection + +**Static Content (NO Sandbox)**: +- Markdown files (.md, .mdx) +- Documentation in docs/ directory +- Plain text files +- Configuration without runtime +→ Generate files, NO deploy_preview needed +→ Focus on content quality and organization + +**Interactive Projects (Require Sandbox)**: +- React apps, presentations, APIs +- Anything with bun run dev +- UI with interactivity +- Backend endpoints +→ Must select template +→ Use deploy_preview for testing +→ Verify with run_analysis + runtime tools`; + + const quality = `# Quality Standards + +**Code Quality:** +- Type-safe TypeScript (no any, proper interfaces) +- Minimal dependencies - reuse what exists +- Clean architecture - separation of concerns +- Professional error handling + +**UI Quality (when applicable):** +- Responsive design (mobile, tablet, desktop) +- Proper spacing and visual hierarchy +- Interactive states (hover, focus, active, disabled) +- Accessibility basics (semantic HTML, ARIA when needed) +- TailwindCSS for styling (theme-consistent) + +**Testing & Verification:** +- All TypeScript errors resolved +- No lint warnings +- Runtime tested via preview +- Edge cases considered`; + + const reactSafety = `# React Safety & Common Pitfalls + +${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} + +${PROMPT_UTILS.COMMON_PITFALLS} + +**Additional Warnings:** +- NEVER modify state during render +- useEffect dependencies must be complete +- Memoize expensive computations +- Avoid inline object/function creation in JSX`; + + const completion = `# Completion Discipline + +When you're done: +**BUILD_COMPLETE: ** +- All requirements met +- All errors fixed +- Testing completed +- Ready for user + +If blocked: +**BUILD_STUCK: ** +- Clear explanation of blocker +- What you tried +- What you need to proceed + +STOP ALL TOOL CALLS IMMEDIATELY after either signal.`; + + const warnings = `# Critical Warnings + +1. TEMPLATE CHOICE IS IMPORTANT - Choose with future scope in mind +2. For template-based: minimal-vite MUST have working 'bun run dev' or sandbox fails +3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview +4. Do NOT deploy static documentation - wastes resources +5. Check log timestamps - they're cumulative, may contain old data +6. NEVER create verbose step-by-step explanations - use tools directly +7. Template switching allowed but strongly discouraged +8. Virtual-first is advanced mode - default to template-based unless necessary`; return [ - persona, + identity, comms, + architecture, environment, constraints, - toolsCatalog, - protocol, + workflow, + tools, + staticVsSandbox, quality, - 'Dynamic Guidance', - dynamicHints, - 'React/General Safety Notes', reactSafety, completion, + warnings, + '# Dynamic Context-Specific Guidance', + dynamicHints, ].join('\n\n'); }; @@ -159,7 +696,7 @@ Build a complete, production-ready solution that best fulfills the request. If i - Commit regularly with descriptive messages ## Execution Reminder -- If no blueprint or plan is present: generate_blueprint FIRST, then alter_blueprint if needed. Do not implement until a plan exists. +- If no blueprint or plan is present: generate_blueprint FIRST (optionally with prompt parameter for additional context), then alter_blueprint if needed. Do not implement until a plan exists. - Deploy only when a runtime exists; do not deploy for documents-only work. Begin building.`; @@ -230,11 +767,15 @@ export class AgenticProjectBuilder extends Assistant { const hasTSX = session.filesIndex?.some(f => /\.(t|j)sx$/i.test(f.filePath)) || false; const hasMD = session.filesIndex?.some(f => /\.(md|mdx)$/i.test(f.filePath)) || false; const hasPlan = isAgenticBlueprint(inputs.blueprint) && inputs.blueprint.plan.length > 0; + const hasTemplate = !!session.selectedTemplate; + const needsSandbox = hasTSX || session.projectType === 'presentation' || session.projectType === 'app'; + const dynamicHints = [ - !hasPlan ? '- No plan detected: Start with generate_blueprint to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', - hasTSX ? '- UI/slides detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', - hasMD && !hasTSX ? '- Documents detected without UI: Do NOT deploy; focus on Markdown/MDX quality and structure.' : '', - !hasFiles ? '- No files yet: After PRD, scaffold initial structure with generate_files. If a deck is appropriate, call initialize_slides before deploying preview.' : '', + !hasPlan ? '- No plan detected: Start with generate_blueprint (optionally with prompt parameter) to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', + needsSandbox && !hasTemplate ? '- Interactive project without template: Use template_manager(command: "list") then template_manager(command: "select", templateName: "minimal-vite") before first deploy.' : '', + hasTSX ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + hasMD && !hasTSX ? '- Documents detected without UI: This is STATIC content - generate files in docs/, NO deploy_preview needed.' : '', + !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', ].filter(Boolean).join('\n'); // Build prompts diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index ae2a712b..2ffe019d 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -6,7 +6,7 @@ import { AgenticBlueprint, PhasicBlueprint, } from '../../schemas'; -import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; +import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails, TemplateFile } from '../../../services/sandbox/sandboxTypes'; import { BaseProjectState, AgenticState } from '../state'; import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; @@ -16,6 +16,7 @@ import { UserConversationProcessor, RenderToolCall } from '../../operations/User import { FileRegenerationOperation } from '../../operations/FileRegeneration'; // Database schema imports removed - using zero-storage OAuth flow import { BaseSandboxService } from '../../../services/sandbox/BaseSandboxService'; +import { getTemplateImportantFiles } from '../../../services/sandbox/utils'; import { createScratchTemplateDetails } from '../../utils/templates'; import { WebSocketMessageData, WebSocketMessageType } from '../../../api/websocketTypes'; import { InferenceContext, AgentActionKey } from '../../inferutils/config.types'; @@ -778,17 +779,39 @@ export abstract class BaseCodingBehavior } // ===== Debugging helpers for assistants ===== + listFiles(): FileOutputType[] { + return this.fileManager.getAllRelevantFiles(); + } + async readFiles(paths: string[]): Promise<{ files: { path: string; content: string }[] }> { - const { sandboxInstanceId } = this.state; - if (!sandboxInstanceId) { - return { files: [] }; + const results: { path: string; content: string }[] = []; + const notFoundInFileManager: string[] = []; + + // First, try to read from FileManager (template + generated files) + for (const path of paths) { + const file = this.fileManager.getFile(path); + if (file) { + results.push({ path, content: file.fileContents }); + } else { + notFoundInFileManager.push(path); + } } - const resp = await this.getSandboxServiceClient().getFiles(sandboxInstanceId, paths); - if (!resp.success) { - this.logger.warn('readFiles failed', { error: resp.error }); - return { files: [] }; + + // If some files not found in FileManager and sandbox exists, try sandbox + if (notFoundInFileManager.length > 0 && this.state.sandboxInstanceId) { + const resp = await this.getSandboxServiceClient().getFiles( + this.state.sandboxInstanceId, + notFoundInFileManager + ); + if (resp.success) { + results.push(...resp.files.map(f => ({ + path: f.filePath, + content: f.fileContents + }))); + } } - return { files: resp.files.map(f => ({ path: f.filePath, content: f.fileContents })) }; + + return { files: results }; } async execCommands(commands: string[], shouldSave: boolean, timeout?: number): Promise { @@ -1032,7 +1055,7 @@ export abstract class BaseCodingBehavior } } - async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number }> { + async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }> { this.logger.info(`Importing template into project: ${templateName}`); const results = await BaseSandboxService.getTemplateDetails(templateName); if (!results.success || !results.templateDetails) { @@ -1060,7 +1083,14 @@ export abstract class BaseCodingBehavior lastPackageJson: templateDetails.allFiles['package.json'] || this.state.lastPackageJson, }); - return { templateName: templateDetails.name, filesImported: filesToSave.length }; + // Get important files for return value + const importantFiles = getTemplateImportantFiles(templateDetails); + + return { + templateName: templateDetails.name, + filesImported: filesToSave.length, + files: importantFiles + }; } async waitForGeneration(): Promise { diff --git a/worker/agents/services/implementations/DeploymentManager.ts b/worker/agents/services/implementations/DeploymentManager.ts index 6f2ff022..1915090e 100644 --- a/worker/agents/services/implementations/DeploymentManager.ts +++ b/worker/agents/services/implementations/DeploymentManager.ts @@ -554,7 +554,6 @@ export class DeploymentManager extends BaseAgentService implem */ private async createNewInstance(): Promise { const state = this.getState(); - const templateName = state.templateName; const projectName = state.projectName; // Add AI proxy vars if AI template @@ -572,18 +571,21 @@ export class DeploymentManager extends BaseAgentService implem }; } } - + + // Get latest files + const files = this.fileManager.getAllFiles(); + // Create instance const client = this.getClient(); const logger = this.getLog(); - - const createResponse = await client.createInstance( - templateName, - `v1-${projectName}`, - undefined, - localEnvVars - ); - + + const createResponse = await client.createInstance({ + files, + projectName, + initCommand: 'bun run dev', + envVars: localEnvVars + }); + if (!createResponse || !createResponse.success || !createResponse.runId) { throw new Error(`Failed to create sandbox instance: ${createResponse?.error || 'Unknown error'}`); } diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index 416f1074..a44101d4 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -7,6 +7,7 @@ import { RenderToolCall } from "worker/agents/operations/UserConversationProcess import { WebSocketMessageType, WebSocketMessageData } from "worker/api/websocketTypes"; import { GitVersionControl } from "worker/agents/git/git"; import { OperationOptions } from "worker/agents/operations/common"; +import { TemplateFile } from "worker/services/sandbox/sandboxTypes"; export interface ICodingAgent { getBehavior(): BehaviorType; @@ -33,10 +34,12 @@ export interface ICodingAgent { getProjectType(): ProjectType; - importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }>; - + importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }>; + getOperationOptions(): OperationOptions; - + + listFiles(): FileOutputType[]; + readFiles(paths: string[]): Promise<{ files: { path: string; content: string }[] }>; runStaticAnalysisCode(files?: string[]): Promise; @@ -70,7 +73,6 @@ export interface ICodingAgent { ): Promise; get git(): GitVersionControl; - getGit(): GitVersionControl; getSandboxServiceClient(): BaseSandboxService; } diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index ec0508ab..f78d9738 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -22,7 +22,8 @@ import { createWaitForGenerationTool } from './toolkit/wait-for-generation'; import { createWaitForDebugTool } from './toolkit/wait-for-debug'; import { createGitTool } from './toolkit/git'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; -import { createInitializeSlidesTool } from './toolkit/initialize-slides'; +import { createTemplateManagerTool } from './toolkit/template-manager'; +import { createVirtualFilesystemTool } from './toolkit/virtual-filesystem'; import { createGenerateImagesTool } from './toolkit/generate-images'; export async function executeToolWithDefinition( @@ -86,13 +87,15 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur // PRD generation + refinement createGenerateBlueprintTool(session.agent, logger), createAlterBlueprintTool(session.agent, logger), + // Template management (combined list + select) + createTemplateManagerTool(session.agent, logger), + // Virtual filesystem operations (list + read from Durable Object storage) + createVirtualFilesystemTool(session.agent, logger), // Build + analysis toolchain - createReadFilesTool(session.agent, logger), createGenerateFilesTool(session.agent, logger), createRegenerateFileTool(session.agent, logger), createRunAnalysisTool(session.agent, logger), // Runtime + deploy - createInitializeSlidesTool(session.agent, logger), createDeployPreviewTool(session.agent, logger), createGetRuntimeErrorsTool(session.agent, logger), createGetLogsTool(session.agent, logger), @@ -100,7 +103,7 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur createExecCommandsTool(session.agent, logger), createWaitTool(logger), createGitTool(session.agent, logger), - // Optional future: images + // WIP: images createGenerateImagesTool(session.agent, logger), ]; diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts index 9d99b5dc..cf821b01 100644 --- a/worker/agents/tools/toolkit/generate-blueprint.ts +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -4,7 +4,9 @@ import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; import type { Blueprint } from 'worker/agents/schemas'; -type GenerateBlueprintArgs = Record; +type GenerateBlueprintArgs = { + prompt: string; +}; type GenerateBlueprintResult = { message: string; blueprint: Blueprint }; /** @@ -19,10 +21,19 @@ export function createGenerateBlueprintTool( function: { name: 'generate_blueprint', description: - 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic.', - parameters: { type: 'object', properties: {}, additionalProperties: false }, + 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic. Provide a description/prompt for the project to generate a blueprint.', + parameters: { + type: 'object', + properties: { + prompt: { + type: 'string', + description: 'Prompt/user query for building the project. Use this to provide clarifications, additional requirements, or refined specifications based on conversation context.' + } + }, + required: ['prompt'], + }, }, - implementation: async () => { + implementation: async ({ prompt }: GenerateBlueprintArgs) => { const { env, inferenceContext, context } = agent.getOperationOptions(); const isAgentic = agent.getBehavior() === 'agentic'; @@ -34,7 +45,7 @@ export function createGenerateBlueprintTool( const args: AgenticBlueprintGenerationArgs = { env, inferenceContext, - query: context.query, + query: prompt, language, frameworks, templateDetails: context.templateDetails, diff --git a/worker/agents/tools/toolkit/template-manager.ts b/worker/agents/tools/toolkit/template-manager.ts new file mode 100644 index 00000000..974ceb36 --- /dev/null +++ b/worker/agents/tools/toolkit/template-manager.ts @@ -0,0 +1,130 @@ +import { ToolDefinition, ErrorResult } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; + +export type TemplateManagerArgs = { + command: 'list' | 'select'; + templateName?: string; +}; + +export type TemplateManagerResult = + | { summary: string } + | { message: string; templateName: string; files: Array<{ path: string; content: string }> } + | ErrorResult; + +/** + * Manages project templates - list available templates or select one for the project. + * Use 'list' to see all available templates with descriptions. + * Use 'select' with templateName to choose and import a template. + */ +export function createTemplateManagerTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'template_manager', + description: 'Manage project templates. Use command="list" to see available templates with their descriptions, frameworks, and use cases. Use command="select" with templateName to select and import a template. Default to "minimal-vite" for 99% of cases unless you have specific requirements.', + parameters: { + type: 'object', + properties: { + command: { + type: 'string', + enum: ['list', 'select'], + description: 'Action to perform: "list" shows all templates, "select" imports a template', + }, + templateName: { + type: 'string', + description: 'Name of template to select (required when command="select"). Examples: "minimal-vite", "c-code-react-runner"', + }, + }, + required: ['command'], + }, + }, + implementation: async ({ command, templateName }: TemplateManagerArgs) => { + try { + if (command === 'list') { + logger.info('Listing available templates'); + + const response = await BaseSandboxService.listTemplates(); + + if (!response.success || !response.templates) { + return { + error: `Failed to fetch templates: ${response.error || 'Unknown error'}` + }; + } + + const templates = response.templates; + + // Format template catalog for LLM + const formattedOutput = templates.map((template, index) => { + const frameworks = template.frameworks?.join(', ') || 'None specified'; + const selectionDesc = template.description?.selection || 'No description'; + const usageDesc = template.description?.usage || 'No usage notes'; + + return ` +${index + 1}. **${template.name}** + - Language: ${template.language} + - Frameworks: ${frameworks} + - Selection Guide: +${selectionDesc} + - Usage Notes: +${usageDesc} +`.trim(); + }).join('\n\n'); + + const summaryText = `# Available Templates (${templates.length} total) +${formattedOutput}`; + + return { summary: summaryText }; + } else if (command === 'select') { + if (!templateName) { + return { + error: 'templateName is required when command is "select"' + }; + } + + logger.info('Selecting template', { templateName }); + + // Validate template exists + const templatesResponse = await BaseSandboxService.listTemplates(); + + if (!templatesResponse.success || !templatesResponse.templates) { + return { + error: `Failed to validate template: ${templatesResponse.error || 'Could not fetch template list'}` + }; + } + + const templateExists = templatesResponse.templates.some(t => t.name === templateName); + if (!templateExists) { + const availableNames = templatesResponse.templates.map(t => t.name).join(', '); + return { + error: `Template "${templateName}" not found. Available templates: ${availableNames}` + }; + } + + // Import template into the agent's virtual filesystem + // This returns important template files + const result = await agent.importTemplate(templateName, `Selected template: ${templateName}`); + + return { + message: `Template "${templateName}" selected and imported successfully. ${result.files.length} important files available. You can now use deploy_preview to create the sandbox.`, + templateName: result.templateName, + files: result.files + }; + } else { + return { + error: `Invalid command: ${command}. Must be "list" or "select"` + }; + } + } catch (error) { + logger.error('Error in template_manager', error); + return { + error: `Error managing templates: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }; +} diff --git a/worker/agents/tools/toolkit/virtual-filesystem.ts b/worker/agents/tools/toolkit/virtual-filesystem.ts new file mode 100644 index 00000000..0b1e0d7f --- /dev/null +++ b/worker/agents/tools/toolkit/virtual-filesystem.ts @@ -0,0 +1,81 @@ +import { ToolDefinition, ErrorResult } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; + +export type VirtualFilesystemArgs = { + command: 'list' | 'read'; + paths?: string[]; +}; + +export type VirtualFilesystemResult = + | { files: Array<{ path: string; purpose?: string; size: number }> } + | { files: Array<{ path: string; content: string }> } + | ErrorResult; + +export function createVirtualFilesystemTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'virtual_filesystem', + description: `Interact with the virtual persistent workspace. +IMPORTANT: This reads from the VIRTUAL filesystem, NOT the sandbox. Files appear here immediately after generation and may not be deployed to sandbox yet.`, + parameters: { + type: 'object', + properties: { + command: { + type: 'string', + enum: ['list', 'read'], + description: 'Action to perform: "list" shows all files, "read" returns file contents', + }, + paths: { + type: 'array', + items: { type: 'string' }, + description: 'File paths to read (required when command="read"). Use relative paths from project root.', + }, + }, + required: ['command'], + }, + }, + implementation: async ({ command, paths }: VirtualFilesystemArgs) => { + try { + if (command === 'list') { + logger.info('Listing virtual filesystem files'); + + const files = agent.listFiles(); + + const fileList = files.map(file => ({ + path: file.filePath, + purpose: file.filePurpose, + size: file.fileContents.length + })); + + return { + files: fileList + }; + } else if (command === 'read') { + if (!paths || paths.length === 0) { + return { + error: 'paths array is required when command is "read"' + }; + } + + logger.info('Reading files from virtual filesystem', { count: paths.length }); + + return await agent.readFiles(paths); + } else { + return { + error: `Invalid command: ${command}. Must be "list" or "read"` + }; + } + } catch (error) { + logger.error('Error in virtual_filesystem', error); + return { + error: `Error accessing virtual filesystem: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }; +} diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index 44a2290d..12cceda4 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -88,8 +88,8 @@ export class CodingAgentController extends BaseController { const agentId = generateId(); const modelConfigService = new ModelConfigService(env); - const behaviorType = resolveBehaviorType(body); const projectType = resolveProjectType(body); + const behaviorType = resolveBehaviorType(body); this.logger.info(`Resolved behaviorType: ${behaviorType}, projectType: ${projectType} for agent ${agentId}`); @@ -135,8 +135,6 @@ export class CodingAgentController extends BaseController { return uploadImage(env, image, ImageType.UPLOADS); })); } - - const isPhasic = behaviorType === 'phasic'; writer.write({ message: 'Code generation started', @@ -145,15 +143,10 @@ export class CodingAgentController extends BaseController { httpStatusUrl, behaviorType, projectType: finalProjectType, - template: isPhasic - ? { - name: templateDetails.name, - files: getTemplateImportantFiles(templateDetails), - } - : { - name: 'scratch', - files: [], - } + template: { + name: templateDetails.name, + files: getTemplateImportantFiles(templateDetails), + } }); const agentInstance = await getAgentStub(env, agentId, { behaviorType, projectType: finalProjectType }); @@ -169,9 +162,7 @@ export class CodingAgentController extends BaseController { }, } as const; - const initArgs = isPhasic - ? { ...baseInitArgs, templateInfo: { templateDetails, selection } } - : baseInitArgs; + const initArgs = { ...baseInitArgs, templateInfo: { templateDetails, selection } } const agentPromise = agentInstance.initialize(initArgs) as Promise; agentPromise.then(async (_state: AgentState) => { diff --git a/worker/services/sandbox/BaseSandboxService.ts b/worker/services/sandbox/BaseSandboxService.ts index 317c04c5..cef1a8cb 100644 --- a/worker/services/sandbox/BaseSandboxService.ts +++ b/worker/services/sandbox/BaseSandboxService.ts @@ -29,6 +29,7 @@ import { ListInstancesResponse, TemplateDetails, TemplateInfo, + InstanceCreationRequest, } from './sandboxTypes'; import { createObjectLogger, StructuredLogger } from '../../logger'; @@ -207,8 +208,11 @@ export abstract class BaseSandboxService { /** * Create a new instance from a template * Returns: { success: boolean, instanceId?: string, error?: string } + * @param options - Instance creation options */ - abstract createInstance(templateName: string, projectName: string, webhookUrl?: string, localEnvVars?: Record): Promise; + abstract createInstance( + options: InstanceCreationRequest + ): Promise; /** * List all instances across all sessions diff --git a/worker/services/sandbox/remoteSandboxService.ts b/worker/services/sandbox/remoteSandboxService.ts index b52ce8cd..3d33622e 100644 --- a/worker/services/sandbox/remoteSandboxService.ts +++ b/worker/services/sandbox/remoteSandboxService.ts @@ -14,7 +14,6 @@ import { GetLogsResponse, ListInstancesResponse, BootstrapResponseSchema, - BootstrapRequest, GetInstanceResponseSchema, BootstrapStatusResponseSchema, WriteFilesResponseSchema, @@ -29,6 +28,7 @@ import { GitHubPushRequest, GitHubPushResponse, GitHubPushResponseSchema, + InstanceCreationRequest, } from './sandboxTypes'; import { BaseSandboxService } from "./BaseSandboxService"; import { DeploymentTarget } from 'worker/agents/core/types'; @@ -118,14 +118,10 @@ export class RemoteSandboxServiceClient extends BaseSandboxService{ /** * Create a new runner instance. */ - async createInstance(templateName: string, projectName: string, webhookUrl?: string, localEnvVars?: Record): Promise { - const requestBody: BootstrapRequest = { - templateName, - projectName, - ...(webhookUrl && { webhookUrl }), - ...(localEnvVars && { envVars: localEnvVars }) - }; - return this.makeRequest('/instances', 'POST', BootstrapResponseSchema, requestBody); + async createInstance( + options: InstanceCreationRequest + ): Promise { + return this.makeRequest('/instances', 'POST', BootstrapResponseSchema, options); } /** diff --git a/worker/services/sandbox/sandboxSdkClient.ts b/worker/services/sandbox/sandboxSdkClient.ts index 068f1d3e..224152f6 100644 --- a/worker/services/sandbox/sandboxSdkClient.ts +++ b/worker/services/sandbox/sandboxSdkClient.ts @@ -22,6 +22,8 @@ import { GetLogsResponse, ListInstancesResponse, StoredError, + TemplateFile, + InstanceCreationRequest, } from './sandboxTypes'; import { createObjectLogger } from '../../logger'; @@ -50,7 +52,6 @@ export { Sandbox as UserAppSandboxService, Sandbox as DeployerService} from "@cl interface InstanceMetadata { - templateName: string; projectName: string; startTime: string; webhookUrl?: string; @@ -232,24 +233,24 @@ export class SandboxSdkClient extends BaseSandboxService { } } - /** Write a binary file to the sandbox using small base64 chunks to avoid large control messages. */ - private async writeBinaryFileViaBase64(targetPath: string, data: ArrayBuffer, bytesPerChunk: number = 16 * 1024): Promise { - const dir = targetPath.includes('/') ? targetPath.slice(0, targetPath.lastIndexOf('/')) : '.'; - // Ensure directory and clean target file - await this.safeSandboxExec(`mkdir -p '${dir}'`); - await this.safeSandboxExec(`rm -f '${targetPath}'`); - - const buffer = new Uint8Array(data); - for (let i = 0; i < buffer.length; i += bytesPerChunk) { - const chunk = buffer.subarray(i, Math.min(i + bytesPerChunk, buffer.length)); - const base64Chunk = btoa(String.fromCharCode(...chunk)); - // Append decoded bytes into the target file inside the sandbox - const appendResult = await this.safeSandboxExec(`printf '%s' '${base64Chunk}' | base64 -d >> '${targetPath}'`); - if (appendResult.exitCode !== 0) { - throw new Error(`Failed to append to ${targetPath}: ${appendResult.stderr}`); - } - } - } + // /** Write a binary file to the sandbox using small base64 chunks to avoid large control messages. */ + // private async writeBinaryFileViaBase64(targetPath: string, data: ArrayBuffer, bytesPerChunk: number = 16 * 1024): Promise { + // const dir = targetPath.includes('/') ? targetPath.slice(0, targetPath.lastIndexOf('/')) : '.'; + // // Ensure directory and clean target file + // await this.safeSandboxExec(`mkdir -p '${dir}'`); + // await this.safeSandboxExec(`rm -f '${targetPath}'`); + + // const buffer = new Uint8Array(data); + // for (let i = 0; i < buffer.length; i += bytesPerChunk) { + // const chunk = buffer.subarray(i, Math.min(i + bytesPerChunk, buffer.length)); + // const base64Chunk = btoa(String.fromCharCode(...chunk)); + // // Append decoded bytes into the target file inside the sandbox + // const appendResult = await this.safeSandboxExec(`printf '%s' '${base64Chunk}' | base64 -d >> '${targetPath}'`); + // if (appendResult.exitCode !== 0) { + // throw new Error(`Failed to append to ${targetPath}: ${appendResult.stderr}`); + // } + // } + // } /** * Write multiple files efficiently using a single shell script @@ -257,7 +258,7 @@ export class SandboxSdkClient extends BaseSandboxService { * Uses base64 encoding to handle all content safely */ private async writeFilesViaScript( - files: Array<{path: string, content: string}>, + files: TemplateFile[], session: ExecutionSession ): Promise> { if (files.length === 0) return []; @@ -267,8 +268,8 @@ export class SandboxSdkClient extends BaseSandboxService { // Generate shell script const scriptLines = ['#!/bin/bash']; - for (const { path, content } of files) { - const utf8Bytes = new TextEncoder().encode(content); + for (const { filePath, fileContents } of files) { + const utf8Bytes = new TextEncoder().encode(fileContents); // Convert bytes to base64 in chunks to avoid stack overflow const chunkSize = 8192; @@ -288,7 +289,7 @@ export class SandboxSdkClient extends BaseSandboxService { const base64 = base64Chunks.join(''); scriptLines.push( - `mkdir -p "$(dirname "${path}")" && echo '${base64}' | base64 -d > "${path}" && echo "OK:${path}" || echo "FAIL:${path}"` + `mkdir -p "$(dirname "${filePath}")" && echo '${base64}' | base64 -d > "${filePath}" && echo "OK:${filePath}" || echo "FAIL:${filePath}"` ); } @@ -297,7 +298,7 @@ export class SandboxSdkClient extends BaseSandboxService { try { // Write script (1 request) - const writeResult = await session.writeFile(scriptPath, script); + const writeResult = await session.writeFile(scriptPath, script); // TODO: Checksum integrity verification if (!writeResult.success) { throw new Error('Failed to write batch script'); } @@ -313,10 +314,10 @@ export class SandboxSdkClient extends BaseSandboxService { if (match[1]) successPaths.add(match[1]); } - const results = files.map(({ path }) => ({ - file: path, - success: successPaths.has(path), - error: successPaths.has(path) ? undefined : 'Write failed' + const results = files.map(({ filePath }) => ({ + file: filePath, + success: successPaths.has(filePath), + error: successPaths.has(filePath) ? undefined : 'Write failed' })); const successCount = successPaths.size; @@ -339,14 +340,50 @@ export class SandboxSdkClient extends BaseSandboxService { } catch (error) { this.logger.error('Batch write failed', error); - return files.map(({ path }) => ({ - file: path, + return files.map(({ filePath }) => ({ + file: filePath, success: false, error: error instanceof Error ? error.message : 'Unknown error' })); } } + async writeFilesBulk(instanceId: string, files: TemplateFile[]): Promise { + try { + const session = await this.getInstanceSession(instanceId); + // Use batch script for efficient writing (3 requests for any number of files) + const filesToWrite = files.map(file => ({ + filePath: `/workspace/${instanceId}/${file.filePath}`, + fileContents: file.fileContents + })); + + const writeResults = await this.writeFilesViaScript(filesToWrite, session); + + // Map results back to original format + const results: WriteFilesResponse['results'] = []; + for (const writeResult of writeResults) { + results.push({ + file: writeResult.file.replace(`/workspace/${instanceId}/`, ''), + success: writeResult.success, + error: writeResult.error + }); + } + + return { + success: true, + results, + message: 'Files written successfully' + }; + } catch (error) { + this.logger.error('writeFiles', error, { instanceId }); + return { + success: false, + results: files.map(f => ({ file: f.filePath, success: false, error: 'Instance error' })), + message: 'Failed to write files' + }; + } + } + async updateProjectName(instanceId: string, projectName: string): Promise { try { await this.updateProjectConfiguration(instanceId, projectName); @@ -433,48 +470,6 @@ export class SandboxSdkClient extends BaseSandboxService { throw new Error('No available ports found in range 8001-8999'); } - - private async checkTemplateExists(templateName: string): Promise { - // Single command to check if template directory and package.json both exist - const checkResult = await this.safeSandboxExec(`test -f ${templateName}/package.json && echo "exists" || echo "missing"`); - return checkResult.exitCode === 0 && checkResult.stdout.trim() === "exists"; - } - - async downloadTemplate(templateName: string, downloadDir?: string) : Promise { - // Fetch the zip file from R2 - const downloadUrl = downloadDir ? `${downloadDir}/${templateName}.zip` : `${templateName}.zip`; - this.logger.info(`Fetching object: ${downloadUrl} from R2 bucket`); - const r2Object = await env.TEMPLATES_BUCKET.get(downloadUrl); - - if (!r2Object) { - throw new Error(`Object '${downloadUrl}' not found in bucket`); - } - - const zipData = await r2Object.arrayBuffer(); - - this.logger.info(`Downloaded zip file (${zipData.byteLength} bytes)`); - return zipData; - } - - private async ensureTemplateExists(templateName: string, downloadDir?: string, isInstance: boolean = false) { - if (!await this.checkTemplateExists(templateName)) { - // Download and extract template - this.logger.info(`Template doesnt exist, Downloading template from: ${templateName}`); - - const zipData = await this.downloadTemplate(templateName, downloadDir); - // Stream zip to sandbox in safe base64 chunks and write directly as binary - await this.writeBinaryFileViaBase64(`${templateName}.zip`, zipData); - this.logger.info(`Wrote zip file to sandbox in chunks: ${templateName}.zip`); - - const setupResult = await this.safeSandboxExec(`unzip -o -q ${templateName}.zip -d ${isInstance ? '.' : templateName}`); - - if (setupResult.exitCode !== 0) { - throw new Error(`Failed to download/extract template: ${setupResult.stderr}`); - } - } else { - this.logger.info(`Template already exists`); - } - } private async buildFileTree(instanceId: string): Promise { try { @@ -539,7 +534,6 @@ export class SandboxSdkClient extends BaseSandboxService { // Create lightweight instance details from metadata const instanceDetails: InstanceDetails = { runId: instanceId, - templateName: metadata.templateName, startTime: new Date(metadata.startTime), uptime: Math.floor((Date.now() - new Date(metadata.startTime).getTime()) / 1000), directory: instanceId, @@ -633,7 +627,7 @@ export class SandboxSdkClient extends BaseSandboxService { return false; } - private async startDevServer(instanceId: string, port: number): Promise { + private async startDevServer(instanceId: string, initCommand: string, port: number): Promise { try { // Use session-based process management // Note: Environment variables should already be set via setLocalEnvVars @@ -641,7 +635,7 @@ export class SandboxSdkClient extends BaseSandboxService { // Start process with env vars inline for those not in .dev.vars const process = await session.startProcess( - `VITE_LOGGER_TYPE=json PORT=${port} monitor-cli process start --instance-id ${instanceId} --port ${port} -- bun run dev` + `VITE_LOGGER_TYPE=json PORT=${port} monitor-cli process start --instance-id ${instanceId} --port ${port} -- ${initCommand}` ); this.logger.info('Development server started', { instanceId, processId: process.id }); @@ -900,7 +894,12 @@ export class SandboxSdkClient extends BaseSandboxService { } } - private async setupInstance(instanceId: string, projectName: string, localEnvVars?: Record): Promise<{previewURL: string, tunnelURL: string, processId: string, allocatedPort: number} | undefined> { + private async setupInstance( + instanceId: string, + projectName: string, + initCommand: string, + localEnvVars?: Record, + ): Promise<{previewURL: string, tunnelURL: string, processId: string, allocatedPort: number} | undefined> { try { const sandbox = this.getSandbox(); // Update project configuration with the specified project name @@ -926,12 +925,11 @@ export class SandboxSdkClient extends BaseSandboxService { this.logger.warn('Failed to store wrangler config in KV', { instanceId, error: error instanceof Error ? error.message : 'Unknown error' }); // Non-blocking - continue with setup } - + // If on local development, start cloudflared tunnel + let tunnelUrlPromise = Promise.resolve(''); // Allocate single port for both dev server and tunnel const allocatedPort = await this.allocateAvailablePort(); - // If on local development, start cloudflared tunnel - let tunnelUrlPromise = Promise.resolve(''); if (isDev(env) || env.USE_TUNNEL_FOR_PREVIEW) { this.logger.info('Starting cloudflared tunnel for local development', { instanceId }); tunnelUrlPromise = this.startCloudflaredTunnel(instanceId, allocatedPort); @@ -951,7 +949,7 @@ export class SandboxSdkClient extends BaseSandboxService { await this.setLocalEnvVars(instanceId, localEnvVars); } // Start dev server on allocated port - const processId = await this.startDevServer(instanceId, allocatedPort); + const processId = await this.startDevServer(instanceId, initCommand, allocatedPort); this.logger.info('Instance created successfully', { instanceId, processId, port: allocatedPort }); // Expose the same port for preview URL @@ -986,46 +984,15 @@ export class SandboxSdkClient extends BaseSandboxService { return undefined; } - - private async fetchDontTouchFiles(templateName: string): Promise { - let donttouchFiles: string[] = []; - try { - // Read .donttouch_files.json using default session with full path - const session = await this.getDefaultSession(); - const donttouchFile = await session.readFile(`${templateName}/.donttouch_files.json`); - if (!donttouchFile.success) { - this.logger.warn('Failed to read .donttouch_files.json'); - return donttouchFiles; - } - donttouchFiles = JSON.parse(donttouchFile.content) as string[]; - } catch (error) { - this.logger.warn(`Failed to read .donttouch_files.json: ${error instanceof Error ? error.message : 'Unknown error'}`); - } - return donttouchFiles; - } - - private async fetchRedactedFiles(templateName: string): Promise { - let redactedFiles: string[] = []; - try { - // Read .redacted_files.json using default session with full path - const session = await this.getDefaultSession(); - const redactedFile = await session.readFile(`${templateName}/.redacted_files.json`); - if (!redactedFile.success) { - this.logger.warn('Failed to read .redacted_files.json'); - return redactedFiles; - } - redactedFiles = JSON.parse(redactedFile.content) as string[]; - } catch (error) { - this.logger.warn(`Failed to read .redacted_files.json: ${error instanceof Error ? error.message : 'Unknown error'}`); - } - return redactedFiles; - } - - async createInstance(templateName: string, projectName: string, webhookUrl?: string, localEnvVars?: Record): Promise { + + async createInstance( + options: InstanceCreationRequest + ): Promise { + const { files, projectName, webhookUrl, envVars, initCommand } = options; try { // Environment variables will be set via session creation on first use - if (localEnvVars && Object.keys(localEnvVars).length > 0) { - this.logger.info('Environment variables will be configured via session', { envVars: Object.keys(localEnvVars) }); + if (envVars && Object.keys(envVars).length > 0) { + this.logger.info('Environment variables will be configured via session', { envVars: Object.keys(envVars) }); } let instanceId: string; if (env.ALLOCATION_STRATEGY === 'one_to_one') { @@ -1059,20 +1026,24 @@ export class SandboxSdkClient extends BaseSandboxService { } else { instanceId = `i-${generateId()}`; } - this.logger.info('Creating sandbox instance', { instanceId, templateName, projectName }); - await this.ensureTemplateExists(templateName); + this.logger.info('Creating sandbox instance', { instanceId, projectName }); - const [donttouchFiles, redactedFiles] = await Promise.all([ - this.fetchDontTouchFiles(templateName), - this.fetchRedactedFiles(templateName) - ]); + const dontTouchFile = files.find(f => f.filePath === '.donttouch_files.json'); + const dontTouchFiles = dontTouchFile ? JSON.parse(dontTouchFile.fileContents) : []; - const moveTemplateResult = await this.safeSandboxExec(`mv ${templateName} ${instanceId}`); - if (moveTemplateResult.exitCode !== 0) { - throw new Error(`Failed to move template: ${moveTemplateResult.stderr}`); + const redactedFile = files.find(f => f.filePath === '.redacted_files.json'); + const redactedFiles = redactedFile ? JSON.parse(redactedFile.fileContents) : []; + + // Write files in bulk to sandbox + const rawResults = await this.writeFilesBulk(instanceId, files); + if (!rawResults.success) { + return { + success: false, + error: 'Failed to write files to sandbox' + }; } - - const setupPromise = () => this.setupInstance(instanceId, projectName, localEnvVars); + + const setupPromise = () => this.setupInstance(instanceId, projectName, initCommand, envVars); const setupResult = await setupPromise(); if (!setupResult) { return { @@ -1082,7 +1053,6 @@ export class SandboxSdkClient extends BaseSandboxService { } // Store instance metadata const metadata = { - templateName: templateName, projectName: projectName, startTime: new Date().toISOString(), webhookUrl: webhookUrl, @@ -1090,7 +1060,7 @@ export class SandboxSdkClient extends BaseSandboxService { processId: setupResult?.processId, tunnelURL: setupResult?.tunnelURL, allocatedPort: setupResult?.allocatedPort, - donttouch_files: donttouchFiles, + donttouch_files: dontTouchFiles, redacted_files: redactedFiles, }; await this.storeInstanceMetadata(instanceId, metadata); @@ -1098,13 +1068,13 @@ export class SandboxSdkClient extends BaseSandboxService { return { success: true, runId: instanceId, - message: `Successfully created instance from template ${templateName}`, + message: `Successfully created instance ${instanceId}`, previewURL: setupResult?.previewURL, tunnelURL: setupResult?.tunnelURL, processId: setupResult?.processId, }; } catch (error) { - this.logger.error('createInstance', error, { templateName: templateName, projectName: projectName }); + this.logger.error(`Failed to create instance for project ${projectName}`, error); return { success: false, error: `Failed to create instance: ${error instanceof Error ? error.message : 'Unknown error'}` @@ -1134,7 +1104,6 @@ export class SandboxSdkClient extends BaseSandboxService { const instanceDetails: InstanceDetails = { runId: instanceId, - templateName: metadata.templateName, startTime, uptime, directory: instanceId, @@ -1275,31 +1244,13 @@ export class SandboxSdkClient extends BaseSandboxService { async writeFiles(instanceId: string, files: WriteFilesRequest['files']): Promise { try { const session = await this.getInstanceSession(instanceId); - - const results = []; - // Filter out donttouch files const metadata = await this.getInstanceMetadata(instanceId); const donttouchFiles = new Set(metadata.donttouch_files); const filteredFiles = files.filter(file => !donttouchFiles.has(file.filePath)); - - // Use batch script for efficient writing (3 requests for any number of files) - const filesToWrite = filteredFiles.map(file => ({ - path: `/workspace/${instanceId}/${file.filePath}`, - content: file.fileContents - })); - - const writeResults = await this.writeFilesViaScript(filesToWrite, session); - - // Map results back to original format - for (const writeResult of writeResults) { - results.push({ - file: writeResult.file.replace(`/workspace/${instanceId}/`, ''), - success: writeResult.success, - error: writeResult.error - }); - } + const rawResults = await this.writeFilesBulk(instanceId, filteredFiles); + const results = rawResults.results; // Add files that were not written to results const wereDontTouchFiles = files.filter(file => donttouchFiles.has(file.filePath)); diff --git a/worker/services/sandbox/sandboxTypes.ts b/worker/services/sandbox/sandboxTypes.ts index 29000152..8ad56c96 100644 --- a/worker/services/sandbox/sandboxTypes.ts +++ b/worker/services/sandbox/sandboxTypes.ts @@ -66,11 +66,21 @@ export type StoredError = z.infer; export const RuntimeErrorSchema = SimpleErrorSchema export type RuntimeError = z.infer +// -- Instance creation options -- + +export const InstanceCreationRequestSchema = z.object({ + files: z.array(TemplateFileSchema), + projectName: z.string(), + webhookUrl: z.string().url().optional(), + envVars: z.record(z.string(), z.string()).optional(), + initCommand: z.string().default('bun run dev'), +}) +export type InstanceCreationRequest = z.infer + // --- Instance Details --- export const InstanceDetailsSchema = z.object({ runId: z.string(), - templateName: z.string(), startTime: z.union([z.string(), z.date()]), uptime: z.number(), previewURL: z.string().optional(), @@ -140,12 +150,7 @@ export const GetTemplateFilesResponseSchema = z.object({ }) export type GetTemplateFilesResponse = z.infer -export const BootstrapRequestSchema = z.object({ - templateName: z.string(), - projectName: z.string(), - webhookUrl: z.string().url().optional(), - envVars: z.record(z.string(), z.string()).optional(), -}) +export const BootstrapRequestSchema = InstanceCreationRequestSchema export type BootstrapRequest = z.infer export const PreviewSchema = z.object({ @@ -291,44 +296,6 @@ export const ShutdownResponseSchema = z.object({ }) export type ShutdownResponse = z.infer -// /templates/from-instance (POST) -export const PromoteToTemplateRequestSchema = z.object({ - instanceId: z.string(), - templateName: z.string().optional(), -}) -export type PromoteToTemplateRequest = z.infer - -export const PromoteToTemplateResponseSchema = z.object({ - success: z.boolean(), - message: z.string().optional(), - templateName: z.string().optional(), - error: z.string().optional(), -}) -export type PromoteToTemplateResponse = z.infer - -// /templates (POST) - AI template generation -export const GenerateTemplateRequestSchema = z.object({ - prompt: z.string(), - templateName: z.string(), - options: z.object({ - framework: z.string().optional(), - language: z.enum(['javascript', 'typescript']).optional(), - styling: z.enum(['tailwind', 'css', 'scss']).optional(), - features: z.array(z.string()).optional(), - }).optional(), -}) -export type GenerateTemplateRequest = z.infer - -export const GenerateTemplateResponseSchema = z.object({ - success: z.boolean(), - templateName: z.string(), - summary: z.string().optional(), - fileCount: z.number().optional(), - fileTree: FileTreeNodeSchema.optional(), - error: z.string().optional(), -}) -export type GenerateTemplateResponse = z.infer - // /instances/:id/lint (GET) export const LintSeveritySchema = z.enum(['error', 'warning', 'info']) export type LintSeverity = z.infer @@ -400,7 +367,7 @@ export const WebhookRuntimeErrorEventSchema = WebhookEventBaseSchema.extend({ runId: z.string(), error: RuntimeErrorSchema, instanceInfo: z.object({ - templateName: z.string().optional(), + instanceId: z.string(), serviceDirectory: z.string().optional(), }), }), @@ -477,18 +444,6 @@ export const WebhookPayloadSchema = z.object({ event: WebhookEventSchema, }) export type WebhookPayload = z.infer - -// Current runner service payload (direct payload without wrapper) -export const RunnerServiceWebhookPayloadSchema = z.object({ - runId: z.string(), - error: RuntimeErrorSchema, - instanceInfo: z.object({ - templateName: z.string().optional(), - serviceDirectory: z.string().optional(), - }), -}) -export type RunnerServiceWebhookPayload = z.infer - /** * GitHub integration types for exporting generated applications */ From f5a3be60bfdb2f19861611fa88f2f32207f75859 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:03:14 -0500 Subject: [PATCH 11/58] feat: add project mode selector with agentic behavior support - Replaced agent mode toggle with project mode selector (App/Slides/Chat) that determines behavior type - Implemented agentic behavior detection for static content (docs, markdown) with automatic editor view - Conditionally render PhaseTimeline and deployment controls based on behavior type (phasic vs agentic) --- src/api-types.ts | 11 +- src/components/project-mode-selector.tsx | 83 +++++++++++++++ src/lib/api-client.ts | 6 +- src/routes/chat/chat.tsx | 122 +++++++++++++---------- src/routes/chat/hooks/use-chat.ts | 36 ++++++- src/routes/home.tsx | 32 +++--- 6 files changed, 208 insertions(+), 82 deletions(-) create mode 100644 src/components/project-mode-selector.tsx diff --git a/src/api-types.ts b/src/api-types.ts index 96845105..cf4ae0f9 100644 --- a/src/api-types.ts +++ b/src/api-types.ts @@ -136,7 +136,7 @@ export type { } from 'worker/database/types'; // Agent/Generator Types -export type { +export type { Blueprint as BlueprintType, PhasicBlueprint, CodeReviewOutputType, @@ -144,11 +144,16 @@ export type { FileOutputType as GeneratedFile, } from 'worker/agents/schemas'; -export type { +export type { AgentState, PhasicState } from 'worker/agents/core/state'; +export type { + BehaviorType, + ProjectType +} from 'worker/agents/core/types'; + export type { ConversationMessage, } from 'worker/agents/inferutils/common'; @@ -170,7 +175,7 @@ export type { export type { RateLimitError } from "worker/services/rate-limit/errors"; export type { AgentPreviewResponse, CodeGenArgs } from 'worker/api/controllers/agent/types'; export type { RateLimitErrorResponse } from 'worker/api/responses'; -export { RateLimitExceededError, SecurityError, SecurityErrorType } from 'shared/types/errors'; +export { RateLimitExceededError, SecurityError, SecurityErrorType } from '../shared/types/errors.js'; export type { AIModels } from 'worker/agents/inferutils/config.types'; // Model selection types diff --git a/src/components/project-mode-selector.tsx b/src/components/project-mode-selector.tsx new file mode 100644 index 00000000..c09df5fa --- /dev/null +++ b/src/components/project-mode-selector.tsx @@ -0,0 +1,83 @@ +import { useState } from 'react'; + +export type ProjectMode = 'app' | 'presentation' | 'general'; + +interface ProjectModeSelectorProps { + value: ProjectMode; + onChange: (mode: ProjectMode) => void; + disabled?: boolean; + className?: string; +} + +export function ProjectModeSelector({ value, onChange, disabled = false, className = '' }: ProjectModeSelectorProps) { + const [hoveredMode, setHoveredMode] = useState(null); + + const modes = [ + { + id: 'app' as const, + label: 'App', + description: 'Full-stack applications', + }, + { + id: 'presentation' as const, + label: 'Slides', + description: 'Interactive presentations', + }, + { + id: 'general' as const, + label: 'Chat', + description: 'Conversational assistant', + }, + ]; + + return ( +
    + {modes.map((mode, index) => { + const isSelected = value === mode.id; + const isHovered = hoveredMode === mode.id; + + return ( +
    + + + {/* Separator dot (except after last item) */} + {index < modes.length - 1 && ( +
    + )} +
    + ); + })} +
    + ); +} diff --git a/src/lib/api-client.ts b/src/lib/api-client.ts index a6ea0952..7b46ffa7 100644 --- a/src/lib/api-client.ts +++ b/src/lib/api-client.ts @@ -57,13 +57,13 @@ import type{ AgentPreviewResponse, PlatformStatusData, RateLimitError -} from '@/api-types'; +} from '../api-types.js'; import { - + RateLimitExceededError, SecurityError, SecurityErrorType, -} from '@/api-types'; +} from '../api-types.js'; import { toast } from 'sonner'; /** diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index 0383df32..32b3fc6d 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -21,13 +21,12 @@ import { ViewModeSwitch } from './components/view-mode-switch'; import { DebugPanel, type DebugMessage } from './components/debug-panel'; import { DeploymentControls } from './components/deployment-controls'; import { useChat, type FileType } from './hooks/use-chat'; -import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES } from '@/api-types'; +import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES, ProjectType } from '@/api-types'; import { Copy } from './components/copy'; import { useFileContentStream } from './hooks/use-file-content-stream'; import { logger } from '@/utils/logger'; import { useApp } from '@/hooks/use-app'; import { useAuth } from '@/contexts/auth-context'; -import { AgentModeDisplay } from '@/components/agent-mode-display'; import { useGitHubExport } from '@/hooks/use-github-export'; import { GitHubExportModal } from '@/components/github-export-modal'; import { GitCloneModal } from '@/components/shared/GitCloneModal'; @@ -50,8 +49,8 @@ export default function Chat() { const [searchParams] = useSearchParams(); const userQuery = searchParams.get('query'); - const agentMode = searchParams.get('agentMode') || 'deterministic'; - + const projectType = searchParams.get('projectType') || 'app'; + // Extract images from URL params if present const userImages = useMemo(() => { const imagesParam = searchParams.get('images'); @@ -142,11 +141,13 @@ export default function Chat() { runtimeErrorCount, staticIssueCount, isDebugging, + // Behavior type from backend + behaviorType, } = useChat({ chatId: urlChatId, query: userQuery, images: userImages, - agentMode: agentMode as 'deterministic' | 'smart', + projectType: projectType as ProjectType, onDebugMessage: addDebugMessage, }); @@ -340,13 +341,29 @@ export default function Chat() { return isPhase1Complete && !!urlChatId; }, [isPhase1Complete, urlChatId]); - const showMainView = useMemo( - () => - streamedBootstrapFiles.length > 0 || - !!blueprint || - files.length > 0, - [streamedBootstrapFiles, blueprint, files.length], - ); + // Detect if agentic mode is showing static content (docs, markdown) + const isStaticContent = useMemo(() => { + if (behaviorType !== 'agentic' || files.length === 0) return false; + + // Check if all files are static (markdown, text, or in docs/ directory) + return files.every(file => { + const path = file.filePath.toLowerCase(); + return path.endsWith('.md') || + path.endsWith('.mdx') || + path.endsWith('.txt') || + path.startsWith('docs/') || + path.includes('/docs/'); + }); + }, [behaviorType, files]); + + const showMainView = useMemo(() => { + // For agentic mode: show preview panel when blueprint generation starts, files appear, or preview URL is available + if (behaviorType === 'agentic') { + return isGeneratingBlueprint || !!blueprint || files.length > 0 || !!previewUrl; + } + // For phasic mode: keep existing logic + return streamedBootstrapFiles.length > 0 || !!blueprint || files.length > 0; + }, [behaviorType, isGeneratingBlueprint, blueprint, files.length, previewUrl, streamedBootstrapFiles.length]); const [mainMessage, ...otherMessages] = useMemo(() => messages, [messages]); @@ -363,14 +380,22 @@ export default function Chat() { }, [messages.length, scrollToBottom]); useEffect(() => { - if (previewUrl && !hasSeenPreview.current && isPhase1Complete) { + // For static content in agentic mode, show editor view instead of preview + if (isStaticContent && files.length > 0 && !hasSeenPreview.current) { + setView('editor'); + // Auto-select first file if none selected + if (!activeFilePath) { + setActiveFilePath(files[0].filePath); + } + hasSeenPreview.current = true; + } else if (previewUrl && !hasSeenPreview.current && isPhase1Complete) { setView('preview'); setShowTooltip(true); setTimeout(() => { setShowTooltip(false); }, 3000); // Auto-hide tooltip after 3 seconds } - }, [previewUrl, isPhase1Complete]); + }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath]); useEffect(() => { if (chatId) { @@ -559,18 +584,6 @@ export default function Chat() { - {import.meta.env - .VITE_AGENT_MODE_ENABLED && ( -
    - -
    - )} )} @@ -632,34 +645,37 @@ export default function Chat() {
    )} - { - setView(viewMode); - hasSwitchedFile.current = true; - }} - chatId={chatId} - isDeploying={isDeploying} - handleDeployToCloudflare={handleDeployToCloudflare} - runtimeErrorCount={runtimeErrorCount} - staticIssueCount={staticIssueCount} - isDebugging={isDebugging} - isGenerating={isGenerating} - isThinking={isThinking} - /> + {/* Only show PhaseTimeline for phasic mode */} + {behaviorType !== 'agentic' && ( + { + setView(viewMode); + hasSwitchedFile.current = true; + }} + chatId={chatId} + isDeploying={isDeploying} + handleDeployToCloudflare={handleDeployToCloudflare} + runtimeErrorCount={runtimeErrorCount} + staticIssueCount={staticIssueCount} + isDebugging={isDebugging} + isGenerating={isGenerating} + isThinking={isThinking} + /> + )} - {/* Deployment and Generation Controls */} - {chatId && ( + {/* Deployment and Generation Controls - Only for phasic mode */} + {chatId && behaviorType !== 'agentic' && ( void; onTerminalMessage?: (log: { id: string; content: string; type: 'command' | 'stdout' | 'stderr' | 'info' | 'error' | 'warn' | 'debug'; timestamp: number; source?: string }) => void; }) { + // Derive initial behavior type from project type + const getInitialBehaviorType = (): BehaviorType => { + if (projectType === 'presentation' || projectType === 'general') { + return 'agentic'; + } + return 'phasic'; + }; + const connectionStatus = useRef<'idle' | 'connecting' | 'connected' | 'failed' | 'retrying'>('idle'); const retryCount = useRef(0); const maxRetries = 5; @@ -80,6 +90,7 @@ export function useChat({ const [blueprint, setBlueprint] = useState(); const [previewUrl, setPreviewUrl] = useState(); const [query, setQuery] = useState(); + const [behaviorType, setBehaviorType] = useState(getInitialBehaviorType()); const [websocket, setWebsocket] = useState(); @@ -405,7 +416,7 @@ export function useChat({ // Start new code generation using API client const response = await apiClient.createAgentSession({ query: userQuery, - agentMode, + projectType, images: userImages, // Pass images from URL params for multi-modal blueprint }); @@ -414,12 +425,16 @@ export function useChat({ const result: { websocketUrl: string; agentId: string; + behaviorType: BehaviorType; + projectType: ProjectType; template: { files: FileType[]; }; } = { websocketUrl: '', agentId: '', + behaviorType: 'phasic', + projectType: 'app', template: { files: [], }, @@ -447,7 +462,7 @@ export function useChat({ } catch (e) { logger.error('Error parsing JSON:', e, obj.chunk); } - } + } if (obj.agentId) { result.agentId = obj.agentId; } @@ -455,6 +470,15 @@ export function useChat({ result.websocketUrl = obj.websocketUrl; logger.debug('📡 Received WebSocket URL from server:', result.websocketUrl) } + if (obj.behaviorType) { + result.behaviorType = obj.behaviorType; + setBehaviorType(obj.behaviorType); + logger.debug('Received behaviorType from server:', obj.behaviorType); + } + if (obj.projectType) { + result.projectType = obj.projectType; + logger.debug('Received projectType from server:', obj.projectType); + } if (obj.template) { logger.debug('Received template from server:', obj.template); result.template = obj.template; @@ -658,5 +682,7 @@ export function useChat({ runtimeErrorCount, staticIssueCount, isDebugging, + // Behavior type from backend + behaviorType, }; } diff --git a/src/routes/home.tsx b/src/routes/home.tsx index 7bf6c0ff..bfb5b4c8 100644 --- a/src/routes/home.tsx +++ b/src/routes/home.tsx @@ -3,9 +3,9 @@ import { ArrowRight, Info } from 'react-feather'; import { useNavigate } from 'react-router'; import { useAuth } from '@/contexts/auth-context'; import { - AgentModeToggle, - type AgentMode, -} from '../components/agent-mode-toggle'; + ProjectModeSelector, + type ProjectMode, +} from '../components/project-mode-selector'; import { useAuthGuard } from '../hooks/useAuthGuard'; import { usePaginatedApps } from '@/hooks/use-paginated-apps'; import { AnimatePresence, LayoutGroup, motion } from 'framer-motion'; @@ -21,7 +21,7 @@ export default function Home() { const navigate = useNavigate(); const { requireAuth } = useAuthGuard(); const textareaRef = useRef(null); - const [agentMode, setAgentMode] = useState('deterministic'); + const [projectMode, setProjectMode] = useState('app'); const [query, setQuery] = useState(''); const { user } = useAuth(); @@ -60,13 +60,13 @@ export default function Home() { // Discover section should appear only when enough apps are available and loading is done const discoverReady = useMemo(() => !loading && (apps?.length ?? 0) > 5, [loading, apps]); - const handleCreateApp = (query: string, mode: AgentMode) => { + const handleCreateApp = (query: string, mode: ProjectMode) => { const encodedQuery = encodeURIComponent(query); const encodedMode = encodeURIComponent(mode); - + // Encode images as JSON if present const imageParam = images.length > 0 ? `&images=${encodeURIComponent(JSON.stringify(images))}` : ''; - const intendedUrl = `/chat/new?query=${encodedQuery}&agentMode=${encodedMode}${imageParam}`; + const intendedUrl = `/chat/new?query=${encodedQuery}&projectType=${encodedMode}${imageParam}`; if ( !requireAuth({ @@ -179,7 +179,7 @@ export default function Home() { onSubmit={(e) => { e.preventDefault(); const query = textareaRef.current!.value; - handleCreateApp(query, agentMode); + handleCreateApp(query, projectMode); }} className="flex z-10 flex-col w-full min-h-[150px] bg-bg-4 border border-accent/30 dark:border-accent/50 dark:bg-bg-2 rounded-[18px] shadow-textarea p-5 transition-all duration-200" > @@ -210,7 +210,7 @@ export default function Home() { if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); const query = textareaRef.current!.value; - handleCreateApp(query, agentMode); + handleCreateApp(query, projectMode); } }} /> @@ -224,15 +224,11 @@ export default function Home() { )}
- {import.meta.env.VITE_AGENT_MODE_ENABLED ? ( - - ) : ( -
- )} +
Date: Tue, 11 Nov 2025 17:05:34 -0500 Subject: [PATCH 12/58] fix: files format --- worker/agents/tools/toolkit/template-manager.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/agents/tools/toolkit/template-manager.ts b/worker/agents/tools/toolkit/template-manager.ts index 974ceb36..d62be55e 100644 --- a/worker/agents/tools/toolkit/template-manager.ts +++ b/worker/agents/tools/toolkit/template-manager.ts @@ -2,6 +2,7 @@ import { ToolDefinition, ErrorResult } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; +import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; export type TemplateManagerArgs = { command: 'list' | 'select'; @@ -10,7 +11,7 @@ export type TemplateManagerArgs = { export type TemplateManagerResult = | { summary: string } - | { message: string; templateName: string; files: Array<{ path: string; content: string }> } + | { message: string; templateName: string; files: TemplateFile[] } | ErrorResult; /** From bb23e88aa4b081a70803dc9cb82fe135acb1c456 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:52:36 -0500 Subject: [PATCH 13/58] fix: ensure workspace directory exists before writing files --- worker/services/sandbox/sandboxSdkClient.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/worker/services/sandbox/sandboxSdkClient.ts b/worker/services/sandbox/sandboxSdkClient.ts index 224152f6..858ea534 100644 --- a/worker/services/sandbox/sandboxSdkClient.ts +++ b/worker/services/sandbox/sandboxSdkClient.ts @@ -1034,6 +1034,9 @@ export class SandboxSdkClient extends BaseSandboxService { const redactedFile = files.find(f => f.filePath === '.redacted_files.json'); const redactedFiles = redactedFile ? JSON.parse(redactedFile.fileContents) : []; + // Create directory for instance + await this.sandbox.exec(`mkdir -p /workspace/${instanceId}`); + // Write files in bulk to sandbox const rawResults = await this.writeFilesBulk(instanceId, files); if (!rawResults.success) { From 234860fe1ff60b5018a9b08d54ece3adfc631aa4 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:53:38 -0500 Subject: [PATCH 14/58] feat: replace template manager with ai template selector - Replaced manual template_manager tool with init_suitable_template that uses the original template selector ai - Updated system prompts to emphasize template-first workflow for interactive projects with AI selector as mandatory first step - Simplified template selection process by removing manual list/select commands in favor of intelligent matching ``` --- .../assistants/agenticProjectBuilder.ts | 214 ++++++++---------- worker/agents/tools/customTools.ts | 6 +- .../tools/toolkit/init-suitable-template.ts | 133 +++++++++++ .../agents/tools/toolkit/template-manager.ts | 131 ----------- 4 files changed, 232 insertions(+), 252 deletions(-) create mode 100644 worker/agents/tools/toolkit/init-suitable-template.ts delete mode 100644 worker/agents/tools/toolkit/template-manager.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 1744a94b..81013d2f 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -20,7 +20,7 @@ export type BuildSession = { filesIndex: FileState[]; agent: ICodingAgent; projectType: ProjectType; - selectedTemplate?: string; // Template chosen by agent (minimal-vite, etc.) + selectedTemplate?: string; // Template chosen by agent (e.g. spectacle-runner, react-game-starter, etc.) }; export type BuildInputs = { @@ -50,15 +50,16 @@ You are an elite autonomous project builder with deep expertise in Cloudflare Wo - Lives in Durable Object storage (persistent) - Managed by FileManager + Git (isomorphic-git with SQLite) - ALL files you generate go here FIRST -- Files exist in memory/DO storage, NOT in actual sandbox yet +- Files exist in DO storage, NOT in actual sandbox yet - Full git history maintained (commits, diffs, log, show) - This is YOUR primary working area ### 2. Sandbox Environment (Execution Layer) -- Separate container running Bun + Vite dev server +- A docker-like container that can run arbitary code +- Suitable for running bun + vite dev server - Has its own filesystem (NOT directly accessible to you) -- Created when deploy_preview is called -- Runs 'bun run dev' and exposes preview URL +- Provisioned/deployed to when deploy_preview is called +- Runs 'bun run dev' and exposes preview URL when initialized - THIS is where code actually executes ## The Deploy Process (What deploy_preview Does) @@ -66,12 +67,11 @@ You are an elite autonomous project builder with deep expertise in Cloudflare Wo When you call deploy_preview: 1. Checks if sandbox instance exists 2. If NOT: Creates new sandbox instance - - Template mode: Downloads template from R2, sets it up - - Virtual-first mode: Uses minimal-vite + your virtual files as overlay + - Writes all virtual files to sandbox filesystem (including template files and then your generated files on top) - Runs: bun install → bun run dev - Exposes port → preview URL 3. If YES: Uses existing sandbox -4. Syncs ALL virtual files → sandbox filesystem (writeFiles) +4. Syncs any provided/freshly generated files to sandbox filesystem 5. Returns preview URL **KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. @@ -84,57 +84,10 @@ You (LLM) → [Files stored in DO, committed to git] deploy_preview called - → DeploymentManager.deployToSandbox() - → Checks if sandbox exists - → If not: createNewInstance() → Syncs virtual files → Sandbox filesystem - → Sandbox runs: bun run dev - → Preview URL returned + → Returns preview URL \`\`\` -## Common Failure Scenarios & What They Mean - -**"No sandbox instance available"** -- Sandbox was never created OR crashed -- Solution: Call deploy_preview to create/recreate - -**"Failed to install dependencies"** -- package.json has issues (missing deps, wrong format) -- Sandbox can't run 'bun install' -- Solution: Fix package.json, redeploy - -**"Preview URL not responding"** -- Dev server failed to start -- Usually: Missing vite.config.js OR 'bun run dev' script broken -- Solution: Check package.json scripts, ensure vite configured - -**"Type errors after deploy"** -- Virtual files are fine, but TypeScript fails in sandbox -- Solution: Run run_analysis to catch before deploy - -**"Runtime errors in logs"** -- Code deployed but crashes when executed -- Check with get_runtime_errors, fix issues, redeploy - -**"File not found in sandbox"** -- You generated file in virtual filesystem -- But forgot to call deploy_preview to sync -- Solution: Always deploy after generating files - -## State Persistence - -**What Persists:** -- Virtual filesystem (all generated files) -- Git history (commits, branches) -- Blueprint -- Conversation messages -- Sandbox instance ID (once created) - -**What Doesn't Persist:** -- Sandbox filesystem state (unless you writeFiles) -- Running processes (dev server restarts on redeploy) -- Logs (cumulative but can be cleared) - ## When Things Break **Sandbox becomes unhealthy:** @@ -166,8 +119,8 @@ deploy_preview called → Solution: Wait for user interaction or check timestamps **Problem: "Same error keeps appearing after fix"** -→ Logs are cumulative - you're seeing old errors -→ Solution: Clear logs with deploy_preview(clearLogs=true) +→ Logs are cumulative - you're seeing old errors. +→ Solution: Clear logs with deploy_preview(clearLogs=true) and try again. **Problem: "Types look correct but still errors"** → You're reading from virtual FS, but sandbox has old versions @@ -206,28 +159,33 @@ deploy_preview called - Will use deploy_preview for testing ## Step 3: Template Selection (Interactive Projects Only) -CRITICAL - Read this carefully: - -**TWO APPROACHES:** - -**A) Template-based (Recommended for most cases):** -- DEFAULT: Use 'minimal-vite' template (99% of cases) - - Minimal Vite+Bun+Cloudflare Worker boilerplate - - Has wrangler.jsonc and vite.config.js pre-configured - - Supports: bun run dev/build/lint/deploy - - CRITICAL: 'bun run dev' MUST work or sandbox creation FAILS -- Alternative templates: Use template_manager(command: "list") to see options -- Template switching allowed but STRONGLY DISCOURAGED - -**B) Virtual-first (Advanced - for custom setups):** -- Skip template selection entirely -- Generate all required config files yourself: - - package.json (with dependencies, scripts: dev/build/lint) - - wrangler.jsonc (Cloudflare Worker config) - - vite.config.js (Vite configuration) -- When you call deploy_preview, sandbox will be created with minimal-vite + your files -- ONLY use this if you have very specific config needs -- DEFAULT to template-based approach unless necessary +CRITICAL - This step is MANDATORY for interactive projects: + +**Use AI-Powered Template Selector:** +1. Call \`init_suitable_template\` - AI analyzes requirements and selects best template + - Automatically searches template library (rich collection of templates) + - Matches project type, complexity, style to available templates + - Returns: selection reasoning + automatically imports template files + - Trust the AI selector - it knows the template library well + +2. Review the selection reasoning + - AI explains why template was chosen + - Template files now in your virtual filesystem + - Ready for blueprint generation with template context + +**What if no suitable template?** +- Rare case: AI returns null if no template matches +- Fallback: Virtual-first mode (generate all config files yourself) +- Manual configs: package.json, wrangler.jsonc, vite.config.js +- Use this ONLY when AI couldn't find a match + +**Why template-first matters:** +- Templates have working configs and features +- Blueprint can leverage existing template structure +- Avoids recreating what template already provides +- Better architecture from day one + +**CRITICAL**: Do NOT skip template selection for interactive projects. Always call \`init_suitable_template\` first. ## Step 4: Generate Blueprint - Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) @@ -307,53 +265,73 @@ Follow phases: generate_files for phase-1, then phase-2, etc. - Use to refine after generation or requirements change - Surgical updates only - don't regenerate entire blueprint -## Template Management -**template_manager** - Unified template operations with command parameter - -Commands available: -- **"list"**: Browse available template catalog -- **"select"**: Choose a template for your project (requires templateName parameter) +## Template Selection +**init_suitable_template** - AI-powered template selection and import -**What templates are:** -- Pre-built project scaffolds with working configs -- Each has wrangler.jsonc, vite.config.js, package.json already set up -- When you select a template, it becomes the BASE layer when sandbox is created -- Your generated files OVERLAY on top of template files +**What it does:** +- Analyzes your requirements against entire template library +- Uses AI to match project type, complexity, style to available templates +- Automatically selects and imports best matching template +- Returns: selection reasoning + imported template files **How it works:** \`\`\` -You call: template_manager(command: "select", templateName: "minimal-vite") +You call: init_suitable_template() ↓ -Template marked for use +AI fetches all available templates from library ↓ -You call: deploy_preview +AI analyzes: project type, requirements, complexity, style ↓ -Template downloaded and extracted to sandbox +AI selects best matching template ↓ -Your generated files synced on top +Template automatically imported to virtual filesystem ↓ -Sandbox runs 'bun run dev' from template +Returns: selection object + reasoning + imported files \`\`\` -**Default choice: "minimal-vite"** (use for 99% of cases) -- Vite + Bun + Cloudflare Worker boilerplate -- Has working 'bun run dev' script (CRITICAL - sandbox fails without this) -- Includes wrangler.jsonc and vite.config.js pre-configured -- Template choice persists for entire session +**What you get back:** +- selection.selectedTemplateName: Chosen template name (or null if none suitable) +- selection.reasoning: Why this template was chosen +- selection.projectType: Detected/confirmed project type +- selection.complexity: simple/moderate/complex +- selection.styleSelection: UI style recommendation +- importedFiles[]: Array of important template files now in virtual FS + +**Template Library Coverage:** +The library includes templates for: +- React/Vue/Svelte apps with various configurations +- Game starters (canvas-based, WebGL) +- Presentation frameworks (Spectacle, Reveal.js) +- Dashboard/Admin templates +- Landing pages and marketing sites +- API/Worker templates +- And many more specialized templates -**CRITICAL Caveat:** -- If template selected, deploy_preview REQUIRES that template's 'bun run dev' works -- If template broken, sandbox creation FAILS completely -- Template switching allowed but DISCOURAGED (requires sandbox recreation) +**When to use:** +- ✅ ALWAYS for interactive projects (app/presentation/workflow) +- ✅ Before generate_blueprint (template context enriches blueprint) +- ✅ First step after understanding requirements -**When to use templates:** -- ✅ Interactive apps (need dev server, hot reload) -- ✅ Want pre-configured build setup -- ✅ Need Cloudflare Worker or Durable Object scaffolding +**When NOT to use:** +- ❌ Static documentation projects (no runtime needed) +- ❌ After template already imported -**When NOT to use templates:** -- ❌ Static documentation (no runtime needed) -- ❌ Want full control over every config file (use virtual-first mode) +**CRITICAL Caveat:** +- If AI returns null (no suitable template), fall back to virtual-first mode +- This is RARE - trust the AI selector to find a match +- Template's 'bun run dev' MUST work or sandbox creation fails +- If using virtual-first fallback, YOU must ensure working dev script + +**Example workflow:** +\`\`\` +1. init_suitable_template() + → AI: "Selected react-game-starter because: user wants 2D game, template has canvas setup and scoring system..." + → Imported 15 important files +2. generate_blueprint(prompt: "Template has canvas and game loop. Build on this...") + → Blueprint leverages existing template features +3. generate_files(...) + → Build on top of template foundation +\`\`\` ## File Operations (Understanding Your Two-Layer System) @@ -492,8 +470,8 @@ Commands available: - NOT for static documentation - Creates sandbox on first call if needed - TWO MODES: - 1. **Template-based**: If you called template_manager(command: "select"), uses that template - 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with minimal-vite + your files as overlay + 1. **Template-based**: If you called init_suitable_template(), uses that selected template + 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with fallback template + your files as overlay - Syncs all files from virtual filesystem to sandbox **run_analysis** @@ -612,8 +590,8 @@ STOP ALL TOOL CALLS IMMEDIATELY after either signal.`; const warnings = `# Critical Warnings -1. TEMPLATE CHOICE IS IMPORTANT - Choose with future scope in mind -2. For template-based: minimal-vite MUST have working 'bun run dev' or sandbox fails +1. TEMPLATE SELECTION IS CRITICAL - Use init_suitable_template() for interactive projects, trust AI selector +2. For template-based: Selected template MUST have working 'bun run dev' or sandbox fails 3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview 4. Do NOT deploy static documentation - wastes resources 5. Check log timestamps - they're cumulative, may contain old data @@ -772,7 +750,7 @@ export class AgenticProjectBuilder extends Assistant { const dynamicHints = [ !hasPlan ? '- No plan detected: Start with generate_blueprint (optionally with prompt parameter) to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', - needsSandbox && !hasTemplate ? '- Interactive project without template: Use template_manager(command: "list") then template_manager(command: "select", templateName: "minimal-vite") before first deploy.' : '', + needsSandbox && !hasTemplate ? '- Interactive project without template: Use init_suitable_template() to let AI select and import best matching template before first deploy.' : '', hasTSX ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', hasMD && !hasTSX ? '- Documents detected without UI: This is STATIC content - generate files in docs/, NO deploy_preview needed.' : '', !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index f78d9738..ae535c12 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -22,7 +22,7 @@ import { createWaitForGenerationTool } from './toolkit/wait-for-generation'; import { createWaitForDebugTool } from './toolkit/wait-for-debug'; import { createGitTool } from './toolkit/git'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; -import { createTemplateManagerTool } from './toolkit/template-manager'; +import { createInitSuitableTemplateTool } from './toolkit/init-suitable-template'; import { createVirtualFilesystemTool } from './toolkit/virtual-filesystem'; import { createGenerateImagesTool } from './toolkit/generate-images'; @@ -87,8 +87,8 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur // PRD generation + refinement createGenerateBlueprintTool(session.agent, logger), createAlterBlueprintTool(session.agent, logger), - // Template management (combined list + select) - createTemplateManagerTool(session.agent, logger), + // Template selection + createInitSuitableTemplateTool(session.agent, logger), // Virtual filesystem operations (list + read from Durable Object storage) createVirtualFilesystemTool(session.agent, logger), // Build + analysis toolchain diff --git a/worker/agents/tools/toolkit/init-suitable-template.ts b/worker/agents/tools/toolkit/init-suitable-template.ts new file mode 100644 index 00000000..6f3957cd --- /dev/null +++ b/worker/agents/tools/toolkit/init-suitable-template.ts @@ -0,0 +1,133 @@ +import { ToolDefinition, ErrorResult } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; +import { selectTemplate } from '../../planning/templateSelector'; +import { TemplateSelection } from '../../schemas'; +import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; + +export type InitSuitableTemplateArgs = { + query: string; +}; + +export type InitSuitableTemplateResult = + | { + selection: TemplateSelection; + importedFiles: TemplateFile[]; + reasoning: string; + message: string; + } + | ErrorResult; + +/** + * template selection and import. + * Analyzes user requirements, selects best matching template from library, + * and automatically imports it to the virtual filesystem. + */ +export function createInitSuitableTemplateTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'init_suitable_template', + description: 'Analyze user requirements and automatically select + import the most suitable template from library. Uses AI to match requirements against available templates. Returns selection with reasoning and imported files. For interactive projects (app/presentation/workflow) only. Call this BEFORE generate_blueprint.', + parameters: { + type: 'object', + properties: { + query: { + type: 'string', + description: 'User requirements and project description. Provide clear description of what needs to be built.', + }, + }, + required: ['query'], + }, + }, + implementation: async ({ query }: InitSuitableTemplateArgs) => { + try { + const projectType = agent.getProjectType(); + const operationOptions = agent.getOperationOptions(); + + logger.info('Analyzing template suitability and importing', { + projectType, + queryLength: query.length + }); + + // Fetch available templates + const templatesResponse = await BaseSandboxService.listTemplates(); + if (!templatesResponse.success || !templatesResponse.templates) { + return { + error: `Failed to fetch templates: ${templatesResponse.error || 'Unknown error'}` + }; + } + + logger.info('Templates fetched', { count: templatesResponse.templates.length }); + + // Use AI selector to find best match + const selection = await selectTemplate({ + env: operationOptions.env, + query, + projectType, + availableTemplates: templatesResponse.templates, + inferenceContext: operationOptions.inferenceContext, + }); + + logger.info('Template selection completed', { + selected: selection.selectedTemplateName, + projectType: selection.projectType + }); + + // If no suitable template found, return error suggesting scratch mode + if (!selection.selectedTemplateName) { + return { + error: `No suitable template found for this project. Reasoning: ${selection.reasoning}. Consider using virtual-first mode (generate all config files yourself) or refine requirements.` + }; + } + + // Import the selected template + const importResult = await agent.importTemplate( + selection.selectedTemplateName, + `Selected template: ${selection.selectedTemplateName}` + ); + + logger.info('Template imported successfully', { + templateName: importResult.templateName, + filesCount: importResult.files.length + }); + + // Build detailed reasoning message + const reasoningMessage = ` +**AI Template Selection Complete** + +**Selected Template**: ${selection.selectedTemplateName} +**Project Type**: ${selection.projectType} +**Complexity**: ${selection.complexity || 'N/A'} +**Style**: ${selection.styleSelection || 'N/A'} +**Use Case**: ${selection.useCase || 'N/A'} + +**Why This Template**: +${selection.reasoning} + +**Template Files Imported**: ${importResult.files.length} important files +**Ready for**: Blueprint generation with template context + +**Next Step**: Use generate_blueprint() to create project plan that leverages this template's features. +`.trim(); + + return { + selection, + importedFiles: importResult.files, + reasoning: reasoningMessage, + message: `Template "${selection.selectedTemplateName}" selected and imported successfully.` + }; + + } catch (error) { + logger.error('Error in init_suitable_template', error); + return { + error: `Error selecting/importing template: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }; +} diff --git a/worker/agents/tools/toolkit/template-manager.ts b/worker/agents/tools/toolkit/template-manager.ts deleted file mode 100644 index d62be55e..00000000 --- a/worker/agents/tools/toolkit/template-manager.ts +++ /dev/null @@ -1,131 +0,0 @@ -import { ToolDefinition, ErrorResult } from '../types'; -import { StructuredLogger } from '../../../logger'; -import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; -import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; - -export type TemplateManagerArgs = { - command: 'list' | 'select'; - templateName?: string; -}; - -export type TemplateManagerResult = - | { summary: string } - | { message: string; templateName: string; files: TemplateFile[] } - | ErrorResult; - -/** - * Manages project templates - list available templates or select one for the project. - * Use 'list' to see all available templates with descriptions. - * Use 'select' with templateName to choose and import a template. - */ -export function createTemplateManagerTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'template_manager', - description: 'Manage project templates. Use command="list" to see available templates with their descriptions, frameworks, and use cases. Use command="select" with templateName to select and import a template. Default to "minimal-vite" for 99% of cases unless you have specific requirements.', - parameters: { - type: 'object', - properties: { - command: { - type: 'string', - enum: ['list', 'select'], - description: 'Action to perform: "list" shows all templates, "select" imports a template', - }, - templateName: { - type: 'string', - description: 'Name of template to select (required when command="select"). Examples: "minimal-vite", "c-code-react-runner"', - }, - }, - required: ['command'], - }, - }, - implementation: async ({ command, templateName }: TemplateManagerArgs) => { - try { - if (command === 'list') { - logger.info('Listing available templates'); - - const response = await BaseSandboxService.listTemplates(); - - if (!response.success || !response.templates) { - return { - error: `Failed to fetch templates: ${response.error || 'Unknown error'}` - }; - } - - const templates = response.templates; - - // Format template catalog for LLM - const formattedOutput = templates.map((template, index) => { - const frameworks = template.frameworks?.join(', ') || 'None specified'; - const selectionDesc = template.description?.selection || 'No description'; - const usageDesc = template.description?.usage || 'No usage notes'; - - return ` -${index + 1}. **${template.name}** - - Language: ${template.language} - - Frameworks: ${frameworks} - - Selection Guide: -${selectionDesc} - - Usage Notes: -${usageDesc} -`.trim(); - }).join('\n\n'); - - const summaryText = `# Available Templates (${templates.length} total) -${formattedOutput}`; - - return { summary: summaryText }; - } else if (command === 'select') { - if (!templateName) { - return { - error: 'templateName is required when command is "select"' - }; - } - - logger.info('Selecting template', { templateName }); - - // Validate template exists - const templatesResponse = await BaseSandboxService.listTemplates(); - - if (!templatesResponse.success || !templatesResponse.templates) { - return { - error: `Failed to validate template: ${templatesResponse.error || 'Could not fetch template list'}` - }; - } - - const templateExists = templatesResponse.templates.some(t => t.name === templateName); - if (!templateExists) { - const availableNames = templatesResponse.templates.map(t => t.name).join(', '); - return { - error: `Template "${templateName}" not found. Available templates: ${availableNames}` - }; - } - - // Import template into the agent's virtual filesystem - // This returns important template files - const result = await agent.importTemplate(templateName, `Selected template: ${templateName}`); - - return { - message: `Template "${templateName}" selected and imported successfully. ${result.files.length} important files available. You can now use deploy_preview to create the sandbox.`, - templateName: result.templateName, - files: result.files - }; - } else { - return { - error: `Invalid command: ${command}. Must be "list" or "select"` - }; - } - } catch (error) { - logger.error('Error in template_manager', error); - return { - error: `Error managing templates: ${error instanceof Error ? error.message : 'Unknown error'}` - }; - } - }, - }; -} From 97bc622e14f180dc61c1b0bf9d28eef7d2126adb Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 21:37:38 -0500 Subject: [PATCH 15/58] refactor: integrate conversation history and sync for agentic builder - Added conversation history support to AgenticProjectBuilder with message preparation and context tracking - Implemented tool call completion callbacks to sync messages and trigger periodic compactification - Modified AgenticCodingBehavior to queue user inputs during builds and inject them between tool call chains using abort mechanism --- .../assistants/agenticProjectBuilder.ts | 55 ++- worker/agents/core/behaviors/agentic.ts | 201 ++++++++++- worker/agents/inferutils/common.ts | 1 + worker/agents/inferutils/core.ts | 88 +++-- worker/agents/inferutils/infer.ts | 8 +- .../operations/UserConversationProcessor.ts | 335 +----------------- worker/agents/tools/customTools.ts | 61 +++- worker/agents/tools/types.ts | 6 +- worker/agents/utils/common.ts | 24 ++ .../agents/utils/conversationCompactifier.ts | 317 +++++++++++++++++ 10 files changed, 697 insertions(+), 399 deletions(-) create mode 100644 worker/agents/utils/conversationCompactifier.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 81013d2f..095334d3 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -3,6 +3,7 @@ import { createSystemMessage, createUserMessage, Message, + ConversationMessage, } from '../inferutils/common'; import { executeInference } from '../inferutils/infer'; import { InferenceContext, ModelConfig } from '../inferutils/config.types'; @@ -15,6 +16,7 @@ import { FileState } from '../core/state'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { ProjectType } from '../core/types'; import { Blueprint, AgenticBlueprint } from '../schemas'; +import { prepareMessagesForInference } from '../utils/common'; export type BuildSession = { filesIndex: FileState[]; @@ -697,12 +699,6 @@ function summarizeFiles(filesIndex: FileState[]): string { return `Generated Files (${filesIndex.length} total):\n${summary}`; } -/** - * AgenticProjectBuilder - * - * Similar to DeepCodeDebugger but for building entire projects. - * Uses tool-calling approach to scaffold, deploy, verify, and iterate. - */ export class AgenticProjectBuilder extends Assistant { logger = createObjectLogger(this, 'AgenticProjectBuilder'); modelConfigOverride?: ModelConfig; @@ -721,6 +717,9 @@ export class AgenticProjectBuilder extends Assistant { session: BuildSession, streamCb?: (chunk: string) => void, toolRenderer?: RenderToolCall, + onToolComplete?: (message: Message) => Promise, + onAssistantMessage?: (message: Message) => Promise, + conversationHistory?: ConversationMessage[] ): Promise { this.logger.info('Starting project build', { projectName: inputs.projectName, @@ -756,16 +755,39 @@ export class AgenticProjectBuilder extends Assistant { !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', ].filter(Boolean).join('\n'); - // Build prompts - const systemPrompt = getSystemPrompt(dynamicHints); - const userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); - + let historyMessages: Message[] = []; + if (conversationHistory && conversationHistory.length > 0) { + const prepared = await prepareMessagesForInference(this.env, conversationHistory); + historyMessages = prepared as Message[]; + + this.logger.info('Loaded conversation history', { + messageCount: historyMessages.length + }); + } + + let systemPrompt = getSystemPrompt(dynamicHints); + + if (historyMessages.length > 0) { + systemPrompt += `\n\n# Conversation History\nYou are being provided with the full conversation history from your previous interactions. Review it to understand context and avoid repeating work.`; + } + + let userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); + + if (historyMessages.length > 0) { + userPrompt = ` +## Timestamp: +${new Date().toISOString()} + + +${userPrompt}`; + } + const system = createSystemMessage(systemPrompt); const user = createUserMessage(userPrompt); - const messages: Message[] = this.save([system, user]); + const messages: Message[] = this.save([system, ...historyMessages, user]); - // Prepare tools (same as debugger) - const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer); + // Build tools with renderer and conversation sync callback + const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); let output = ''; @@ -780,14 +802,15 @@ export class AgenticProjectBuilder extends Assistant { stream: streamCb ? { chunk_size: 64, onChunk: (c) => streamCb(c) } : undefined, + onAssistantMessage, }); - + output = result?.string || ''; - + this.logger.info('Project build completed', { outputLength: output.length }); - + } catch (error) { this.logger.error('Project build failed', error); throw error; diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 931c2a22..a3814e26 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -17,6 +17,11 @@ import { BaseCodingBehavior, BaseCodingOperations } from './base'; import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; import { OperationOptions } from 'worker/agents/operations/common'; +import { ImageAttachment, ProcessedImageAttachment } from '../../../types/image-attachment'; +import { compactifyContext } from '../../utils/conversationCompactifier'; +import { ConversationMessage, createMultiModalUserMessage, createUserMessage, Message } from '../../inferutils/common'; +import { uploadImage, ImageType } from '../../../utils/images'; +import { AbortError } from 'worker/agents/inferutils/core'; interface AgenticOperations extends BaseCodingOperations { generateNextPhase: PhaseGenerationOperation; @@ -28,7 +33,7 @@ interface AgenticOperations extends BaseCodingOperations { */ export class AgenticCodingBehavior extends BaseCodingBehavior implements ICodingAgent { protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; - + protected operations: AgenticOperations = { regenerateFile: new FileRegenerationOperation(), fastCodeFixer: new FastCodeFixerOperation(), @@ -38,6 +43,12 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl implementPhase: new PhaseImplementationOperation(), }; + // Conversation sync tracking + private toolCallCounter: number = 0; + private readonly COMPACTIFY_CHECK_INTERVAL = 9; // Check compactification every 9 tool calls + + private currentConversationId: string | undefined; + /** * Initialize the code generator with project blueprint and template * Sets up services and begins deployment process @@ -119,6 +130,97 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl await super.onStart(props); } + /** + * Override handleUserInput to just queue messages without AI processing + * Messages will be injected into conversation after tool call completions + */ + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + let processedImages: ProcessedImageAttachment[] | undefined; + + if (images && images.length > 0) { + processedImages = await Promise.all(images.map(async (image) => { + return await uploadImage(this.env, image, ImageType.UPLOADS); + })); + + this.logger.info('Uploaded images for queued request', { + imageCount: processedImages.length + }); + } + + await this.queueUserRequest(userMessage, processedImages); + + this.logger.info('User message queued during agentic build', { + message: userMessage, + queueSize: this.state.pendingUserInputs.length, + hasImages: !!processedImages && processedImages.length > 0 + }); + } + + /** + * Handle tool call completion - sync to conversation and check queue/compactification + */ + private async handleMessageCompletion(conversationMessage: ConversationMessage): Promise { + this.toolCallCounter++; + + this.infrastructure.addConversationMessage(conversationMessage); + + this.logger.debug('Message synced to conversation', { + role: conversationMessage.role, + toolCallCount: this.toolCallCounter + }); + + if (this.toolCallCounter % this.COMPACTIFY_CHECK_INTERVAL === 0) { + await this.compactifyIfNeeded(); + } + } + + private resetConversationId(): string { + this.currentConversationId = undefined; + return this.getCurrentConversationId(); + } + + private getCurrentConversationId(): string { + if (!this.currentConversationId) { + this.currentConversationId = IdGenerator.generateConversationId(); + } + return this.currentConversationId; + } + + /** + * Compactify conversation state if needed + */ + private async compactifyIfNeeded(): Promise { + const conversationState = this.infrastructure.getConversationState(); + + const compactedHistory = await compactifyContext( + conversationState.runningHistory, + this.env, + this.getOperationOptions(), + (args) => { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: '', + conversationId: this.getCurrentConversationId(), + isStreaming: false, + tool: args + }); + }, + this.logger + ); + + // Update if compactification occurred + if (compactedHistory.length !== conversationState.runningHistory.length) { + this.infrastructure.setConversationState({ + ...conversationState, + runningHistory: compactedHistory + }); + + this.logger.info('Conversation compactified', { + originalSize: conversationState.runningHistory.length, + compactedSize: compactedHistory.length + }); + } + } + getOperationOptions(): OperationOptions { return { env: this.env, @@ -131,47 +233,78 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl } async build(): Promise { - await this.executeGeneration(); + while (!this.state.mvpGenerated || this.state.pendingUserInputs.length > 0) { + await this.executeGeneration(); + } } /** * Execute the project generation */ private async executeGeneration(): Promise { + // Reset tool call counter for this build session + this.toolCallCounter = 0; + this.logger.info('Starting project generation', { query: this.state.query, projectName: this.state.projectName }); - + // Generate unique conversation ID for this build session - const buildConversationId = IdGenerator.generateConversationId(); - + const buildConversationId = this.resetConversationId(); + // Broadcast generation started this.broadcast(WebSocketMessageResponses.GENERATION_STARTED, { message: 'Starting project generation...', totalFiles: 1 }); - + // Send initial message to frontend this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: 'Initializing project builder...', conversationId: buildConversationId, isStreaming: false }); - + try { const generator = new AgenticProjectBuilder( this.env, this.state.inferenceContext ); + + const pendingUserInputs = this.fetchPendingUserRequests(); + if (pendingUserInputs.length > 0) { + this.logger.info('Processing user requests', { + requests: pendingUserInputs, + }); + let compiledMessage: Message; + const images = this.pendingUserImages; + if (images && images.length > 0) { + compiledMessage = createMultiModalUserMessage( + pendingUserInputs.join('\n'), + images.map(img => img.r2Key), + 'high' + ); + } else { + compiledMessage = createUserMessage(pendingUserInputs.join('\n')); + } + // Save the message to conversation history + this.infrastructure.addConversationMessage({ + ...compiledMessage, + conversationId: buildConversationId, + }); + this.logger.info('User requests processed', { + conversationId: buildConversationId, + }); + } // Create build session for tools const session: BuildSession = { agent: this, filesIndex: Object.values(this.state.generatedFilesMap), - projectType: this.state.projectType || 'app' + projectType: this.state.projectType || 'app', }; - + // Create tool renderer for UI feedback const toolCallRenderer = buildToolCallRenderer( (message: string, conversationId: string, isStreaming: boolean, tool?) => { @@ -184,8 +317,31 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl }, buildConversationId ); - - // Run the assistant with streaming and tool rendering + + // Create conversation sync callback + const onToolComplete = async (toolMessage: Message) => { + await this.handleMessageCompletion({ + ...toolMessage, + conversationId: this.getCurrentConversationId() + }); + + // If user messages are queued, we throw an abort error, that shall break the tool call chain. + if (this.state.pendingUserInputs.length > 0) { + throw new AbortError('User messages are queued'); + } + }; + + const onAssistantMessage = async (message: Message) => { + const conversationMessage: ConversationMessage = { + ...message, + content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content), + conversationId: this.getCurrentConversationId(), + }; + await this.handleMessageCompletion(conversationMessage); + }; + + const conversationState = this.infrastructure.getConversationState(); + await generator.run( { query: this.state.query, @@ -193,23 +349,34 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl blueprint: this.state.blueprint }, session, - // Stream callback - sends text chunks to frontend (chunk: string) => { this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: chunk, - conversationId: buildConversationId, + conversationId: this.getCurrentConversationId(), isStreaming: true }); }, - // Tool renderer for visual feedback on tool calls - toolCallRenderer + toolCallRenderer, + onToolComplete, + onAssistantMessage, + conversationState.runningHistory ); - + // TODO: If user messages pending, start another execution run + + if (!this.state.mvpGenerated) { + // TODO: Should this be moved to a tool that the agent can call? + this.state.mvpGenerated = true; + this.logger.info('MVP generated'); + } + this.broadcast(WebSocketMessageResponses.GENERATION_COMPLETED, { message: 'Project generation completed', filesGenerated: Object.keys(this.state.generatedFilesMap).length }); - + + // Final checks after generation completes + await this.compactifyIfNeeded(); + this.logger.info('Project generation completed'); } catch (error) { diff --git a/worker/agents/inferutils/common.ts b/worker/agents/inferutils/common.ts index f4e5c968..57df50c8 100644 --- a/worker/agents/inferutils/common.ts +++ b/worker/agents/inferutils/common.ts @@ -25,6 +25,7 @@ export type Message = { content: MessageContent; name?: string; // Optional name field required for function messages tool_calls?: ChatCompletionMessageToolCall[]; + tool_call_id?: string; // For role = tool }; export interface ConversationMessage extends Message { diff --git a/worker/agents/inferutils/core.ts b/worker/agents/inferutils/core.ts index 7ad6991a..dd4f624e 100644 --- a/worker/agents/inferutils/core.ts +++ b/worker/agents/inferutils/core.ts @@ -320,6 +320,7 @@ type InferArgsBase = { providerOverride?: 'cloudflare' | 'direct'; userApiKeys?: Record; abortSignal?: AbortSignal; + onAssistantMessage?: (message: Message) => Promise; }; type InferArgsStructured = InferArgsBase & { @@ -417,7 +418,7 @@ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionTo if (!td) { throw new Error(`Tool ${tc.function.name} not found`); } - const result = await executeToolWithDefinition(td, args); + const result = await executeToolWithDefinition(tc, td, args); console.log(`Tool execution result for ${tc.function.name}:`, result); return { id: tc.id, @@ -427,6 +428,11 @@ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionTo }; } catch (error) { console.error(`Tool execution failed for ${tc.function.name}:`, error); + // Check if error is an abort error + if (error instanceof AbortError) { + console.warn(`Tool call was aborted while executing ${tc.function.name}, ending tool call chain with the latest tool call result`); + throw error; + } return { id: tc.id, name: tc.function.name, @@ -438,6 +444,28 @@ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionTo ); } +function updateToolCallContext(toolCallContext: ToolCallContext | undefined, assistantMessage: Message, executedToolCalls: ToolCallResult[]) { + const newMessages = [ + ...(toolCallContext?.messages || []), + assistantMessage, + ...executedToolCalls + .filter(result => result.name && result.name.trim() !== '') + .map((result, _) => ({ + role: "tool" as MessageRole, + content: result.result ? JSON.stringify(result.result) : 'done', + name: result.name, + tool_call_id: result.id, + })), + ]; + + const newDepth = (toolCallContext?.depth ?? 0) + 1; + const newToolCallContext = { + messages: newMessages, + depth: newDepth + }; + return newToolCallContext; +} + export function infer( args: InferArgsStructured, toolCallContext?: ToolCallContext, @@ -471,6 +499,7 @@ export async function infer({ reasoning_effort, temperature, abortSignal, + onAssistantMessage, }: InferArgsBase & { schema?: OutputSchema; schemaName?: string; @@ -622,6 +651,10 @@ export async function infer({ } let toolCalls: ChatCompletionMessageFunctionToolCall[] = []; + /* + * Handle LLM response + */ + let content = ''; if (stream) { // If streaming is enabled, handle the stream response @@ -715,6 +748,16 @@ export async function infer({ console.log(`Total tokens used in prompt: ${totalTokens}`); } + const assistantMessage = { role: "assistant" as MessageRole, content, tool_calls: toolCalls }; + + if (onAssistantMessage) { + await onAssistantMessage(assistantMessage); + } + + /* + * Handle tool calls + */ + if (!content && !stream && !toolCalls.length) { // // Only error if not streaming and no content // console.error('No content received from OpenAI', JSON.stringify(response, null, 2)); @@ -725,33 +768,32 @@ export async function infer({ let executedToolCalls: ToolCallResult[] = []; if (tools) { // console.log(`Tool calls:`, JSON.stringify(toolCalls, null, 2), 'definition:', JSON.stringify(tools, null, 2)); - executedToolCalls = await executeToolCalls(toolCalls, tools); + try { + executedToolCalls = await executeToolCalls(toolCalls, tools); + } catch (error) { + console.error(`Tool execution failed for ${toolCalls[0].function.name}:`, error); + // Check if error is an abort error + if (error instanceof AbortError) { + console.warn(`Tool call was aborted, ending tool call chain with the latest tool call result`); + + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); + return { string: content, toolCallContext: newToolCallContext }; + } + // Otherwise, continue + } } + /* + * Handle tool call results + */ + if (executedToolCalls.length) { console.log(`Tool calls executed:`, JSON.stringify(executedToolCalls, null, 2)); - // Generate a new response with the tool calls executed - const newMessages = [ - ...(toolCallContext?.messages || []), - { role: "assistant" as MessageRole, content, tool_calls: toolCalls }, - ...executedToolCalls - .filter(result => result.name && result.name.trim() !== '') - .map((result, _) => ({ - role: "tool" as MessageRole, - content: result.result ? JSON.stringify(result.result) : 'done', - name: result.name, - tool_call_id: result.id, - })), - ]; - - const newDepth = (toolCallContext?.depth ?? 0) + 1; - const newToolCallContext = { - messages: newMessages, - depth: newDepth - }; + + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); const executedCallsWithResults = executedToolCalls.filter(result => result.result); - console.log(`${actionKey}: Tool calling depth: ${newDepth}/${getMaxToolCallingDepth(actionKey)}`); + console.log(`${actionKey}: Tool calling depth: ${newToolCallContext.depth}/${getMaxToolCallingDepth(actionKey)}`); if (executedCallsWithResults.length) { if (schema && schemaName) { @@ -771,6 +813,7 @@ export async function infer({ reasoning_effort, temperature, abortSignal, + onAssistantMessage, }, newToolCallContext); return output; } else { @@ -786,6 +829,7 @@ export async function infer({ reasoning_effort, temperature, abortSignal, + onAssistantMessage, }, newToolCallContext); return output; } diff --git a/worker/agents/inferutils/infer.ts b/worker/agents/inferutils/infer.ts index a03530f3..db0907fd 100644 --- a/worker/agents/inferutils/infer.ts +++ b/worker/agents/inferutils/infer.ts @@ -39,6 +39,7 @@ interface InferenceParamsBase { reasoning_effort?: ReasoningEffort; modelConfig?: ModelConfig; context: InferenceContext; + onAssistantMessage?: (message: Message) => Promise; } interface InferenceParamsStructured extends InferenceParamsBase { @@ -60,7 +61,7 @@ export async function executeInference( { messages, temperature, maxTokens, - retryLimit = 5, // Increased retry limit for better reliability + retryLimit = 5, stream, tools, reasoning_effort, @@ -69,7 +70,8 @@ export async function executeInference( { format, modelName, modelConfig, - context + context, + onAssistantMessage }: InferenceParamsBase & { schema?: T; format?: SchemaFormat; @@ -124,6 +126,7 @@ export async function executeInference( { reasoning_effort: useCheaperModel ? undefined : reasoning_effort, temperature, abortSignal: context.abortSignal, + onAssistantMessage, }) : await infer({ env, metadata: context, @@ -136,6 +139,7 @@ export async function executeInference( { reasoning_effort: useCheaperModel ? undefined : reasoning_effort, temperature, abortSignal: context.abortSignal, + onAssistantMessage, }); logger.info(`Successfully completed ${agentActionName} operation`); // console.log(result); diff --git a/worker/agents/operations/UserConversationProcessor.ts b/worker/agents/operations/UserConversationProcessor.ts index 915b3e25..4cc000e8 100644 --- a/worker/agents/operations/UserConversationProcessor.ts +++ b/worker/agents/operations/UserConversationProcessor.ts @@ -1,7 +1,6 @@ import { ConversationalResponseType } from "../schemas"; -import { createAssistantMessage, createUserMessage, createMultiModalUserMessage, MessageRole, mapImagesInMultiModalMessage } from "../inferutils/common"; +import { createAssistantMessage, createUserMessage, createMultiModalUserMessage } from "../inferutils/common"; import { executeInference } from "../inferutils/infer"; -import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; import { WebSocketMessageResponses } from "../constants"; import { WebSocketMessageData } from "../../api/websocketTypes"; import { AgentOperation, OperationOptions, getSystemPromptWithProjectContext } from "../operations/common"; @@ -15,22 +14,17 @@ import { PROMPT_UTILS } from "../prompts"; import { RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { CodeSerializerType } from "../utils/codeSerializers"; import { ConversationState } from "../inferutils/common"; -import { downloadR2Image, imagesToBase64, imageToBase64 } from "worker/utils/images"; +import { imagesToBase64 } from "worker/utils/images"; import { ProcessedImageAttachment } from "worker/types/image-attachment"; import { AbortError, InferResponseString } from "../inferutils/core"; import { GenerationContext } from "../domain/values/GenerationContext"; +import { compactifyContext } from "../utils/conversationCompactifier"; +import { ChatCompletionMessageFunctionToolCall } from "openai/resources"; +import { prepareMessagesForInference } from "../utils/common"; // Constants const CHUNK_SIZE = 64; -// Compactification thresholds -const COMPACTIFICATION_CONFIG = { - MAX_TURNS: 40, // Trigger after 50 conversation turns - MAX_ESTIMATED_TOKENS: 100000, - PRESERVE_RECENT_MESSAGES: 10, // Always keep last 10 messages uncompacted - CHARS_PER_TOKEN: 4, // Rough estimation: 1 token ≈ 4 characters -} as const; - export interface ToolCallStatusArgs { name: string; status: 'start' | 'success' | 'error'; @@ -305,34 +299,7 @@ function buildUserMessageWithContext(userMessage: string, errors: RuntimeError[] } } -async function prepareMessagesForInference(env: Env, messages: ConversationMessage[]) : Promise { - // For each multimodal image, convert the image to base64 data url - const processedMessages = await Promise.all(messages.map(m => { - return mapImagesInMultiModalMessage(structuredClone(m), async (c) => { - let url = c.image_url.url; - if (url.includes('base64,')) { - return c; - } - const image = await downloadR2Image(env, url); - return { - ...c, - image_url: { - ...c.image_url, - url: await imageToBase64(env, image) - }, - }; - }); - })); - return processedMessages; -} - export class UserConversationProcessor extends AgentOperation { - /** - * Remove system context tags from message content - */ - private stripSystemContext(text: string): string { - return text.replace(/[\s\S]*?<\/system_context>\n?/gi, '').trim(); - } async execute(inputs: UserConversationInputs, options: OperationOptions): Promise { const { env, logger, context, agent } = options; @@ -373,18 +340,18 @@ export class UserConversationProcessor extends AgentOperation inputs.conversationResponseCallback(chunk, aiConversationId, true) ).map(td => ({ ...td, - onStart: (args: Record) => toolCallRenderer({ name: td.function.name, status: 'start', args }), - onComplete: (args: Record, result: unknown) => toolCallRenderer({ + onStart: (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => Promise.resolve(toolCallRenderer({ name: td.function.name, status: 'start', args })), + onComplete: (_tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => Promise.resolve(toolCallRenderer({ name: td.function.name, status: 'success', args, result: typeof result === 'string' ? result : JSON.stringify(result) - }) + })) })); const runningHistory = await prepareMessagesForInference(env, conversationState.runningHistory); - const compactHistory = await this.compactifyContext(runningHistory, env, options, toolCallRenderer, logger); + const compactHistory = await compactifyContext(runningHistory, env, options, toolCallRenderer, logger); if (compactHistory.length !== runningHistory.length) { logger.info("Conversation history compactified", { fullHistoryLength: conversationState.fullHistory.length, @@ -521,290 +488,6 @@ export class UserConversationProcessor extends AgentOperation m.role === 'user').length; - } - - /** - * Convert character count to estimated token count - */ - private tokensFromChars(chars: number): number { - return Math.ceil(chars / COMPACTIFICATION_CONFIG.CHARS_PER_TOKEN); - } - - /** - * Estimate token count for messages (4 chars ≈ 1 token) - */ - private estimateTokens(messages: ConversationMessage[]): number { - let totalChars = 0; - - for (const msg of messages) { - if (typeof msg.content === 'string') { - totalChars += msg.content.length; - } else if (Array.isArray(msg.content)) { - // Multi-modal content - for (const part of msg.content) { - if (part.type === 'text') { - totalChars += part.text.length; - } else if (part.type === 'image_url') { - // Images use ~1000 tokens each (approximate) - totalChars += 4000; - } - } - } - - // Account for tool calls - if (msg.tool_calls && Array.isArray(msg.tool_calls)) { - for (const tc of msg.tool_calls as ChatCompletionMessageFunctionToolCall[]) { - // Function name - if (tc.function?.name) { - totalChars += tc.function.name.length; - } - // Function arguments (JSON string) - if (tc.function?.arguments) { - totalChars += tc.function.arguments.length; - } - // Tool call structure overhead (id, type, etc.) - rough estimate - totalChars += 50; - } - } - } - - return this.tokensFromChars(totalChars); - } - - /** - * Check if compactification should be triggered - */ - private shouldCompactify(messages: ConversationMessage[]): { - should: boolean; - reason?: 'turns' | 'tokens'; - turns: number; - estimatedTokens: number; - } { - const turns = this.countTurns(messages); - const estimatedTokens = this.estimateTokens(messages); - - console.log(`[UserConversationProcessor] shouldCompactify: turns=${turns}, estimatedTokens=${estimatedTokens}`); - - if (turns >= COMPACTIFICATION_CONFIG.MAX_TURNS) { - return { should: true, reason: 'turns', turns, estimatedTokens }; - } - - if (estimatedTokens >= COMPACTIFICATION_CONFIG.MAX_ESTIMATED_TOKENS) { - return { should: true, reason: 'tokens', turns, estimatedTokens }; - } - - return { should: false, turns, estimatedTokens }; - } - - /** - * Find the last valid turn boundary before the preserve threshold - * A turn boundary is right before a user message - */ - private findTurnBoundary(messages: ConversationMessage[], preserveCount: number): number { - // Start from the point where we want to split - const targetSplitIndex = messages.length - preserveCount; - - if (targetSplitIndex <= 0) { - return 0; - } - - // Walk backwards to find the nearest user message boundary - for (let i = targetSplitIndex; i >= 0; i--) { - if (messages[i].role === 'user') { - // Split right before this user message to preserve turn integrity - return i; - } - } - - // If no user message found, don't split - return 0; - } - - /** - * Generate LLM-powered conversation summary - * Sends the full conversation history as-is to the LLM with a summarization instruction - */ - private async generateConversationSummary( - messages: ConversationMessage[], - env: Env, - options: OperationOptions, - logger: StructuredLogger - ): Promise { - try { - // Prepare summarization instruction - const summarizationInstruction = createUserMessage( - `Please provide a comprehensive summary of the entire conversation above. Your summary should: - -1. Capture the key features, changes, and fixes discussed -2. Note any recurring issues or important bugs mentioned -3. Highlight the current state of the project -4. Preserve critical technical details and decisions made -5. Maintain chronological flow of major changes and developments - -Format your summary as a cohesive, well-structured narrative. Focus on what matters for understanding the project's evolution and current state. - -Provide the summary now:` - ); - - logger.info('Generating conversation summary via LLM', { - messageCount: messages.length, - estimatedInputTokens: this.estimateTokens(messages) - }); - - // Send full conversation history + summarization request - const summaryResult = await executeInference({ - env, - messages: [...messages, summarizationInstruction], - agentActionName: 'conversationalResponse', - context: options.inferenceContext, - }); - - const summary = summaryResult.string.trim(); - - logger.info('Generated conversation summary', { - summaryLength: summary.length, - summaryTokens: this.tokensFromChars(summary.length) - }); - - return summary; - } catch (error) { - logger.error('Failed to generate conversation summary', { error }); - // Fallback to simple concatenation - return messages - .map(m => { - const content = typeof m.content === 'string' ? m.content : '[complex content]'; - return `${m.role}: ${this.stripSystemContext(content).substring(0, 200)}`; - }) - .join('\n') - .substring(0, 2000); - } - } - - /** - * Intelligent conversation compactification system - * - * Strategy: - * - Monitors turns (user message to user message) and token count - * - Triggers at 50 turns OR ~100k tokens - * - Uses LLM to generate intelligent summary - * - Preserves last 10 messages in full - * - Respects turn boundaries to avoid tool call fragmentation - */ - async compactifyContext( - runningHistory: ConversationMessage[], - env: Env, - options: OperationOptions, - toolCallRenderer: RenderToolCall, - logger: StructuredLogger - ): Promise { - try { - // Check if compactification is needed on the running history - const analysis = this.shouldCompactify(runningHistory); - - if (!analysis.should) { - // No compactification needed - return runningHistory; - } - - logger.info('Compactification triggered', { - reason: analysis.reason, - turns: analysis.turns, - estimatedTokens: analysis.estimatedTokens, - totalRunningMessages: runningHistory.length, - }); - - // Currently compactification would be done on the running history, but should we consider doing it on the full history? - - // Find turn boundary for splitting - const splitIndex = this.findTurnBoundary( - runningHistory, - COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES - ); - - // Safety check: ensure we have something to compactify - if (splitIndex <= 0) { - logger.warn('Cannot find valid turn boundary for compactification, preserving all messages'); - return runningHistory; - } - - // Split messages - const messagesToSummarize = runningHistory.slice(0, splitIndex); - const recentMessages = runningHistory.slice(splitIndex); - - logger.info('Compactification split determined', { - summarizeCount: messagesToSummarize.length, - preserveCount: recentMessages.length, - splitIndex - }); - - toolCallRenderer({ - name: 'summarize_history', - status: 'start', - args: { - messageCount: messagesToSummarize.length, - recentCount: recentMessages.length - } - }); - - // Generate LLM-powered summary - const summary = await this.generateConversationSummary( - messagesToSummarize, - env, - options, - logger - ); - - // Create summary message - its conversationId will be the archive ID - const summarizedTurns = this.countTurns(messagesToSummarize); - const archiveId = `archive-${Date.now()}-${IdGenerator.generateConversationId()}`; - - const summaryMessage: ConversationMessage = { - role: 'assistant' as MessageRole, - content: `[Conversation History Summary: ${messagesToSummarize.length} messages, ${summarizedTurns} turns]\n[Archive ID: ${archiveId}]\n\n${summary}`, - conversationId: archiveId - }; - - toolCallRenderer({ - name: 'summarize_history', - status: 'success', - args: { - summary: summary.substring(0, 200) + '...', - archiveId - } - }); - - // Return summary + recent messages - const compactifiedHistory = [summaryMessage, ...recentMessages]; - - logger.info('Compactification completed with archival', { - originalMessageCount: runningHistory.length, - newMessageCount: compactifiedHistory.length, - compressionRatio: (compactifiedHistory.length / runningHistory.length).toFixed(2), - estimatedTokenSavings: analysis.estimatedTokens - this.estimateTokens(compactifiedHistory), - archivedMessageCount: messagesToSummarize.length, - archiveId - }); - - return compactifiedHistory; - - } catch (error) { - logger.error('Compactification failed, preserving original messages', { error }); - - // Safe fallback: if we have too many messages, keep recent ones - if (runningHistory.length > COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 3) { - const fallbackCount = COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 2; - logger.warn(`Applying emergency fallback: keeping last ${fallbackCount} messages`); - return runningHistory.slice(-fallbackCount); - } - - return runningHistory; - } - } processProjectUpdates(updateType: T, _data: WebSocketMessageData, logger: StructuredLogger) : ConversationMessage[] { diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index ae535c12..500719b8 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -25,14 +25,17 @@ import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { createInitSuitableTemplateTool } from './toolkit/init-suitable-template'; import { createVirtualFilesystemTool } from './toolkit/virtual-filesystem'; import { createGenerateImagesTool } from './toolkit/generate-images'; +import { Message } from '../inferutils/common'; +import { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; export async function executeToolWithDefinition( + toolCall: ChatCompletionMessageFunctionToolCall, toolDef: ToolDefinition, args: TArgs ): Promise { - toolDef.onStart?.(args); + await toolDef.onStart?.(toolCall, args); const result = await toolDef.implementation(args); - toolDef.onComplete?.(args, result); + await toolDef.onComplete?.(toolCall, args, result); return result; } @@ -82,7 +85,12 @@ export function buildDebugTools(session: DebugSession, logger: StructuredLogger, /** * Toolset for the Agentic Project Builder (autonomous build assistant) */ -export function buildAgenticBuilderTools(session: DebugSession, logger: StructuredLogger, toolRenderer?: RenderToolCall): ToolDefinition[] { +export function buildAgenticBuilderTools( + session: DebugSession, + logger: StructuredLogger, + toolRenderer?: RenderToolCall, + onToolComplete?: (message: Message) => Promise +): ToolDefinition[] { const tools = [ // PRD generation + refinement createGenerateBlueprintTool(session.agent, logger), @@ -107,20 +115,47 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur createGenerateImagesTool(session.agent, logger), ]; - return withRenderer(tools, toolRenderer); + return withRenderer(tools, toolRenderer, onToolComplete); } -/** Decorate tool definitions with a renderer for UI visualization */ -function withRenderer(tools: ToolDefinition[], toolRenderer?: RenderToolCall): ToolDefinition[] { +/** + * Decorate tool definitions with a renderer for UI visualization and conversation sync + */ +function withRenderer( + tools: ToolDefinition[], + toolRenderer?: RenderToolCall, + onComplete?: (message: Message) => Promise +): ToolDefinition[] { if (!toolRenderer) return tools; + return tools.map(td => ({ ...td, - onStart: (args: Record) => toolRenderer({ name: td.function.name, status: 'start', args }), - onComplete: (args: Record, result: unknown) => toolRenderer({ - name: td.function.name, - status: 'success', - args, - result: typeof result === 'string' ? result : JSON.stringify(result) - }) + onStart: async (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => { + if (toolRenderer) { + toolRenderer({ name: td.function.name, status: 'start', args }); + } + }, + onComplete: async (tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => { + // UI rendering + if (toolRenderer) { + toolRenderer({ + name: td.function.name, + status: 'success', + args, + result: typeof result === 'string' ? result : JSON.stringify(result) + }); + } + + // Conversation sync callback + if (onComplete) { + const toolMessage: Message = { + role: 'tool', + content: typeof result === 'string' ? result : JSON.stringify(result), + name: td.function.name, + tool_call_id: tc.id, + }; + await onComplete(toolMessage); + } + } })); } diff --git a/worker/agents/tools/types.ts b/worker/agents/tools/types.ts index 3683227f..37f80502 100644 --- a/worker/agents/tools/types.ts +++ b/worker/agents/tools/types.ts @@ -1,4 +1,4 @@ -import { ChatCompletionFunctionTool } from 'openai/resources'; +import { ChatCompletionFunctionTool, ChatCompletionMessageFunctionToolCall } from 'openai/resources'; export interface MCPServerConfig { name: string; sseUrl: string; @@ -26,8 +26,8 @@ export type ToolDefinition< TResult = unknown > = ChatCompletionFunctionTool & { implementation: ToolImplementation; - onStart?: (args: TArgs) => void; - onComplete?: (args: TArgs, result: TResult) => void; + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; }; export type ExtractToolArgs = T extends ToolImplementation ? A : never; diff --git a/worker/agents/utils/common.ts b/worker/agents/utils/common.ts index 0b1625f5..a85dee62 100644 --- a/worker/agents/utils/common.ts +++ b/worker/agents/utils/common.ts @@ -1,3 +1,6 @@ +import { downloadR2Image, imageToBase64 } from "../../utils/images"; +import { ConversationMessage, mapImagesInMultiModalMessage } from "../inferutils/common"; + export function extractCommands(rawOutput: string, onlyInstallCommands: boolean = false): string[] { const commands: string[] = []; @@ -215,4 +218,25 @@ export function looksLikeCommand(text: string): boolean { ]; return commandIndicators.some((pattern) => pattern.test(text)); +} + +export async function prepareMessagesForInference(env: Env, messages: ConversationMessage[]) : Promise { + // For each multimodal image, convert the image to base64 data url + const processedMessages = await Promise.all(messages.map(m => { + return mapImagesInMultiModalMessage(structuredClone(m), async (c) => { + let url = c.image_url.url; + if (url.includes('base64,')) { + return c; + } + const image = await downloadR2Image(env, url); + return { + ...c, + image_url: { + ...c.image_url, + url: await imageToBase64(env, image) + }, + }; + }); + })); + return processedMessages; } \ No newline at end of file diff --git a/worker/agents/utils/conversationCompactifier.ts b/worker/agents/utils/conversationCompactifier.ts new file mode 100644 index 00000000..3804c9d4 --- /dev/null +++ b/worker/agents/utils/conversationCompactifier.ts @@ -0,0 +1,317 @@ +import { ConversationMessage, MessageRole, createUserMessage } from "../inferutils/common"; +import { executeInference } from "../inferutils/infer"; +import { StructuredLogger } from "../../logger"; +import { IdGenerator } from './idGenerator'; +import { OperationOptions } from "../operations/common"; +import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; + +/** + * Compactification configuration constants + */ +export const COMPACTIFICATION_CONFIG = { + MAX_TURNS: 40, // Trigger after 40 conversation turns + MAX_ESTIMATED_TOKENS: 100000, + PRESERVE_RECENT_MESSAGES: 10, // Always keep last 10 messages uncompacted + CHARS_PER_TOKEN: 4, // Rough estimation: 1 token ≈ 4 characters +} as const; + +/** + * Tool call renderer type for UI feedback during compactification + * Compatible with RenderToolCall from UserConversationProcessor + */ +export type CompactificationRenderer = (args: { + name: string; + status: 'start' | 'success' | 'error'; + args?: Record; + result?: string; +}) => void; + +/** + * Count conversation turns (user message to next user message) + */ +function countTurns(messages: ConversationMessage[]): number { + return messages.filter(m => m.role === 'user').length; +} + +/** + * Convert character count to estimated token count + */ +function tokensFromChars(chars: number): number { + return Math.ceil(chars / COMPACTIFICATION_CONFIG.CHARS_PER_TOKEN); +} + +/** + * Remove system context tags from message content + */ +function stripSystemContext(text: string): string { + return text.replace(/[\s\S]*?<\/system_context>\n?/gi, '').trim(); +} + +/** + * Estimate token count for messages (4 chars ≈ 1 token) + */ +function estimateTokens(messages: ConversationMessage[]): number { + let totalChars = 0; + + for (const msg of messages) { + if (typeof msg.content === 'string') { + totalChars += msg.content.length; + } else if (Array.isArray(msg.content)) { + // Multi-modal content + for (const part of msg.content) { + if (part.type === 'text') { + totalChars += part.text.length; + } else if (part.type === 'image_url') { + // Images use ~1000 tokens each (approximate) + totalChars += 4000; + } + } + } + + // Account for tool calls + if (msg.tool_calls && Array.isArray(msg.tool_calls)) { + for (const tc of msg.tool_calls as ChatCompletionMessageFunctionToolCall[]) { + // Function name + if (tc.function?.name) { + totalChars += tc.function.name.length; + } + // Function arguments (JSON string) + if (tc.function?.arguments) { + totalChars += tc.function.arguments.length; + } + // Tool call structure overhead (id, type, etc.) - rough estimate + totalChars += 50; + } + } + } + + return tokensFromChars(totalChars); +} + +/** + * Check if compactification should be triggered + */ +export function shouldCompactify(messages: ConversationMessage[]): { + should: boolean; + reason?: 'turns' | 'tokens'; + turns: number; + estimatedTokens: number; +} { + const turns = countTurns(messages); + const estimatedTokens = estimateTokens(messages); + + console.log(`[ConversationCompactifier] shouldCompactify: turns=${turns}, estimatedTokens=${estimatedTokens}`); + + if (turns >= COMPACTIFICATION_CONFIG.MAX_TURNS) { + return { should: true, reason: 'turns', turns, estimatedTokens }; + } + + if (estimatedTokens >= COMPACTIFICATION_CONFIG.MAX_ESTIMATED_TOKENS) { + return { should: true, reason: 'tokens', turns, estimatedTokens }; + } + + return { should: false, turns, estimatedTokens }; +} + +/** + * Find the last valid turn boundary before the preserve threshold + * A turn boundary is right before a user message + */ +function findTurnBoundary(messages: ConversationMessage[], preserveCount: number): number { + // Start from the point where we want to split + const targetSplitIndex = messages.length - preserveCount; + + if (targetSplitIndex <= 0) { + return 0; + } + + // Walk backwards to find the nearest user message boundary + for (let i = targetSplitIndex; i >= 0; i--) { + if (messages[i].role === 'user') { + // Split right before this user message to preserve turn integrity + return i; + } + } + + // If no user message found, don't split + return 0; +} + +/** + * Generate LLM-powered conversation summary + * Sends the full conversation history as-is to the LLM with a summarization instruction + */ +async function generateConversationSummary( + messages: ConversationMessage[], + env: Env, + options: OperationOptions, + logger: StructuredLogger +): Promise { + try { + // Prepare summarization instruction + const summarizationInstruction = createUserMessage( + `Please provide a comprehensive summary of the entire conversation above. Your summary should: + +1. Capture the key features, changes, and fixes discussed +2. Note any recurring issues or important bugs mentioned +3. Highlight the current state of the project +4. Preserve critical technical details and decisions made +5. Maintain chronological flow of major changes and developments + +Format your summary as a cohesive, well-structured narrative. Focus on what matters for understanding the project's evolution and current state. + +Provide the summary now:` + ); + + logger.info('Generating conversation summary via LLM', { + messageCount: messages.length, + estimatedInputTokens: estimateTokens(messages) + }); + + // Send full conversation history + summarization request + const summaryResult = await executeInference({ + env, + messages: [...messages, summarizationInstruction], + agentActionName: 'conversationalResponse', + context: options.inferenceContext, + }); + + const summary = summaryResult.string.trim(); + + logger.info('Generated conversation summary', { + summaryLength: summary.length, + summaryTokens: tokensFromChars(summary.length) + }); + + return summary; + } catch (error) { + logger.error('Failed to generate conversation summary', { error }); + // Fallback to simple concatenation + return messages + .map(m => { + const content = typeof m.content === 'string' ? m.content : '[complex content]'; + return `${m.role}: ${stripSystemContext(content).substring(0, 200)}`; + }) + .join('\n') + .substring(0, 2000); + } +} + +/** + * Intelligent conversation compactification system + * + * Strategy: + * - Monitors turns (user message to user message) and token count + * - Triggers at 40 turns OR ~100k tokens + * - Uses LLM to generate intelligent summary + * - Preserves last 10 messages in full + * - Respects turn boundaries to avoid tool call fragmentation + */ +export async function compactifyContext( + runningHistory: ConversationMessage[], + env: Env, + options: OperationOptions, + toolCallRenderer: CompactificationRenderer, + logger: StructuredLogger +): Promise { + try { + // Check if compactification is needed on the running history + const analysis = shouldCompactify(runningHistory); + + if (!analysis.should) { + // No compactification needed + return runningHistory; + } + + logger.info('Compactification triggered', { + reason: analysis.reason, + turns: analysis.turns, + estimatedTokens: analysis.estimatedTokens, + totalRunningMessages: runningHistory.length, + }); + + // Find turn boundary for splitting + const splitIndex = findTurnBoundary( + runningHistory, + COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES + ); + + // Safety check: ensure we have something to compactify + if (splitIndex <= 0) { + logger.warn('Cannot find valid turn boundary for compactification, preserving all messages'); + return runningHistory; + } + + // Split messages + const messagesToSummarize = runningHistory.slice(0, splitIndex); + const recentMessages = runningHistory.slice(splitIndex); + + logger.info('Compactification split determined', { + summarizeCount: messagesToSummarize.length, + preserveCount: recentMessages.length, + splitIndex + }); + + toolCallRenderer({ + name: 'summarize_history', + status: 'start', + args: { + messageCount: messagesToSummarize.length, + recentCount: recentMessages.length + } + }); + + // Generate LLM-powered summary + const summary = await generateConversationSummary( + messagesToSummarize, + env, + options, + logger + ); + + // Create summary message - its conversationId will be the archive ID + const summarizedTurns = countTurns(messagesToSummarize); + const archiveId = `archive-${Date.now()}-${IdGenerator.generateConversationId()}`; + + const summaryMessage: ConversationMessage = { + role: 'assistant' as MessageRole, + content: `[Conversation History Summary: ${messagesToSummarize.length} messages, ${summarizedTurns} turns]\n[Archive ID: ${archiveId}]\n\n${summary}`, + conversationId: archiveId + }; + + toolCallRenderer({ + name: 'summarize_history', + status: 'success', + args: { + summary: summary.substring(0, 200) + '...', + archiveId + } + }); + + // Return summary + recent messages + const compactifiedHistory = [summaryMessage, ...recentMessages]; + + logger.info('Compactification completed with archival', { + originalMessageCount: runningHistory.length, + newMessageCount: compactifiedHistory.length, + compressionRatio: (compactifiedHistory.length / runningHistory.length).toFixed(2), + estimatedTokenSavings: analysis.estimatedTokens - estimateTokens(compactifiedHistory), + archivedMessageCount: messagesToSummarize.length, + archiveId + }); + + return compactifiedHistory; + + } catch (error) { + logger.error('Compactification failed, preserving original messages', { error }); + + // Safe fallback: if we have too many messages, keep recent ones + if (runningHistory.length > COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 3) { + const fallbackCount = COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 2; + logger.warn(`Applying emergency fallback: keeping last ${fallbackCount} messages`); + return runningHistory.slice(-fallbackCount); + } + + return runningHistory; + } +} From 060cc9e0e5ac5d821f9f1666da229443538a1a38 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 22:28:36 -0500 Subject: [PATCH 16/58] fix: template import and state init - Fix importTemplate to actually work - Fixed template filtering logic to respect 'general' project type - Added behaviorType to logger context for better debugging - fixed not saving behaviorType to state --- worker/agents/core/behaviors/agentic.ts | 3 +- worker/agents/core/behaviors/base.ts | 31 +++++++------------ worker/agents/core/behaviors/phasic.ts | 1 + worker/agents/core/codingAgent.ts | 8 +++-- worker/agents/core/stateMigration.ts | 16 ---------- worker/agents/planning/templateSelector.ts | 4 +-- .../services/interfaces/ICodingAgent.ts | 2 +- 7 files changed, 22 insertions(+), 43 deletions(-) diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index a3814e26..bf9de555 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -92,9 +92,10 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl hostname, inferenceContext, projectType: this.projectType, + behaviorType: 'agentic' }); - if (templateInfo) { + if (templateInfo && templateInfo.templateDetails.name !== 'scratch') { // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) const customizedFiles = customizeTemplateFiles( templateInfo.templateDetails.allFiles, diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 2ffe019d..0b693d73 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -1055,31 +1055,22 @@ export abstract class BaseCodingBehavior } } - async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }> { + async importTemplate(templateName: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }> { this.logger.info(`Importing template into project: ${templateName}`); - const results = await BaseSandboxService.getTemplateDetails(templateName); - if (!results.success || !results.templateDetails) { - throw new Error(`Failed to get template details for: ${templateName}`); - } - - const templateDetails = results.templateDetails; - const customizedFiles = customizeTemplateFiles(templateDetails.allFiles, { - projectName: this.state.projectName, - commandsHistory: this.getBootstrapCommands() + + // Update state + this.setState({ + ...this.state, + templateName: templateName, }); - const filesToSave = Object.entries(customizedFiles).map(([filePath, content]) => ({ - filePath, - fileContents: content, - filePurpose: 'Template file' - })); - - await this.fileManager.saveGeneratedFiles(filesToSave, commitMessage); + const templateDetails = await this.ensureTemplateDetails(); + if (!templateDetails) { + throw new Error(`Failed to get template details for: ${templateName}`); + } - // Update state this.setState({ ...this.state, - templateName: templateDetails.name, lastPackageJson: templateDetails.allFiles['package.json'] || this.state.lastPackageJson, }); @@ -1088,7 +1079,7 @@ export abstract class BaseCodingBehavior return { templateName: templateDetails.name, - filesImported: filesToSave.length, + filesImported: Object.keys(templateDetails.allFiles).length, files: importantFiles }; } diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index cbceec4d..75d3de56 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -122,6 +122,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem hostname, inferenceContext, projectType: this.projectType, + behaviorType: 'phasic' }; this.setState(nextState); // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index d5059611..24224626 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -235,6 +235,8 @@ export class CodeGeneratorAgent extends Agent implements AgentI this._logger.setFields({ agentId, userId, + projectType: this.state.projectType, + behaviorType: this.state.behaviorType }); if (sessionId) { this._logger.setField('sessionId', sessionId); @@ -308,12 +310,12 @@ export class CodeGeneratorAgent extends Agent implements AgentI return this.objective.export(options); } - importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }> { - return this.behavior.importTemplate(templateName, commitMessage); + importTemplate(templateName: string): Promise<{ templateName: string; filesImported: number }> { + return this.behavior.importTemplate(templateName); } protected async saveToDatabase() { - this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); + this.logger().info(`Saving agent ${this.getAgentId()} to database`); // Save the app to database (authenticated users only) const appService = new AppService(this.env); await appService.createApp({ diff --git a/worker/agents/core/stateMigration.ts b/worker/agents/core/stateMigration.ts index d77dd2dc..f77a13bb 100644 --- a/worker/agents/core/stateMigration.ts +++ b/worker/agents/core/stateMigration.ts @@ -207,21 +207,6 @@ export class StateMigration { needsMigration = true; logger.info('Adding default projectType for legacy state', { projectType: migratedProjectType }); } - - let migratedBehaviorType = state.behaviorType; - if (isStateWithAgentMode(state)) { - const legacyAgentMode = state.agentMode; - const nextBehaviorType = legacyAgentMode === 'smart' ? 'agentic' : 'phasic'; - if (nextBehaviorType !== migratedBehaviorType) { - migratedBehaviorType = nextBehaviorType; - needsMigration = true; - } - logger.info('Migrating behaviorType from agentMode', { - legacyAgentMode, - behaviorType: migratedBehaviorType - }); - } - if (needsMigration) { logger.info('Migrating state: schema format, conversation cleanup, security fixes, and bootstrap setup', { generatedFilesCount: Object.keys(migratedFilesMap).length, @@ -238,7 +223,6 @@ export class StateMigration { templateName: migratedTemplateName, projectName: migratedProjectName, projectType: migratedProjectType, - behaviorType: migratedBehaviorType } as AgentState; // Remove deprecated fields diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index fce55bda..bd202316 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -185,14 +185,14 @@ Reasoning: "Social template provides user interactions, content sharing, and com */ export async function selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { // Step 1: Predict project type if 'auto' - const actualProjectType: ProjectType = projectType === 'auto' + const actualProjectType: ProjectType = projectType === 'auto' ? await predictProjectType(env, query, inferenceContext, images) : (projectType || 'app') as ProjectType; logger.info(`Using project type: ${actualProjectType}${projectType === 'auto' ? ' (auto-detected)' : ''}`); // Step 2: Filter templates by project type - const filteredTemplates = availableTemplates.filter(t => t.projectType === actualProjectType); + const filteredTemplates = projectType === 'general' ? availableTemplates : availableTemplates.filter(t => t.projectType === actualProjectType); if (filteredTemplates.length === 0) { logger.warn(`No templates available for project type: ${actualProjectType}`); diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index a44101d4..cbb34c27 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -34,7 +34,7 @@ export interface ICodingAgent { getProjectType(): ProjectType; - importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }>; + importTemplate(templateName: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }>; getOperationOptions(): OperationOptions; From 5deea6ae9ba7c831fb275764b3400e068f3f0f1c Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 23:12:17 -0500 Subject: [PATCH 17/58] fix: template cache clear before import + init meta in behavior constructor - Moved behaviorType and projectType initialization from hardcoded values to constructor-based setup - Changed initial state values to 'unknown' to ensure proper initialization through behavior constructor - Cleared template details cache when importing new templates to prevent stale data --- worker/agents/core/behaviors/base.ts | 9 +++++++++ worker/agents/core/codingAgent.ts | 4 ++-- .../agents/services/implementations/DeploymentManager.ts | 4 ++++ worker/agents/tools/toolkit/init-suitable-template.ts | 3 +-- worker/agents/tools/toolkit/initialize-slides.ts | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 0b693d73..5a0788f8 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -82,6 +82,12 @@ export abstract class BaseCodingBehavior constructor(infrastructure: AgentInfrastructure, protected projectType: ProjectType) { super(infrastructure); + + this.setState({ + ...this.state, + behaviorType: this.getBehavior(), + projectType: this.projectType, + }); } public async initialize( @@ -95,6 +101,8 @@ export abstract class BaseCodingBehavior await this.ensureTemplateDetails(); } + + // Reset the logg return this.state; } @@ -1064,6 +1072,7 @@ export abstract class BaseCodingBehavior templateName: templateName, }); + this.templateDetailsCache = null; // Clear template details cache const templateDetails = await this.ensureTemplateDetails(); if (!templateDetails) { throw new Error(`Failed to get template details for: ${templateName}`); diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index 24224626..eaf98e11 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -56,8 +56,8 @@ export class CodeGeneratorAgent extends Agent implements AgentI // ========================================== initialState = { - behaviorType: 'phasic', - projectType: 'app', + behaviorType: 'unknown' as BehaviorType, + projectType: 'unknown' as ProjectType, projectName: "", query: "", sessionId: '', diff --git a/worker/agents/services/implementations/DeploymentManager.ts b/worker/agents/services/implementations/DeploymentManager.ts index 1915090e..2b81a7fa 100644 --- a/worker/agents/services/implementations/DeploymentManager.ts +++ b/worker/agents/services/implementations/DeploymentManager.ts @@ -575,6 +575,10 @@ export class DeploymentManager extends BaseAgentService implem // Get latest files const files = this.fileManager.getAllFiles(); + this.getLog().info('Files to deploy', { + files: files.map(f => f.filePath) + }); + // Create instance const client = this.getClient(); const logger = this.getLog(); diff --git a/worker/agents/tools/toolkit/init-suitable-template.ts b/worker/agents/tools/toolkit/init-suitable-template.ts index 6f3957cd..e970bdb6 100644 --- a/worker/agents/tools/toolkit/init-suitable-template.ts +++ b/worker/agents/tools/toolkit/init-suitable-template.ts @@ -87,8 +87,7 @@ export function createInitSuitableTemplateTool( // Import the selected template const importResult = await agent.importTemplate( - selection.selectedTemplateName, - `Selected template: ${selection.selectedTemplateName}` + selection.selectedTemplateName ); logger.info('Template imported successfully', { diff --git a/worker/agents/tools/toolkit/initialize-slides.ts b/worker/agents/tools/toolkit/initialize-slides.ts index 5e7ce4ef..7cb529b2 100644 --- a/worker/agents/tools/toolkit/initialize-slides.ts +++ b/worker/agents/tools/toolkit/initialize-slides.ts @@ -35,7 +35,7 @@ export function createInitializeSlidesTool( }, implementation: async ({ theme, force_preview }: InitializeSlidesArgs) => { logger.info('Initializing slides via Spectacle template', { theme }); - const { templateName, filesImported } = await agent.importTemplate('spectacle', `chore: init slides (theme=${theme || 'default'})`); + const { templateName, filesImported } = await agent.importTemplate('spectacle'); logger.info('Imported template', { templateName, filesImported }); const deployMsg = await agent.deployPreview(true, !!force_preview); From bbf19790004dc570b33dce07399c59276809e1fd Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 12 Nov 2025 00:11:42 -0500 Subject: [PATCH 18/58] fix: ui and convo state management - Moved user input idle check from PhasicCodingBehavior to CodeGeneratorAgent for consistent behavior across all modes - Fixed message order in agenticProjectBuilder to place history after user message instead of before - Added replaceExisting parameter to addConversationMessage for better control over message updates - Enhanced initial state restoration to include queued user messages and behaviorType - Added status and queuePosition fields --- src/routes/chat/hooks/use-chat.ts | 3 ++ .../chat/utils/handle-websocket-message.ts | 29 +++++++++++++++++-- src/routes/chat/utils/message-helpers.ts | 2 ++ .../assistants/agenticProjectBuilder.ts | 11 +------ worker/agents/core/AgentCore.ts | 2 +- worker/agents/core/behaviors/agentic.ts | 4 +-- worker/agents/core/behaviors/phasic.ts | 9 +----- worker/agents/core/codingAgent.ts | 13 +++++++-- worker/agents/core/websocket.ts | 2 +- 9 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/routes/chat/hooks/use-chat.ts b/src/routes/chat/hooks/use-chat.ts index 2ed284bb..b50a7ef3 100644 --- a/src/routes/chat/hooks/use-chat.ts +++ b/src/routes/chat/hooks/use-chat.ts @@ -201,6 +201,7 @@ export function useChat({ setRuntimeErrorCount, setStaticIssueCount, setIsDebugging, + setBehaviorType, // Current state isInitialStateRestored, blueprint, @@ -212,6 +213,7 @@ export function useChat({ projectStages, isGenerating, urlChatId, + behaviorType, // Functions updateStage, sendMessage, @@ -230,6 +232,7 @@ export function useChat({ projectStages, isGenerating, urlChatId, + behaviorType, updateStage, sendMessage, loadBootstrapFiles, diff --git a/src/routes/chat/utils/handle-websocket-message.ts b/src/routes/chat/utils/handle-websocket-message.ts index 944272bf..37386c60 100644 --- a/src/routes/chat/utils/handle-websocket-message.ts +++ b/src/routes/chat/utils/handle-websocket-message.ts @@ -1,5 +1,5 @@ import type { WebSocket } from 'partysocket'; -import type { WebSocketMessage, BlueprintType, ConversationMessage, AgentState, PhasicState } from '@/api-types'; +import type { WebSocketMessage, BlueprintType, ConversationMessage, AgentState, PhasicState, BehaviorType } from '@/api-types'; import { deduplicateMessages, isAssistantMessageDuplicate } from './deduplicate-messages'; import { logger } from '@/utils/logger'; import { getFileType } from '@/utils/string'; @@ -50,7 +50,8 @@ export interface HandleMessageDeps { setRuntimeErrorCount: React.Dispatch>; setStaticIssueCount: React.Dispatch>; setIsDebugging: React.Dispatch>; - + setBehaviorType: React.Dispatch>; + // Current state isInitialStateRestored: boolean; blueprint: BlueprintType | undefined; @@ -62,6 +63,7 @@ export interface HandleMessageDeps { projectStages: any[]; isGenerating: boolean; urlChatId: string | undefined; + behaviorType: BehaviorType; // Functions updateStage: (stageId: string, updates: any) => void; @@ -118,6 +120,7 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { setIsGenerating, setIsPhaseProgressActive, setIsDebugging, + setBehaviorType, isInitialStateRestored, blueprint, query, @@ -128,6 +131,7 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { projectStages, isGenerating, urlChatId, + behaviorType, updateStage, sendMessage, loadBootstrapFiles, @@ -162,7 +166,12 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { if (!isInitialStateRestored) { logger.debug('📥 Performing initial state restoration'); - + + if (state.behaviorType && state.behaviorType !== behaviorType) { + setBehaviorType(state.behaviorType); + logger.debug('🔄 Restored behaviorType from backend:', state.behaviorType); + } + if (state.blueprint && !blueprint) { setBlueprint(state.blueprint); updateStage('blueprint', { status: 'completed' }); @@ -253,6 +262,20 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { } } + // Display queued user messages from state + const queuedInputs = state.pendingUserInputs || []; + if (queuedInputs.length > 0) { + logger.debug('📋 Restoring queued user messages:', queuedInputs); + const queuedMessages: ChatMessage[] = queuedInputs.map((msg, idx) => ({ + role: 'user', + content: msg, + conversationId: `queued-${idx}`, + status: 'queued' as const, + queuePosition: idx + 1 + })); + setMessages(prev => [...prev, ...queuedMessages]); + } + setIsInitialStateRestored(true); if (state.shouldBeGenerating && !isGenerating) { diff --git a/src/routes/chat/utils/message-helpers.ts b/src/routes/chat/utils/message-helpers.ts index eddba260..1f36ff1a 100644 --- a/src/routes/chat/utils/message-helpers.ts +++ b/src/routes/chat/utils/message-helpers.ts @@ -16,6 +16,8 @@ export type ChatMessage = Omit & { isThinking?: boolean; toolEvents?: ToolEvent[]; }; + status?: 'queued' | 'active'; + queuePosition?: number; }; /** diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 095334d3..4c9a22fc 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -773,18 +773,9 @@ export class AgenticProjectBuilder extends Assistant { let userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); - if (historyMessages.length > 0) { - userPrompt = ` -## Timestamp: -${new Date().toISOString()} - - -${userPrompt}`; - } - const system = createSystemMessage(systemPrompt); const user = createUserMessage(userPrompt); - const messages: Message[] = this.save([system, ...historyMessages, user]); + const messages: Message[] = this.save([system, user, ...historyMessages]); // Build tools with renderer and conversation sync callback const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts index 1a6c98b9..c0038784 100644 --- a/worker/agents/core/AgentCore.ts +++ b/worker/agents/core/AgentCore.ts @@ -28,7 +28,7 @@ export interface AgentInfrastructure { setConversationState(state: ConversationState): void; getConversationState(): ConversationState; - addConversationMessage(message: ConversationMessage): void; + addConversationMessage(message: ConversationMessage, replaceExisting: boolean): void; clearConversation(): void; // Services diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index bf9de555..c9c43672 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -163,7 +163,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl private async handleMessageCompletion(conversationMessage: ConversationMessage): Promise { this.toolCallCounter++; - this.infrastructure.addConversationMessage(conversationMessage); + this.infrastructure.addConversationMessage(conversationMessage, false); this.logger.debug('Message synced to conversation', { role: conversationMessage.role, @@ -293,7 +293,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl this.infrastructure.addConversationMessage({ ...compiledMessage, conversationId: buildConversationId, - }); + }, false); this.logger.info('User requests processed', { conversationId: buildConversationId, }); diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 75d3de56..c29f751a 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -468,7 +468,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem conversationId: IdGenerator.generateConversationId(), } // Store the message in the conversation history so user's response can trigger the deep debug tool - this.infrastructure.addConversationMessage(message); + this.infrastructure.addConversationMessage(message, true); this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: message.content, @@ -851,13 +851,6 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { const result = await super.handleUserInput(userMessage, images); - if (!this.generationPromise) { - // If idle, start generation process - this.logger.info('User input during IDLE state, starting generation'); - this.generateAllFiles().catch(error => { - this.logger.error('Error starting generation from user input:', error); - }); - } return result; } } diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index eaf98e11..01583b36 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -417,9 +417,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI } } - addConversationMessage(message: ConversationMessage) { + addConversationMessage(message: ConversationMessage, replaceExisting: boolean = false) { const conversationState = this.getConversationState(); - if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!replaceExisting || !conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { conversationState.runningHistory.push(message); } else { conversationState.runningHistory = conversationState.runningHistory.map(msg => { @@ -429,7 +429,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI return msg; }); } - if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!replaceExisting || !conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { conversationState.fullHistory.push(message); } else { conversationState.fullHistory = conversationState.fullHistory.map(msg => { @@ -475,6 +475,13 @@ export class CodeGeneratorAgent extends Agent implements AgentI }); await this.behavior.handleUserInput(userMessage, images); + if (!this.behavior.isCodeGenerating()) { + // If idle, start generation process + this.logger().info('User input during IDLE state, starting generation'); + this.behavior.generateAllFiles().catch(error => { + this.logger().error('Error starting generation from user input:', error); + }); + } } catch (error) { if (error instanceof RateLimitExceededError) { diff --git a/worker/agents/core/websocket.ts b/worker/agents/core/websocket.ts index 666a2124..9b18032d 100644 --- a/worker/agents/core/websocket.ts +++ b/worker/agents/core/websocket.ts @@ -157,7 +157,7 @@ export function handleWebSocketMessage( } } - agent.getBehavior().handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { + agent.handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { logger.error('Error handling user suggestion:', error); sendError(connection, `Error processing user suggestion: ${error instanceof Error ? error.message : String(error)}`); }); From d45f3688a017496604e6dffe454c083d506fed74 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 12 Nov 2025 01:11:17 -0500 Subject: [PATCH 19/58] fix: convo id uniqueness and improve message deduplication - Single convo id needs to be broadcasted but messages need to be saved with unique ids. - Fix message deduplication to use composite key (conversationId + role + tool_call_id) - Improved tool message filtering to validate against parent assistant tool_calls - Removed unused CodingAgentInterface stub file - Simplified addConversationMessage interface by removing replaceExisting parameter --- worker/agents/constants.ts | 2 + worker/agents/core/AgentCore.ts | 2 +- worker/agents/core/behaviors/agentic.ts | 54 +++----- worker/agents/core/behaviors/phasic.ts | 2 +- worker/agents/core/codingAgent.ts | 21 ++- worker/agents/inferutils/core.ts | 32 ++++- .../services/implementations/CodingAgent.ts | 123 ------------------ 7 files changed, 60 insertions(+), 176 deletions(-) delete mode 100644 worker/agents/services/implementations/CodingAgent.ts diff --git a/worker/agents/constants.ts b/worker/agents/constants.ts index 907f3a84..d10b3788 100644 --- a/worker/agents/constants.ts +++ b/worker/agents/constants.ts @@ -114,6 +114,8 @@ export const getMaxToolCallingDepth = (agentActionKey: AgentActionKey | 'testMod switch (agentActionKey) { case 'deepDebugger': return 100; + case 'agenticProjectBuilder': + return 100; default: return MAX_TOOL_CALLING_DEPTH_DEFAULT; } diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts index c0038784..1a6c98b9 100644 --- a/worker/agents/core/AgentCore.ts +++ b/worker/agents/core/AgentCore.ts @@ -28,7 +28,7 @@ export interface AgentInfrastructure { setConversationState(state: ConversationState): void; getConversationState(): ConversationState; - addConversationMessage(message: ConversationMessage, replaceExisting: boolean): void; + addConversationMessage(message: ConversationMessage): void; clearConversation(): void; // Services diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index c9c43672..50b0f8ba 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -47,8 +47,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl private toolCallCounter: number = 0; private readonly COMPACTIFY_CHECK_INTERVAL = 9; // Check compactification every 9 tool calls - private currentConversationId: string | undefined; - /** * Initialize the code generator with project blueprint and template * Sets up services and begins deployment process @@ -163,7 +161,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl private async handleMessageCompletion(conversationMessage: ConversationMessage): Promise { this.toolCallCounter++; - this.infrastructure.addConversationMessage(conversationMessage, false); + this.infrastructure.addConversationMessage(conversationMessage); this.logger.debug('Message synced to conversation', { role: conversationMessage.role, @@ -175,18 +173,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl } } - private resetConversationId(): string { - this.currentConversationId = undefined; - return this.getCurrentConversationId(); - } - - private getCurrentConversationId(): string { - if (!this.currentConversationId) { - this.currentConversationId = IdGenerator.generateConversationId(); - } - return this.currentConversationId; - } - /** * Compactify conversation state if needed */ @@ -200,7 +186,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl (args) => { this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: '', - conversationId: this.getCurrentConversationId(), + conversationId: IdGenerator.generateConversationId(), isStreaming: false, tool: args }); @@ -251,21 +237,21 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl projectName: this.state.projectName }); - // Generate unique conversation ID for this build session - const buildConversationId = this.resetConversationId(); - // Broadcast generation started this.broadcast(WebSocketMessageResponses.GENERATION_STARTED, { message: 'Starting project generation...', totalFiles: 1 }); - // Send initial message to frontend - this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { - message: 'Initializing project builder...', - conversationId: buildConversationId, - isStreaming: false - }); + const aiConversationId = IdGenerator.generateConversationId(); + + if (!this.state.mvpGenerated) { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: 'Initializing project builder...', + conversationId: aiConversationId, + isStreaming: false + }); + } try { const generator = new AgenticProjectBuilder( @@ -292,10 +278,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl // Save the message to conversation history this.infrastructure.addConversationMessage({ ...compiledMessage, - conversationId: buildConversationId, - }, false); - this.logger.info('User requests processed', { - conversationId: buildConversationId, + conversationId: IdGenerator.generateConversationId(), }); } @@ -316,14 +299,14 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl tool }); }, - buildConversationId + aiConversationId ); // Create conversation sync callback const onToolComplete = async (toolMessage: Message) => { await this.handleMessageCompletion({ ...toolMessage, - conversationId: this.getCurrentConversationId() + conversationId: IdGenerator.generateConversationId() }); // If user messages are queued, we throw an abort error, that shall break the tool call chain. @@ -336,7 +319,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl const conversationMessage: ConversationMessage = { ...message, content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content), - conversationId: this.getCurrentConversationId(), + conversationId: IdGenerator.generateConversationId(), }; await this.handleMessageCompletion(conversationMessage); }; @@ -353,7 +336,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl (chunk: string) => { this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: chunk, - conversationId: this.getCurrentConversationId(), + conversationId: aiConversationId, isStreaming: true }); }, @@ -370,11 +353,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl this.logger.info('MVP generated'); } - this.broadcast(WebSocketMessageResponses.GENERATION_COMPLETED, { - message: 'Project generation completed', - filesGenerated: Object.keys(this.state.generatedFilesMap).length - }); - // Final checks after generation completes await this.compactifyIfNeeded(); diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index c29f751a..14fd5e3a 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -468,7 +468,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem conversationId: IdGenerator.generateConversationId(), } // Store the message in the conversation history so user's response can trigger the deep debug tool - this.infrastructure.addConversationMessage(message, true); + this.infrastructure.addConversationMessage(message); this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: message.content, diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index 01583b36..e0a710f5 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -387,16 +387,19 @@ export class CodeGeneratorAgent extends Agent implements AgentI const deduplicateMessages = (messages: ConversationMessage[]): ConversationMessage[] => { const seen = new Set(); return messages.filter(msg => { - if (seen.has(msg.conversationId)) { + const key = `${msg.conversationId}-${msg.role}-${msg.tool_call_id || ''}`; + if (seen.has(key)) { return false; } - seen.add(msg.conversationId); + seen.add(key); return true; }); }; runningHistory = deduplicateMessages(runningHistory); fullHistory = deduplicateMessages(fullHistory); + + this.logger().info(`Loaded conversation state ${id}, full_length: ${fullHistory.length}, compact_length: ${runningHistory.length}`, fullHistory); return { id: id, @@ -409,7 +412,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI const serializedFull = JSON.stringify(conversations.fullHistory); const serializedCompact = JSON.stringify(conversations.runningHistory); try { - this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`); + this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`, serializedFull); this.sql`INSERT OR REPLACE INTO compact_conversations (id, messages) VALUES (${conversations.id}, ${serializedCompact})`; this.sql`INSERT OR REPLACE INTO full_conversations (id, messages) VALUES (${conversations.id}, ${serializedFull})`; } catch (error) { @@ -417,9 +420,15 @@ export class CodeGeneratorAgent extends Agent implements AgentI } } - addConversationMessage(message: ConversationMessage, replaceExisting: boolean = false) { + addConversationMessage(message: ConversationMessage) { const conversationState = this.getConversationState(); - if (!replaceExisting || !conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + this.logger().info('Adding conversation message', { + message, + conversationId: message.conversationId, + runningHistoryLength: conversationState.runningHistory.length, + fullHistoryLength: conversationState.fullHistory.length + }); conversationState.runningHistory.push(message); } else { conversationState.runningHistory = conversationState.runningHistory.map(msg => { @@ -429,7 +438,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI return msg; }); } - if (!replaceExisting || !conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { conversationState.fullHistory.push(message); } else { conversationState.fullHistory = conversationState.fullHistory.map(msg => { diff --git a/worker/agents/inferutils/core.ts b/worker/agents/inferutils/core.ts index dd4f624e..9a98aec6 100644 --- a/worker/agents/inferutils/core.ts +++ b/worker/agents/inferutils/core.ts @@ -556,14 +556,32 @@ export async function infer({ let messagesToPass = [...optimizedMessages]; if (toolCallContext && toolCallContext.messages) { - // Minimal core fix with logging: exclude prior tool messages that have empty name const ctxMessages = toolCallContext.messages; - const droppedToolMsgs = ctxMessages.filter(m => m.role === 'tool' && (!m.name || m.name.trim() === '')); - if (droppedToolMsgs.length) { - console.warn(`[TOOL_CALL_WARNING] Dropping ${droppedToolMsgs.length} prior tool message(s) with empty name to avoid provider error`, droppedToolMsgs); - } - const filteredCtx = ctxMessages.filter(m => m.role !== 'tool' || (m.name && m.name.trim() !== '')); - messagesToPass.push(...filteredCtx); + let validToolCallIds = new Set(); + + const filtered = ctxMessages.filter(msg => { + // Update valid IDs when we see assistant with tool_calls + if (msg.role === 'assistant' && msg.tool_calls) { + validToolCallIds = new Set(msg.tool_calls.map(tc => tc.id)); + return true; + } + + // Filter tool messages + if (msg.role === 'tool') { + if (!msg.name?.trim()) { + console.warn('[TOOL_ORPHAN] Dropping tool message with empty name:', msg.tool_call_id); + return false; + } + if (!msg.tool_call_id || !validToolCallIds.has(msg.tool_call_id)) { + console.warn('[TOOL_ORPHAN] Dropping orphaned tool message:', msg.name, msg.tool_call_id); + return false; + } + } + + return true; + }); + + messagesToPass.push(...filtered); } if (format) { diff --git a/worker/agents/services/implementations/CodingAgent.ts b/worker/agents/services/implementations/CodingAgent.ts deleted file mode 100644 index d82db3c1..00000000 --- a/worker/agents/services/implementations/CodingAgent.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { ProcessedImageAttachment } from "worker/types/image-attachment"; -import { Blueprint, FileConceptType } from "worker/agents/schemas"; -import { ExecuteCommandsResponse, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; -import { ICodingAgent } from "../interfaces/ICodingAgent"; -import { OperationOptions } from "worker/agents/operations/common"; -import { DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; -import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; -import { WebSocketMessageResponses } from "worker/agents/constants"; - -/* -* CodingAgentInterface - stub for passing to tool calls -*/ -export class CodingAgentInterface { - agentStub: ICodingAgent; - constructor (agentStub: ICodingAgent) { - this.agentStub = agentStub; - } - - getLogs(reset?: boolean, durationSeconds?: number): Promise { - return this.agentStub.getLogs(reset, durationSeconds); - } - - fetchRuntimeErrors(clear?: boolean): Promise { - return this.agentStub.fetchRuntimeErrors(clear); - } - - async deployPreview(clearLogs: boolean = true, forceRedeploy: boolean = false): Promise { - const response = await this.agentStub.deployToSandbox([], forceRedeploy, undefined, clearLogs); - // Send a message to refresh the preview - if (response && response.previewURL) { - this.agentStub.broadcast(WebSocketMessageResponses.PREVIEW_FORCE_REFRESH, {}); - return `Deployment successful: ${response.previewURL}`; - } else { - return `Failed to deploy: ${response?.tunnelURL}`; - } - } - - async deployToCloudflare(target?: DeploymentTarget): Promise { - const response = await this.agentStub.deployToCloudflare(target); - if (response && response.deploymentUrl) { - return `Deployment successful: ${response.deploymentUrl}`; - } else { - return `Failed to deploy: ${response?.workersUrl}`; - } - } - - queueUserRequest(request: string, images?: ProcessedImageAttachment[]): void { - this.agentStub.queueUserRequest(request, images); - } - - clearConversation(): void { - this.agentStub.clearConversation(); - } - - getOperationOptions(): OperationOptions { - return this.agentStub.getOperationOptions(); - } - - getGit() { - return this.agentStub.git; - } - - updateProjectName(newName: string): Promise { - return this.agentStub.updateProjectName(newName); - } - - updateBlueprint(patch: Partial): Promise { - return this.agentStub.updateBlueprint(patch); - } - - // Generic debugging helpers — delegate to underlying agent - readFiles(paths: string[]): Promise<{ files: { path: string; content: string }[] }> { - return this.agentStub.readFiles(paths); - } - - runStaticAnalysisCode(files?: string[]): Promise { - return this.agentStub.runStaticAnalysisCode(files); - } - - execCommands(commands: string[], shouldSave: boolean, timeout?: number): Promise { - return this.agentStub.execCommands(commands, shouldSave, timeout); - } - - // Exposes a simplified regenerate API for tools - regenerateFile(path: string, issues: string[]): Promise<{ path: string; diff: string }> { - return this.agentStub.regenerateFileByPath(path, issues); - } - - // Exposes file generation via phase implementation - generateFiles( - phaseName: string, - phaseDescription: string, - requirements: string[], - files: FileConceptType[] - ): Promise<{ files: Array<{ path: string; purpose: string; diff: string }> }> { - return this.agentStub.generateFiles(phaseName, phaseDescription, requirements, files); - } - - isCodeGenerating(): boolean { - return this.agentStub.isCodeGenerating(); - } - - waitForGeneration(): Promise { - return this.agentStub.waitForGeneration(); - } - - isDeepDebugging(): boolean { - return this.agentStub.isDeepDebugging(); - } - - waitForDeepDebug(): Promise { - return this.agentStub.waitForDeepDebug(); - } - - executeDeepDebug( - issue: string, - toolRenderer: RenderToolCall, - streamCb: (chunk: string) => void, - focusPaths?: string[] - ): Promise { - return this.agentStub.executeDeepDebug(issue, toolRenderer, streamCb, focusPaths); - } -} From 868ba34aae25855791f24dff41bebf6ff6f4cb8f Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 12 Nov 2025 01:52:04 -0500 Subject: [PATCH 20/58] fix: ui auto focus, preview hiding and blueprints --- src/routes/chat/chat.tsx | 24 +++++---- .../chat/utils/handle-websocket-message.ts | 28 +++++++++- worker/agents/constants.ts | 1 + worker/agents/core/behaviors/agentic.ts | 52 +++++++++---------- .../tools/toolkit/generate-blueprint.ts | 7 +++ 5 files changed, 75 insertions(+), 37 deletions(-) diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index 32b3fc6d..0be83aad 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -357,9 +357,9 @@ export default function Chat() { }, [behaviorType, files]); const showMainView = useMemo(() => { - // For agentic mode: show preview panel when blueprint generation starts, files appear, or preview URL is available + // For agentic mode: only show preview panel when files or preview URL exist if (behaviorType === 'agentic') { - return isGeneratingBlueprint || !!blueprint || files.length > 0 || !!previewUrl; + return files.length > 0 || !!previewUrl; } // For phasic mode: keep existing logic return streamedBootstrapFiles.length > 0 || !!blueprint || files.length > 0; @@ -388,14 +388,20 @@ export default function Chat() { setActiveFilePath(files[0].filePath); } hasSeenPreview.current = true; - } else if (previewUrl && !hasSeenPreview.current && isPhase1Complete) { - setView('preview'); - setShowTooltip(true); - setTimeout(() => { - setShowTooltip(false); - }, 3000); // Auto-hide tooltip after 3 seconds + } else if (previewUrl && !hasSeenPreview.current) { + // Agentic: auto-switch immediately when preview URL available + // Phasic: require phase 1 complete + const shouldSwitch = behaviorType === 'agentic' || isPhase1Complete; + + if (shouldSwitch) { + setView('preview'); + setShowTooltip(true); + setTimeout(() => { + setShowTooltip(false); + }, 3000); + } } - }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath]); + }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath, behaviorType]); useEffect(() => { if (chatId) { diff --git a/src/routes/chat/utils/handle-websocket-message.ts b/src/routes/chat/utils/handle-websocket-message.ts index 37386c60..8d3563d4 100644 --- a/src/routes/chat/utils/handle-websocket-message.ts +++ b/src/routes/chat/utils/handle-websocket-message.ts @@ -11,7 +11,7 @@ import { setAllFilesCompleted, updatePhaseFileStatus, } from './file-state-helpers'; -import { +import { createAIMessage, handleRateLimitError, handleStreamingMessage, @@ -22,6 +22,7 @@ import { completeStages } from './project-stage-helpers'; import { sendWebSocketMessage } from './websocket-helpers'; import type { FileType, PhaseTimelineItem } from '../hooks/use-chat'; import { toast } from 'sonner'; +import { createRepairingJSONParser } from '@/utils/ndjson-parser/ndjson-parser'; const isPhasicState = (state: AgentState): state is PhasicState => state.behaviorType === 'phasic'; @@ -98,6 +99,10 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { } return ''; }; + + // Blueprint chunk parser (maintained across chunks) + let blueprintParser: ReturnType | null = null; + return (websocket: WebSocket, message: WebSocketMessage) => { const { setFiles, @@ -861,6 +866,27 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { break; } + case 'blueprint_chunk': { + // Initialize parser on first chunk + if (!blueprintParser) { + blueprintParser = createRepairingJSONParser(); + logger.debug('Blueprint streaming started'); + } + + // Feed chunk to parser + blueprintParser.feed(message.chunk); + + // Try to parse partial blueprint + try { + const partial = blueprintParser.finalize(); + setBlueprint(partial); + logger.debug('Blueprint chunk processed, partial blueprint updated'); + } catch (e) { + logger.debug('Blueprint chunk accumulated, waiting for more data'); + } + break; + } + case 'terminal_output': { // Handle terminal output from server if (onTerminalMessage) { diff --git a/worker/agents/constants.ts b/worker/agents/constants.ts index d10b3788..d34a0d3f 100644 --- a/worker/agents/constants.ts +++ b/worker/agents/constants.ts @@ -68,6 +68,7 @@ export const WebSocketMessageResponses: Record = { CONVERSATION_STATE: 'conversation_state', PROJECT_NAME_UPDATED: 'project_name_updated', BLUEPRINT_UPDATED: 'blueprint_updated', + BLUEPRINT_CHUNK: 'blueprint_chunk', // Model configuration info MODEL_CONFIGS_INFO: 'model_configs_info', diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 50b0f8ba..32a42277 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -17,10 +17,8 @@ import { BaseCodingBehavior, BaseCodingOperations } from './base'; import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; import { OperationOptions } from 'worker/agents/operations/common'; -import { ImageAttachment, ProcessedImageAttachment } from '../../../types/image-attachment'; import { compactifyContext } from '../../utils/conversationCompactifier'; import { ConversationMessage, createMultiModalUserMessage, createUserMessage, Message } from '../../inferutils/common'; -import { uploadImage, ImageType } from '../../../utils/images'; import { AbortError } from 'worker/agents/inferutils/core'; interface AgenticOperations extends BaseCodingOperations { @@ -129,31 +127,31 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl await super.onStart(props); } - /** - * Override handleUserInput to just queue messages without AI processing - * Messages will be injected into conversation after tool call completions - */ - async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { - let processedImages: ProcessedImageAttachment[] | undefined; - - if (images && images.length > 0) { - processedImages = await Promise.all(images.map(async (image) => { - return await uploadImage(this.env, image, ImageType.UPLOADS); - })); - - this.logger.info('Uploaded images for queued request', { - imageCount: processedImages.length - }); - } - - await this.queueUserRequest(userMessage, processedImages); - - this.logger.info('User message queued during agentic build', { - message: userMessage, - queueSize: this.state.pendingUserInputs.length, - hasImages: !!processedImages && processedImages.length > 0 - }); - } + // /** + // * Override handleUserInput to just queue messages without AI processing + // * Messages will be injected into conversation after tool call completions + // */ + // async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + // let processedImages: ProcessedImageAttachment[] | undefined; + + // if (images && images.length > 0) { + // processedImages = await Promise.all(images.map(async (image) => { + // return await uploadImage(this.env, image, ImageType.UPLOADS); + // })); + + // this.logger.info('Uploaded images for queued request', { + // imageCount: processedImages.length + // }); + // } + + // await this.queueUserRequest(userMessage, processedImages); + + // this.logger.info('User message queued during agentic build', { + // message: userMessage, + // queueSize: this.state.pendingUserInputs.length, + // hasImages: !!processedImages && processedImages.length > 0 + // }); + // } /** * Handle tool call completion - sync to conversation and check queue/compactification diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts index cf821b01..4ef0a914 100644 --- a/worker/agents/tools/toolkit/generate-blueprint.ts +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -3,6 +3,7 @@ import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; import type { Blueprint } from 'worker/agents/schemas'; +import { WebSocketMessageResponses } from '../../constants'; type GenerateBlueprintArgs = { prompt: string; @@ -50,6 +51,12 @@ export function createGenerateBlueprintTool( frameworks, templateDetails: context.templateDetails, projectType: agent.getProjectType(), + stream: { + chunk_size: 256, + onChunk: (chunk: string) => { + agent.broadcast(WebSocketMessageResponses.BLUEPRINT_CHUNK, { chunk }); + } + } }; const blueprint = await generateBlueprint(args); From be720550bdf97f85635bd3bdeceb4fecd31341d3 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Sat, 15 Nov 2025 21:11:27 -0500 Subject: [PATCH 21/58] feat: add completion detection and dependency-aware tool execution - Added CompletionDetector interface and CompletionConfig for detecting task completion signals - Implemented dependency-aware parallel tool execution engine with resource conflict detection - Added LoopDetector to prevent infinite tool call loops with contextual warnings - Enhanced ToolCallContext with completion signal tracking and warning injection state - Modified tool execution to respect dependencies and execute in parallel groups --- worker/agents/inferutils/core.ts | 118 ++++--- worker/agents/inferutils/infer.ts | 8 +- worker/agents/inferutils/loopDetection.ts | 143 +++++++++ worker/agents/inferutils/toolExecution.ts | 292 ++++++++++++++++++ .../operations/UserConversationProcessor.ts | 26 +- worker/agents/tools/customTools.ts | 62 ++-- worker/agents/tools/resource-types.ts | 112 +++++++ worker/agents/tools/resources.ts | 101 ++++++ .../agents/tools/toolkit/alter-blueprint.ts | 111 +++---- .../tools/toolkit/completion-signals.ts | 76 +++++ worker/agents/tools/toolkit/deep-debugger.ts | 61 ++-- worker/agents/tools/toolkit/deploy-preview.ts | 31 +- worker/agents/tools/toolkit/exec-commands.ts | 52 ++-- worker/agents/tools/toolkit/feedback.ts | 57 +--- .../tools/toolkit/generate-blueprint.ts | 113 +++---- worker/agents/tools/toolkit/generate-files.ts | 76 ++--- .../agents/tools/toolkit/generate-images.ts | 44 +-- worker/agents/tools/toolkit/get-logs.ts | 81 ++--- .../tools/toolkit/get-runtime-errors.ts | 46 ++- worker/agents/tools/toolkit/git.ts | 100 +++--- .../tools/toolkit/init-suitable-template.ts | 189 +++++------- .../agents/tools/toolkit/initialize-slides.ts | 62 ++-- worker/agents/tools/toolkit/queue-request.ts | 43 +-- worker/agents/tools/toolkit/read-files.ts | 43 +-- .../agents/tools/toolkit/regenerate-file.ts | 34 +- worker/agents/tools/toolkit/rename-project.ts | 57 ++-- worker/agents/tools/toolkit/run-analysis.ts | 33 +- .../tools/toolkit/virtual-filesystem.ts | 126 ++++---- worker/agents/tools/toolkit/wait-for-debug.ts | 25 +- .../tools/toolkit/wait-for-generation.ts | 25 +- worker/agents/tools/toolkit/wait.ts | 51 +-- worker/agents/tools/toolkit/web-search.ts | 79 ++--- worker/agents/tools/types.ts | 197 +++++++++++- 33 files changed, 1616 insertions(+), 1058 deletions(-) create mode 100644 worker/agents/inferutils/loopDetection.ts create mode 100644 worker/agents/inferutils/toolExecution.ts create mode 100644 worker/agents/tools/resource-types.ts create mode 100644 worker/agents/tools/resources.ts create mode 100644 worker/agents/tools/toolkit/completion-signals.ts diff --git a/worker/agents/inferutils/core.ts b/worker/agents/inferutils/core.ts index 9a98aec6..53de0d58 100644 --- a/worker/agents/inferutils/core.ts +++ b/worker/agents/inferutils/core.ts @@ -13,16 +13,17 @@ import { type ReasoningEffort, type ChatCompletionChunk, } from 'openai/resources.mjs'; -import { Message, MessageContent, MessageRole } from './common'; -import { ToolCallResult, ToolDefinition } from '../tools/types'; +import { Message, MessageContent, MessageRole, CompletionSignal } from './common'; +import { ToolCallResult, ToolDefinition, toOpenAITool } from '../tools/types'; import { AgentActionKey, AIModels, InferenceMetadata } from './config.types'; +import type { CompletionDetector } from './completionDetection'; // import { SecretsService } from '../../database'; import { RateLimitService } from '../../services/rate-limit/rateLimits'; import { getUserConfigurableSettings } from '../../config'; import { SecurityError, RateLimitExceededError } from 'shared/types/errors'; -import { executeToolWithDefinition } from '../tools/customTools'; import { RateLimitType } from 'worker/services/rate-limit/config'; import { getMaxToolCallingDepth, MAX_LLM_MESSAGES } from '../constants'; +import { executeToolCallsWithDependencies } from './toolExecution'; function optimizeInputs(messages: Message[]): Message[] { return messages.map((message) => ({ @@ -99,7 +100,7 @@ function accumulateToolCallDelta( const before = entry.function.arguments; const chunk = deltaToolCall.function.arguments; - // Check if we already have complete JSON and this is extra data + // Check if we already have complete JSON and this is extra data. Question: Do we want this? let isComplete = false; if (before.length > 0) { try { @@ -321,6 +322,7 @@ type InferArgsBase = { userApiKeys?: Record; abortSignal?: AbortSignal; onAssistantMessage?: (message: Message) => Promise; + completionConfig?: CompletionConfig; }; type InferArgsStructured = InferArgsBase & { @@ -336,6 +338,17 @@ type InferWithCustomFormatArgs = InferArgsStructured & { export interface ToolCallContext { messages: Message[]; depth: number; + completionSignal?: CompletionSignal; + warningInjected?: boolean; +} + +/** + * Configuration for completion signal detection and auto-warning injection. + */ +export interface CompletionConfig { + detector?: CompletionDetector; + operationalMode?: 'initial' | 'followup'; + allowWarningInjection?: boolean; } export function serializeCallChain(context: ToolCallContext, finalResponse: string): string { @@ -409,42 +422,16 @@ export type InferResponseString = { * Execute all tool calls from OpenAI response */ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionToolCall[], originalDefinitions: ToolDefinition[]): Promise { - const toolDefinitions = new Map(originalDefinitions.map(td => [td.function.name, td])); - return Promise.all( - openAiToolCalls.map(async (tc) => { - try { - const args = tc.function.arguments ? JSON.parse(tc.function.arguments) : {}; - const td = toolDefinitions.get(tc.function.name); - if (!td) { - throw new Error(`Tool ${tc.function.name} not found`); - } - const result = await executeToolWithDefinition(tc, td, args); - console.log(`Tool execution result for ${tc.function.name}:`, result); - return { - id: tc.id, - name: tc.function.name, - arguments: args, - result - }; - } catch (error) { - console.error(`Tool execution failed for ${tc.function.name}:`, error); - // Check if error is an abort error - if (error instanceof AbortError) { - console.warn(`Tool call was aborted while executing ${tc.function.name}, ending tool call chain with the latest tool call result`); - throw error; - } - return { - id: tc.id, - name: tc.function.name, - arguments: {}, - result: { error: `Failed to execute ${tc.function.name}: ${error instanceof Error ? error.message : 'Unknown error'}` } - }; - } - }) - ); + // Use dependency-aware execution engine + return executeToolCallsWithDependencies(openAiToolCalls, originalDefinitions); } -function updateToolCallContext(toolCallContext: ToolCallContext | undefined, assistantMessage: Message, executedToolCalls: ToolCallResult[]) { +function updateToolCallContext( + toolCallContext: ToolCallContext | undefined, + assistantMessage: Message, + executedToolCalls: ToolCallResult[], + completionDetector?: CompletionDetector +) { const newMessages = [ ...(toolCallContext?.messages || []), assistantMessage, @@ -459,9 +446,18 @@ function updateToolCallContext(toolCallContext: ToolCallContext | undefined, ass ]; const newDepth = (toolCallContext?.depth ?? 0) + 1; - const newToolCallContext = { + + // Detect completion signal from executed tool calls + let completionSignal = toolCallContext?.completionSignal; + if (completionDetector && !completionSignal) { + completionSignal = completionDetector.detectCompletion(executedToolCalls); + } + + const newToolCallContext: ToolCallContext = { messages: newMessages, - depth: newDepth + depth: newDepth, + completionSignal, + warningInjected: toolCallContext?.warningInjected || false }; return newToolCallContext; } @@ -500,6 +496,7 @@ export async function infer({ temperature, abortSignal, onAssistantMessage, + completionConfig, }: InferArgsBase & { schema?: OutputSchema; schemaName?: string; @@ -628,7 +625,12 @@ export async function infer({ console.log(`Running inference with ${modelName} using structured output with ${format} format, reasoning effort: ${reasoning_effort}, max tokens: ${maxTokens}, temperature: ${temperature}, baseURL: ${baseURL}`); - const toolsOpts = tools ? { tools, tool_choice: 'auto' as const } : {}; + const toolsOpts = tools ? { + tools: tools.map(t => { + return toOpenAITool(t); + }), + tool_choice: 'auto' as const + } : {}; let response: OpenAI.ChatCompletion | OpenAI.ChatCompletionChunk | Stream; try { // Call OpenAI API with proper structured output format @@ -789,12 +791,12 @@ export async function infer({ try { executedToolCalls = await executeToolCalls(toolCalls, tools); } catch (error) { - console.error(`Tool execution failed for ${toolCalls[0].function.name}:`, error); + console.error(`Tool execution failed${toolCalls.length > 0 ? ` for ${toolCalls[0].function.name}` : ''}:`, error); // Check if error is an abort error if (error instanceof AbortError) { console.warn(`Tool call was aborted, ending tool call chain with the latest tool call result`); - const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls, completionConfig?.detector); return { string: content, toolCallContext: newToolCallContext }; } // Otherwise, continue @@ -808,10 +810,30 @@ export async function infer({ if (executedToolCalls.length) { console.log(`Tool calls executed:`, JSON.stringify(executedToolCalls, null, 2)); - const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); - - const executedCallsWithResults = executedToolCalls.filter(result => result.result); - console.log(`${actionKey}: Tool calling depth: ${newToolCallContext.depth}/${getMaxToolCallingDepth(actionKey)}`); + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls, completionConfig?.detector); + + // Stop recursion if completion signal detected + if (newToolCallContext.completionSignal?.signaled) { + console.log(`[COMPLETION] ${newToolCallContext.completionSignal.toolName} called, stopping recursion`); + + if (schema && schemaName) { + throw new AbortError( + `Completion signaled: ${newToolCallContext.completionSignal.summary || 'Task complete'}`, + newToolCallContext + ); + } + return { + string: content || newToolCallContext.completionSignal.summary || 'Task complete', + toolCallContext: newToolCallContext + }; + } + + // Filter completion tools from recursion trigger + const executedCallsWithResults = executedToolCalls.filter(result => + result.result !== undefined && + !(completionConfig?.detector?.isCompletionTool(result.name)) + ); + console.log(`${actionKey}: Tool depth ${newToolCallContext.depth}/${getMaxToolCallingDepth(actionKey)}`); if (executedCallsWithResults.length) { if (schema && schemaName) { @@ -832,6 +854,7 @@ export async function infer({ temperature, abortSignal, onAssistantMessage, + completionConfig, }, newToolCallContext); return output; } else { @@ -848,6 +871,7 @@ export async function infer({ temperature, abortSignal, onAssistantMessage, + completionConfig, }, newToolCallContext); return output; } diff --git a/worker/agents/inferutils/infer.ts b/worker/agents/inferutils/infer.ts index db0907fd..8a050b83 100644 --- a/worker/agents/inferutils/infer.ts +++ b/worker/agents/inferutils/infer.ts @@ -1,4 +1,4 @@ -import { infer, InferError, InferResponseString, InferResponseObject, AbortError } from './core'; +import { infer, InferError, InferResponseString, InferResponseObject, AbortError, CompletionConfig } from './core'; import { createAssistantMessage, createUserMessage, Message } from './common'; import z from 'zod'; // import { CodeEnhancementOutput, CodeEnhancementOutputType } from '../codegen/phasewiseGenerator'; @@ -40,6 +40,7 @@ interface InferenceParamsBase { modelConfig?: ModelConfig; context: InferenceContext; onAssistantMessage?: (message: Message) => Promise; + completionConfig?: CompletionConfig; } interface InferenceParamsStructured extends InferenceParamsBase { @@ -71,7 +72,8 @@ export async function executeInference( { modelName, modelConfig, context, - onAssistantMessage + onAssistantMessage, + completionConfig, }: InferenceParamsBase & { schema?: T; format?: SchemaFormat; @@ -127,6 +129,7 @@ export async function executeInference( { temperature, abortSignal: context.abortSignal, onAssistantMessage, + completionConfig, }) : await infer({ env, metadata: context, @@ -140,6 +143,7 @@ export async function executeInference( { temperature, abortSignal: context.abortSignal, onAssistantMessage, + completionConfig, }); logger.info(`Successfully completed ${agentActionName} operation`); // console.log(result); diff --git a/worker/agents/inferutils/loopDetection.ts b/worker/agents/inferutils/loopDetection.ts new file mode 100644 index 00000000..8991fd0f --- /dev/null +++ b/worker/agents/inferutils/loopDetection.ts @@ -0,0 +1,143 @@ +import { Message, createUserMessage } from './common'; + +/** + * Represents a single tool call record for loop detection + */ +export type ToolCallRecord = { + toolName: string; + args: string; // JSON stringified arguments + timestamp: number; +}; + +/** + * State tracking for loop detection + */ +export type LoopDetectionState = { + recentCalls: ToolCallRecord[]; + repetitionWarnings: number; +}; + +/** + * Detects repetitive tool calls and generates warnings to prevent infinite loops. + * + * Detection Logic: + * - Tracks tool calls within a 2-minute sliding window + * - Flags repetition when 2+ identical calls (same tool + same args) occur + */ +export class LoopDetector { + private state: LoopDetectionState = { + recentCalls: [], + repetitionWarnings: 0, + }; + + detectRepetition(toolName: string, args: Record): boolean { + const argsStr = this.safeStringify(args); + const now = Date.now(); + const WINDOW_MS = 2 * 60 * 1000; + + this.state.recentCalls = this.state.recentCalls.filter( + (call) => now - call.timestamp < WINDOW_MS + ); + + const matchingCalls = this.state.recentCalls.filter( + (call) => call.toolName === toolName && call.args === argsStr + ); + + this.state.recentCalls.push({ + toolName, + args: argsStr, + timestamp: now, + }); + + if (this.state.recentCalls.length > 1000) { + this.state.recentCalls = this.state.recentCalls.slice(-1000); + } + + return matchingCalls.length >= 2; + } + + /** + * Stringify arguments with deterministic key ordering and circular reference handling + */ + private safeStringify(args: Record): string { + try { + const sortedArgs = Object.keys(args) + .sort() + .reduce((acc, key) => { + acc[key] = args[key]; + return acc; + }, {} as Record); + + return JSON.stringify(sortedArgs); + } catch (error) { + return JSON.stringify({ + _error: 'circular_reference_or_stringify_error', + _keys: Object.keys(args).sort(), + _errorMessage: error instanceof Error ? error.message : 'Unknown error', + }); + } + } + + /** + * Generate contextual warning message for injection into conversation history + * + * @param toolName - Name of the tool that's being repeated + * @param assistantType - Type of assistant for completion tool reference + * @returns Message object to inject into conversation + */ + generateWarning(toolName: string, assistantType: 'builder' | 'debugger'): Message { + this.state.repetitionWarnings++; + + const completionTool = + assistantType === 'builder' + ? 'mark_generation_complete' + : 'mark_debugging_complete'; + + const warningMessage = ` +[!ALERT] CRITICAL: POSSIBLE REPETITION DETECTED + +You just attempted to execute "${toolName}" with identical arguments for the ${this.state.repetitionWarnings}th time. + +This indicates you may be stuck in a loop. Please take one of these actions: + +1. **If your task is complete:** + - Call ${completionTool} with a summary of what you accomplished + - STOP immediately after calling the completion tool + - Make NO further tool calls + +2. **If you previously declared completion:** + - Review your recent messages + - If you already called ${completionTool}, HALT immediately + - Do NOT repeat the same work + +3. **If your task is NOT complete:** + - Try a DIFFERENT approach or strategy + - Use DIFFERENT tools than before + - Use DIFFERENT arguments or parameters + - Read DIFFERENT files for more context + - Consider if the current approach is viable + +DO NOT repeat the same action. Doing the same thing repeatedly will not produce different results. + +Once you call ${completionTool}, make NO further tool calls - the system will stop automatically.`.trim(); + + return createUserMessage(warningMessage); + } + + /** + * Get the current warning count + */ + getWarningCount(): number { + return this.state.repetitionWarnings; + } + + /** + * Reset the loop detection state + */ + reset(): void { + this.state = { + recentCalls: [], + repetitionWarnings: 0, + }; + } +} diff --git a/worker/agents/inferutils/toolExecution.ts b/worker/agents/inferutils/toolExecution.ts new file mode 100644 index 00000000..0d405552 --- /dev/null +++ b/worker/agents/inferutils/toolExecution.ts @@ -0,0 +1,292 @@ +import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; +import type { ToolDefinition, ToolCallResult, ResourceAccess } from '../tools/types'; + +/** + * Execution plan for a set of tool calls with dependency-aware parallelization. + * + * The plan groups tools into parallel execution groups, where: + * - Groups execute sequentially (one after another) + * - Tools within a group execute in parallel (simultaneously) + * - Dependencies between tools are automatically respected + */ +export interface ExecutionPlan { + /** + * Parallel execution groups ordered by dependency + * Each group's tools can run simultaneously + * Groups execute in sequence (group N+1 after group N completes) + */ + parallelGroups: ChatCompletionMessageFunctionToolCall[][]; +} + + +/** + * Detect resource conflicts between two tool calls. + */ +function hasResourceConflict( + res1: ResourceAccess, + res2: ResourceAccess +): boolean { + // File conflicts + if (res1.files && res2.files) { + const f1 = res1.files; + const f2 = res2.files; + + // Read-read = no conflict + if (f1.mode === 'read' && f2.mode === 'read') { + // No conflict + } else { + // Write-write or read-write conflict + // Empty paths = all files = conflict + if (f1.paths.length === 0 || f2.paths.length === 0) { + return true; + } + + // Check specific path overlap + const set1 = new Set(f1.paths); + const set2 = new Set(f2.paths); + for (const p of set1) { + if (set2.has(p)) return true; + } + } + } + + // Git conflicts + if (res1.git?.index && res2.git?.index) return true; + if (res1.git?.history && res2.git?.history) return true; + + // any overlap = conflict + if (res1.sandbox && res2.sandbox) return true; + if (res1.deployment && res2.deployment) return true; + if (res1.blueprint && res2.blueprint) return true; + if (res1.logs && res2.logs) return true; + if (res1.staticAnalysis && res2.staticAnalysis) return true; + + return false; +} + +/** + * Build execution plan from tool calls using topological sort. + * + * Algorithm: + * 1. Build dependency graph from: + * - Explicit dependencies (dependsOn) + * - Resource conflicts (writes/reads) + * - Conflict declarations (conflictsWith) + * 2. Topologically sort into parallel groups: + * - Each group contains tools with no mutual dependencies + * - Tools in group N depend only on tools in groups 0..N-1 + * 3. Handle edge cases: + * - Circular dependencies -> fallback to sequential + * - Missing tool definitions -> Warn and skip + */ +export function buildExecutionPlan( + toolCalls: ChatCompletionMessageFunctionToolCall[], + toolDefinitions: Map +): ExecutionPlan { + // Parse arguments and get resource access for each tool call + const toolCallResources = new Map(); + + for (const call of toolCalls) { + const def = toolDefinitions.get(call.function.name); + if (!def) continue; + + try { + const args = JSON.parse(call.function.arguments || '{}'); + const resources = def.resources(args); + toolCallResources.set(call.id, resources); + } catch (error) { + console.warn(`[TOOL_EXECUTION] Failed to parse arguments for ${call.function.name}:`, error); + toolCallResources.set(call.id, {}); + } + } + + // Build dependency graph + const dependencyGraph = new Map>(); + + // Initialize graph nodes + for (const call of toolCalls) { + if (!dependencyGraph.has(call.id)) { + dependencyGraph.set(call.id, new Set()); + } + } + + // Add edges based on resource conflicts + for (const call of toolCalls) { + const callResources = toolCallResources.get(call.id); + if (!callResources) continue; + + const callDeps = dependencyGraph.get(call.id)!; + + // Add resource-based dependencies + for (const otherCall of toolCalls) { + if (otherCall.id === call.id) continue; + + const otherResources = toolCallResources.get(otherCall.id); + if (!otherResources) continue; + + // If tools conflict, make them sequential + if (hasResourceConflict(callResources, otherResources)) { + const callIndex = toolCalls.indexOf(call); + const otherIndex = toolCalls.indexOf(otherCall); + + // Later call depends on earlier call + if (callIndex > otherIndex) { + callDeps.add(otherCall.id); + } + } + } + } + + // Topological sort into parallel groups + const parallelGroups: ChatCompletionMessageFunctionToolCall[][] = []; + const executed = new Set(); + + while (executed.size < toolCalls.length) { + const group: ChatCompletionMessageFunctionToolCall[] = []; + + // Find all tools whose dependencies are satisfied + for (const call of toolCalls) { + if (executed.has(call.id)) continue; + + const deps = dependencyGraph.get(call.id) || new Set(); + const allDepsExecuted = Array.from(deps).every((depId) => executed.has(depId)); + + if (allDepsExecuted) { + group.push(call); + } + } + + // Handle circular dependencies + if (group.length === 0) { + console.warn( + '[TOOL_EXECUTION] Circular dependency detected, falling back to sequential' + ); + + // Add first unexecuted tool to break cycle + for (const call of toolCalls) { + if (!executed.has(call.id)) { + group.push(call); + break; + } + } + } + + parallelGroups.push(group); + group.forEach((call) => executed.add(call.id)); + } + + return { parallelGroups }; +} + +/** + * Execute a single tool call + */ +async function executeSingleTool( + toolCall: ChatCompletionMessageFunctionToolCall, + toolDefinition: ToolDefinition +): Promise { + try { + const args = toolCall.function.arguments ? JSON.parse(toolCall.function.arguments) : {}; + + // Execute lifecycle hooks and implementation + await toolDefinition.onStart?.(toolCall, args); + + const result = await toolDefinition.implementation(args); + + await toolDefinition.onComplete?.(toolCall, args, result); + + return { + id: toolCall.id, + name: toolCall.function.name, + arguments: args, + result, + }; + } catch (error) { + // Propagate abort errors immediately + if (error instanceof Error && error.name === 'AbortError') { + throw error; + } + + // Return error result for other failures + const errorMessage = + error instanceof Error ? error.message : 'Unknown error occurred'; + + return { + id: toolCall.id, + name: toolCall.function.name, + arguments: {}, + result: { + error: `Failed to execute ${toolCall.function.name}: ${errorMessage}`, + }, + }; + } +} + +/** + * Execute tool calls with dependency-aware parallelization. + * + * This is the main entry point for tool execution. It: + * 1. Builds execution plan based on dependencies + * 2. Logs plan for debugging + * 3. Executes groups sequentially, tools within group in parallel + * 4. Collects and returns all results + * + * Performance characteristics: + * - Independent tools: Execute in parallel (speedup = N tools) + * - Dependent tools: Execute sequentially (no speedup) + * - Mixed workflows: Partial parallelization (speedup varies) + */ +export async function executeToolCallsWithDependencies( + toolCalls: ChatCompletionMessageFunctionToolCall[], + toolDefinitions: ToolDefinition[] +): Promise { + // Build tool definition map for fast lookup + const toolDefMap = new Map( + toolDefinitions.map((td) => [td.name, td]) + ); + + // Build execution plan + const plan = buildExecutionPlan(toolCalls, toolDefMap); + + // Log execution plan for debugging + console.log(`[TOOL_EXECUTION] Execution plan: ${plan.parallelGroups.length} parallel groups`); + plan.parallelGroups.forEach((group, i) => { + const toolNames = group.map((c) => c.function.name).join(', '); + const parallelIndicator = group.length > 1 ? ' (parallel)' : ''; + console.log(`[TOOL_EXECUTION] Group ${i + 1}: ${toolNames}${parallelIndicator}`); + }); + + // Execute groups sequentially, tools within group in parallel + const allResults: ToolCallResult[] = []; + + for (const [groupIndex, group] of plan.parallelGroups.entries()) { + console.log( + `[TOOL_EXECUTION] Executing group ${groupIndex + 1}/${plan.parallelGroups.length}` + ); + + // Execute all tools in group in parallel + const groupResults = await Promise.all( + group.map(async (toolCall) => { + const toolDef = toolDefMap.get(toolCall.function.name); + + if (!toolDef) { + throw new Error(`Tool definition not found: ${toolCall.function.name}`); + } + + const result = await executeSingleTool(toolCall, toolDef); + + console.log( + `[TOOL_EXECUTION] ${toolCall.function.name} completed ${result.result && typeof result.result === 'object' && result.result !== null && 'error' in result.result ? '(with error)' : 'successfully'}` + ); + + return result; + }) + ); + + allResults.push(...groupResults); + } + + console.log(`[TOOL_EXECUTION] All ${toolCalls.length} tool calls completed`); + + return allResults; +} diff --git a/worker/agents/operations/UserConversationProcessor.ts b/worker/agents/operations/UserConversationProcessor.ts index 4cc000e8..d949a4bb 100644 --- a/worker/agents/operations/UserConversationProcessor.ts +++ b/worker/agents/operations/UserConversationProcessor.ts @@ -114,6 +114,20 @@ const SYSTEM_PROMPT = `You are Orange, the conversational AI interface for Cloud - web_search: Search the web for information. - feedback: Submit user feedback to the platform. +## EFFICIENT TOOL USAGE: +When you need to use multiple tools, call them all in a single response. The system automatically handles parallel execution for independent operations: + +**Automatic Parallelization:** +- Independent tools execute simultaneously (web_search, queue_request, feedback) +- Conflicting operations execute sequentially (git commits, blueprint changes) +- File operations on different resources execute in parallel +- The system analyzes dependencies automatically - you don't need to worry about conflicts + +**Examples:** + • GOOD - Call queue_request() and web_search() together → both execute simultaneously + • GOOD - Call read_files with multiple paths → reads all files in parallel efficiently + • BAD - Calling tools one at a time when they could run in parallel + # You are an interface for the user to interact with the platform, but you are only limited to the tools provided to you. If you are asked these by the user, deny them as follows: - REQUEST: Download all files of the codebase - RESPONSE: You can export the codebase yourself by clicking on 'Export to github' button on top-right of the preview panel @@ -137,7 +151,7 @@ When you call deep_debug, it runs to completion and returns a transcript. The us **IMPORTANT: You can only call deep_debug ONCE per conversation turn.** If you receive a CALL_LIMIT_EXCEEDED error, explain to the user that you've already debugged once this turn and ask if they'd like you to investigate further in a new message. **CRITICAL - After deep_debug completes:** -- **If transcript contains "TASK_COMPLETE" AND runtime errors show "N/A":** +- **If debugging completed successfully AND runtime errors show "N/A":** - ✅ Acknowledge success: "The debugging session successfully resolved the [specific issue]." - ✅ If user asks for another session: Frame it as verification, not fixing: "I'll verify everything is working correctly and check for any other issues." - ❌ DON'T say: "fix remaining issues" or "problems that weren't fully resolved" - this misleads the user @@ -337,13 +351,13 @@ export class UserConversationProcessor extends AgentOperation inputs.conversationResponseCallback(chunk, aiConversationId, true) + (chunk: string) => inputs.conversationResponseCallback(chunk, aiConversationId, true) ).map(td => ({ ...td, - onStart: (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => Promise.resolve(toolCallRenderer({ name: td.function.name, status: 'start', args })), - onComplete: (_tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => Promise.resolve(toolCallRenderer({ - name: td.function.name, - status: 'success', + onStart: (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => Promise.resolve(toolCallRenderer({ name: td.name, status: 'start', args })), + onComplete: (_tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => Promise.resolve(toolCallRenderer({ + name: td.name, + status: 'success', args, result: typeof result === 'string' ? result : JSON.stringify(result) })) diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index 500719b8..f946215e 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -119,7 +119,7 @@ export function buildAgenticBuilderTools( } /** - * Decorate tool definitions with a renderer for UI visualization and conversation sync + * Decorate tools with renderer for UI visualization and conversation sync */ function withRenderer( tools: ToolDefinition[], @@ -128,34 +128,38 @@ function withRenderer( ): ToolDefinition[] { if (!toolRenderer) return tools; - return tools.map(td => ({ - ...td, - onStart: async (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => { - if (toolRenderer) { - toolRenderer({ name: td.function.name, status: 'start', args }); - } - }, - onComplete: async (tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => { - // UI rendering - if (toolRenderer) { - toolRenderer({ - name: td.function.name, - status: 'success', - args, - result: typeof result === 'string' ? result : JSON.stringify(result) - }); - } + return tools.map(td => { + const originalOnStart = td.onStart; + const originalOnComplete = td.onComplete; - // Conversation sync callback - if (onComplete) { - const toolMessage: Message = { - role: 'tool', - content: typeof result === 'string' ? result : JSON.stringify(result), - name: td.function.name, - tool_call_id: tc.id, - }; - await onComplete(toolMessage); + return { + ...td, + onStart: async (tc: ChatCompletionMessageFunctionToolCall, args: Record) => { + await originalOnStart?.(tc, args); + if (toolRenderer) { + toolRenderer({ name: td.name, status: 'start', args }); + } + }, + onComplete: async (tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => { + await originalOnComplete?.(tc, args, result); + if (toolRenderer) { + toolRenderer({ + name: td.name, + status: 'success', + args, + result: typeof result === 'string' ? result : JSON.stringify(result) + }); + } + if (onComplete) { + const toolMessage: Message = { + role: 'tool', + content: typeof result === 'string' ? result : JSON.stringify(result), + name: td.name, + tool_call_id: tc.id, + }; + await onComplete(toolMessage); + } } - } - })); + }; + }); } diff --git a/worker/agents/tools/resource-types.ts b/worker/agents/tools/resource-types.ts new file mode 100644 index 00000000..78a04aba --- /dev/null +++ b/worker/agents/tools/resource-types.ts @@ -0,0 +1,112 @@ +import { z } from 'zod'; + +import { mergeResources, type Resources } from './resources'; + +export interface Type { + schema: z.ZodType; + resources: ResourceResolver; + describe(desc: string): Type; + optional(): Type; + default(defaultValue: T): Type; +} + +type ResourceResolver = (value: T) => Resources; + +function buildType( + schema: z.ZodTypeAny, + resources: ResourceResolver +): Type { + return { + schema, + resources, + describe: (desc) => buildType(schema.describe(desc), resources), + optional: () => buildType(schema.optional(), (value) => + value === undefined ? {} : resources(value) + ), + default: (defaultValue) => buildType(schema.default(defaultValue), resources), + }; +} + +export function type( + schema: S, + resources: ResourceResolver> +): Type> { + return buildType(schema, resources); +} + +const primitive = { + string: () => type(z.string(), () => ({})), + number: () => type(z.number(), () => ({})), + boolean: () => type(z.boolean(), () => ({})), + + array(itemType: Type) { + return type(z.array(itemType.schema), (items) => { + const merged: Resources = {}; + items.forEach((item) => mergeResources(merged, itemType.resources(item))); + return merged; + }); + }, + + enum(values: T) { + return type(z.enum(values), () => ({})); + }, +}; + +export const t = { + string: primitive.string, + number: primitive.number, + boolean: primitive.boolean, + array: primitive.array, + enum: primitive.enum, + + file: { + read: () => + type(z.string(), (path) => ({ files: { mode: 'read', paths: [path] } })), + write: () => + type(z.string(), (path) => ({ files: { mode: 'write', paths: [path] } })), + }, + + files: { + read: () => + type(z.array(z.string()), (paths) => ({ files: { mode: 'read', paths } })), + write: () => + type(z.array(z.string()), (paths) => ({ files: { mode: 'write', paths } })), + }, + + generation: () => + type( + z.array( + z.object({ + path: z.string(), + description: z.string(), + requirements: z.array(z.string()).optional(), + }) + ), + (specs) => ({ files: { mode: 'write', paths: specs.map((s) => s.path) } }) + ), + + commands: () => + type(z.array(z.string()), () => ({ sandbox: { operation: 'exec' } })), + + analysis: { + files: () => type(z.array(z.string()).optional(), () => ({ sandbox: { operation: 'analysis' } })), + }, + + deployment: { + force: () => type(z.boolean().optional(), () => ({ + sandbox: { operation: 'deploy' }, + files: { mode: 'read', paths: [] }, + })), + }, + + logs: { + reset: () => type(z.boolean().optional(), () => ({ sandbox: { operation: 'read' } })), + durationSeconds: () => type(z.number().optional(), () => ({ sandbox: { operation: 'read' } })), + maxLines: () => type(z.number().optional(), () => ({ sandbox: { operation: 'read' } })), + }, + + runtimeErrors: () => + type(z.literal(true).optional(), () => ({ sandbox: { operation: 'read' } })), + + blueprint: () => type(z.string(), () => ({ blueprint: true })), +}; diff --git a/worker/agents/tools/resources.ts b/worker/agents/tools/resources.ts new file mode 100644 index 00000000..74221141 --- /dev/null +++ b/worker/agents/tools/resources.ts @@ -0,0 +1,101 @@ +export interface Resources { + files?: { + mode: 'read' | 'write'; + paths: string[]; + }; + sandbox?: { + operation: 'exec' | 'analysis' | 'deploy' | 'read'; + }; + blueprint?: boolean; + gitCommit?: boolean; +} + +export function mergeResources(target: Resources, source: Resources): void { + // Merge files + if (source.files) { + if (target.files) { + // If either has empty paths (all files), result is all files + if (target.files.paths.length === 0 || source.files.paths.length === 0) { + target.files.paths = []; + } else { + // Merge paths and deduplicate + const combined = [...target.files.paths, ...source.files.paths]; + target.files.paths = Array.from(new Set(combined)); + } + // Escalate mode to write if either is write + if (source.files.mode === 'write') { + target.files.mode = 'write'; + } + } else { + target.files = { ...source.files, paths: [...source.files.paths] }; + } + } + + // Merge sandbox (last one wins, they should be the same for same tool) + if (source.sandbox) { + target.sandbox = { ...source.sandbox }; + } + + // Merge blueprint + if (source.blueprint) { + target.blueprint = true; + } + + // Merge gitCommit + if (source.gitCommit) { + target.gitCommit = true; + } +} + +/** + * Check if two file path arrays overlap + */ +function pathsOverlap(paths1: string[], paths2: string[]): boolean { + // Empty array means "all files" + if (paths1.length === 0 || paths2.length === 0) { + return true; + } + + // Check for exact path overlap + const set1 = new Set(paths1); + return paths2.some(p => set1.has(p)); +} + +/** + * Determine if two resource sets conflict + */ +export function hasResourceConflict(r1: Resources, r2: Resources): boolean { + // File conflicts: write-write or read-write with path overlap + if (r1.files && r2.files) { + const hasWrite = r1.files.mode === 'write' || r2.files.mode === 'write'; + if (hasWrite && pathsOverlap(r1.files.paths, r2.files.paths)) { + return true; + } + } + + // Sandbox conflicts: exec/analysis/deploy are exclusive + if (r1.sandbox && r2.sandbox) { + const exclusive = ['exec', 'analysis', 'deploy']; + const op1Exclusive = exclusive.includes(r1.sandbox.operation); + const op2Exclusive = exclusive.includes(r2.sandbox.operation); + if (op1Exclusive || op2Exclusive) { + return true; + } + // 'read' operations can run in parallel with each other + } + + // Blueprint: always exclusive + if (r1.blueprint && r2.blueprint) { + return true; + } + + // Git commit: conflicts with file writes + if (r1.gitCommit && r2.files?.mode === 'write') { + return true; + } + if (r2.gitCommit && r1.files?.mode === 'write') { + return true; + } + + return false; +} diff --git a/worker/agents/tools/toolkit/alter-blueprint.ts b/worker/agents/tools/toolkit/alter-blueprint.ts index e11eaaaa..6854fc11 100644 --- a/worker/agents/tools/toolkit/alter-blueprint.ts +++ b/worker/agents/tools/toolkit/alter-blueprint.ts @@ -1,72 +1,59 @@ -import { ToolDefinition } from '../types'; +import { tool, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { Blueprint } from 'worker/agents/schemas'; - -type AlterBlueprintArgs = { - patch: Record; -}; +import { z } from 'zod'; export function createAlterBlueprintTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - // Build behavior-aware schema at tool creation time (tools are created per-agent) - const isAgentic = agent.getBehavior() === 'agentic'; + agent: ICodingAgent, + logger: StructuredLogger +) { + const isAgentic = agent.getBehavior() === 'agentic'; + + const agenticPatchSchema = z.object({ + title: z.string().optional(), + projectName: z.string().min(3).max(50).regex(/^[a-z0-9-_]+$/).optional(), + description: z.string().optional(), + detailedDescription: z.string().optional(), + colorPalette: z.array(z.string()).optional(), + frameworks: z.array(z.string()).optional(), + plan: z.array(z.string()).optional(), + }); - const agenticProperties = { - title: { type: 'string' }, - projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, - description: { type: 'string' }, - detailedDescription: { type: 'string' }, - colorPalette: { type: 'array', items: { type: 'string' } }, - frameworks: { type: 'array', items: { type: 'string' } }, - // Agentic-only: plan - plan: { type: 'array', items: { type: 'string' } }, - } as const; + const phasicPatchSchema = z.object({ + title: z.string().optional(), + projectName: z.string().min(3).max(50).regex(/^[a-z0-9-_]+$/).optional(), + description: z.string().optional(), + detailedDescription: z.string().optional(), + colorPalette: z.array(z.string()).optional(), + frameworks: z.array(z.string()).optional(), + views: z.array(z.object({ name: z.string(), description: z.string() })).optional(), + userFlow: z.object({ uiLayout: z.string().optional(), uiDesign: z.string().optional(), userJourney: z.string().optional() }).optional(), + dataFlow: z.string().optional(), + architecture: z.object({ dataFlow: z.string().optional() }).optional(), + pitfalls: z.array(z.string()).optional(), + implementationRoadmap: z.array(z.object({ phase: z.string(), description: z.string() })).optional(), + }); - const phasicProperties = { - title: { type: 'string' }, - projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, - description: { type: 'string' }, - detailedDescription: { type: 'string' }, - colorPalette: { type: 'array', items: { type: 'string' } }, - frameworks: { type: 'array', items: { type: 'string' } }, - views: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { name: { type: 'string' }, description: { type: 'string' } }, required: ['name', 'description'] } }, - userFlow: { type: 'object', additionalProperties: false, properties: { uiLayout: { type: 'string' }, uiDesign: { type: 'string' }, userJourney: { type: 'string' } } }, - dataFlow: { type: 'string' }, - architecture: { type: 'object', additionalProperties: false, properties: { dataFlow: { type: 'string' } } }, - pitfalls: { type: 'array', items: { type: 'string' } }, - implementationRoadmap: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { phase: { type: 'string' }, description: { type: 'string' } }, required: ['phase', 'description'] } }, - // No plan here; phasic handles phases separately - } as const; + const patchSchema = isAgentic ? agenticPatchSchema : phasicPatchSchema; - const dynamicPatchSchema = isAgentic ? agenticProperties : phasicProperties; + const patchType = type( + patchSchema, + () => ({ blueprint: true }) + ); - return { - type: 'function' as const, - function: { - name: 'alter_blueprint', - description: isAgentic - ? 'Apply a patch to the agentic blueprint (title, description, colorPalette, frameworks, plan, projectName).' - : 'Apply a patch to the phasic blueprint (title, description, colorPalette, frameworks, views, userFlow, architecture, dataFlow, pitfalls, implementationRoadmap, projectName).', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - patch: { - type: 'object', - additionalProperties: false, - properties: dynamicPatchSchema as Record, - }, - }, - required: ['patch'], - }, - }, - implementation: async ({ patch }) => { - logger.info('Altering blueprint', { keys: Object.keys(patch || {}) }); - const updated = await agent.updateBlueprint(patch as Partial); - return updated; - }, - }; + return tool({ + name: 'alter_blueprint', + description: isAgentic + ? 'Apply a patch to the agentic blueprint (title, description, colorPalette, frameworks, plan, projectName).' + : 'Apply a patch to the phasic blueprint (title, description, colorPalette, frameworks, views, userFlow, architecture, dataFlow, pitfalls, implementationRoadmap, projectName).', + args: { + patch: patchType, + }, + run: async ({ patch }) => { + logger.info('Altering blueprint', { keys: Object.keys(patch || {}) }); + const updated = await agent.updateBlueprint(patch as Partial); + return updated; + }, + }); } diff --git a/worker/agents/tools/toolkit/completion-signals.ts b/worker/agents/tools/toolkit/completion-signals.ts new file mode 100644 index 00000000..d8f304d9 --- /dev/null +++ b/worker/agents/tools/toolkit/completion-signals.ts @@ -0,0 +1,76 @@ +import { tool, t, ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; + +type CompletionResult = { + acknowledged: true; + message: string; +}; + +export function createMarkGenerationCompleteTool( + logger: StructuredLogger +): ToolDefinition<{ summary: string; filesGenerated: number }, CompletionResult> { + return tool({ + name: 'mark_generation_complete', + description: `Signal that initial project generation is complete. Use this when: +- All planned features/files have been generated based on the blueprint +- Project is functional and meets the specified requirements +- All errors have been resolved (run_analysis passes, no runtime errors) +- You have verified everything works via deploy_preview + +CRITICAL: This is for INITIAL PROJECT BUILDS only. + +For follow-up conversations where the user asks for tweaks, additions, or modifications +to an existing project, just respond naturally - DO NOT call this tool. + +Once you call this tool, make NO further tool calls. The system will stop immediately.`, + args: { + summary: t.string().describe('Brief summary of what was built (2-3 sentences max). Describe the key features and functionality implemented.'), + filesGenerated: t.number().describe('Total count of files generated during this build session'), + }, + run: async ({ summary, filesGenerated }) => { + logger.info('Generation marked complete', { + summary, + filesGenerated, + timestamp: new Date().toISOString() + }); + + return { + acknowledged: true as const, + message: `Generation completion acknowledged. Successfully built project with ${filesGenerated} files. ${summary}`, + }; + }, + }); +} + +export function createMarkDebuggingCompleteTool( + logger: StructuredLogger +): ToolDefinition<{ summary: string; issuesFixed: number }, CompletionResult> { + return tool({ + name: 'mark_debugging_complete', + description: `Signal that debugging task is complete. Use this when: +- All reported issues have been fixed +- Verification confirms fixes work (run_analysis passes, get_runtime_errors shows no errors) +- No new errors were introduced by your changes +- All task requirements have been met + +DO NOT call this tool if you are still investigating issues or in the process of fixing them. + +Once you call this tool, make NO further tool calls. The system will stop immediately.`, + args: { + summary: t.string().describe('Brief summary of what was fixed (2-3 sentences max). Describe the issues resolved and verification performed.'), + issuesFixed: t.number().describe('Count of issues successfully resolved'), + }, + run: async ({ summary, issuesFixed }) => { + logger.info('Debugging marked complete', { + summary, + issuesFixed, + timestamp: new Date().toISOString() + }); + + return { + acknowledged: true as const, + message: `Debugging completion acknowledged. Successfully fixed ${issuesFixed} issue(s). ${summary}`, + }; + }, + }); +} diff --git a/worker/agents/tools/toolkit/deep-debugger.ts b/worker/agents/tools/toolkit/deep-debugger.ts index f9e3e154..29b2b9de 100644 --- a/worker/agents/tools/toolkit/deep-debugger.ts +++ b/worker/agents/tools/toolkit/deep-debugger.ts @@ -1,48 +1,44 @@ -import { ToolDefinition } from '../types'; +import { tool, t, type Type, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { RenderToolCall } from 'worker/agents/operations/UserConversationProcessor'; +import { z } from 'zod'; export function createDeepDebuggerTool( agent: ICodingAgent, logger: StructuredLogger, - toolRenderer: RenderToolCall, - streamCb: (chunk: string) => void, -): ToolDefinition< - { issue: string; focus_paths?: string[] }, - { transcript: string } | { error: string } -> { - // Track calls per conversation turn (resets when buildTools is called again) + toolRenderer: RenderToolCall, + streamCb: (chunk: string) => void +) { let callCount = 0; - - return { - type: 'function', - function: { - name: 'deep_debug', - description: - 'Autonomous debugging assistant that investigates errors, reads files, and applies fixes. CANNOT run during code generation - will return GENERATION_IN_PROGRESS error if generation is active. LIMITED TO ONE CALL PER CONVERSATION TURN.', - parameters: { - type: 'object', - properties: { - issue: { type: 'string' }, - focus_paths: { type: 'array', items: { type: 'string' } }, - }, - required: ['issue'], - }, + + const focusPathsType: Type = type( + z.array(z.string()).optional(), + (paths: string[] | undefined) => ({ + files: paths ? { mode: 'write', paths } : { mode: 'write', paths: [] }, + gitCommit: true, + sandbox: { operation: 'deploy' }, + }) + ); + + return tool({ + name: 'deep_debug', + description: + 'Autonomous debugging assistant that investigates errors, reads files, and applies fixes. CANNOT run during code generation - will return GENERATION_IN_PROGRESS error if generation is active. LIMITED TO ONE CALL PER CONVERSATION TURN.', + args: { + issue: t.string().describe('Description of the issue to debug'), + focus_paths: focusPathsType.describe('Optional array of file paths to focus debugging on'), }, - implementation: async ({ issue, focus_paths }: { issue: string; focus_paths?: string[] }) => { - // Check if already called in this turn + run: async ({ issue, focus_paths }) => { if (callCount > 0) { logger.warn('Cannot start debugging: Already called once this turn'); return { error: 'CALL_LIMIT_EXCEEDED: You are only allowed to make a single deep_debug call per conversation turn. Ask user for permission before trying again.' }; } - - // Increment call counter + callCount++; - - // Check if code generation is in progress + if (agent.isCodeGenerating()) { logger.warn('Cannot start debugging: Code generation in progress'); return { @@ -50,7 +46,6 @@ export function createDeepDebuggerTool( }; } - // Check if another debug session is running if (agent.isDeepDebugging()) { logger.warn('Cannot start debugging: Another debug session in progress'); return { @@ -58,15 +53,13 @@ export function createDeepDebuggerTool( }; } - // Execute debug session - agent handles all logic internally const result = await agent.executeDeepDebug(issue, toolRenderer, streamCb, focus_paths); - - // Convert discriminated union to tool response format + if (result.success) { return { transcript: result.transcript }; } else { return { error: result.error }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/deploy-preview.ts b/worker/agents/tools/toolkit/deploy-preview.ts index 36995c79..b3631158 100644 --- a/worker/agents/tools/toolkit/deploy-preview.ts +++ b/worker/agents/tools/toolkit/deploy-preview.ts @@ -1,30 +1,19 @@ -import { ErrorResult, ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type DeployPreviewArgs = Record; - -type DeployPreviewResult = { message: string } | ErrorResult; - export function createDeployPreviewTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'deploy_preview', - description: - 'Uploads and syncs the current application to the preview environment. After deployment, the app is live at the preview URL, but runtime logs (get_logs) will only appear when the user interacts with the app - not automatically after deployment. CRITICAL: After deploying, use wait(20-30) to allow time for user interaction before checking logs. Use force_redeploy=true to force a redeploy (will reset session ID and spawn a new sandbox, is expensive) ', - parameters: { - type: 'object', - properties: { - force_redeploy: { type: 'boolean' }, - }, - required: [], - }, +) { + return tool({ + name: 'deploy_preview', + description: + 'Uploads and syncs the current application to the preview environment. After deployment, the app is live at the preview URL, but runtime logs (get_logs) will only appear when the user interacts with the app - not automatically after deployment. CRITICAL: After deploying, use wait(20-30) to allow time for user interaction before checking logs. Use force_redeploy=true to force a redeploy (will reset session ID and spawn a new sandbox, is expensive) ', + args: { + force_redeploy: t.deployment.force().describe('Force a full redeploy (resets session ID and spawns new sandbox)'), }, - implementation: async ({ force_redeploy }: { force_redeploy?: boolean }) => { + run: async ({ force_redeploy }) => { try { logger.info('Deploying preview to sandbox environment'); const result = await agent.deployPreview(undefined, force_redeploy); @@ -39,5 +28,5 @@ export function createDeployPreviewTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/exec-commands.ts b/worker/agents/tools/toolkit/exec-commands.ts index 3e947455..5e8f43ad 100644 --- a/worker/agents/tools/toolkit/exec-commands.ts +++ b/worker/agents/tools/toolkit/exec-commands.ts @@ -1,45 +1,35 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { ExecuteCommandsResponse } from 'worker/services/sandbox/sandboxTypes'; -export type ExecCommandsArgs = { - commands: string[]; - shouldSave: boolean; - timeout?: number; -}; - -export type ExecCommandsResult = ExecuteCommandsResponse | ErrorResult; +export type ExecCommandsResult = ExecuteCommandsResponse | { error: string }; export function createExecCommandsTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'exec_commands', - description: - 'Execute shell commands in the sandbox. CRITICAL shouldSave rules: (1) Set shouldSave=true ONLY for package management with specific packages (e.g., "bun add react", "npm install lodash"). (2) Set shouldSave=false for: file operations (rm, mv, cp), plain installs ("bun install"), run commands ("bun run dev"), and temporary operations. Invalid commands in shouldSave=true will be automatically filtered out. Always use bun for package management.', - parameters: { - type: 'object', - properties: { - commands: { type: 'array', items: { type: 'string' } }, - shouldSave: { type: 'boolean', default: true }, - timeout: { type: 'number', default: 30000 }, - }, - required: ['commands'], - }, + logger: StructuredLogger +) { + return tool({ + name: 'exec_commands', + description: + 'Execute shell commands in the sandbox. CRITICAL shouldSave rules: (1) Set shouldSave=true ONLY for package management with specific packages (e.g., "bun add react", "npm install lodash"). (2) Set shouldSave=false for: file operations (rm, mv, cp), plain installs ("bun install"), run commands ("bun run dev"), and temporary operations. Invalid commands in shouldSave=true will be automatically filtered out. Always use bun for package management.', + args: { + commands: t.commands().describe('Array of shell commands to execute'), + shouldSave: t.boolean().default(true).describe('Whether to save package management commands to blueprint'), + timeout: t.number().default(30000).describe('Timeout in milliseconds'), }, - implementation: async ({ commands, shouldSave = true, timeout = 30000 }) => { + run: async ({ commands, shouldSave, timeout }) => { try { + const shouldSaveValue = shouldSave ?? true; + const timeoutValue = timeout ?? 30000; + logger.info('Executing commands', { count: commands.length, - commands, - shouldSave, - timeout, + commands, + shouldSave: shouldSaveValue, + timeout: timeoutValue, }); - return await agent.execCommands(commands, shouldSave, timeout); + return await agent.execCommands(commands, shouldSaveValue, timeoutValue); } catch (error) { return { error: @@ -49,5 +39,5 @@ export function createExecCommandsTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/feedback.ts b/worker/agents/tools/toolkit/feedback.ts index 37d1fcff..726f7f88 100644 --- a/worker/agents/tools/toolkit/feedback.ts +++ b/worker/agents/tools/toolkit/feedback.ts @@ -1,6 +1,6 @@ import { captureMessage, withScope, flush } from '@sentry/cloudflare'; import { env } from 'cloudflare:workers'; -import { ErrorResult, ToolDefinition } from '../types'; +import { ErrorResult, tool, t } from '../types'; type FeedbackArgs = { message: string; @@ -22,29 +22,24 @@ const submitFeedbackImplementation = async ( }; } - // Use withScope to isolate this event's context const eventId = withScope((scope) => { - // Set tags for categorization scope.setTags({ type: args.type, severity: args.severity || 'medium', source: 'ai_conversation_tool', }); - // Set context for additional information scope.setContext('feedback', { user_provided_context: args.context || 'No additional context', submission_type: args.type, }); - // Capture the message with appropriate severity level return captureMessage( args.message, args.type === 'bug' ? 'error' : 'info' ); }); - // Flush to ensure it's sent immediately await flush(2000); return { @@ -61,44 +56,14 @@ const submitFeedbackImplementation = async ( } }; -export const toolFeedbackDefinition: ToolDefinition< - FeedbackArgs, - FeedbackResult -> = { - type: 'function' as const, - function: { - name: 'submit_feedback', - description: - 'Submit bug reports or user feedback to the development team. ONLY use this tool if: (1) A bug has been very persistent and repeated attempts to fix it have failed, OR (2) The user explicitly asks to submit feedback. Do NOT use this for every bug - only for critical or persistent issues.', - parameters: { - type: 'object', - properties: { - message: { - type: 'string', - description: - 'Clear description of the bug or feedback. Include what the user tried, what went wrong, and any error messages.', - minLength: 20, - }, - type: { - type: 'string', - enum: ['bug', 'feedback'], - description: - "'bug' for persistent technical issues, 'feedback' for feature requests or general comments", - }, - severity: { - type: 'string', - enum: ['low', 'medium', 'high'], - description: - "Severity level - 'high' only for critical blocking issues", - }, - context: { - type: 'string', - description: - 'Additional context about the project, what the user was trying to build, or environment details', - }, - }, - required: ['message', 'type'], - }, +export const toolFeedbackDefinition = tool({ + name: 'submit_feedback', + description: 'Submit bug reports or user feedback to the development team. ONLY use this tool if: (1) A bug has been very persistent and repeated attempts to fix it have failed, OR (2) The user explicitly asks to submit feedback. Do NOT use this for every bug - only for critical or persistent issues.', + args: { + message: t.string().describe('Clear description of the bug or feedback. Include what the user tried, what went wrong, and any error messages.'), + type: t.enum(['bug', 'feedback'] as const).describe("'bug' for persistent technical issues, 'feedback' for feature requests or general comments"), + severity: t.enum(['low', 'medium', 'high'] as const).optional().describe("Severity level - 'high' only for critical blocking issues"), + context: t.string().optional().describe('Additional context about the project, what the user was trying to build, or environment details'), }, - implementation: submitFeedbackImplementation, -}; + run: submitFeedbackImplementation, +}); diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts index 4ef0a914..43b52e5d 100644 --- a/worker/agents/tools/toolkit/generate-blueprint.ts +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -1,74 +1,53 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; -import type { Blueprint } from 'worker/agents/schemas'; import { WebSocketMessageResponses } from '../../constants'; -type GenerateBlueprintArgs = { - prompt: string; -}; -type GenerateBlueprintResult = { message: string; blueprint: Blueprint }; - -/** - * Generates a blueprint - */ export function createGenerateBlueprintTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'generate_blueprint', - description: - 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic. Provide a description/prompt for the project to generate a blueprint.', - parameters: { - type: 'object', - properties: { - prompt: { - type: 'string', - description: 'Prompt/user query for building the project. Use this to provide clarifications, additional requirements, or refined specifications based on conversation context.' - } - }, - required: ['prompt'], - }, - }, - implementation: async ({ prompt }: GenerateBlueprintArgs) => { - const { env, inferenceContext, context } = agent.getOperationOptions(); - - const isAgentic = agent.getBehavior() === 'agentic'; - - // Language/frameworks are optional; provide sensible defaults - const language = 'typescript'; - const frameworks: string[] = []; - - const args: AgenticBlueprintGenerationArgs = { - env, - inferenceContext, - query: prompt, - language, - frameworks, - templateDetails: context.templateDetails, - projectType: agent.getProjectType(), - stream: { - chunk_size: 256, - onChunk: (chunk: string) => { - agent.broadcast(WebSocketMessageResponses.BLUEPRINT_CHUNK, { chunk }); - } - } - }; - const blueprint = await generateBlueprint(args); - - // Persist in state for subsequent steps - await agent.setBlueprint(blueprint); - - logger.info('Blueprint generated via tool', { - behavior: isAgentic ? 'agentic' : 'phasic', - title: blueprint.title, - }); - - return { message: 'Blueprint generated successfully', blueprint }; - }, - }; + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'generate_blueprint', + description: + 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic. Provide a description/prompt for the project to generate a blueprint.', + args: { + prompt: t.blueprint().describe('Prompt/user query for building the project. Use this to provide clarifications, additional requirements, or refined specifications based on conversation context.'), + }, + run: async ({ prompt }) => { + const { env, inferenceContext, context } = agent.getOperationOptions(); + + const isAgentic = agent.getBehavior() === 'agentic'; + + const language = 'typescript'; + const frameworks: string[] = []; + + const args: AgenticBlueprintGenerationArgs = { + env, + inferenceContext, + query: prompt, + language, + frameworks, + templateDetails: context.templateDetails, + projectType: agent.getProjectType(), + stream: { + chunk_size: 256, + onChunk: (chunk: string) => { + agent.broadcast(WebSocketMessageResponses.BLUEPRINT_CHUNK, { chunk }); + } + } + }; + const blueprint = await generateBlueprint(args); + + await agent.setBlueprint(blueprint); + + logger.info('Blueprint generated via tool', { + behavior: isAgentic ? 'agentic' : 'phasic', + title: blueprint.title, + }); + + return { message: 'Blueprint generated successfully', blueprint }; + }, + }); } diff --git a/worker/agents/tools/toolkit/generate-files.ts b/worker/agents/tools/toolkit/generate-files.ts index db513d78..43f3dc47 100644 --- a/worker/agents/tools/toolkit/generate-files.ts +++ b/worker/agents/tools/toolkit/generate-files.ts @@ -1,32 +1,23 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { FileConceptType } from 'worker/agents/schemas'; -export type GenerateFilesArgs = { - phase_name: string; - phase_description: string; - requirements: string[]; - files: FileConceptType[]; -}; - export type GenerateFilesResult = | { files: Array<{ path: string; purpose: string; diff: string }>; summary: string; } - | ErrorResult; + | { error: string }; export function createGenerateFilesTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'generate_files', - description: `Generate new files or completely rewrite existing files using the full phase implementation system. - + logger: StructuredLogger +) { + return tool({ + name: 'generate_files', + description: `Generate new files or completely rewrite existing files using the full phase implementation system. + Use this when: - File(s) don't exist and need to be created - regenerate_file failed (file too broken to patch) @@ -40,42 +31,13 @@ The system will: 4. Return diffs for all generated files Provide detailed, specific requirements. The more detail, the better the results.`, - parameters: { - type: 'object', - properties: { - phase_name: { - type: 'string', - description: - 'Short, descriptive name for what you\'re generating (e.g., "Add data export utilities")', - }, - phase_description: { - type: 'string', - description: 'Brief description of what these files should accomplish', - }, - requirements: { - type: 'array', - items: { type: 'string' }, - description: - 'Array of specific, detailed requirements. Be explicit about function signatures, types, implementation details.', - }, - files: { - type: 'array', - items: { - type: 'object', - properties: { - path: { type: 'string', description: 'File path relative to project root' }, - purpose: { type: 'string', description: 'Brief description of file purpose' }, - changes: { type: ['string', 'null'], description: 'Specific changes for existing files, or null for new files' } - }, - required: ['path', 'purpose', 'changes'] - }, - description: 'Array of files to generate with their paths and purposes' - }, - }, - required: ['phase_name', 'phase_description', 'requirements', 'files'], - }, + args: { + phase_name: t.string().describe('Short, descriptive name for what you\'re generating (e.g., "Add data export utilities")'), + phase_description: t.string().describe('Brief description of what these files should accomplish'), + requirements: t.array(t.string()).describe('Array of specific, detailed requirements. Be explicit about function signatures, types, implementation details.'), + files: t.generation().describe('Array of file specs with path and description (purpose). Requirements field is optional for finetuning expectations.'), }, - implementation: async ({ phase_name, phase_description, requirements, files }) => { + run: async ({ phase_name, phase_description, requirements, files }) => { try { logger.info('Generating files via phase implementation', { phase_name, @@ -83,7 +45,13 @@ Provide detailed, specific requirements. The more detail, the better the results filesCount: files.length, }); - const result = await agent.generateFiles(phase_name, phase_description, requirements, files); + const fileConcepts: FileConceptType[] = files.map((file) => ({ + path: file.path, + purpose: file.description, + changes: null, + })); + + const result = await agent.generateFiles(phase_name, phase_description, requirements, fileConcepts); return { files: result.files.map((f) => ({ @@ -102,5 +70,5 @@ Provide detailed, specific requirements. The more detail, the better the results }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/generate-images.ts b/worker/agents/tools/toolkit/generate-images.ts index 7a971185..32d3fa2e 100644 --- a/worker/agents/tools/toolkit/generate-images.ts +++ b/worker/agents/tools/toolkit/generate-images.ts @@ -1,35 +1,21 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type GenerateImagesArgs = { - prompts: string[]; - style?: string; -}; - -type GenerateImagesResult = { message: string }; - export function createGenerateImagesTool( - _agent: ICodingAgent, - _logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'generate_images', - description: 'Generate images for the project (stub). Use later when the image generation pipeline is available.', - parameters: { - type: 'object', - properties: { - prompts: { type: 'array', items: { type: 'string' } }, - style: { type: 'string' }, - }, - required: ['prompts'], - }, - }, - implementation: async ({ prompts, style }: GenerateImagesArgs) => { - return { message: `Image generation not implemented yet. Requested ${prompts.length} prompt(s)${style ? ` with style ${style}` : ''}.` }; - }, - }; + _agent: ICodingAgent, + _logger: StructuredLogger +) { + return tool({ + name: 'generate_images', + description: 'Generate images for the project (stub). Use later when the image generation pipeline is available.', + args: { + prompts: t.array(t.string()).describe('Array of image generation prompts'), + style: t.string().optional().describe('Optional style parameter for image generation'), + }, + run: async ({ prompts, style }) => { + return { message: `Image generation not implemented yet. Requested ${prompts.length} prompt(s)${style ? ` with style ${style}` : ''}.` }; + }, + }); } diff --git a/worker/agents/tools/toolkit/get-logs.ts b/worker/agents/tools/toolkit/get-logs.ts index b2214201..1f4b32f4 100644 --- a/worker/agents/tools/toolkit/get-logs.ts +++ b/worker/agents/tools/toolkit/get-logs.ts @@ -1,25 +1,15 @@ -import { ErrorResult, ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type GetLogsArgs = { - reset?: boolean; - durationSeconds?: number; - maxLines?: number; -}; - -type GetLogsResult = { logs: string } | ErrorResult; - export function createGetLogsTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'get_logs', - description: - `Get cumulative application/server logs from the sandbox environment. +) { + return tool({ + name: 'get_logs', + description: + `Get cumulative application/server logs from the sandbox environment. **USE SPARINGLY:** Only call when get_runtime_errors and run_analysis don't provide enough information. Logs are verbose and cumulative - prefer other diagnostic tools first. @@ -29,55 +19,40 @@ export function createGetLogsTool( 3. Check timestamps vs. your deploy times **WHEN TO USE:** -- ✅ Need to see console output or detailed execution flow -- ✅ Runtime errors lack detail and static analysis passes -- ❌ DON'T use as first diagnostic - try get_runtime_errors and run_analysis first +- Need to see console output or detailed execution flow +- Runtime errors lack detail and static analysis passes +- DON'T use as first diagnostic - try get_runtime_errors and run_analysis first **DEFAULTS:** 30s window, 100 lines, no reset. Logs are USER-DRIVEN (require user interaction). **RESET:** Set reset=true to clear accumulated logs before fetching. Use when starting fresh debugging or after major fixes.`, - parameters: { - type: 'object', - properties: { - reset: { - type: 'boolean', - description: 'Clear accumulated logs before fetching. Default: false. Set to true when starting fresh debugging or after major fixes to avoid stale errors.', - }, - durationSeconds: { - type: 'number', - description: 'Time window in seconds. Default: 30 seconds (recent activity). Set to higher value if you need older logs.', - }, - maxLines: { - type: 'number', - description: 'Maximum lines to return. Default: 100. Set to -1 for no truncation (warning: heavy token usage). Increase to 200-500 for more context.', - }, - }, - required: [], - }, + args: { + reset: t.logs.reset().describe('Clear accumulated logs before fetching. Default: false. Set to true when starting fresh debugging or after major fixes to avoid stale errors.'), + durationSeconds: t.logs.durationSeconds().describe('Time window in seconds. Default: 30 seconds (recent activity). Set to higher value if you need older logs.'), + maxLines: t.logs.maxLines().describe('Maximum lines to return. Default: 100. Set to -1 for no truncation (warning: heavy token usage). Increase to 200-500 for more context.'), }, - implementation: async (args?) => { + run: async ({ reset, durationSeconds, maxLines }) => { try { - const reset = args?.reset ?? false; // Default: don't reset - const durationSeconds = args?.durationSeconds ?? 30; // Default to last 30 seconds - const maxLines = args?.maxLines ?? 100; // Default to 100 lines - - logger.info('Fetching application logs', { reset, durationSeconds, maxLines }); - const logs = await agent.getLogs(reset, durationSeconds); - - // Truncate logs if maxLines is not -1 - if (maxLines !== -1 && logs) { + const resetValue = reset ?? false; + const duration = durationSeconds ?? 30; + const maxLinesValue = maxLines ?? 100; + + logger.info('Fetching application logs', { reset: resetValue, durationSeconds: duration, maxLines: maxLinesValue }); + const logs = await agent.getLogs(resetValue, duration); + + if (maxLinesValue !== -1 && logs) { const lines = logs.split('\n'); - if (lines.length > maxLines) { - const truncatedLines = lines.slice(-maxLines); // Keep last N lines (most recent) + if (lines.length > maxLinesValue) { + const truncatedLines = lines.slice(-maxLinesValue); const truncatedLog = [ - `[TRUNCATED: Showing last ${maxLines} of ${lines.length} lines. Set maxLines higher or to -1 for full output]`, + `[TRUNCATED: Showing last ${maxLinesValue} of ${lines.length} lines. Set maxLines higher or to -1 for full output]`, ...truncatedLines ].join('\n'); - logger.info('Logs truncated', { originalLines: lines.length, truncatedLines: maxLines }); + logger.info('Logs truncated', { originalLines: lines.length, truncatedLines: maxLinesValue }); return { logs: truncatedLog }; } } - + return { logs }; } catch (error) { return { @@ -88,5 +63,5 @@ export function createGetLogsTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/get-runtime-errors.ts b/worker/agents/tools/toolkit/get-runtime-errors.ts index c3e35277..a6a74a91 100644 --- a/worker/agents/tools/toolkit/get-runtime-errors.ts +++ b/worker/agents/tools/toolkit/get-runtime-errors.ts @@ -1,22 +1,15 @@ -import { ErrorResult, ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -import { RuntimeError } from 'worker/services/sandbox/sandboxTypes'; - -type GetRuntimeErrorsArgs = Record; - -type GetRuntimeErrorsResult = { errors: RuntimeError[] } | ErrorResult; export function createGetRuntimeErrorsTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'get_runtime_errors', - description: - `Fetch latest runtime errors from the sandbox error storage. These are errors captured by the runtime error detection system. +) { + return tool({ + name: 'get_runtime_errors', + description: + `Fetch latest runtime errors from the sandbox error storage. These are errors captured by the runtime error detection system. **IMPORTANT CHARACTERISTICS:** - Runtime errors are USER-INTERACTION DRIVEN - they only appear when users interact with the app @@ -30,26 +23,23 @@ export function createGetRuntimeErrorsTool( 4. Call get_runtime_errors again to verify errors are resolved **When to use:** -- ✅ To see what runtime errors users have encountered -- ✅ After deploying fixes to verify issues are resolved -- ✅ To understand error patterns in the application +- To see what runtime errors users have encountered +- After deploying fixes to verify issues are resolved +- To understand error patterns in the application **When NOT to use:** -- ❌ Immediately after deploy (errors need user interaction to generate) -- ❌ In rapid succession (errors update on user interaction, not continuously)`, - parameters: { - type: 'object', - properties: {}, - required: [], - }, +- Immediately after deploy (errors need user interaction to generate) +- In rapid succession (errors update on user interaction, not continuously)`, + args: { + _trigger: t.runtimeErrors().describe('Internal trigger for resource tracking'), }, - implementation: async (_args?) => { + run: async () => { try { logger.info('Fetching runtime errors from sandbox'); - + const errors = await agent.fetchRuntimeErrors(true); - - return { + + return { errors: errors || [] }; } catch (error) { @@ -61,5 +51,5 @@ export function createGetRuntimeErrorsTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/git.ts b/worker/agents/tools/toolkit/git.ts index 7aeba29e..fefc40bb 100644 --- a/worker/agents/tools/toolkit/git.ts +++ b/worker/agents/tools/toolkit/git.ts @@ -1,72 +1,52 @@ -import { ToolDefinition } from '../types'; +import { tool, t, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { z } from 'zod'; type GitCommand = 'commit' | 'log' | 'show' | 'reset'; -interface GitToolArgs { - command: GitCommand; - message?: string; - limit?: number; - oid?: string; - includeDiff?: boolean; -} - export function createGitTool( agent: ICodingAgent, logger: StructuredLogger, options?: { excludeCommands?: GitCommand[] } -): ToolDefinition { +) { const allCommands: GitCommand[] = ['commit', 'log', 'show', 'reset']; const allowedCommands = options?.excludeCommands ? allCommands.filter(cmd => !options.excludeCommands!.includes(cmd)) : allCommands; - + const hasReset = allowedCommands.includes('reset'); const commandsList = allowedCommands.join(', '); const description = hasReset ? `Execute git commands. Commands: ${commandsList}. WARNING: reset is destructive!` : `Execute git commands. Commands: ${commandsList}.`; - return { - type: 'function', - function: { - name: 'git', - description, - parameters: { - type: 'object', - properties: { - command: { - type: 'string', - enum: allowedCommands, - description: 'Git command to execute' - }, - message: { - type: 'string', - description: 'Commit message (required for commit command, e.g., "fix: resolve authentication bug")' - }, - limit: { - type: 'number', - description: 'Number of commits to show (for log command, default: 10)' - }, - oid: { - type: 'string', - description: hasReset - ? 'Commit hash/OID (required for show and reset commands)' - : 'Commit hash/OID (required for show command)' - }, - includeDiff: { - type: 'boolean', - description: 'Include file diffs in show command output (default: false). Use ONLY when you need to see actual code changes. WARNING: Slower for commits with many/large files.' - } - }, - required: ['command'], - }, + const commandType = type( + z.enum(allowedCommands as [GitCommand, ...GitCommand[]]), + (cmd: GitCommand) => { + if (cmd === 'commit' || cmd === 'reset') { + return { gitCommit: true }; + } + return {}; + } + ); + + return tool({ + name: 'git', + description, + args: { + command: commandType.describe('Git command to execute'), + message: t.string().optional().describe('Commit message (required for commit command, e.g., "fix: resolve authentication bug")'), + limit: t.number().optional().describe('Number of commits to show (for log command, default: 10)'), + oid: t.string().optional().describe(hasReset + ? 'Commit hash/OID (required for show and reset commands)' + : 'Commit hash/OID (required for show command)'), + includeDiff: t.boolean().optional().describe('Include file diffs in show command output (default: false). Use ONLY when you need to see actual code changes. WARNING: Slower for commits with many/large files.'), }, - implementation: async ({ command, message, limit, oid, includeDiff }: GitToolArgs) => { + run: async ({ command, message, limit, oid, includeDiff }) => { try { const gitInstance = agent.git; - + switch (command) { case 'commit': { if (!message) { @@ -75,30 +55,30 @@ export function createGitTool( message: 'Commit message is required for commit command' }; } - + const unescapedMessage = message.replace(/\\n/g, '\n').replace(/\\t/g, '\t'); - + logger.info('Git commit', { message: unescapedMessage }); const commitOid = await gitInstance.commit([], unescapedMessage); - + return { success: true, data: { oid: commitOid }, message: commitOid ? `Committed: ${message}` : 'No changes to commit' }; } - + case 'log': { logger.info('Git log', { limit: limit || 10 }); const commits = await gitInstance.log(limit || 10); - + return { success: true, data: { commits }, message: `Retrieved ${commits.length} commits` }; } - + case 'show': { if (!oid) { return { @@ -106,17 +86,17 @@ export function createGitTool( message: 'Commit OID is required for show command' }; } - + logger.info('Git show', { oid, includeDiff }); const result = await gitInstance.show(oid, { includeDiff }); - + return { success: true, data: result, message: `Commit ${result.oid.substring(0, 7)}: ${result.message} (${result.files} files)` }; } - + case 'reset': { if (!oid) { return { @@ -124,17 +104,17 @@ export function createGitTool( message: 'Commit OID is required for reset command' }; } - + logger.info('Git reset', { oid }); const result = await gitInstance.reset(oid, { hard: true }); - + return { success: true, data: result, message: `Reset to commit ${result.ref.substring(0, 7)}. ${result.filesReset} files updated. HEAD moved.` }; } - + default: return { success: false, @@ -149,5 +129,5 @@ export function createGitTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/init-suitable-template.ts b/worker/agents/tools/toolkit/init-suitable-template.ts index e970bdb6..c31f4d17 100644 --- a/worker/agents/tools/toolkit/init-suitable-template.ts +++ b/worker/agents/tools/toolkit/init-suitable-template.ts @@ -1,102 +1,81 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; import { selectTemplate } from '../../planning/templateSelector'; import { TemplateSelection } from '../../schemas'; import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; - -export type InitSuitableTemplateArgs = { - query: string; -}; +import { z } from 'zod'; export type InitSuitableTemplateResult = - | { - selection: TemplateSelection; - importedFiles: TemplateFile[]; - reasoning: string; - message: string; - } - | ErrorResult; - -/** - * template selection and import. - * Analyzes user requirements, selects best matching template from library, - * and automatically imports it to the virtual filesystem. - */ + | { + selection: TemplateSelection; + importedFiles: TemplateFile[]; + reasoning: string; + message: string; + } + | { error: string }; + export function createInitSuitableTemplateTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'init_suitable_template', - description: 'Analyze user requirements and automatically select + import the most suitable template from library. Uses AI to match requirements against available templates. Returns selection with reasoning and imported files. For interactive projects (app/presentation/workflow) only. Call this BEFORE generate_blueprint.', - parameters: { - type: 'object', - properties: { - query: { - type: 'string', - description: 'User requirements and project description. Provide clear description of what needs to be built.', - }, - }, - required: ['query'], - }, - }, - implementation: async ({ query }: InitSuitableTemplateArgs) => { - try { - const projectType = agent.getProjectType(); - const operationOptions = agent.getOperationOptions(); - - logger.info('Analyzing template suitability and importing', { - projectType, - queryLength: query.length - }); - - // Fetch available templates - const templatesResponse = await BaseSandboxService.listTemplates(); - if (!templatesResponse.success || !templatesResponse.templates) { - return { - error: `Failed to fetch templates: ${templatesResponse.error || 'Unknown error'}` - }; - } - - logger.info('Templates fetched', { count: templatesResponse.templates.length }); - - // Use AI selector to find best match - const selection = await selectTemplate({ - env: operationOptions.env, - query, - projectType, - availableTemplates: templatesResponse.templates, - inferenceContext: operationOptions.inferenceContext, - }); - - logger.info('Template selection completed', { - selected: selection.selectedTemplateName, - projectType: selection.projectType - }); - - // If no suitable template found, return error suggesting scratch mode - if (!selection.selectedTemplateName) { - return { - error: `No suitable template found for this project. Reasoning: ${selection.reasoning}. Consider using virtual-first mode (generate all config files yourself) or refine requirements.` - }; - } - - // Import the selected template - const importResult = await agent.importTemplate( - selection.selectedTemplateName - ); - - logger.info('Template imported successfully', { - templateName: importResult.templateName, - filesCount: importResult.files.length - }); - - // Build detailed reasoning message - const reasoningMessage = ` + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'init_suitable_template', + description: 'Analyze user requirements and automatically select + import the most suitable template from library. Uses AI to match requirements against available templates. Returns selection with reasoning and imported files. For interactive projects (app/presentation/workflow) only. Call this BEFORE generate_blueprint.', + args: { + query: type(z.string(), () => ({ + files: { mode: 'write', paths: [] }, + })).describe('User requirements and project description. Provide clear description of what needs to be built.'), + }, + run: async ({ query }) => { + try { + const projectType = agent.getProjectType(); + const operationOptions = agent.getOperationOptions(); + + logger.info('Analyzing template suitability and importing', { + projectType, + queryLength: query.length + }); + + const templatesResponse = await BaseSandboxService.listTemplates(); + if (!templatesResponse.success || !templatesResponse.templates) { + return { + error: `Failed to fetch templates: ${templatesResponse.error || 'Unknown error'}` + }; + } + + logger.info('Templates fetched', { count: templatesResponse.templates.length }); + + const selection = await selectTemplate({ + env: operationOptions.env, + query, + projectType, + availableTemplates: templatesResponse.templates, + inferenceContext: operationOptions.inferenceContext, + }); + + logger.info('Template selection completed', { + selected: selection.selectedTemplateName, + projectType: selection.projectType + }); + + if (!selection.selectedTemplateName) { + return { + error: `No suitable template found for this project. Reasoning: ${selection.reasoning}. Consider using virtual-first mode (generate all config files yourself) or refine requirements.` + }; + } + + const importResult = await agent.importTemplate( + selection.selectedTemplateName + ); + + logger.info('Template imported successfully', { + templateName: importResult.templateName, + filesCount: importResult.files.length + }); + + const reasoningMessage = ` **AI Template Selection Complete** **Selected Template**: ${selection.selectedTemplateName} @@ -114,19 +93,19 @@ ${selection.reasoning} **Next Step**: Use generate_blueprint() to create project plan that leverages this template's features. `.trim(); - return { - selection, - importedFiles: importResult.files, - reasoning: reasoningMessage, - message: `Template "${selection.selectedTemplateName}" selected and imported successfully.` - }; - - } catch (error) { - logger.error('Error in init_suitable_template', error); - return { - error: `Error selecting/importing template: ${error instanceof Error ? error.message : 'Unknown error'}` - }; - } - }, - }; + return { + selection, + importedFiles: importResult.files, + reasoning: reasoningMessage, + message: `Template "${selection.selectedTemplateName}" selected and imported successfully.` + }; + + } catch (error) { + logger.error('Error in init_suitable_template', error); + return { + error: `Error selecting/importing template: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }); } diff --git a/worker/agents/tools/toolkit/initialize-slides.ts b/worker/agents/tools/toolkit/initialize-slides.ts index 7cb529b2..207f3dee 100644 --- a/worker/agents/tools/toolkit/initialize-slides.ts +++ b/worker/agents/tools/toolkit/initialize-slides.ts @@ -1,46 +1,30 @@ -import { ToolDefinition } from '../types'; +import { tool, t, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { z } from 'zod'; -type InitializeSlidesArgs = { - theme?: string; - force_preview?: boolean; -}; - -type InitializeSlidesResult = { message: string }; - -/** - * Initializes a Spectacle-based slides runtime in from-scratch projects. - * - Imports the Spectacle template files into the repository - * - Commits them - * - Deploys a preview (agent policy will allow because slides exist) - */ export function createInitializeSlidesTool( - agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'initialize_slides', - description: 'Initialize a Spectacle slides project inside the current workspace and deploy a live preview. Use only if the user wants a slide deck.', - parameters: { - type: 'object', - properties: { - theme: { type: 'string', description: 'Optional theme preset name' }, - force_preview: { type: 'boolean', description: 'Force redeploy sandbox after import' }, - }, - required: [], - }, - }, - implementation: async ({ theme, force_preview }: InitializeSlidesArgs) => { - logger.info('Initializing slides via Spectacle template', { theme }); - const { templateName, filesImported } = await agent.importTemplate('spectacle'); - logger.info('Imported template', { templateName, filesImported }); + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'initialize_slides', + description: 'Initialize a presentation template inside the current workspace and deploy a live preview. Use only if the user wants a slide deck.', + args: { + theme: type(z.string().optional(), () => ({ + files: { mode: 'write', paths: [] }, + sandbox: { operation: 'deploy' }, + })).describe('Optional theme preset name'), + force_preview: t.boolean().optional().describe('Force redeploy sandbox after import'), + }, + run: async ({ theme, force_preview }) => { + logger.info('Initializing presentation template', { theme }); + const { templateName, filesImported } = await agent.importTemplate('spectacle'); + logger.info('Imported presentation template', { templateName, filesImported }); - const deployMsg = await agent.deployPreview(true, !!force_preview); - return { message: `Slides initialized with template '${templateName}', files: ${filesImported}. ${deployMsg}` }; - }, - }; + const deployMsg = await agent.deployPreview(true, !!force_preview); + return { message: `Slides initialized with template '${templateName}', files: ${filesImported}. ${deployMsg}` }; + }, + }); } diff --git a/worker/agents/tools/toolkit/queue-request.ts b/worker/agents/tools/toolkit/queue-request.ts index 4fd90f5e..301f758a 100644 --- a/worker/agents/tools/toolkit/queue-request.ts +++ b/worker/agents/tools/toolkit/queue-request.ts @@ -1,41 +1,24 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type QueueRequestArgs = { - modificationRequest: string; -}; - export function createQueueRequestTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'queue_request', - description: - 'Queue up modification requests or changes, to be implemented in the next development phase', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - modificationRequest: { - type: 'string', - minLength: 8, - description: - "The changes needed to be made to the app. Please don't supply any code level or implementation details. Provide detailed requirements and description of the changes you want to make.", - }, - }, - required: ['modificationRequest'], - }, +) { + return tool({ + name: 'queue_request', + description: + 'Queue up modification requests or changes, to be implemented in the next development phase', + args: { + modificationRequest: t.string().describe("The changes needed to be made to the app. Please don't supply any code level or implementation details. Provide detailed requirements and description of the changes you want to make."), }, - implementation: async (args) => { + run: async ({ modificationRequest }) => { logger.info('Received app edit request', { - modificationRequest: args.modificationRequest, + modificationRequest, }); - agent.queueUserRequest(args.modificationRequest); - return null; + agent.queueUserRequest(modificationRequest); + return null; }, - }; + }); } diff --git a/worker/agents/tools/toolkit/read-files.ts b/worker/agents/tools/toolkit/read-files.ts index 15cb28c4..2cb0aeb8 100644 --- a/worker/agents/tools/toolkit/read-files.ts +++ b/worker/agents/tools/toolkit/read-files.ts @@ -1,43 +1,30 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -export type ReadFilesArgs = { - paths: string[]; - timeout?: number; -}; - export type ReadFilesResult = | { files: { path: string; content: string }[] } - | ErrorResult; + | { error: string }; export function createReadFilesTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'read_files', - description: - 'Read file contents by exact RELATIVE paths (sandbox pwd = project root). Prefer batching multiple paths in a single call to reduce overhead. Target all relevant files useful for understanding current context', - parameters: { - type: 'object', - properties: { - paths: { type: 'array', items: { type: 'string' } }, - timeout: { type: 'number', default: 30000 }, - }, - required: ['paths'], - }, + logger: StructuredLogger +) { + return tool({ + name: 'read_files', + description: 'Read file contents by exact RELATIVE paths (sandbox pwd = project root). Prefer batching multiple paths in a single call to reduce overhead. Target all relevant files useful for understanding current context', + args: { + paths: t.files.read().describe('Array of relative file paths to read'), + timeout: t.number().default(30000).describe('Timeout in milliseconds'), }, - implementation: async ({ paths, timeout = 30000 }) => { + run: async ({ paths, timeout }) => { try { logger.info('Reading files', { count: paths.length, timeout }); - - const timeoutPromise = new Promise((_, reject) => + + const timeoutPromise = new Promise<{ error: string }>((_, reject) => setTimeout(() => reject(new Error(`Read files operation timed out after ${timeout}ms`)), timeout) ); - + return await Promise.race([ agent.readFiles(paths), timeoutPromise @@ -51,5 +38,5 @@ export function createReadFilesTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/regenerate-file.ts b/worker/agents/tools/toolkit/regenerate-file.ts index 5be23f99..d7eab4de 100644 --- a/worker/agents/tools/toolkit/regenerate-file.ts +++ b/worker/agents/tools/toolkit/regenerate-file.ts @@ -1,12 +1,7 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t, ErrorResult } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -export type RegenerateFileArgs = { - path: string; - issues: string[]; -}; - export type RegenerateFileResult = | { path: string; diff: string } | ErrorResult; @@ -14,25 +9,18 @@ export type RegenerateFileResult = export function createRegenerateFileTool( agent: ICodingAgent, logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'regenerate_file', - description: - `Autonomous AI agent that applies surgical fixes to code files. Takes file path and array of specific issues to fix. Returns diff showing changes made. +) { + return tool({ + name: 'regenerate_file', + description: + `Autonomous AI agent that applies surgical fixes to code files. Takes file path and array of specific issues to fix. Returns diff showing changes made. CRITICAL: Provide detailed, specific issues - not vague descriptions. See system prompt for full usage guide. These would be implemented by an independent LLM AI agent`, - parameters: { - type: 'object', - properties: { - path: { type: 'string' }, - issues: { type: 'array', items: { type: 'string' } }, - }, - required: ['path', 'issues'], - }, + args: { + path: t.file.write().describe('Relative path to file from project root'), + issues: t.array(t.string()).describe('Specific, detailed issues to fix in the file'), }, - implementation: async ({ path, issues }) => { + run: async ({ path, issues }) => { try { logger.info('Regenerating file', { path, @@ -48,5 +36,5 @@ CRITICAL: Provide detailed, specific issues - not vague descriptions. See system }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/rename-project.ts b/worker/agents/tools/toolkit/rename-project.ts index 850161b5..84a03d49 100644 --- a/worker/agents/tools/toolkit/rename-project.ts +++ b/worker/agents/tools/toolkit/rename-project.ts @@ -1,43 +1,24 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type RenameArgs = { - newName: string; -}; - -type RenameResult = { projectName: string }; - export function createRenameProjectTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'rename_project', - description: 'Rename the project. Lowercase letters, numbers, hyphens, and underscores only. No spaces or dots. Call this alongside queue_request tool to update the codebase', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - newName: { - type: 'string', - minLength: 3, - maxLength: 50, - pattern: '^[a-z0-9-_]+$' - }, - }, - required: ['newName'], - }, - }, - implementation: async (args) => { - logger.info('Renaming project', { newName: args.newName }); - const ok = await agent.updateProjectName(args.newName); - if (!ok) { - throw new Error('Failed to rename project'); - } - return { projectName: args.newName }; - }, - }; + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'rename_project', + description: 'Rename the project. Lowercase letters, numbers, hyphens, and underscores only. No spaces or dots. Call this alongside queue_request tool to update the codebase', + args: { + newName: t.blueprint().describe('New project name'), + }, + run: async ({ newName }) => { + logger.info('Renaming project', { newName }); + const ok = await agent.updateProjectName(newName); + if (!ok) { + throw new Error('Failed to rename project'); + } + return { projectName: newName }; + }, + }); } diff --git a/worker/agents/tools/toolkit/run-analysis.ts b/worker/agents/tools/toolkit/run-analysis.ts index b95a38c8..06675b09 100644 --- a/worker/agents/tools/toolkit/run-analysis.ts +++ b/worker/agents/tools/toolkit/run-analysis.ts @@ -1,37 +1,26 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { StaticAnalysisResponse } from 'worker/services/sandbox/sandboxTypes'; -export type RunAnalysisArgs = { - files?: string[]; -}; - export type RunAnalysisResult = StaticAnalysisResponse; export function createRunAnalysisTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'run_analysis', - description: - 'Run static analysis (lint + typecheck), optionally scoped to given files.', - parameters: { - type: 'object', - properties: { - files: { type: 'array', items: { type: 'string' } }, - }, - required: [], - }, + logger: StructuredLogger +) { + return tool({ + name: 'run_analysis', + description: + 'Run static analysis (lint + typecheck), optionally scoped to given files.', + args: { + files: t.analysis.files().describe('Optional array of files to analyze'), }, - implementation: async ({ files }) => { + run: async ({ files }) => { logger.info('Running static analysis', { filesCount: files?.length || 0, }); return await agent.runStaticAnalysisCode(files); }, - }; + }); } diff --git a/worker/agents/tools/toolkit/virtual-filesystem.ts b/worker/agents/tools/toolkit/virtual-filesystem.ts index 0b1e0d7f..1e622bcb 100644 --- a/worker/agents/tools/toolkit/virtual-filesystem.ts +++ b/worker/agents/tools/toolkit/virtual-filesystem.ts @@ -1,81 +1,61 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -export type VirtualFilesystemArgs = { - command: 'list' | 'read'; - paths?: string[]; -}; - export type VirtualFilesystemResult = - | { files: Array<{ path: string; purpose?: string; size: number }> } - | { files: Array<{ path: string; content: string }> } - | ErrorResult; + | { files: Array<{ path: string; purpose?: string; size: number }>; error?: never } + | { files: Array<{ path: string; content: string }>; error?: never } + | { error: string; files?: never }; export function createVirtualFilesystemTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'virtual_filesystem', - description: `Interact with the virtual persistent workspace. + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'virtual_filesystem', + description: `Interact with the virtual persistent workspace. IMPORTANT: This reads from the VIRTUAL filesystem, NOT the sandbox. Files appear here immediately after generation and may not be deployed to sandbox yet.`, - parameters: { - type: 'object', - properties: { - command: { - type: 'string', - enum: ['list', 'read'], - description: 'Action to perform: "list" shows all files, "read" returns file contents', - }, - paths: { - type: 'array', - items: { type: 'string' }, - description: 'File paths to read (required when command="read"). Use relative paths from project root.', - }, - }, - required: ['command'], - }, - }, - implementation: async ({ command, paths }: VirtualFilesystemArgs) => { - try { - if (command === 'list') { - logger.info('Listing virtual filesystem files'); - - const files = agent.listFiles(); - - const fileList = files.map(file => ({ - path: file.filePath, - purpose: file.filePurpose, - size: file.fileContents.length - })); - - return { - files: fileList - }; - } else if (command === 'read') { - if (!paths || paths.length === 0) { - return { - error: 'paths array is required when command is "read"' - }; - } - - logger.info('Reading files from virtual filesystem', { count: paths.length }); - - return await agent.readFiles(paths); - } else { - return { - error: `Invalid command: ${command}. Must be "list" or "read"` - }; - } - } catch (error) { - logger.error('Error in virtual_filesystem', error); - return { - error: `Error accessing virtual filesystem: ${error instanceof Error ? error.message : 'Unknown error'}` - }; - } - }, - }; + args: { + command: t.enum(['list', 'read']).describe('Action to perform: "list" shows all files, "read" returns file contents'), + paths: t.files.read().optional().describe('File paths to read (required when command="read"). Use relative paths from project root.'), + }, + run: async ({ command, paths }) => { + try { + if (command === 'list') { + logger.info('Listing virtual filesystem files'); + + const files = agent.listFiles(); + + const fileList = files.map(file => ({ + path: file.filePath, + purpose: file.filePurpose, + size: file.fileContents.length + })); + + return { + files: fileList + }; + } else if (command === 'read') { + if (!paths || paths.length === 0) { + return { + error: 'paths array is required when command is "read"' + }; + } + + logger.info('Reading files from virtual filesystem', { count: paths.length }); + + return await agent.readFiles(paths); + } else { + return { + error: `Invalid command: ${command}. Must be "list" or "read"` + }; + } + } catch (error) { + logger.error('Error in virtual_filesystem', error); + return { + error: `Error accessing virtual filesystem: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }); } diff --git a/worker/agents/tools/toolkit/wait-for-debug.ts b/worker/agents/tools/toolkit/wait-for-debug.ts index 59e31185..4dbe4646 100644 --- a/worker/agents/tools/toolkit/wait-for-debug.ts +++ b/worker/agents/tools/toolkit/wait-for-debug.ts @@ -1,24 +1,17 @@ -import { ToolDefinition } from '../types'; +import { tool } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; export function createWaitForDebugTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition, { status: string } | { error: string }> { - return { - type: 'function', - function: { - name: 'wait_for_debug', - description: - 'Wait for the current debug session to complete. Use when deep_debug returns DEBUG_IN_PROGRESS error. Returns immediately if no debug session is running.', - parameters: { - type: 'object', - properties: {}, - required: [], - }, - }, - implementation: async () => { +) { + return tool({ + name: 'wait_for_debug', + description: + 'Wait for the current debug session to complete. Use when deep_debug returns DEBUG_IN_PROGRESS error. Returns immediately if no debug session is running.', + args: {}, + run: async () => { try { if (agent.isDeepDebugging()) { logger.info('Waiting for debug session to complete...'); @@ -39,5 +32,5 @@ export function createWaitForDebugTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/wait-for-generation.ts b/worker/agents/tools/toolkit/wait-for-generation.ts index a599f8ff..8cdae4e5 100644 --- a/worker/agents/tools/toolkit/wait-for-generation.ts +++ b/worker/agents/tools/toolkit/wait-for-generation.ts @@ -1,24 +1,17 @@ -import { ToolDefinition } from '../types'; +import { tool } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; export function createWaitForGenerationTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition, { status: string } | { error: string }> { - return { - type: 'function', - function: { - name: 'wait_for_generation', - description: - 'Wait for code generation to complete. Use when deep_debug returns GENERATION_IN_PROGRESS error. Returns immediately if no generation is running.', - parameters: { - type: 'object', - properties: {}, - required: [], - }, - }, - implementation: async () => { +) { + return tool({ + name: 'wait_for_generation', + description: + 'Wait for code generation to complete. Use when deep_debug returns GENERATION_IN_PROGRESS error. Returns immediately if no generation is running.', + args: {}, + run: async () => { try { if (agent.isCodeGenerating()) { logger.info('Waiting for code generation to complete...'); @@ -39,5 +32,5 @@ export function createWaitForGenerationTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/wait.ts b/worker/agents/tools/toolkit/wait.ts index 39233981..e2913854 100644 --- a/worker/agents/tools/toolkit/wait.ts +++ b/worker/agents/tools/toolkit/wait.ts @@ -1,48 +1,25 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; -type WaitArgs = { - seconds: number; - reason?: string; -}; - -type WaitResult = { message: string }; - -export function createWaitTool( - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'wait', - description: - 'Wait/sleep for a specified number of seconds. Use this after deploying changes when you need the user to interact with the app before checking logs. Typical usage: wait 15-30 seconds after deploy_preview to allow time for user interaction.', - parameters: { - type: 'object', - properties: { - seconds: { - type: 'number', - description: 'Number of seconds to wait (typically 15-30 for user interaction)', - }, - reason: { - type: 'string', - description: 'Optional: why you are waiting (e.g., "Waiting for user to interact with app")', - }, - }, - required: ['seconds'], - }, +export function createWaitTool(logger: StructuredLogger) { + return tool({ + name: 'wait', + description: 'Wait/sleep for a specified number of seconds. Use this after deploying changes when you need the user to interact with the app before checking logs. Typical usage: wait 15-30 seconds after deploy_preview to allow time for user interaction.', + args: { + seconds: t.number().describe('Number of seconds to wait (typically 15-30 for user interaction)'), + reason: t.string().optional().describe('Optional: why you are waiting (e.g., "Waiting for user to interact with app")'), }, - implementation: async ({ seconds, reason }) => { - const waitMs = Math.min(Math.max(seconds * 1000, 1000), 60000); // Clamp between 1-60 seconds + run: async ({ seconds, reason }) => { + const waitMs = Math.min(Math.max(seconds * 1000, 1000), 60000); const actualSeconds = waitMs / 1000; - + logger.info('Waiting', { seconds: actualSeconds, reason }); - + await new Promise(resolve => setTimeout(resolve, waitMs)); - + return { message: `Waited ${actualSeconds} seconds${reason ? `: ${reason}` : ''}`, }; }, - }; + }); } diff --git a/worker/agents/tools/toolkit/web-search.ts b/worker/agents/tools/toolkit/web-search.ts index c7e01edc..7004fb08 100644 --- a/worker/agents/tools/toolkit/web-search.ts +++ b/worker/agents/tools/toolkit/web-search.ts @@ -1,5 +1,5 @@ -import { env } from 'cloudflare:workers' -import { ToolDefinition } from '../types'; +import { env } from 'cloudflare:workers'; +import { tool, t } from '../types'; interface SerpApiResponse { knowledge_graph?: { @@ -195,58 +195,37 @@ async function fetchWebContent(url: string): Promise { } } -// Define the argument and result types for the web search tool type WebSearchArgs = { - query?: string; - url?: string; - num_results?: number; + query?: string; + url?: string; + num_results: number; }; -type WebSearchResult = { content?: string; error?: string } +type WebSearchResult = { content?: string; error?: string }; const toolWebSearch = async (args: WebSearchArgs): Promise => { - const { query, url, num_results = 5 } = args; - if (typeof url === 'string') { - const content = await fetchWebContent(url); - return { content }; - } - if (typeof query === 'string') { - const content = await performWebSearch( - query, - num_results as number, - ); - return { content }; - } - return { error: 'Either query or url parameter is required' }; + const { query, url, num_results } = args; + if (typeof url === 'string') { + const content = await fetchWebContent(url); + return { content }; + } + if (typeof query === 'string') { + const content = await performWebSearch( + query, + num_results as number + ); + return { content }; + } + return { error: 'Either query or url parameter is required' }; }; -export const toolWebSearchDefinition: ToolDefinition = { - implementation: toolWebSearch, - type: 'function' as const, - function: { - name: 'web_search', - description: - 'Search the web using Google or fetch content from a specific URL', - parameters: { - type: 'object', - properties: { - query: { - type: 'string', - description: 'Search query for Google search', - }, - url: { - type: 'string', - description: - 'Specific URL to fetch content from (alternative to search)', - }, - num_results: { - type: 'number', - description: - 'Number of search results to return (default: 5, max: 10)', - default: 5, - }, - }, - required: [], - }, - }, -}; +export const toolWebSearchDefinition = tool({ + name: 'web_search', + description: 'Search the web using Google or fetch content from a specific URL', + args: { + query: t.string().optional().describe('Search query for Google search'), + url: t.string().optional().describe('Specific URL to fetch content from (alternative to search)'), + num_results: t.number().default(5).describe('Number of search results to return (default: 5, max: 10)'), + }, + run: toolWebSearch, +}); diff --git a/worker/agents/tools/types.ts b/worker/agents/tools/types.ts index 37f80502..87421371 100644 --- a/worker/agents/tools/types.ts +++ b/worker/agents/tools/types.ts @@ -1,8 +1,17 @@ import { ChatCompletionFunctionTool, ChatCompletionMessageFunctionToolCall } from 'openai/resources'; +import { z } from 'zod'; +import { mergeResources, type Resources } from './resources'; +import { Type } from './resource-types'; + +export { t, type } from './resource-types'; +export type { Type } from './resource-types'; +export type { Resources as ResourceAccess } from './resources'; + export interface MCPServerConfig { name: string; sseUrl: string; } + export interface MCPResult { content: string; } @@ -18,18 +27,182 @@ export interface ToolCallResult { result?: unknown; } -export type ToolImplementation, TResult = unknown> = - (args: TArgs) => Promise; +export interface ToolDefinition { + name: string; + description: string; + schema: z.ZodTypeAny; + implementation: (args: TArgs) => Promise; + resources: (args: TArgs) => Resources; + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; + openAISchema: ChatCompletionFunctionTool; +} + +interface JSONSchema { + type?: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'null'; + description?: string; + properties?: Record; + items?: JSONSchema; + required?: string[]; + enum?: unknown[]; + default?: unknown; + [key: string]: unknown; +} + +function zodToOpenAIParameters(schema: z.ZodType): JSONSchema { + if (schema instanceof z.ZodObject) { + const shape = schema._def.shape(); + const properties: Record = {}; + const required: string[] = []; + + for (const [key, value] of Object.entries(shape)) { + const zodField = value as z.ZodTypeAny; + properties[key] = zodTypeToJsonSchema(zodField); + + if (!zodField.isOptional()) { + required.push(key); + } + } + + return { + type: 'object' as const, + properties, + required: required.length > 0 ? required : undefined, + }; + } + + return zodTypeToJsonSchema(schema); +} + +function zodTypeToJsonSchema(schema: z.ZodTypeAny): JSONSchema { + const description = schema.description; + + if (schema instanceof z.ZodString) { + return { type: 'string' as const, description }; + } + + if (schema instanceof z.ZodNumber) { + return { type: 'number' as const, description }; + } + + if (schema instanceof z.ZodBoolean) { + return { type: 'boolean' as const, description }; + } -export type ToolDefinition< - TArgs = Record, - TResult = unknown -> = ChatCompletionFunctionTool & { - implementation: ToolImplementation; - onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; - onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; -}; + if (schema instanceof z.ZodArray) { + return { + type: 'array' as const, + items: zodTypeToJsonSchema(schema._def.type), + description, + }; + } -export type ExtractToolArgs = T extends ToolImplementation ? A : never; + if (schema instanceof z.ZodObject) { + const shape = schema._def.shape(); + const properties: Record = {}; + const required: string[] = []; -export type ExtractToolResult = T extends ToolImplementation ? R : never; \ No newline at end of file + for (const [key, value] of Object.entries(shape)) { + const zodField = value as z.ZodTypeAny; + properties[key] = zodTypeToJsonSchema(zodField); + + if (!zodField.isOptional()) { + required.push(key); + } + } + + return { + type: 'object' as const, + properties, + required: required.length > 0 ? required : undefined, + description, + }; + } + + if (schema instanceof z.ZodOptional) { + return zodTypeToJsonSchema(schema._def.innerType); + } + + if (schema instanceof z.ZodDefault) { + const innerSchema = zodTypeToJsonSchema(schema._def.innerType); + return { + ...innerSchema, + default: schema._def.defaultValue(), + }; + } + + if (schema instanceof z.ZodEnum) { + return { + type: 'string' as const, + enum: schema._def.values, + description, + }; + } + + return { type: 'string' as const, description }; +} + +function buildTool( + name: string, + description: string, + schema: z.ZodObject, + implementation: (args: TArgs) => Promise, + resources: (args: TArgs) => Resources, + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise, + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise +): ToolDefinition { + return { + name, + description, + schema, + implementation, + resources, + onStart, + onComplete, + openAISchema: { + type: 'function' as const, + function: { + name, + description, + parameters: zodToOpenAIParameters(schema), + }, + }, + }; +} + +export function tool, TResult>(config: { + name: string; + description: string; + args: { [K in keyof TArgs]: Type }; + run: (args: TArgs) => Promise; + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; +}): ToolDefinition { + const zodSchemaShape: Record = {}; + for (const key in config.args) { + zodSchemaShape[key] = config.args[key].schema; + } + const zodSchema = z.object(zodSchemaShape); + + const extractResources = (args: TArgs): Resources => { + const merged: Resources = {}; + for (const key in config.args) { + mergeResources(merged, config.args[key].resources(args[key])); + } + return merged; + }; + + return buildTool( + config.name, + config.description, + zodSchema, + config.run, + extractResources, + config.onStart, + config.onComplete + ); +} + +export function toOpenAITool(tool: ToolDefinition): ChatCompletionFunctionTool { + return tool.openAISchema; +} From 219d2c7c464544ebe5477ab36192be2d15ae3bbe Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Sat, 15 Nov 2025 21:15:43 -0500 Subject: [PATCH 22/58] feat: add completion detection and loop prevention to agentic builder and debugger - Added CompletionDetector to track completion signals via dedicated tools (mark_generation_complete, mark_debugging_complete) - Implemented LoopDetector to prevent infinite tool call loops with contextual warnings - Created wrapToolsWithLoopDetection utility to inject loop detection into tool execution flow - Enhanced system prompts to emphasize efficient parallel tool usage and completion discipline --- .../assistants/agenticProjectBuilder.ts | 123 ++++++++-------- worker/agents/assistants/codeDebugger.ts | 137 ++++++------------ worker/agents/assistants/utils.ts | 57 ++++++++ worker/agents/inferutils/common.ts | 10 ++ .../agents/inferutils/completionDetection.ts | 63 ++++++++ worker/agents/inferutils/loopDetection.ts | 14 +- worker/agents/inferutils/toolExecution.ts | 60 +------- 7 files changed, 236 insertions(+), 228 deletions(-) create mode 100644 worker/agents/assistants/utils.ts create mode 100644 worker/agents/inferutils/completionDetection.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 4c9a22fc..5be200af 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -17,6 +17,10 @@ import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { ProjectType } from '../core/types'; import { Blueprint, AgenticBlueprint } from '../schemas'; import { prepareMessagesForInference } from '../utils/common'; +import { createMarkGenerationCompleteTool } from '../tools/toolkit/completion-signals'; +import { CompletionDetector } from '../inferutils/completionDetection'; +import { LoopDetector } from '../inferutils/loopDetection'; +import { wrapToolsWithLoopDetection } from './utils'; export type BuildSession = { filesIndex: FileState[]; @@ -194,10 +198,13 @@ CRITICAL - This step is MANDATORY for interactive projects: - Blueprint defines: title, description, features, architecture, plan - Refine with alter_blueprint if needed - NEVER start building without a plan +- If the project is too simple, plan can be empty or very small, but minimal blueprint should exist ## Step 5: Build Incrementally - Use generate_files for new features/components (goes to virtual FS) -- Use regenerate_file for surgical fixes to existing files (goes to virtual FS) + - generate_files tool can write multiple files in a single call (2-3 files at once max), sequentially, use it effectively + - You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. +- Use regenerate_file for surgical modifications to existing files (goes to virtual FS) - Commit frequently with clear messages (git operates on virtual FS) - For interactive projects: - After generating files: deploy_preview (syncs virtual → sandbox) @@ -213,6 +220,9 @@ CRITICAL - This step is MANDATORY for interactive projects: const tools = `# Available Tools (Detailed Reference) +Tools are powerful and the only way for you to take actions. Use them properly and effectively. +ultrathink and ultrareason to optimize how you build out the project and make the best use of tools. + ## Planning & Architecture **generate_blueprint** - Create structured project plan (Product Requirements Document) @@ -248,7 +258,7 @@ CRITICAL - This step is MANDATORY for interactive projects: **CRITICAL After-Effects:** 1. Blueprint stored in agent state 2. You now have clear plan to follow -3. Use plan phases to guide generate_files calls +3. Use plan phases to guide generate_files calls. You may use multiple generate_files calls to generate multiple sets of files in a single turn. 4. **Do NOT start building without blueprint** (fundamental rule) **Example workflow:** @@ -259,7 +269,7 @@ You: generate_blueprint (creates PRD with phases) ↓ Review blueprint, refine with alter_blueprint if needed ↓ -Follow phases: generate_files for phase-1, then phase-2, etc. +Implement the plan and fullfill the requirements \`\`\` **alter_blueprint** @@ -324,17 +334,6 @@ The library includes templates for: - Template's 'bun run dev' MUST work or sandbox creation fails - If using virtual-first fallback, YOU must ensure working dev script -**Example workflow:** -\`\`\` -1. init_suitable_template() - → AI: "Selected react-game-starter because: user wants 2D game, template has canvas setup and scoring system..." - → Imported 15 important files -2. generate_blueprint(prompt: "Template has canvas and game loop. Build on this...") - → Blueprint leverages existing template features -3. generate_files(...) - → Build on top of template foundation -\`\`\` - ## File Operations (Understanding Your Two-Layer System) **CRITICAL: Where Your Files Live** @@ -355,7 +354,7 @@ You work with TWO separate filesystems: **The File Flow You Control:** \`\`\` -You call: generate_files or regenerate_file +You call: generate_files to generate multiple files at once or regenerate_file for surgical modifications to existing files ↓ Files written to VIRTUAL filesystem (Durable Object storage) ↓ @@ -405,7 +404,8 @@ Commands available: **What it does:** - Generates complete file contents from scratch -- Can create multiple files in one call (batch operation) +- Can create multiple files in one call (batch operation) but sequentially +- You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. - Automatically commits to git with descriptive message - **Where files go**: Virtual filesystem only (not in sandbox yet) @@ -519,7 +519,12 @@ Commands available: **generate_images** - Future image generation capability -- Currently a stub - do NOT rely on this`; +- Currently a stub - do NOT rely on this + +--- + +You can call multiple tools one after another in a single turn. When you are absolutely sure of your actions, make multiple calls to tools and finish. You would be notified when the tool calls are completed. +`; const staticVsSandbox = `# CRITICAL: Static vs Sandbox Detection @@ -575,20 +580,16 @@ ${PROMPT_UTILS.COMMON_PITFALLS} const completion = `# Completion Discipline -When you're done: -**BUILD_COMPLETE: ** -- All requirements met -- All errors fixed -- Testing completed -- Ready for user - -If blocked: -**BUILD_STUCK: ** -- Clear explanation of blocker -- What you tried -- What you need to proceed +When initial project generation is complete: +- Call mark_generation_complete tool with: + - summary: Brief description of what was built (2-3 sentences) + - filesGenerated: Count of files created +- Requirements: All features implemented, errors fixed, testing done +- CRITICAL: Make NO further tool calls after calling mark_generation_complete -STOP ALL TOOL CALLS IMMEDIATELY after either signal.`; +For follow-up requests (adding features, making changes): +- Just respond naturally when done +- Do NOT call mark_generation_complete for follow-ups`; const warnings = `# Critical Warnings @@ -627,22 +628,25 @@ const getUserPrompt = ( fileSummaries: string, templateInfo?: string ): string => { - const { query, projectName, blueprint } = inputs; + const { query, projectName } = inputs; return `## Build Task **Project Name**: ${projectName} **User Request**: ${query} -${blueprint ? `## Project Blueprint +${ +// blueprint ? `## Project Blueprint -The following blueprint defines the structure, features, and requirements for this project: +// The following blueprint defines the structure, features, and requirements for this project: -\`\`\`json -${JSON.stringify(blueprint, null, 2)} -\`\`\` +// \`\`\`json +// ${JSON.stringify(blueprint, null, 2)} +// \`\`\` -**Use this blueprint to guide your implementation.** It outlines what needs to be built.` : `## Note +// **Use this blueprint to guide your implementation.** It outlines what needs to be built.` : `## Note -No blueprint provided. Design the project structure based on the user request above.`} +// No blueprint provided. Design the project structure based on the user request above.` +'' +} ${templateInfo ? `## Template Context @@ -657,28 +661,6 @@ ${fileSummaries ? `## Current Codebase ${fileSummaries}` : `## Starting Fresh This is a new project. Start from the template or scratch.`} - -## Your Mission - -Build a complete, production-ready solution that best fulfills the request. If it needs a full web experience, build it. If it’s a backend workflow, implement it. If it’s narrative content, write documents; if slides are appropriate, build a deck and verify via preview. - -**Approach (internal planning):** -1. Understand requirements and decide representation (UI, backend, slides, documents) -2. Generate PRD (if missing) and refine -3. Scaffold with generate_files, preferring regenerate_file for targeted edits -4. When a runtime exists: deploy_preview, then verify with run_analysis -5. Iterate and polish; commit meaningful checkpoints - -**Remember:** -- Write clean, type-safe, maintainable code -- Test thoroughly with deploy_preview and run_analysis -- Fix all issues before claiming completion -- Commit regularly with descriptive messages - -## Execution Reminder -- If no blueprint or plan is present: generate_blueprint FIRST (optionally with prompt parameter for additional context), then alter_blueprint if needed. Do not implement until a plan exists. -- Deploy only when a runtime exists; do not deploy for documents-only work. - Begin building.`; }; @@ -702,6 +684,7 @@ function summarizeFiles(filesIndex: FileState[]): string { export class AgenticProjectBuilder extends Assistant { logger = createObjectLogger(this, 'AgenticProjectBuilder'); modelConfigOverride?: ModelConfig; + private loopDetector = new LoopDetector(); constructor( env: Env, @@ -778,7 +761,20 @@ export class AgenticProjectBuilder extends Assistant { const messages: Message[] = this.save([system, user, ...historyMessages]); // Build tools with renderer and conversation sync callback - const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); + const rawTools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); + rawTools.push(createMarkGenerationCompleteTool(this.logger)); + + // Wrap tools with loop detection + const tools = wrapToolsWithLoopDetection(rawTools, this.loopDetector); + + // Configure completion detection + const completionConfig = { + detector: new CompletionDetector(['mark_generation_complete']), + operationalMode: (!hasFiles && !hasPlan) ? 'initial' as const : 'followup' as const, + allowWarningInjection: !hasFiles && !hasPlan, + }; + + this.logger.info('Agentic builder mode', { mode: completionConfig.operationalMode, hasFiles, hasPlan }); let output = ''; @@ -790,10 +786,9 @@ export class AgenticProjectBuilder extends Assistant { modelConfig: this.modelConfigOverride || AGENT_CONFIG.agenticProjectBuilder, messages, tools, - stream: streamCb - ? { chunk_size: 64, onChunk: (c) => streamCb(c) } - : undefined, + stream: streamCb ? { chunk_size: 64, onChunk: (c) => streamCb(c) } : undefined, onAssistantMessage, + completionConfig, }); output = result?.string || ''; diff --git a/worker/agents/assistants/codeDebugger.ts b/worker/agents/assistants/codeDebugger.ts index 586f3541..be5e1257 100644 --- a/worker/agents/assistants/codeDebugger.ts +++ b/worker/agents/assistants/codeDebugger.ts @@ -9,7 +9,6 @@ import { import { executeInference } from '../inferutils/infer'; import { InferenceContext, ModelConfig } from '../inferutils/config.types'; import { createObjectLogger } from '../../logger'; -import type { ToolDefinition } from '../tools/types'; import { AGENT_CONFIG } from '../inferutils/config'; import { buildDebugTools } from '../tools/customTools'; import { RenderToolCall } from '../operations/UserConversationProcessor'; @@ -19,6 +18,10 @@ import { RuntimeError } from 'worker/services/sandbox/sandboxTypes'; import { FileState } from '../core/state'; import { InferError } from '../inferutils/core'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; +import { createMarkDebuggingCompleteTool } from '../tools/toolkit/completion-signals'; +import { LoopDetector } from '../inferutils/loopDetection'; +import { CompletionDetector } from '../inferutils/completionDetection'; +import { wrapToolsWithLoopDetection } from './utils'; const SYSTEM_PROMPT = `You are an elite autonomous code debugging specialist with deep expertise in root-cause analysis, modern web frameworks (React, Vite, Cloudflare Workers), TypeScript/JavaScript, build tools, and runtime environments. @@ -96,6 +99,20 @@ You are smart, methodical, focused and evidence-based. You choose your own path - **wait**: Sleep for N seconds (use after deploy to allow time for user interaction before checking logs) - **git**: Execute git commands (commit, log, show, reset) - see detailed guide below. **WARNING: reset is UNTESTED - use with extreme caution!** +## EFFICIENT TOOL USAGE: +The system automatically handles parallel execution. Call multiple tools in a single response when beneficial: + +**Automatic Parallelization:** +- Diagnostic tools can run simultaneously (run_analysis, get_runtime_errors, get_logs) +- File reads execute in parallel (read_files on different files) +- File writes on different files execute in parallel (regenerate_file - see detailed guide below) +- Conflicting operations execute sequentially (multiple git commits, same file edits) + +**Examples:** + • GOOD - Call run_analysis() and get_runtime_errors() together → both execute simultaneously + • GOOD - Call regenerate_file on App.tsx, utils.ts, and helpers.ts together → all execute in parallel + • BAD - Call regenerate_file on same file twice → forced sequential execution + ## How to Use regenerate_file (CRITICAL) **What it is:** @@ -325,7 +342,7 @@ git({ command: 'reset', oid: 'abc123...' }) **Best Practices:** - **Use descriptive messages**: "fix: resolve null pointer in auth.ts" not "fix bug" - **Commit before deploying**: Save your work before deploy_preview in case you need to revert -- **Commit before TASK_COMPLETE**: Always commit your final working state before finishing +- **Commit before completion**: Always commit your final working state before finishing **Example Workflow:** \`\`\`typescript @@ -435,17 +452,20 @@ You're done when: - ❌ You applied fixes but didn't verify them **When you complete the task:** -1. Write: "TASK_COMPLETE: [brief summary]" +1. Call the \`mark_debugging_complete\` tool with: + - summary: Brief overview of what was accomplished + - filesModified: Number of files you regenerated/fixed 2. Provide a concise final report: - Issues found and root cause - Fixes applied (file paths) - Verification results - Current state -3. **CRITICAL: Once you write "TASK_COMPLETE", IMMEDIATELY HALT with no more tool calls. Your work is done.** +3. **CRITICAL: After calling \`mark_debugging_complete\`, make NO further tool calls. Your work is done.** -**If stuck:** -1. State: "TASK_STUCK: [reason]" + what you tried -2. **CRITICAL: Once you write "TASK_STUCK", IMMEDIATELY HALT with no more tool calls. Stop immediately.** +**If stuck and cannot proceed:** +1. Call \`mark_debugging_complete\` with summary explaining what you tried and why you're stuck +2. Provide a report of what you attempted and what's blocking progress +3. **CRITICAL: After calling the completion tool, make NO further tool calls. Stop immediately.** ## Working Style - Use your internal reasoning - think deeply, output concisely @@ -532,17 +552,6 @@ Diagnose and fix all user issues. Begin.`; -type ToolCallRecord = { - toolName: string; - args: string; // JSON stringified args for comparison - timestamp: number; -}; - -type LoopDetectionState = { - recentCalls: ToolCallRecord[]; - repetitionWarnings: number; -}; - export type DebugSession = { filesIndex: FileState[]; agent: ICodingAgent; @@ -571,10 +580,7 @@ export class DeepCodeDebugger extends Assistant { logger = createObjectLogger(this, 'DeepCodeDebugger'); modelConfigOverride?: ModelConfig; - private loopDetection: LoopDetectionState = { - recentCalls: [], - repetitionWarnings: 0, - }; + private loopDetector = new LoopDetector(); constructor( env: Env, @@ -585,51 +591,6 @@ export class DeepCodeDebugger extends Assistant { this.modelConfigOverride = modelConfigOverride; } - private detectRepetition(toolName: string, args: Record): boolean { - const argsStr = JSON.stringify(args); - const now = Date.now(); - - // Keep only recent calls (last 10 minutes) - this.loopDetection.recentCalls = this.loopDetection.recentCalls.filter( - (call) => now - call.timestamp < 600000, - ); - - // Count how many times this exact call was made recently - const matchingCalls = this.loopDetection.recentCalls.filter( - (call) => call.toolName === toolName && call.args === argsStr, - ); - - // Record this call - this.loopDetection.recentCalls.push({ toolName, args: argsStr, timestamp: now }); - - // Repetition detected if same call made 3+ times - return matchingCalls.length >= 2; - } - - private injectLoopWarning(toolName: string): void { - this.loopDetection.repetitionWarnings++; - - const warningMessage = ` -⚠️ CRITICAL: REPETITION DETECTED - -You just attempted to execute "${toolName}" with identical arguments for the ${this.loopDetection.repetitionWarnings}th time. - -RECOMMENDED ACTIONS: -1. If your task is complete, state "TASK_COMPLETE: [summary]" and STOP. Once you write 'TASK_COMPLETE' or 'TASK_STUCK', You shall not make any more tool/function calls. -2. If you observe you have already declared 'TASK_COMPLETE' or 'TASK_STUCK' in the past, Halt immediately. It might be that you are stuck in a loop. -3. If not complete, try a DIFFERENT approach: - - Use different tools - - Use different arguments - - Read different files - - Apply a different fix strategy - -DO NOT repeat the same action. The definition of insanity is doing the same thing expecting different results. - -If you're genuinely stuck after trying 3 different approaches, honestly report: "TASK_STUCK: [reason]"`; - - this.save([createUserMessage(warningMessage)]); - } - async run( inputs: DebugInputs, session: DebugSession, @@ -658,26 +619,18 @@ If you're genuinely stuck after trying 3 different approaches, honestly report: const logger = this.logger; - // Wrap tools with loop detection + // Build tools with loop detection const rawTools = buildDebugTools(session, logger, toolRenderer); - const tools: ToolDefinition[] = rawTools.map((tool) => ({ - ...tool, - implementation: async (args: any) => { - // Check for repetition before executing - if (this.detectRepetition(tool.function.name, args)) { - this.logger.warn(`Loop detected for tool: ${tool.function.name}`); - this.injectLoopWarning(tool.function.name); - - // // CRITICAL: Block execution to prevent infinite loops - // return { - // error: `Loop detected: You've called ${tool.function.name} with the same arguments multiple times. Try a different approach or stop if the task is complete.` - // }; - } - - // Only execute if no loop detected - return await tool.implementation(args); - }, - })); + rawTools.push(createMarkDebuggingCompleteTool(logger)); + + const tools = wrapToolsWithLoopDetection(rawTools, this.loopDetector); + + // Configure completion detection + const completionConfig = { + detector: new CompletionDetector(['mark_debugging_complete']), + operationalMode: 'initial' as const, + allowWarningInjection: true, + }; let out = ''; @@ -689,9 +642,8 @@ If you're genuinely stuck after trying 3 different approaches, honestly report: modelConfig: this.modelConfigOverride || AGENT_CONFIG.deepDebugger, messages, tools, - stream: streamCb - ? { chunk_size: 64, onChunk: (c) => streamCb(c) } - : undefined, + stream: streamCb ? { chunk_size: 64, onChunk: (c) => streamCb(c) } : undefined, + completionConfig, }); out = result?.string || ''; } catch (e) { @@ -703,12 +655,7 @@ If you're genuinely stuck after trying 3 different approaches, honestly report: throw e; } } - - // Check for completion signals to prevent unnecessary continuation - if (out.includes('TASK_COMPLETE') || out.includes('Mission accomplished') || out.includes('TASK_STUCK')) { - this.logger.info('Agent signaled task completion or stuck state, stopping'); - } - + this.save([createAssistantMessage(out)]); return out; } diff --git a/worker/agents/assistants/utils.ts b/worker/agents/assistants/utils.ts new file mode 100644 index 00000000..a4981341 --- /dev/null +++ b/worker/agents/assistants/utils.ts @@ -0,0 +1,57 @@ +import { ToolDefinition } from '../tools/types'; +import { LoopDetector } from '../inferutils/loopDetection'; +import { createLogger } from '../../logger'; + +const logger = createLogger('LoopDetection'); + +/** + * Wraps tool definitions with loop detection capability. + * + * When a loop is detected (same tool with same args called repeatedly), + * the warning is injected into the tool's result so it flows naturally + * into the inference chain and the LLM sees it in the next iteration. + */ +export function wrapToolsWithLoopDetection( + tools: ToolDefinition[], + loopDetector: LoopDetector +): ToolDefinition[] { + return tools.map((tool) => { + const originalImplementation = tool.implementation; + + return { + ...tool, + implementation: async (args: unknown) => { + // Check for repetition before executing + let loopWarning: string | null = null; + if (args && typeof args === 'object' && !Array.isArray(args)) { + const argsRecord = args as Record; + if (loopDetector.detectRepetition(tool.name, argsRecord)) { + logger.warn(`Loop detected: ${tool.name}`); + const warningMessage = loopDetector.generateWarning(tool.name); + loopWarning = '\n\n' + warningMessage.content; + } + } + + // Execute original implementation + const result = await originalImplementation(args); + + // If loop detected, prepend warning to result + if (loopWarning) { + // Handle different result types + if (typeof result === 'string') { + logger.warn(`Injecting Loop Warning in string result`); + return loopWarning + '\n\n' + result; + } else if (result && typeof result === 'object') { + logger.warn(`Injecting Loop Warning in object result`); + return { loopWarning, ...result }; + } else { + logger.warn(`Injecting Loop Warning in unknown result`); + return {loopWarning, result}; + } + } + + return result; + }, + }; + }); +} diff --git a/worker/agents/inferutils/common.ts b/worker/agents/inferutils/common.ts index 57df50c8..fb914fcd 100644 --- a/worker/agents/inferutils/common.ts +++ b/worker/agents/inferutils/common.ts @@ -115,4 +115,14 @@ export async function mapImagesInMultiModalMessage(message: ConversationMessage, } return message; +} + +/** + * Represents a completion signal detected from tool execution + */ +export interface CompletionSignal { + signaled: boolean; + toolName: string; + summary?: string; + timestamp: number; } \ No newline at end of file diff --git a/worker/agents/inferutils/completionDetection.ts b/worker/agents/inferutils/completionDetection.ts new file mode 100644 index 00000000..2081206e --- /dev/null +++ b/worker/agents/inferutils/completionDetection.ts @@ -0,0 +1,63 @@ +import { ToolCallResult } from '../tools/types'; +import { CompletionSignal } from './common'; + +/** + * Detects completion signals from executed tool calls + */ +export class CompletionDetector { + /** + * @param completionToolNames - Array of tool names that signal completion + */ + constructor(private readonly completionToolNames: string[]) {} + + /** + * Scan executed tool calls for completion signals + * + * @param executedToolCalls - Array of tool call results from execution + * @returns CompletionSignal if completion tool was called, undefined otherwise + */ + detectCompletion( + executedToolCalls: ToolCallResult[] + ): CompletionSignal | undefined { + for (const call of executedToolCalls) { + if (this.completionToolNames.includes(call.name)) { + console.log( + `[COMPLETION_DETECTOR] Completion signal detected from tool: ${call.name}` + ); + + // Extract summary from tool result if available + let summary: string | undefined; + if ( + call.result && + typeof call.result === 'object' && + call.result !== null && + 'message' in call.result + ) { + const msg = (call.result as { message: unknown }).message; + if (typeof msg === 'string') { + summary = msg; + } + } + + return { + signaled: true, + toolName: call.name, + summary, + timestamp: Date.now(), + }; + } + } + + return undefined; + } + + /** + * Check if a specific tool name is a completion tool + * + * @param toolName - Name of the tool to check + * @returns true if the tool is a completion tool + */ + isCompletionTool(toolName: string): boolean { + return this.completionToolNames.includes(toolName); + } +} diff --git a/worker/agents/inferutils/loopDetection.ts b/worker/agents/inferutils/loopDetection.ts index 8991fd0f..b043b283 100644 --- a/worker/agents/inferutils/loopDetection.ts +++ b/worker/agents/inferutils/loopDetection.ts @@ -82,17 +82,11 @@ export class LoopDetector { * Generate contextual warning message for injection into conversation history * * @param toolName - Name of the tool that's being repeated - * @param assistantType - Type of assistant for completion tool reference * @returns Message object to inject into conversation */ - generateWarning(toolName: string, assistantType: 'builder' | 'debugger'): Message { + generateWarning(toolName: string): Message { this.state.repetitionWarnings++; - const completionTool = - assistantType === 'builder' - ? 'mark_generation_complete' - : 'mark_debugging_complete'; - const warningMessage = ` [!ALERT] CRITICAL: POSSIBLE REPETITION DETECTED @@ -101,13 +95,13 @@ You just attempted to execute "${toolName}" with identical arguments for the ${t This indicates you may be stuck in a loop. Please take one of these actions: 1. **If your task is complete:** - - Call ${completionTool} with a summary of what you accomplished + - Call the appropriate completion tool with a summary of what you accomplished - STOP immediately after calling the completion tool - Make NO further tool calls 2. **If you previously declared completion:** - Review your recent messages - - If you already called ${completionTool}, HALT immediately + - If you already called the completion tool, HALT immediately - Do NOT repeat the same work 3. **If your task is NOT complete:** @@ -119,7 +113,7 @@ This indicates you may be stuck in a loop. Please take one of these actions: DO NOT repeat the same action. Doing the same thing repeatedly will not produce different results. -Once you call ${completionTool}, make NO further tool calls - the system will stop automatically.`.trim(); +Once you call the completion tool, make NO further tool calls - the system will stop automatically.`.trim(); return createUserMessage(warningMessage); } diff --git a/worker/agents/inferutils/toolExecution.ts b/worker/agents/inferutils/toolExecution.ts index 0d405552..9ae53106 100644 --- a/worker/agents/inferutils/toolExecution.ts +++ b/worker/agents/inferutils/toolExecution.ts @@ -1,69 +1,11 @@ import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; import type { ToolDefinition, ToolCallResult, ResourceAccess } from '../tools/types'; +import { hasResourceConflict } from '../tools/resources'; -/** - * Execution plan for a set of tool calls with dependency-aware parallelization. - * - * The plan groups tools into parallel execution groups, where: - * - Groups execute sequentially (one after another) - * - Tools within a group execute in parallel (simultaneously) - * - Dependencies between tools are automatically respected - */ export interface ExecutionPlan { - /** - * Parallel execution groups ordered by dependency - * Each group's tools can run simultaneously - * Groups execute in sequence (group N+1 after group N completes) - */ parallelGroups: ChatCompletionMessageFunctionToolCall[][]; } - -/** - * Detect resource conflicts between two tool calls. - */ -function hasResourceConflict( - res1: ResourceAccess, - res2: ResourceAccess -): boolean { - // File conflicts - if (res1.files && res2.files) { - const f1 = res1.files; - const f2 = res2.files; - - // Read-read = no conflict - if (f1.mode === 'read' && f2.mode === 'read') { - // No conflict - } else { - // Write-write or read-write conflict - // Empty paths = all files = conflict - if (f1.paths.length === 0 || f2.paths.length === 0) { - return true; - } - - // Check specific path overlap - const set1 = new Set(f1.paths); - const set2 = new Set(f2.paths); - for (const p of set1) { - if (set2.has(p)) return true; - } - } - } - - // Git conflicts - if (res1.git?.index && res2.git?.index) return true; - if (res1.git?.history && res2.git?.history) return true; - - // any overlap = conflict - if (res1.sandbox && res2.sandbox) return true; - if (res1.deployment && res2.deployment) return true; - if (res1.blueprint && res2.blueprint) return true; - if (res1.logs && res2.logs) return true; - if (res1.staticAnalysis && res2.staticAnalysis) return true; - - return false; -} - /** * Build execution plan from tool calls using topological sort. * From 06d9ce92c6896677cce47a683d7e85aa02238456 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 17 Nov 2025 14:30:38 -0500 Subject: [PATCH 23/58] feat: use agentic builder directly for handling user messages --- worker/agents/core/behaviors/agentic.ts | 69 ++++++++++++++++--------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 32a42277..c6ac3291 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -20,6 +20,8 @@ import { OperationOptions } from 'worker/agents/operations/common'; import { compactifyContext } from '../../utils/conversationCompactifier'; import { ConversationMessage, createMultiModalUserMessage, createUserMessage, Message } from '../../inferutils/common'; import { AbortError } from 'worker/agents/inferutils/core'; +import { ImageAttachment, ProcessedImageAttachment } from 'worker/types/image-attachment'; +import { ImageType, uploadImage } from 'worker/utils/images'; interface AgenticOperations extends BaseCodingOperations { generateNextPhase: PhaseGenerationOperation; @@ -127,31 +129,48 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl await super.onStart(props); } - // /** - // * Override handleUserInput to just queue messages without AI processing - // * Messages will be injected into conversation after tool call completions - // */ - // async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { - // let processedImages: ProcessedImageAttachment[] | undefined; - - // if (images && images.length > 0) { - // processedImages = await Promise.all(images.map(async (image) => { - // return await uploadImage(this.env, image, ImageType.UPLOADS); - // })); - - // this.logger.info('Uploaded images for queued request', { - // imageCount: processedImages.length - // }); - // } - - // await this.queueUserRequest(userMessage, processedImages); - - // this.logger.info('User message queued during agentic build', { - // message: userMessage, - // queueSize: this.state.pendingUserInputs.length, - // hasImages: !!processedImages && processedImages.length > 0 - // }); - // } + /** + * Override handleUserInput to just queue messages without AI processing + * Messages will be injected into conversation after tool call completions + */ + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + let processedImages: ProcessedImageAttachment[] | undefined; + + if (images && images.length > 0) { + processedImages = await Promise.all(images.map(async (image) => { + return await uploadImage(this.env, image, ImageType.UPLOADS); + })); + + this.logger.info('Uploaded images for queued request', { + imageCount: processedImages.length + }); + } + + await this.queueUserRequest(userMessage, processedImages); + + if (this.isCodeGenerating()) { + // Code generating - render tool call for UI + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: '', + conversationId: IdGenerator.generateConversationId(), + isStreaming: false, + tool: { + name: 'Message Queued', + status: 'success', + args: { + userMessage, + images: processedImages + } + } + }); + } + + this.logger.info('User message queued during agentic build', { + message: userMessage, + queueSize: this.state.pendingUserInputs.length, + hasImages: !!processedImages && processedImages.length > 0 + }); + } /** * Handle tool call completion - sync to conversation and check queue/compactification From 0bfcdbbb52c7707e32b8a0eaf8cc411f107206e5 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 17 Nov 2025 14:30:58 -0500 Subject: [PATCH 24/58] feat: presentation specific prompts + prompts restructuring --- .../assistants/agenticBuilderPrompts.ts | 1092 +++++++++++++++++ .../assistants/agenticProjectBuilder.ts | 596 +-------- 2 files changed, 1100 insertions(+), 588 deletions(-) create mode 100644 worker/agents/assistants/agenticBuilderPrompts.ts diff --git a/worker/agents/assistants/agenticBuilderPrompts.ts b/worker/agents/assistants/agenticBuilderPrompts.ts new file mode 100644 index 00000000..90500efa --- /dev/null +++ b/worker/agents/assistants/agenticBuilderPrompts.ts @@ -0,0 +1,1092 @@ +import { ProjectType } from "../core/types"; +import { PROMPT_UTILS } from "../prompts"; + +const getSystemPrompt = (projectType: ProjectType, dynamicHints: string): string => { + const isPresentationProject = projectType === 'presentation'; + + const identity = isPresentationProject + ? `# Identity +You are an elite presentation designer and builder with deep expertise in creating STUNNING, BEAUTIFUL, and ENGAGING slide presentations. You combine world-class visual design sensibility with technical mastery of React, JSX, TailwindCSS, and modern UI/UX principles. You operate with EXTREMELY HIGH reasoning capability and a keen eye for aesthetics, typography, color theory, and information hierarchy. + +Your presentations are not just functional - they are VISUALLY CAPTIVATING works of art that elevate the content and leave audiences impressed. You understand that great presentations balance beautiful design with clear communication.` + : `# Identity +You are an elite autonomous project builder with deep expertise in Cloudflare Workers, Durable Objects, TypeScript, React, Vite, and modern web applications. You operate with EXTREMELY HIGH reasoning capability.`; + + const comms = `# CRITICAL: Communication Mode +- Perform ALL analysis, planning, and reasoning INTERNALLY using your high reasoning capability +- Your output should be CONCISE: brief status updates and tool calls ONLY +- NO verbose explanations, NO step-by-step narrations in your output +- Think deeply internally → Act externally with precise tool calls → Report results briefly +- This is NOT negotiable - verbose output wastes tokens and degrades user experience`; + + const architecture = isPresentationProject + ? `# Presentation System Architecture (CRITICAL - Understand This) + +## How Presentations Work + +**Your presentations run ENTIRELY in the user's browser** - there is NO server-side runtime, NO sandbox, NO deployment process. + +### Browser-Based JSX Compilation +- Presentations use a **browser-based JSX compiler** (Babel Standalone) +- Your JSX/TSX code is compiled **live in the browser** when the user views it +- This is similar to CodeSandbox or StackBlitz - pure client-side execution +- No build step, no server - everything happens in the browser + +### File Structure +\`\`\` +/public/slides/ ← YOUR SLIDES GO HERE + Slide1.jsx ← Individual slide files + Slide2.jsx + Slide3.jsx + ... + +/public/lib/ ← SHARED COMPONENTS & UTILITIES + theme-config.js ← Theme system (colors, fonts, gradients) + slides-library.jsx ← Reusable components (TitleSlide, ContentSlide, etc.) + utils.js ← Helper functions (optional) + +/public/manifest.json ← SLIDE ORDER & METADATA + { + "slides": ["Slide1.jsx", "Slide2.jsx", "Slide3.jsx"], + "metadata": { + "title": "Presentation Title", + "theme": "dark", + "controls": true, + "progress": true, + "transition": "slide" + } + } +\`\`\` + +### How manifest.json Works +- **\`slides\` array**: Defines the ORDER of slides (first to last) +- Only slides listed here are included in the presentation +- Slide files not in manifest are ignored +- **\`metadata\`**: Configures Reveal.js behavior (theme, controls, transitions, etc.) + +### Your Workflow (Presentations) +\`\`\` +1. User requests a presentation + ↓ +2. Template provides basic example slides (just for reference) + ↓ +3. You analyze requirements and design UNIQUE presentation + ↓ +4. You REPLACE manifest.json with YOUR slide list + ↓ +5. You generate/overwrite slides with YOUR custom design + ↓ +6. Files written to virtual filesystem + ↓ +7. User's browser compiles and renders JSX + ↓ +8. Beautiful presentation displayed! +\`\`\` + +### What You CANNOT Do +- ❌ NO server-side code (no Node.js APIs, no backend) +- ❌ NO npm packages beyond what's available (see Supported Libraries below) +- ❌ NO dynamic imports of arbitrary packages +- ❌ NO file system access (everything is in-memory) +- ❌ NO external API calls (unless via fetch in browser) + +### What You CAN Do +- ✅ Create stunning JSX/TSX slides with React components +- ✅ Use TailwindCSS for all styling (utility classes) +- ✅ Use Lucide React icons for visual elements +- ✅ Use Recharts for data visualizations +- ✅ Use Prism for syntax-highlighted code blocks +- ✅ Import from theme-config.js and slides-library.jsx +- ✅ Create beautiful gradients, animations, layouts +- ✅ Build custom components in slides-library.jsx for reuse + +### Supported Libraries (ONLY THESE) +\`\`\`javascript +import { useState, useEffect } from 'react'; // React hooks +import { motion } from 'framer-motion'; // Animations +import { Play, Rocket, Zap } from 'lucide-react'; // Icons +import { BarChart, LineChart } from 'recharts'; // Charts +import { Prism } from 'prism-react-renderer'; // Code highlighting +// TailwindCSS available via className +// Google Fonts loaded via tag +\`\`\` + +**NO OTHER LIBRARIES AVAILABLE**. Do not import anything else - it will fail! + +### Template is JUST AN EXAMPLE +The provided template shows: +- How to structure slides (section wrapper, layout patterns) +- How to use theme-config.js (THEME, gradients, colors) +- How to create reusable components (slides-library.jsx) +- Basic slide examples (title, content, code, etc.) + +**YOU MUST:** +- Treat template as reference ONLY +- Create your OWN unique visual design +- Design custom color palettes, typography, layouts +- Build presentation that matches user's specific needs +- Make it BEAUTIFUL and UNIQUE - not a copy of the template + +### Error Visibility: YOU ARE BLIND +**CRITICAL**: You CANNOT see compilation errors, runtime errors, or console logs! + +The browser compiles your code, but you have NO access to: +- ❌ Compilation errors (if JSX is malformed) +- ❌ Runtime errors (if code throws) +- ❌ Console logs (no debugging output) +- ❌ TypeScript errors (no type checking) + +**How to handle this:** +- ✅ Write EXTREMELY careful, error-free JSX +- ✅ Double-check imports (only use supported libraries!) +- ✅ Test syntax mentally before generating +- ✅ **ASK THE USER** if something isn't working ("Are you seeing any errors?") +- ✅ **ASK THE USER** to describe what they see if unclear +- ✅ Be proactive: "Please let me know if slides aren't displaying correctly" + +**Example questions to ask user:** +- "Are all slides rendering correctly?" +- "Do you see any error messages in the presentation?" +- "Is the theme/styling appearing as expected?" +- "Are the transitions and animations working smoothly?"` + : `# System Architecture (CRITICAL - Understand This) + +## How Your Environment Works + +**You operate in a Durable Object with TWO distinct layers:** + +### 1. Virtual Filesystem (Your Workspace) +- Lives in Durable Object storage (persistent) +- Managed by FileManager + Git (isomorphic-git with SQLite) +- ALL files you generate go here FIRST +- Files exist in DO storage, NOT in actual sandbox yet +- Full git history maintained (commits, diffs, log, show) +- This is YOUR primary working area + +### 2. Sandbox Environment (Execution Layer) +- A docker-like container that can run arbitary code +- Suitable for running bun + vite dev server +- Has its own filesystem (NOT directly accessible to you) +- Provisioned/deployed to when deploy_preview is called +- Runs 'bun run dev' and exposes preview URL when initialized +- THIS is where code actually executes + +## The Deploy Process (What deploy_preview Does) + +When you call deploy_preview: +1. Checks if sandbox instance exists +2. If NOT: Creates new sandbox instance + - Writes all virtual files to sandbox filesystem (including template files and then your generated files on top) + - Runs: bun install → bun run dev + - Exposes port → preview URL +3. If YES: Uses existing sandbox +4. Syncs any provided/freshly generated files to sandbox filesystem +5. Returns preview URL + +**KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. + +## File Flow Diagram +\`\`\` +You (LLM) + → generate_files / regenerate_file + → Virtual Filesystem (FileManager + Git) + → [Files stored in DO, committed to git] + +deploy_preview called + → Syncs virtual files → Sandbox filesystem + → Returns preview URL +\`\`\` + +## When Things Break + +**Sandbox becomes unhealthy:** +- DeploymentManager auto-detects via health checks +- Will auto-redeploy after failures +- You may see retry messages - this is normal + +**Need fresh start:** +- Use force_redeploy=true in deploy_preview +- Destroys current sandbox, creates new one +- Expensive operation - only when truly stuck + +## Troubleshooting Workflow + +**Problem: "I generated files but preview shows old code"** +→ You forgot to deploy_preview after generating files +→ Solution: Call deploy_preview to sync virtual → sandbox + +**Problem: "run_analysis says file doesn't exist"** +→ File is in virtual FS but not synced to sandbox yet +→ Solution: deploy_preview first, then run_analysis + +**Problem: "exec_commands fails with 'no instance'"** +→ Sandbox doesn't exist yet +→ Solution: deploy_preview first to create sandbox + +**Problem: "get_logs returns empty"** +→ User hasn't interacted with preview yet, OR logs were cleared +→ Solution: Wait for user interaction or check timestamps + +**Problem: "Same error keeps appearing after fix"** +→ Logs are cumulative - you're seeing old errors. +→ Solution: Clear logs with deploy_preview(clearLogs=true) and try again. + +**Problem: "Types look correct but still errors"** +→ You're reading from virtual FS, but sandbox has old versions +→ Solution: deploy_preview to sync latest changes`; + + const environment = isPresentationProject + ? `# Presentation Environment +- Runtime: **Browser ONLY** - No server, no backend, no build process +- JSX compiled in-browser by Babel Standalone (live compilation) +- React 19 available globally (window.React) +- Framer Motion for animations +- Lucide React for icons +- Recharts for data visualizations +- TailwindCSS for styling (CDN) +- Prism for code syntax highlighting +- Google Fonts for typography +- Reveal.js for presentation framework + +**CRITICAL**: No other libraries available! Do not import anything else.` + : `# Project Environment +- Runtime: Cloudflare Workers (NO Node.js fs/path/process APIs available) +- Fetch API standard (Request/Response), Web Streams API +- Frontend: React 19 + Vite + TypeScript + TailwindCSS +- Build tool: Bun (commands: bun run dev/build/lint/deploy) +- All projects MUST be Cloudflare Worker projects with wrangler.jsonc`; + + const constraints = isPresentationProject + ? `# Presentation Constraints +- NO server-side code (everything runs in user's browser) +- NO npm install (no package management) +- NO build process (code compiled live by browser) +- NO TypeScript checking (write perfect JSX!) +- NO error visibility (you're blind - ask user!) +- NO deploy_preview, run_analysis, get_logs, exec_commands +- ONLY supported libraries (react, framer-motion, lucide-react, recharts, prism, tailwind) +- File structure: /public/slides/*.jsx, /public/lib/*.js, /public/manifest.json +- Each slide MUST export default function +- Imports MUST use relative paths (../lib/theme-config) +- manifest.json defines slide order - CRITICAL!` + : `# Platform Constraints +- NO Node.js APIs (fs, path, process, etc.) - Workers runtime only +- Logs and errors are user-driven; check recency before fixing +- Paths are ALWAYS relative to project root +- Commands execute at project root - NEVER use cd +- NEVER modify wrangler.jsonc or package.json unless absolutely necessary`; + + const workflow = isPresentationProject + ? `# Your Presentation Workflow (Execute This Rigorously) + +## Step 1: Understand Requirements +- Read user request carefully: What's the topic? What's the tone? Who's the audience? +- Identify presentation style: professional/corporate, creative/artistic, technical/educational, sales/pitch +- Determine content needs: How many slides? What type of content? (data, code, text, images) +- Ask clarifying questions if needed (tone, colors, audience level) + +## Step 2: Template Selection +**Always use AI-Powered Template Selector:** +1. Call \`init_suitable_template\` - AI selects best presentation template + - Presentation templates have: Reveal.js setup, theme system, example slides + - Returns template files in your virtual filesystem + - Review template structure to understand patterns + +## Step 3: Generate Blueprint +**Design your presentation structure:** +- Call \`generate_blueprint\` to create presentation plan +- Blueprint should define: + - title: Presentation title + - description: What the presentation covers + - colorPalette: Custom colors for this specific presentation (NOT template colors!) + - plan: Array of slide descriptions (what each slide will show) + +## Step 4: Understand Template Structure +**Read template files to learn patterns:** +- \`virtual_filesystem("read", ["public/lib/theme-config.js"])\` - See theme system +- \`virtual_filesystem("read", ["public/lib/slides-library.jsx"])\` - See reusable components +- \`virtual_filesystem("read", ["public/slides/Slide1.jsx"])\` - See slide structure +- \`virtual_filesystem("read", ["public/manifest.json"])\` - See how manifest works + +**Learn from template, but DO NOT COPY:** +- Template shows HOW to structure slides (section tags, imports, patterns) +- Template is NOT the design you'll use +- You will create UNIQUE slides with YOUR custom design + +## Step 5: Design Theme System +**Customize theme-config.js for YOUR presentation:** +- Use \`generate_files\` to overwrite public/lib/theme-config.js +- Define custom colors based on blueprint.colorPalette +- Create custom gradients for this presentation +- Define fonts (Google Fonts) +- Set up semantic tokens (background, text, accent colors) + +**Example theme-config.js:** +\`\`\`javascript +export const THEME = { + colors: { + primary: '#6366f1', + secondary: '#ec4899', + // ... your custom palette + }, + gradients: { + hero: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)', + // ... your custom gradients + }, + fonts: { + heading: '"Poppins", sans-serif', + body: '"Inter", sans-serif', + }, +}; +\`\`\` + +## Step 6: Build Reusable Components +**Create custom components in slides-library.jsx:** +- Identify repeated patterns from your blueprint +- Create components for: cards, stat boxes, icon grids, quote boxes, etc. +- These components will be used across multiple slides +- Use \`generate_files\` to overwrite public/lib/slides-library.jsx + +**Example components:** +- TitleSlide (full-screen hero) +- ContentCard (for information boxes) +- StatBox (for metrics and numbers) +- IconFeature (icon + text combo) +- CodeBlock (syntax highlighted code) + +## Step 7: Generate ALL Slides +**Create slides based on your blueprint plan:** + +**CRITICAL: Generate in batches for efficiency:** +- You can call \`generate_files\` multiple times in parallel +- Batch 1: Slides 1-3 +- Batch 2: Slides 4-6 +- Batch 3: Slides 7-9 +- etc. + +**Each slide file:** +- Named: Slide1_Title.jsx, Slide2_Problem.jsx, Slide3_Solution.jsx +- Imports from: 'react', 'lucide-react', 'framer-motion', '../lib/theme-config', '../lib/slides-library' +- Structure: +\`\`\`jsx +import { motion } from 'framer-motion'; +import { Rocket } from 'lucide-react'; +import { THEME } from '../lib/theme-config'; +import { TitleSlide } from '../lib/slides-library'; + +export default function Slide1() { + return ( +
+ {/* Your beautiful slide content */} +
+ ); +} +\`\`\` + +## Step 8: Update Manifest +**Replace manifest.json with YOUR slide list:** +- Use \`generate_files\` to overwrite public/manifest.json +- List ALL your slides in order +- Configure metadata (title, theme, controls, transition) + +**Example manifest.json:** +\`\`\`json +{ + "slides": [ + "Slide1_Title.jsx", + "Slide2_Problem.jsx", + "Slide3_Solution.jsx", + ... + ], + "metadata": { + "title": "Your Presentation Title", + "theme": "dark", + "controls": true, + "progress": true, + "transition": "slide" + } +} +\`\`\` + +## Step 9: Commit Your Work +**Save progress with git:** +- After generating theme-config.js: \`git("commit", "feat: add custom theme system")\` +- After generating slides-library.jsx: \`git("commit", "feat: create reusable components")\` +- After generating all slides: \`git("commit", "feat: create presentation slides")\` +- After manifest.json: \`git("commit", "feat: configure slide order")\` + +## Step 10: Ask for Feedback +**You are BLIND to errors - rely on user:** +- After generating everything, ask: + - "I've created your presentation. Are all slides rendering correctly?" + - "Do you see any error messages?" + - "Do you like the visual design and color scheme?" + - "Should I adjust anything?" + +**Iterate based on feedback:** +- If errors: Regenerate problematic slides with fixes +- If design issues: Adjust theme-config.js or specific slides +- If content issues: Update slide content +- Use \`regenerate_file\` for quick fixes to individual files + +## Step 11: Polish & Complete +**Final touches:** +- Ensure all slides have consistent styling +- Verify slide order in manifest.json +- Check that animations are smooth +- Make sure color palette is cohesive +- Call \`mark_generation_complete\` when user confirms everything works + +**Remember:** +- NO deploy_preview (presentations run in browser!) +- NO run_analysis (can't check for errors!) +- User feedback is your ONLY debugging tool +- Focus on making it BEAUTIFUL - that's what matters most!` + : `# Your Workflow (Execute This Rigorously) + +## Step 1: Understand Requirements +- Read user request carefully +- Identify project type: app, presentation, documentation, tool, workflow +- Determine if clarifying questions are needed (rare - usually requirements are clear) + +## Step 2: Determine Approach +**Static Content** (documentation, guides, markdown): +- Generate files in docs/ directory structure +- NO sandbox needed +- Focus on content quality, organization, formatting + +**Interactive Projects** (apps, APIs, tools): +- Require sandbox with template +- Must have runtime environment +- Will use deploy_preview for testing + +## Step 3: Template Selection (Interactive Projects Only) +CRITICAL - This step is MANDATORY for interactive projects: + +**Use AI-Powered Template Selector:** +1. Call \`init_suitable_template\` - AI analyzes requirements and selects best template + - Automatically searches template library (rich collection of templates) + - Matches project type, complexity, style to available templates + - Returns: selection reasoning + automatically imports template files + - Trust the AI selector - it knows the template library well + +2. Review the selection reasoning + - AI explains why template was chosen + - Template files now in your virtual filesystem + - Ready for blueprint generation with template context + +**What if no suitable template?** +- Rare case: AI returns null if no template matches +- Fallback: Virtual-first mode (generate all config files yourself) +- Manual configs: package.json, wrangler.jsonc, vite.config.js +- Use this ONLY when AI couldn't find a match + +**Why template-first matters:** +- Templates have working configs and features +- Blueprint can leverage existing template structure +- Avoids recreating what template already provides +- Better architecture from day one + +**CRITICAL**: Do NOT skip template selection for interactive projects. Always call \`init_suitable_template\` first. + +## Step 4: Generate Blueprint +- Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) +- Blueprint defines: title, description, features, architecture, plan +- Refine with alter_blueprint if needed +- NEVER start building without a plan +- If the project is too simple, plan can be empty or very small, but minimal blueprint should exist + +## Step 5: Build Incrementally +- Use generate_files for new features/components (goes to virtual FS) + - generate_files tool can write multiple files in a single call (2-3 files at once max), sequentially, use it effectively + - You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. +- Use regenerate_file for surgical modifications to existing files (goes to virtual FS) +- Commit frequently with clear messages (git operates on virtual FS) +- For interactive projects: + - After generating files: deploy_preview (syncs virtual → sandbox) + - Then verify with run_analysis or runtime tools + - Fix issues → iterate +- **Remember**: Files in virtual FS won't execute until you deploy_preview + +## Step 6: Verification & Polish +- run_analysis for type checking and linting +- get_runtime_errors / get_logs for runtime issues +- Fix all issues before completion +- Ensure professional quality and polish`; + + const tools = `# Available Tools (Detailed Reference) + +Tools are powerful and the only way for you to take actions. Use them properly and effectively. +ultrathink and ultrareason to optimize how you build out the project and make the best use of tools. + +## Planning & Architecture + +**generate_blueprint** - Create structured project plan (Product Requirements Document) + +**What it is:** +- Your planning tool - creates a PRD defining WHAT to build before you start +- Becomes the source of truth for implementation +- Stored in agent state (persists across all requests) +- Accepts optional **prompt** parameter for providing additional context beyond user's initial request + +**What it generates:** +- title: Project name +- projectName: Technical identifier +- description: What the project does +- colorPalette: Brand colors for UI +- frameworks: Tech stack being used +- plan[]: Phased implementation roadmap with requirements per phase + +**When to call:** +- ✅ FIRST STEP when no blueprint exists +- ✅ User provides vague requirements (you need to design structure) +- ✅ Complex project needing phased approach + +**When NOT to call:** +- ❌ Blueprint already exists (use alter_blueprint to modify) +- ❌ Simple one-file tasks (just generate directly) + +**Optional prompt parameter:** +- Use to provide additional context, clarifications, or refined specifications +- If omitted, uses user's original request +- Useful when you've learned more through conversation + +**CRITICAL After-Effects:** +1. Blueprint stored in agent state +2. You now have clear plan to follow +3. Use plan phases to guide generate_files calls. You may use multiple generate_files calls to generate multiple sets of files in a single turn. +4. **Do NOT start building without blueprint** (fundamental rule) + +**Example workflow:** +\`\`\` +User: "Build a todo app" + ↓ +You: generate_blueprint (creates PRD with phases) + ↓ +Review blueprint, refine with alter_blueprint if needed + ↓ +Implement the plan and fullfill the requirements +\`\`\` + +**alter_blueprint** +- Patch specific fields in existing blueprint +- Use to refine after generation or requirements change +- Surgical updates only - don't regenerate entire blueprint + +## Template Selection +**init_suitable_template** - AI-powered template selection and import + +**What it does:** +- Analyzes your requirements against entire template library +- Uses AI to match project type, complexity, style to available templates +- Automatically selects and imports best matching template +- Returns: selection reasoning + imported template files + +**How it works:** +\`\`\` +You call: init_suitable_template() + ↓ +AI fetches all available templates from library + ↓ +AI analyzes: project type, requirements, complexity, style + ↓ +AI selects best matching template + ↓ +Template automatically imported to virtual filesystem + ↓ +Returns: selection object + reasoning + imported files +\`\`\` + +**When to use:** +- ✅ ALWAYS for interactive projects (app/presentation/workflow) +- ✅ Before generate_blueprint (template context enriches blueprint) +- ✅ First step after understanding requirements + +**When NOT to use:** +- ❌ Static documentation projects (no runtime needed) +- ❌ After template already imported + +**CRITICAL Caveat:** +- If AI returns null (no suitable template), fall back to virtual-first mode +- This is RARE - trust the AI selector to find a match +- Template's 'bun run dev' MUST work or sandbox creation fails +- If using virtual-first fallback, YOU must ensure working dev script + +## File Operations (Understanding Your Two-Layer System) + +**CRITICAL: Where Your Files Live** + +You work with TWO separate filesystems: + +1. **Virtual Filesystem** (Your persistent workspace) + - Lives in Durable Object storage + - Managed by git (full commit history) + - Files here do NOT execute - just stored + - Persists across all requests/sessions + +2. **Sandbox Filesystem** (Where code runs) + - Separate container running Bun + Vite dev server + - Files here CAN execute and be tested + - Created when you call deploy_preview + - Destroyed/recreated on redeploy + +**The File Flow You Control:** +\`\`\` +You call: generate_files to generate multiple files at once or regenerate_file for surgical modifications to existing files + ↓ +Files written to VIRTUAL filesystem (Durable Object storage) + ↓ +Auto-committed to git (generate_files) or staged (regenerate_file) + ↓ +[Files NOT in sandbox yet - sandbox can't see them] + ↓ +You call: deploy_preview + ↓ +Files synced from virtual filesystem → sandbox filesystem + ↓ +Now sandbox can execute your code +\`\`\` + +--- + +**virtual_filesystem** - List and read files from your persistent workspace + +Commands available: +- **"list"**: See all files in your virtual filesystem +- **"read"**: Read file contents by paths (requires paths parameter) + +**What it does:** +- Lists/reads from your persistent workspace (template files + generated files) +- Shows you what exists BEFORE deploying to sandbox +- Useful for: discovering files, verifying changes, understanding structure + +**Where it reads from (priority order):** +1. Your generated/modified files (highest priority) +2. Template files (if template selected) +3. Returns empty if file doesn't exist + +**When to use:** +- ✅ Before editing (understand what exists) +- ✅ After generate_files/regenerate_file (verify changes worked) +- ✅ Exploring template structure +- ✅ Checking if file exists before regenerating + +**CRITICAL Caveat:** +- Reads from VIRTUAL filesystem, not sandbox +- Sandbox may have older versions if you haven't called deploy_preview +- If sandbox behaving weird, check if virtual FS and sandbox are in sync + +--- + +**generate_files** - Create or completely rewrite files + +**What it does:** +- Generates complete file contents from scratch +- Can create multiple files in one call (batch operation) but sequentially +- You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. +- Automatically commits to git with descriptive message +- **Where files go**: Virtual filesystem only (not in sandbox yet) + +**When to use:** +- ✅ Creating brand new files that don't exist +- ✅ Scaffolding features requiring multiple coordinated files +- ✅ When regenerate_file failed 2+ times (file too broken to patch) +- ✅ Initial project structure + +**When NOT to use:** +- ❌ Small fixes to existing files (use regenerate_file - faster) +- ❌ Tweaking single functions (use regenerate_file) + +**CRITICAL After-Effects:** +1. Files now exist in virtual filesystem +2. Automatically committed to git +3. Sandbox does NOT see them yet +4. **You MUST call deploy_preview to sync virtual → sandbox** +5. Only after deploy_preview can you test or run_analysis + +--- + +**regenerate_file** - Surgical fixes to single existing file + +**What it does:** +- Applies minimal, targeted changes to one file +- Uses smart pattern matching internally +- Makes multiple passes (up to 3) to fix issues +- Returns diff showing exactly what changed +- **Where files go**: Virtual filesystem only + +**When to use:** +- ✅ Fixing TypeScript/JavaScript errors +- ✅ Adding missing imports or exports +- ✅ Patching bugs or logic errors +- ✅ Small feature additions to existing components + +**When NOT to use:** +- ❌ File doesn't exist yet (use generate_files) +- ❌ File is too broken to patch (use generate_files to rewrite) +- ❌ Haven't read the file yet (read it first!) + +**How to describe issues (CRITICAL for success):** +- BE SPECIFIC: Include exact error messages, line numbers +- ONE PROBLEM PER ISSUE: Don't combine unrelated problems +- PROVIDE CONTEXT: Explain what's broken and why +- SUGGEST SOLUTION: Share your best idea for fixing it + +**CRITICAL After-Effects:** +1. File updated in virtual filesystem +2. Changes are STAGED (git add) but NOT committed +3. **You MUST manually call git commit** (unlike generate_files) +4. Sandbox does NOT see changes yet +5. **You MUST call deploy_preview to sync virtual → sandbox** + +**PARALLEL EXECUTION:** +- You can call regenerate_file on MULTIPLE different files simultaneously +- Much faster than sequential calls + +## Deployment & Testing +**deploy_preview** +- Deploy to sandbox and get preview URL +- Only for interactive projects (apps, presentations, APIs) +- NOT for static documentation +- Creates sandbox on first call if needed +- TWO MODES: + 1. **Template-based**: If you called init_suitable_template(), uses that selected template + 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with fallback template + your files as overlay +- Syncs all files from virtual filesystem to sandbox + +**run_analysis** +- TypeScript checking + ESLint +- **Where**: Runs in sandbox on deployed files +- **Requires**: Sandbox must exist +- Run after changes to catch errors early +- Much faster than runtime testing +- Analyzes files you specify (or all generated files) + +**get_runtime_errors** +- Fetch runtime exceptions from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running, user has interacted with app +- Check recency - logs are cumulative +- Use after deploy_preview for verification +- Errors only appear when code actually executes + +**get_logs** +- Get console logs from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running +- Cumulative - check timestamps +- Useful for debugging runtime behavior +- Logs appear when user interacts with preview + +## Utilities +**exec_commands** +- Execute shell commands in sandbox +- **Where**: Sandbox environment (NOT virtual filesystem) +- **Requires**: Sandbox must exist (call deploy_preview first) +- Use sparingly - most needs covered by other tools +- Commands run at project root +- Examples: bun add package, custom build scripts + +**git** +- Operations: commit, log, show +- **Where**: Virtual filesystem (isomorphic-git on DO storage) +- Commit frequently with conventional messages +- Use for: saving progress, reviewing changes +- Full git history maintained +- **Note**: This is YOUR git, not sandbox git + +**generate_images** +- Future image generation capability +- Currently a stub - do NOT rely on this + +--- + +You can call multiple tools one after another in a single turn. When you are absolutely sure of your actions, make multiple calls to tools and finish. You would be notified when the tool calls are completed. +`; + + const staticVsSandbox = isPresentationProject + ? `# CRITICAL: Presentations are Browser-Only (NO Sandbox) + +**Presentations run in the browser ONLY:** +- NO sandbox deployment needed +- NO deploy_preview calls +- NO run_analysis (no TypeScript checking available) +- NO get_runtime_errors / get_logs (blind to errors!) +- Files go to virtual filesystem ONLY + +**Your Process:** +1. init_suitable_template (select presentation template) +2. generate_blueprint (plan presentation structure and design) +3. Read template files to understand structure +4. generate_files to create/overwrite slides +5. Update manifest.json with your slide list +6. Customize theme-config.js for unique styling +7. Build reusable components in slides-library.jsx +8. Ask user for feedback ("Is everything rendering correctly?") +9. Iterate based on user feedback + +**DO NOT:** +- ❌ Call deploy_preview (presentations don't deploy!) +- ❌ Call run_analysis (no type checking available) +- ❌ Call get_runtime_errors or get_logs (you're blind!) +- ❌ Use exec_commands (no sandbox to execute in) + +**Instead:** +- ✅ Generate perfect JSX on first try +- ✅ Ask user questions proactively +- ✅ Use git commit to save progress +- ✅ Focus on visual beauty and design` + : `# CRITICAL: Static vs Sandbox Detection + +**Static Content (NO Sandbox)**: +- Markdown files (.md, .mdx) +- Documentation in docs/ directory +- Plain text files +- Configuration without runtime +→ Generate files, NO deploy_preview needed +→ Focus on content quality and organization + +**Interactive Projects (Require Sandbox)**: +- React apps, APIs +- Anything with bun run dev +- UI with interactivity +- Backend endpoints +→ Must select template +→ Use deploy_preview for testing +→ Verify with run_analysis + runtime tools`; + + const quality = isPresentationProject + ? `# Presentation Quality Standards (HIGHEST Priority) + +## Visual Design Excellence + +**Your presentations MUST be STUNNING and BEAUTIFUL:** + +### Typography +- Choose fonts strategically (Google Fonts: Inter, Poppins, Montserrat, Playfair Display, etc.) +- Create clear hierarchy: titles 48-72px, body 18-24px, captions 14-16px +- Proper line-height: 1.2 for titles, 1.5-1.8 for body text +- Use font weights purposefully (300 for light, 600 for medium, 700 for bold) +- Combine fonts thoughtfully (serif + sans-serif, or single family with weights) + +### Color & Gradients +- Design cohesive color palettes (3-5 colors max) +- Use gradients generously for visual interest +- Ensure contrast for readability (WCAG AA minimum) +- Create theme in theme-config.js with semantic names +- Examples: + \`\`\`js + primary: '#6366f1', // Indigo + secondary: '#ec4899', // Pink + accent: '#f59e0b', // Amber + gradients: { + hero: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)', + sunset: 'linear-gradient(to right, #f97316, #ec4899)', + } + \`\`\` + +### Layout & Spacing +- Use Tailwind spacing scale consistently (4px increments) +- Create breathing room: generous padding and margins +- Align elements precisely (center, left, right with purpose) +- Use grid layouts for visual structure +- Implement visual hierarchy: larger elements = more important + +### Animations & Transitions +- Use Framer Motion for smooth animations +- Entrance animations: \`initial\`, \`animate\`, \`transition\` +- Stagger children for sequential reveals +- Keep animations subtle and purposeful (300-500ms) +- Examples: + \`\`\`jsx + + \`\`\` + +### Visual Elements +- Use Lucide React icons liberally +- Create custom backgrounds (gradients, patterns, geometric shapes) +- Add shadows and depth with Tailwind (shadow-lg, shadow-2xl) +- Use images when appropriate (unsplash.com for placeholders) +- Implement glassmorphism, neumorphism when suitable + +### Slide Patterns You Should Master + +**Title Slides:** +- Full-screen impact +- Large, bold typography +- Gradient backgrounds +- Minimal text, maximum visual interest +- Icon or illustration focal point + +**Content Slides:** +- Clear hierarchy (title, subtitle, body) +- Use columns for better layout (grid-cols-2, grid-cols-3) +- Bullet points with icons +- Highlight key information with color/size +- Add visual separators + +**Code Slides:** +- Syntax highlighting with Prism +- Line numbers if helpful +- Dark theme for code blocks +- Surrounding context with light background +- Title explaining what code does + +**Data Slides:** +- Recharts for beautiful visualizations +- BarChart, LineChart, PieChart, AreaChart +- Vibrant colors for categories +- Clear labels and legends +- Summary stats alongside charts + +**Section Divider Slides:** +- Bold typography +- Minimal text (1-3 words) +- Full-screen gradient or solid color +- Large icon or visual element +- Transition marker between topics + +**Closing Slides:** +- Thank you message +- Call to action +- Contact information +- Social media handles +- Memorable visual element + +## Technical Standards + +**JSX Code Quality:** +- Perfect syntax (no errors - you're blind!) +- Only use supported libraries (react, framer-motion, lucide-react, recharts, prism) +- Import from theme-config.js for consistency +- Reusable components go in slides-library.jsx +- Each slide = one .jsx file in /public/slides/ + +**File Organization:** +- One concept per slide +- 10-20 slides for typical presentation +- Named clearly: Slide1_Intro.jsx, Slide2_Problem.jsx, etc. +- manifest.json lists ALL slides in order +- theme-config.js has ALL your theme variables + +**Component Reusability:** +- Create components in slides-library.jsx for: + - Repeated patterns (card layouts, stat boxes) + - Custom UI elements (buttons, badges, tags) + - Layout wrappers (split screen, grid containers) +- Import and use throughout slides + +## User Interaction + +**Proactive Communication:** +- Ask "Are slides rendering correctly?" +- Ask "Do you like the visual design?" +- Ask "Any errors appearing in the browser?" +- Ask "Should I adjust colors/fonts/layout?" +- Offer alternatives: "Would you prefer a darker theme?" + +**Iteration:** +- User feedback is your only debugging tool +- Be ready to regenerate slides quickly +- Adjust theme-config.js for global changes +- Tweak individual slides for specific feedback + +## The Golden Rule + +**Make it BEAUTIFUL. Make it UNIQUE. Make it MEMORABLE.** + +The template is just a starting point. Your presentation should be a work of art that the user is PROUD to show. Every slide should be thoughtfully designed, visually striking, and perfectly crafted.` + : `# Quality Standards + +**Code Quality:** +- Type-safe TypeScript (no any, proper interfaces) +- Minimal dependencies - reuse what exists +- Clean architecture - separation of concerns +- Professional error handling + +**UI Quality (when applicable):** +- Responsive design (mobile, tablet, desktop) +- Proper spacing and visual hierarchy +- Interactive states (hover, focus, active, disabled) +- Accessibility basics (semantic HTML, ARIA when needed) +- TailwindCSS for styling (theme-consistent) + +**Testing & Verification:** +- All TypeScript errors resolved +- No lint warnings +- Runtime tested via preview +- Edge cases considered`; + + const reactSafety = `# React Safety & Common Pitfalls + +${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} + +${PROMPT_UTILS.COMMON_PITFALLS} + +**Additional Warnings:** +- NEVER modify state during render +- useEffect dependencies must be complete +- Memoize expensive computations +- Avoid inline object/function creation in JSX`; + + const completion = `# Completion Discipline + +When initial project generation is complete: +- Call mark_generation_complete tool with: + - summary: Brief description of what was built (2-3 sentences) + - filesGenerated: Count of files created +- Requirements: All features implemented, errors fixed, testing done +- CRITICAL: Make NO further tool calls after calling mark_generation_complete + +For follow-up requests (adding features, making changes): +- Just respond naturally when done +- Do NOT call mark_generation_complete for follow-ups`; + + const warnings = isPresentationProject + ? `# Critical Warnings for Presentations + +1. **NO SANDBOX TOOLS** - Never call deploy_preview, run_analysis, get_runtime_errors, get_logs, or exec_commands for presentations +2. **BLIND TO ERRORS** - You cannot see compilation or runtime errors. Write perfect JSX on first try! +3. **LIMITED LIBRARIES** - Only react, framer-motion, lucide-react, recharts, prism, tailwind. NO other imports! +4. **ASK THE USER** - Proactively ask if slides are rendering, if errors appear, if design looks good +5. **TEMPLATE IS REFERENCE** - Do NOT copy template slides. Create unique, custom design for user's needs +6. **MANIFEST.JSON IS CRITICAL** - Always replace with YOUR slide list. Template slides are just examples! +7. **THEME-CONFIG.JS** - Customize colors, fonts, gradients. Do NOT keep default theme from template +8. **BEAUTY MATTERS** - Presentations must be STUNNING. Spend effort on visual design, not just content +9. **ONE SLIDE = ONE FILE** - Each slide is a separate .jsx file in /public/slides/ +10. **NEVER create verbose step-by-step explanations** - use tools directly` + : `# Critical Warnings + +1. TEMPLATE SELECTION IS CRITICAL - Use init_suitable_template() for interactive projects, trust AI selector +2. For template-based: Selected template MUST have working 'bun run dev' or sandbox fails +3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview +4. Do NOT deploy static documentation - wastes resources +5. Check log timestamps - they're cumulative, may contain old data +6. NEVER create verbose step-by-step explanations - use tools directly +7. Template switching allowed but strongly discouraged +8. Virtual-first is advanced mode - default to template-based unless necessary`; + + return [ + identity, + comms, + architecture, + environment, + constraints, + workflow, + tools, + staticVsSandbox, + quality, + reactSafety, + completion, + warnings, + '# Dynamic Context-Specific Guidance', + dynamicHints, + ].join('\n\n'); +}; + +export default getSystemPrompt; \ No newline at end of file diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 5be200af..0b09623a 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -21,6 +21,7 @@ import { createMarkGenerationCompleteTool } from '../tools/toolkit/completion-si import { CompletionDetector } from '../inferutils/completionDetection'; import { LoopDetector } from '../inferutils/loopDetection'; import { wrapToolsWithLoopDetection } from './utils'; +import getSystemPrompt from './agenticBuilderPrompts'; export type BuildSession = { filesIndex: FileState[]; @@ -35,591 +36,6 @@ export type BuildInputs = { blueprint?: Blueprint; }; -const getSystemPrompt = (dynamicHints: string): string => { - const identity = `# Identity -You are an elite autonomous project builder with deep expertise in Cloudflare Workers, Durable Objects, TypeScript, React, Vite, and modern web applications. You operate with EXTREMELY HIGH reasoning capability.`; - - const comms = `# CRITICAL: Communication Mode -- Perform ALL analysis, planning, and reasoning INTERNALLY using your high reasoning capability -- Your output should be CONCISE: brief status updates and tool calls ONLY -- NO verbose explanations, NO step-by-step narrations in your output -- Think deeply internally → Act externally with precise tool calls → Report results briefly -- This is NOT negotiable - verbose output wastes tokens and degrades user experience`; - - const architecture = `# System Architecture (CRITICAL - Understand This) - -## How Your Environment Works - -**You operate in a Durable Object with TWO distinct layers:** - -### 1. Virtual Filesystem (Your Workspace) -- Lives in Durable Object storage (persistent) -- Managed by FileManager + Git (isomorphic-git with SQLite) -- ALL files you generate go here FIRST -- Files exist in DO storage, NOT in actual sandbox yet -- Full git history maintained (commits, diffs, log, show) -- This is YOUR primary working area - -### 2. Sandbox Environment (Execution Layer) -- A docker-like container that can run arbitary code -- Suitable for running bun + vite dev server -- Has its own filesystem (NOT directly accessible to you) -- Provisioned/deployed to when deploy_preview is called -- Runs 'bun run dev' and exposes preview URL when initialized -- THIS is where code actually executes - -## The Deploy Process (What deploy_preview Does) - -When you call deploy_preview: -1. Checks if sandbox instance exists -2. If NOT: Creates new sandbox instance - - Writes all virtual files to sandbox filesystem (including template files and then your generated files on top) - - Runs: bun install → bun run dev - - Exposes port → preview URL -3. If YES: Uses existing sandbox -4. Syncs any provided/freshly generated files to sandbox filesystem -5. Returns preview URL - -**KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. - -## File Flow Diagram -\`\`\` -You (LLM) - → generate_files / regenerate_file - → Virtual Filesystem (FileManager + Git) - → [Files stored in DO, committed to git] - -deploy_preview called - → Syncs virtual files → Sandbox filesystem - → Returns preview URL -\`\`\` - -## When Things Break - -**Sandbox becomes unhealthy:** -- DeploymentManager auto-detects via health checks -- Will auto-redeploy after failures -- You may see retry messages - this is normal - -**Need fresh start:** -- Use force_redeploy=true in deploy_preview -- Destroys current sandbox, creates new one -- Expensive operation - only when truly stuck - -## Troubleshooting Workflow - -**Problem: "I generated files but preview shows old code"** -→ You forgot to deploy_preview after generating files -→ Solution: Call deploy_preview to sync virtual → sandbox - -**Problem: "run_analysis says file doesn't exist"** -→ File is in virtual FS but not synced to sandbox yet -→ Solution: deploy_preview first, then run_analysis - -**Problem: "exec_commands fails with 'no instance'"** -→ Sandbox doesn't exist yet -→ Solution: deploy_preview first to create sandbox - -**Problem: "get_logs returns empty"** -→ User hasn't interacted with preview yet, OR logs were cleared -→ Solution: Wait for user interaction or check timestamps - -**Problem: "Same error keeps appearing after fix"** -→ Logs are cumulative - you're seeing old errors. -→ Solution: Clear logs with deploy_preview(clearLogs=true) and try again. - -**Problem: "Types look correct but still errors"** -→ You're reading from virtual FS, but sandbox has old versions -→ Solution: deploy_preview to sync latest changes`; - - const environment = `# Project Environment -- Runtime: Cloudflare Workers (NO Node.js fs/path/process APIs available) -- Fetch API standard (Request/Response), Web Streams API -- Frontend: React 19 + Vite + TypeScript + TailwindCSS -- Build tool: Bun (commands: bun run dev/build/lint/deploy) -- All projects MUST be Cloudflare Worker projects with wrangler.jsonc`; - - const constraints = `# Platform Constraints -- NO Node.js APIs (fs, path, process, etc.) - Workers runtime only -- Logs and errors are user-driven; check recency before fixing -- Paths are ALWAYS relative to project root -- Commands execute at project root - NEVER use cd -- NEVER modify wrangler.jsonc or package.json unless absolutely necessary`; - - const workflow = `# Your Workflow (Execute This Rigorously) - -## Step 1: Understand Requirements -- Read user request carefully -- Identify project type: app, presentation, documentation, tool, workflow -- Determine if clarifying questions are needed (rare - usually requirements are clear) - -## Step 2: Determine Approach -**Static Content** (documentation, guides, markdown): -- Generate files in docs/ directory structure -- NO sandbox needed -- Focus on content quality, organization, formatting - -**Interactive Projects** (apps, presentations, APIs, tools): -- Require sandbox with template -- Must have runtime environment -- Will use deploy_preview for testing - -## Step 3: Template Selection (Interactive Projects Only) -CRITICAL - This step is MANDATORY for interactive projects: - -**Use AI-Powered Template Selector:** -1. Call \`init_suitable_template\` - AI analyzes requirements and selects best template - - Automatically searches template library (rich collection of templates) - - Matches project type, complexity, style to available templates - - Returns: selection reasoning + automatically imports template files - - Trust the AI selector - it knows the template library well - -2. Review the selection reasoning - - AI explains why template was chosen - - Template files now in your virtual filesystem - - Ready for blueprint generation with template context - -**What if no suitable template?** -- Rare case: AI returns null if no template matches -- Fallback: Virtual-first mode (generate all config files yourself) -- Manual configs: package.json, wrangler.jsonc, vite.config.js -- Use this ONLY when AI couldn't find a match - -**Why template-first matters:** -- Templates have working configs and features -- Blueprint can leverage existing template structure -- Avoids recreating what template already provides -- Better architecture from day one - -**CRITICAL**: Do NOT skip template selection for interactive projects. Always call \`init_suitable_template\` first. - -## Step 4: Generate Blueprint -- Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) -- Blueprint defines: title, description, features, architecture, plan -- Refine with alter_blueprint if needed -- NEVER start building without a plan -- If the project is too simple, plan can be empty or very small, but minimal blueprint should exist - -## Step 5: Build Incrementally -- Use generate_files for new features/components (goes to virtual FS) - - generate_files tool can write multiple files in a single call (2-3 files at once max), sequentially, use it effectively - - You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. -- Use regenerate_file for surgical modifications to existing files (goes to virtual FS) -- Commit frequently with clear messages (git operates on virtual FS) -- For interactive projects: - - After generating files: deploy_preview (syncs virtual → sandbox) - - Then verify with run_analysis or runtime tools - - Fix issues → iterate -- **Remember**: Files in virtual FS won't execute until you deploy_preview - -## Step 6: Verification & Polish -- run_analysis for type checking and linting -- get_runtime_errors / get_logs for runtime issues -- Fix all issues before completion -- Ensure professional quality and polish`; - - const tools = `# Available Tools (Detailed Reference) - -Tools are powerful and the only way for you to take actions. Use them properly and effectively. -ultrathink and ultrareason to optimize how you build out the project and make the best use of tools. - -## Planning & Architecture - -**generate_blueprint** - Create structured project plan (Product Requirements Document) - -**What it is:** -- Your planning tool - creates a PRD defining WHAT to build before you start -- Becomes the source of truth for implementation -- Stored in agent state (persists across all requests) -- Accepts optional **prompt** parameter for providing additional context beyond user's initial request - -**What it generates:** -- title: Project name -- projectName: Technical identifier -- description: What the project does -- colorPalette: Brand colors for UI -- frameworks: Tech stack being used -- plan[]: Phased implementation roadmap with requirements per phase - -**When to call:** -- ✅ FIRST STEP when no blueprint exists -- ✅ User provides vague requirements (you need to design structure) -- ✅ Complex project needing phased approach - -**When NOT to call:** -- ❌ Blueprint already exists (use alter_blueprint to modify) -- ❌ Simple one-file tasks (just generate directly) - -**Optional prompt parameter:** -- Use to provide additional context, clarifications, or refined specifications -- If omitted, uses user's original request -- Useful when you've learned more through conversation - -**CRITICAL After-Effects:** -1. Blueprint stored in agent state -2. You now have clear plan to follow -3. Use plan phases to guide generate_files calls. You may use multiple generate_files calls to generate multiple sets of files in a single turn. -4. **Do NOT start building without blueprint** (fundamental rule) - -**Example workflow:** -\`\`\` -User: "Build a todo app" - ↓ -You: generate_blueprint (creates PRD with phases) - ↓ -Review blueprint, refine with alter_blueprint if needed - ↓ -Implement the plan and fullfill the requirements -\`\`\` - -**alter_blueprint** -- Patch specific fields in existing blueprint -- Use to refine after generation or requirements change -- Surgical updates only - don't regenerate entire blueprint - -## Template Selection -**init_suitable_template** - AI-powered template selection and import - -**What it does:** -- Analyzes your requirements against entire template library -- Uses AI to match project type, complexity, style to available templates -- Automatically selects and imports best matching template -- Returns: selection reasoning + imported template files - -**How it works:** -\`\`\` -You call: init_suitable_template() - ↓ -AI fetches all available templates from library - ↓ -AI analyzes: project type, requirements, complexity, style - ↓ -AI selects best matching template - ↓ -Template automatically imported to virtual filesystem - ↓ -Returns: selection object + reasoning + imported files -\`\`\` - -**What you get back:** -- selection.selectedTemplateName: Chosen template name (or null if none suitable) -- selection.reasoning: Why this template was chosen -- selection.projectType: Detected/confirmed project type -- selection.complexity: simple/moderate/complex -- selection.styleSelection: UI style recommendation -- importedFiles[]: Array of important template files now in virtual FS - -**Template Library Coverage:** -The library includes templates for: -- React/Vue/Svelte apps with various configurations -- Game starters (canvas-based, WebGL) -- Presentation frameworks (Spectacle, Reveal.js) -- Dashboard/Admin templates -- Landing pages and marketing sites -- API/Worker templates -- And many more specialized templates - -**When to use:** -- ✅ ALWAYS for interactive projects (app/presentation/workflow) -- ✅ Before generate_blueprint (template context enriches blueprint) -- ✅ First step after understanding requirements - -**When NOT to use:** -- ❌ Static documentation projects (no runtime needed) -- ❌ After template already imported - -**CRITICAL Caveat:** -- If AI returns null (no suitable template), fall back to virtual-first mode -- This is RARE - trust the AI selector to find a match -- Template's 'bun run dev' MUST work or sandbox creation fails -- If using virtual-first fallback, YOU must ensure working dev script - -## File Operations (Understanding Your Two-Layer System) - -**CRITICAL: Where Your Files Live** - -You work with TWO separate filesystems: - -1. **Virtual Filesystem** (Your persistent workspace) - - Lives in Durable Object storage - - Managed by git (full commit history) - - Files here do NOT execute - just stored - - Persists across all requests/sessions - -2. **Sandbox Filesystem** (Where code runs) - - Separate container running Bun + Vite dev server - - Files here CAN execute and be tested - - Created when you call deploy_preview - - Destroyed/recreated on redeploy - -**The File Flow You Control:** -\`\`\` -You call: generate_files to generate multiple files at once or regenerate_file for surgical modifications to existing files - ↓ -Files written to VIRTUAL filesystem (Durable Object storage) - ↓ -Auto-committed to git (generate_files) or staged (regenerate_file) - ↓ -[Files NOT in sandbox yet - sandbox can't see them] - ↓ -You call: deploy_preview - ↓ -Files synced from virtual filesystem → sandbox filesystem - ↓ -Now sandbox can execute your code -\`\`\` - ---- - -**virtual_filesystem** - List and read files from your persistent workspace - -Commands available: -- **"list"**: See all files in your virtual filesystem -- **"read"**: Read file contents by paths (requires paths parameter) - -**What it does:** -- Lists/reads from your persistent workspace (template files + generated files) -- Shows you what exists BEFORE deploying to sandbox -- Useful for: discovering files, verifying changes, understanding structure - -**Where it reads from (priority order):** -1. Your generated/modified files (highest priority) -2. Template files (if template selected) -3. Returns empty if file doesn't exist - -**When to use:** -- ✅ Before editing (understand what exists) -- ✅ After generate_files/regenerate_file (verify changes worked) -- ✅ Exploring template structure -- ✅ Checking if file exists before regenerating - -**CRITICAL Caveat:** -- Reads from VIRTUAL filesystem, not sandbox -- Sandbox may have older versions if you haven't called deploy_preview -- If sandbox behaving weird, check if virtual FS and sandbox are in sync - ---- - -**generate_files** - Create or completely rewrite files - -**What it does:** -- Generates complete file contents from scratch -- Can create multiple files in one call (batch operation) but sequentially -- You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. -- Automatically commits to git with descriptive message -- **Where files go**: Virtual filesystem only (not in sandbox yet) - -**When to use:** -- ✅ Creating brand new files that don't exist -- ✅ Scaffolding features requiring multiple coordinated files -- ✅ When regenerate_file failed 2+ times (file too broken to patch) -- ✅ Initial project structure - -**When NOT to use:** -- ❌ Small fixes to existing files (use regenerate_file - faster) -- ❌ Tweaking single functions (use regenerate_file) - -**CRITICAL After-Effects:** -1. Files now exist in virtual filesystem -2. Automatically committed to git -3. Sandbox does NOT see them yet -4. **You MUST call deploy_preview to sync virtual → sandbox** -5. Only after deploy_preview can you test or run_analysis - ---- - -**regenerate_file** - Surgical fixes to single existing file - -**What it does:** -- Applies minimal, targeted changes to one file -- Uses smart pattern matching internally -- Makes multiple passes (up to 3) to fix issues -- Returns diff showing exactly what changed -- **Where files go**: Virtual filesystem only - -**When to use:** -- ✅ Fixing TypeScript/JavaScript errors -- ✅ Adding missing imports or exports -- ✅ Patching bugs or logic errors -- ✅ Small feature additions to existing components - -**When NOT to use:** -- ❌ File doesn't exist yet (use generate_files) -- ❌ File is too broken to patch (use generate_files to rewrite) -- ❌ Haven't read the file yet (read it first!) - -**How to describe issues (CRITICAL for success):** -- BE SPECIFIC: Include exact error messages, line numbers -- ONE PROBLEM PER ISSUE: Don't combine unrelated problems -- PROVIDE CONTEXT: Explain what's broken and why -- SUGGEST SOLUTION: Share your best idea for fixing it - -**CRITICAL After-Effects:** -1. File updated in virtual filesystem -2. Changes are STAGED (git add) but NOT committed -3. **You MUST manually call git commit** (unlike generate_files) -4. Sandbox does NOT see changes yet -5. **You MUST call deploy_preview to sync virtual → sandbox** - -**PARALLEL EXECUTION:** -- You can call regenerate_file on MULTIPLE different files simultaneously -- Much faster than sequential calls - -## Deployment & Testing -**deploy_preview** -- Deploy to sandbox and get preview URL -- Only for interactive projects (apps, presentations, APIs) -- NOT for static documentation -- Creates sandbox on first call if needed -- TWO MODES: - 1. **Template-based**: If you called init_suitable_template(), uses that selected template - 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with fallback template + your files as overlay -- Syncs all files from virtual filesystem to sandbox - -**run_analysis** -- TypeScript checking + ESLint -- **Where**: Runs in sandbox on deployed files -- **Requires**: Sandbox must exist -- Run after changes to catch errors early -- Much faster than runtime testing -- Analyzes files you specify (or all generated files) - -**get_runtime_errors** -- Fetch runtime exceptions from sandbox -- **Where**: Sandbox environment -- **Requires**: Sandbox running, user has interacted with app -- Check recency - logs are cumulative -- Use after deploy_preview for verification -- Errors only appear when code actually executes - -**get_logs** -- Get console logs from sandbox -- **Where**: Sandbox environment -- **Requires**: Sandbox running -- Cumulative - check timestamps -- Useful for debugging runtime behavior -- Logs appear when user interacts with preview - -## Utilities -**exec_commands** -- Execute shell commands in sandbox -- **Where**: Sandbox environment (NOT virtual filesystem) -- **Requires**: Sandbox must exist (call deploy_preview first) -- Use sparingly - most needs covered by other tools -- Commands run at project root -- Examples: bun add package, custom build scripts - -**git** -- Operations: commit, log, show -- **Where**: Virtual filesystem (isomorphic-git on DO storage) -- Commit frequently with conventional messages -- Use for: saving progress, reviewing changes -- Full git history maintained -- **Note**: This is YOUR git, not sandbox git - -**generate_images** -- Future image generation capability -- Currently a stub - do NOT rely on this - ---- - -You can call multiple tools one after another in a single turn. When you are absolutely sure of your actions, make multiple calls to tools and finish. You would be notified when the tool calls are completed. -`; - - const staticVsSandbox = `# CRITICAL: Static vs Sandbox Detection - -**Static Content (NO Sandbox)**: -- Markdown files (.md, .mdx) -- Documentation in docs/ directory -- Plain text files -- Configuration without runtime -→ Generate files, NO deploy_preview needed -→ Focus on content quality and organization - -**Interactive Projects (Require Sandbox)**: -- React apps, presentations, APIs -- Anything with bun run dev -- UI with interactivity -- Backend endpoints -→ Must select template -→ Use deploy_preview for testing -→ Verify with run_analysis + runtime tools`; - - const quality = `# Quality Standards - -**Code Quality:** -- Type-safe TypeScript (no any, proper interfaces) -- Minimal dependencies - reuse what exists -- Clean architecture - separation of concerns -- Professional error handling - -**UI Quality (when applicable):** -- Responsive design (mobile, tablet, desktop) -- Proper spacing and visual hierarchy -- Interactive states (hover, focus, active, disabled) -- Accessibility basics (semantic HTML, ARIA when needed) -- TailwindCSS for styling (theme-consistent) - -**Testing & Verification:** -- All TypeScript errors resolved -- No lint warnings -- Runtime tested via preview -- Edge cases considered`; - - const reactSafety = `# React Safety & Common Pitfalls - -${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} - -${PROMPT_UTILS.COMMON_PITFALLS} - -**Additional Warnings:** -- NEVER modify state during render -- useEffect dependencies must be complete -- Memoize expensive computations -- Avoid inline object/function creation in JSX`; - - const completion = `# Completion Discipline - -When initial project generation is complete: -- Call mark_generation_complete tool with: - - summary: Brief description of what was built (2-3 sentences) - - filesGenerated: Count of files created -- Requirements: All features implemented, errors fixed, testing done -- CRITICAL: Make NO further tool calls after calling mark_generation_complete - -For follow-up requests (adding features, making changes): -- Just respond naturally when done -- Do NOT call mark_generation_complete for follow-ups`; - - const warnings = `# Critical Warnings - -1. TEMPLATE SELECTION IS CRITICAL - Use init_suitable_template() for interactive projects, trust AI selector -2. For template-based: Selected template MUST have working 'bun run dev' or sandbox fails -3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview -4. Do NOT deploy static documentation - wastes resources -5. Check log timestamps - they're cumulative, may contain old data -6. NEVER create verbose step-by-step explanations - use tools directly -7. Template switching allowed but strongly discouraged -8. Virtual-first is advanced mode - default to template-based unless necessary`; - - return [ - identity, - comms, - architecture, - environment, - constraints, - workflow, - tools, - staticVsSandbox, - quality, - reactSafety, - completion, - warnings, - '# Dynamic Context-Specific Guidance', - dynamicHints, - ].join('\n\n'); -}; - /** * Build user prompt with all context */ @@ -728,12 +144,16 @@ export class AgenticProjectBuilder extends Assistant { const hasMD = session.filesIndex?.some(f => /\.(md|mdx)$/i.test(f.filePath)) || false; const hasPlan = isAgenticBlueprint(inputs.blueprint) && inputs.blueprint.plan.length > 0; const hasTemplate = !!session.selectedTemplate; - const needsSandbox = hasTSX || session.projectType === 'presentation' || session.projectType === 'app'; + const isPresentationProject = session.projectType === 'presentation'; + // Presentations don't need sandbox (run in browser), only apps with TSX need sandbox + const needsSandbox = !isPresentationProject && (hasTSX || session.projectType === 'app'); const dynamicHints = [ !hasPlan ? '- No plan detected: Start with generate_blueprint (optionally with prompt parameter) to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', needsSandbox && !hasTemplate ? '- Interactive project without template: Use init_suitable_template() to let AI select and import best matching template before first deploy.' : '', - hasTSX ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + isPresentationProject && !hasTemplate ? '- Presentation project detected: Use init_suitable_template() to select presentation template, then create stunning slides with unique design.' : '', + hasTSX && !isPresentationProject ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + isPresentationProject ? '- Presentation mode: NO deploy_preview/run_analysis needed. Focus on beautiful JSX slides, ask user for feedback.' : '', hasMD && !hasTSX ? '- Documents detected without UI: This is STATIC content - generate files in docs/, NO deploy_preview needed.' : '', !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', ].filter(Boolean).join('\n'); @@ -748,7 +168,7 @@ export class AgenticProjectBuilder extends Assistant { }); } - let systemPrompt = getSystemPrompt(dynamicHints); + let systemPrompt = getSystemPrompt(session.projectType, dynamicHints); if (historyMessages.length > 0) { systemPrompt += `\n\n# Conversation History\nYou are being provided with the full conversation history from your previous interactions. Review it to understand context and avoid repeating work.`; From 08d2fc7e374db8598da9c51d05dea6e3e4933e37 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Fri, 7 Nov 2025 18:00:29 -0500 Subject: [PATCH 25/58] refactor: agent behaviors, objectives generalized, abstracted + agentic coding agent implemented - Abstracted behaviors and objectives - Behavior and Objectives are bot h AgentComponent - CodeGeneratorAgent (Agent DO) houses common business logic - Implemented agentic coding agent and and assistant --- .../assistants/agenticProjectBuilder.ts | 411 +++++++++ worker/agents/core/AgentComponent.ts | 89 ++ worker/agents/core/AgentCore.ts | 37 + worker/agents/core/behaviors/agentic.ts | 244 ++++++ .../core/{baseAgent.ts => behaviors/base.ts} | 787 +++--------------- .../behavior.ts => behaviors/phasic.ts} | 172 ++-- worker/agents/core/codingAgent.ts | 714 ++++++++++++++++ worker/agents/core/objectives/app.ts | 152 ++++ worker/agents/core/objectives/base.ts | 90 ++ worker/agents/core/objectives/presentation.ts | 62 ++ worker/agents/core/objectives/workflow.ts | 58 ++ worker/agents/core/smartGeneratorAgent.ts | 89 -- worker/agents/core/state.ts | 4 +- worker/agents/core/types.ts | 32 +- worker/agents/core/websocket.ts | 32 +- worker/agents/inferutils/config.ts | 7 + worker/agents/inferutils/config.types.ts | 1 + .../services/implementations/FileManager.ts | 4 +- .../services/implementations/StateManager.ts | 22 +- .../services/interfaces/ICodingAgent.ts | 4 +- .../services/interfaces/IStateManager.ts | 15 +- worker/agents/tools/toolkit/git.ts | 2 +- worker/index.ts | 3 +- 23 files changed, 2142 insertions(+), 889 deletions(-) create mode 100644 worker/agents/assistants/agenticProjectBuilder.ts create mode 100644 worker/agents/core/AgentComponent.ts create mode 100644 worker/agents/core/AgentCore.ts create mode 100644 worker/agents/core/behaviors/agentic.ts rename worker/agents/core/{baseAgent.ts => behaviors/base.ts} (64%) rename worker/agents/core/{phasic/behavior.ts => behaviors/phasic.ts} (84%) create mode 100644 worker/agents/core/codingAgent.ts create mode 100644 worker/agents/core/objectives/app.ts create mode 100644 worker/agents/core/objectives/base.ts create mode 100644 worker/agents/core/objectives/presentation.ts create mode 100644 worker/agents/core/objectives/workflow.ts delete mode 100644 worker/agents/core/smartGeneratorAgent.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts new file mode 100644 index 00000000..01ba66d8 --- /dev/null +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -0,0 +1,411 @@ +import Assistant from './assistant'; +import { + createSystemMessage, + createUserMessage, + Message, +} from '../inferutils/common'; +import { executeInference } from '../inferutils/infer'; +import { InferenceContext, ModelConfig } from '../inferutils/config.types'; +import { createObjectLogger } from '../../logger'; +import { AGENT_CONFIG } from '../inferutils/config'; +import { buildDebugTools } from '../tools/customTools'; +import { RenderToolCall } from '../operations/UserConversationProcessor'; +import { PROMPT_UTILS } from '../prompts'; +import { FileState } from '../core/state'; +import { ICodingAgent } from '../services/interfaces/ICodingAgent'; +import { ProjectType } from '../core/types'; +import { Blueprint } from '../schemas'; + +export type BuildSession = { + filesIndex: FileState[]; + agent: ICodingAgent; + projectType: ProjectType; +}; + +export type BuildInputs = { + query: string; + projectName: string; + blueprint?: Blueprint; +}; + +/** + * Get base system prompt with project type specific instructions + */ +const getSystemPrompt = (projectType: ProjectType): string => { + const baseInstructions = `You are an elite Autonomous Project Builder at Cloudflare, specialized in building complete, production-ready applications using an LLM-driven tool-calling approach. + +## CRITICAL: Communication Mode +**You have EXTREMELY HIGH reasoning capability. Use it strategically.** +- Conduct analysis and planning INTERNALLY +- Output should be CONCISE but informative: status updates, key decisions, and tool calls +- NO lengthy thought processes or verbose play-by-play narration +- Think deeply internally → Act decisively externally → Report progress clearly + +## Your Mission +Build a complete, functional, polished project from the user's requirements using available tools. You orchestrate the entire build process autonomously - from scaffolding to deployment to verification. + +## Platform Environment +- **Runtime**: Cloudflare Workers (V8 isolates, not Node.js) +- **Language**: TypeScript +- **Build Tool**: Vite (for frontend projects) +- **Deployment**: wrangler to Cloudflare edge +- **Testing**: Sandbox/Container preview with live reload + +## Platform Constraints +- **NEVER edit wrangler.jsonc or package.json** - these are locked +- **Only use dependencies from project's package.json** - no others exist +- All projects run in Cloudflare Workers environment +- **No Node.js APIs** (no fs, path, process, etc.) + +## Available Tools + +**File Management:** +- **generate_files**: Create new files or rewrite existing files + - Use for scaffolding components, utilities, API routes, pages + - Requires: phase_name, phase_description, requirements[], files[] + - Automatically commits changes to git + - This is your PRIMARY tool for building the project + +- **regenerate_file**: Make surgical fixes to existing files + - Use for targeted bug fixes and updates + - Requires: path, issues[] + - Files are automatically staged (need manual commit with git tool) + +- **read_files**: Read file contents (batch multiple for efficiency) + +**Deployment & Testing:** +- **deploy_preview**: Deploy to Cloudflare Workers preview + - REQUIRED before verification + - Use clearLogs=true to start fresh + - Deployment URL will be available for testing + +- **run_analysis**: Fast static analysis (lint + typecheck) + - Use FIRST for verification after generation + - No user interaction needed + - Catches syntax errors, type errors, import issues + +- **get_runtime_errors**: Recent runtime errors (requires user interaction with deployed app) +- **get_logs**: Cumulative logs (use sparingly, verbose, requires user interaction) + +**Commands & Git:** +- **exec_commands**: Execute shell commands from project root + - Use for installing dependencies (if needed), running tests, etc. + - Set shouldSave=true to persist changes + +- **git**: Version control (commit, log, show) + - Commit regularly with descriptive messages + - Use after significant milestones + +**Utilities:** +- **wait**: Sleep for N seconds (use after deploy to allow user interaction time) + +## Core Build Workflow + +1. **Understand Requirements**: Analyze user query and blueprint (if provided) +2. **Plan Structure**: Decide what files/components to create +3. **Scaffold Project**: Use generate_files to create initial structure +4. **Deploy & Test**: deploy_preview to verify in sandbox +5. **Verify Quality**: run_analysis for static checks +6. **Fix Issues**: Use regenerate_file or generate_files for corrections +7. **Commit Progress**: git commit with descriptive messages +8. **Iterate**: Repeat steps 4-7 until project is complete and polished +9. **Final Verification**: Comprehensive check before declaring complete + +## Critical Build Principles`; + + // Add project-type specific instructions + let typeSpecificInstructions = ''; + + if (projectType === 'app') { + typeSpecificInstructions = ` + +## Project Type: Full-Stack Web Application + +**Stack:** +- Frontend: React + Vite + TypeScript +- Backend: Cloudflare Workers (Durable Objects when needed) +- Styling: Tailwind CSS + shadcn/ui components +- State: Zustand for client state +- API: REST/JSON endpoints in Workers + +**CRITICAL: Visual Excellence Requirements** + +YOU MUST CREATE VISUALLY STUNNING APPLICATIONS. + +Every component must demonstrate: +- **Modern UI Design**: Clean, professional, beautiful interfaces +- **Perfect Spacing**: Harmonious padding, margins, and layout rhythm +- **Visual Hierarchy**: Clear information flow and structure +- **Interactive Polish**: Smooth hover states, transitions, micro-interactions +- **Responsive Excellence**: Flawless on mobile, tablet, and desktop +- **Professional Depth**: Thoughtful shadows, borders, and elevation +- **Color Harmony**: Consistent, accessible color schemes +- **Typography**: Clear hierarchy with perfect font sizes and weights + +${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} + +${PROMPT_UTILS.COMMON_PITFALLS} + +**Success Criteria for Apps:** +✅ All features work as specified +✅ Can be demoed immediately without errors +✅ Visually stunning and professional-grade +✅ Responsive across all device sizes +✅ No runtime errors or TypeScript issues +✅ Smooth interactions with proper feedback +✅ Code is clean, type-safe, and maintainable`; + + } else if (projectType === 'workflow') { + typeSpecificInstructions = ` + +## Project Type: Backend Workflow + +**Focus:** +- Backend-only Cloudflare Workers +- REST APIs, scheduled jobs, queue processing, webhooks, data pipelines +- No UI components needed +- Durable Objects for stateful workflows + +**Success Criteria for Workflows:** +✅ All endpoints/handlers work correctly +✅ Robust error handling and validation +✅ No runtime errors or TypeScript issues +✅ Clean, maintainable architecture +✅ Proper logging for debugging +✅ Type-safe throughout`; + + } else if (projectType === 'presentation') { + typeSpecificInstructions = ` + +## Project Type: Presentation/Slides + +**Stack:** +- Spectacle (React-based presentation library) +- Tailwind CSS for styling +- Web-based slides (can export to PDF) + +**Success Criteria for Presentations:** +✅ All slides implemented with content +✅ Visually stunning and engaging design +✅ Clear content hierarchy and flow +✅ Smooth transitions between slides +✅ No rendering or TypeScript errors +✅ Professional-grade visual polish`; + } + + const completionGuidelines = ` + +## Communication & Progress Updates + +**DO:** +- Report key milestones: "Scaffolding complete", "Deployment successful", "All tests passing" +- Explain critical decisions: "Using Zustand for state management because..." +- Share verification results: "Static analysis passed", "3 TypeScript errors found" +- Update on iterations: "Fixed rendering issue, redeploying..." + +**DON'T:** +- Output verbose thought processes +- Narrate every single step +- Repeat yourself unnecessarily +- Over-explain obvious actions + +## When You're Done + +**Success Completion:** +1. Write: "BUILD_COMPLETE: [brief summary]" +2. Provide final report: + - What was built (key files/features) + - Verification results (all checks passed) + - Deployment URL + - Any notes for the user +3. **CRITICAL: Once you write "BUILD_COMPLETE", IMMEDIATELY HALT with no more tool calls.** + +**If Stuck:** +1. State: "BUILD_STUCK: [reason]" + what you tried +2. **CRITICAL: Once you write "BUILD_STUCK", IMMEDIATELY HALT with no more tool calls.** + +## Working Style +- Use your internal reasoning capability - think deeply, output concisely +- Be decisive - analyze internally, act externally +- Focus on delivering working, polished results +- Quality through reasoning, not verbose output +- Build incrementally: scaffold → deploy → verify → fix → iterate + +The goal is a complete, functional, polished project. Think internally, act decisively, report progress.`; + + return baseInstructions + typeSpecificInstructions + completionGuidelines; +}; + +/** + * Build user prompt with all context + */ +const getUserPrompt = ( + inputs: BuildInputs, + session: BuildSession, + fileSummaries: string, + templateInfo?: string +): string => { + const { query, projectName, blueprint } = inputs; + const { projectType } = session; + + let projectTypeDescription = ''; + if (projectType === 'app') { + projectTypeDescription = 'Full-Stack Web Application (React + Vite + Cloudflare Workers)'; + } else if (projectType === 'workflow') { + projectTypeDescription = 'Backend Workflow (Cloudflare Workers)'; + } else if (projectType === 'presentation') { + projectTypeDescription = 'Presentation/Slides (Spectacle)'; + } + + return `## Build Task +**Project Name**: ${projectName} +**Project Type**: ${projectTypeDescription} +**User Request**: ${query} + +${blueprint ? `## Project Blueprint + +The following blueprint defines the structure, features, and requirements for this project: + +\`\`\`json +${JSON.stringify(blueprint, null, 2)} +\`\`\` + +**Use this blueprint to guide your implementation.** It outlines what needs to be built.` : `## Note + +No blueprint provided. Design the project structure based on the user request above.`} + +${templateInfo ? `## Template Context + +This project uses a preconfigured template: + +${templateInfo} + +**IMPORTANT:** Leverage existing components, utilities, and APIs from the template. Do not recreate what already exists.` : ''} + +${fileSummaries ? `## Current Codebase + +${fileSummaries}` : `## Starting Fresh + +This is a new project. Start from the template or scratch.`} + +## Your Mission + +Build a complete, production-ready, ${projectType === 'app' ? 'visually stunning full-stack web application' : projectType === 'workflow' ? 'robust backend workflow' : 'visually stunning presentation'} that fulfills the user's request. + +**Approach:** +1. Understand requirements deeply +2. Plan the architecture${projectType === 'app' ? ' (frontend + backend)' : ''} +3. Scaffold the ${projectType === 'app' ? 'application' : 'project'} structure with generate_files +4. Deploy and test with deploy_preview +5. Verify with run_analysis +6. Fix any issues found +7. Polish ${projectType === 'app' ? 'the UI' : 'the code'} to perfection +8. Commit your work with git +9. Repeat until complete + +**Remember:** +${projectType === 'app' ? '- Create stunning, modern UI that users love\n' : ''}- Write clean, type-safe, maintainable code +- Test thoroughly with deploy_preview and run_analysis +- Fix all issues before claiming completion +- Commit regularly with descriptive messages + +Begin building.`; +}; + +/** + * Summarize files for context + */ +function summarizeFiles(filesIndex: FileState[]): string { + if (!filesIndex || filesIndex.length === 0) { + return 'No files generated yet.'; + } + + const summary = filesIndex.map(f => { + const relativePath = f.filePath.startsWith('/') ? f.filePath.substring(1) : f.filePath; + const sizeKB = (f.fileContents.length / 1024).toFixed(1); + return `- ${relativePath} (${sizeKB} KB) - ${f.filePurpose}`; + }).join('\n'); + + return `Generated Files (${filesIndex.length} total):\n${summary}`; +} + +/** + * AgenticProjectBuilder + * + * Similar to DeepCodeDebugger but for building entire projects. + * Uses tool-calling approach to scaffold, deploy, verify, and iterate. + */ +export class AgenticProjectBuilder extends Assistant { + logger = createObjectLogger(this, 'AgenticProjectBuilder'); + modelConfigOverride?: ModelConfig; + + constructor( + env: Env, + inferenceContext: InferenceContext, + modelConfigOverride?: ModelConfig, + ) { + super(env, inferenceContext); + this.modelConfigOverride = modelConfigOverride; + } + + async run( + inputs: BuildInputs, + session: BuildSession, + streamCb?: (chunk: string) => void, + toolRenderer?: RenderToolCall, + ): Promise { + this.logger.info('Starting project build', { + projectName: inputs.projectName, + projectType: session.projectType, + hasBlueprint: !!inputs.blueprint, + }); + + // Get file summaries + const fileSummaries = summarizeFiles(session.filesIndex); + + // Get template details from agent + const operationOptions = session.agent.getOperationOptions(); + const templateInfo = operationOptions.context.templateDetails + ? PROMPT_UTILS.serializeTemplate(operationOptions.context.templateDetails) + : undefined; + + // Build prompts + const systemPrompt = getSystemPrompt(session.projectType); + const userPrompt = getUserPrompt(inputs, session, fileSummaries, templateInfo); + + const system = createSystemMessage(systemPrompt); + const user = createUserMessage(userPrompt); + const messages: Message[] = this.save([system, user]); + + // Prepare tools (same as debugger) + const tools = buildDebugTools(session, this.logger, toolRenderer); + + let output = ''; + + try { + const result = await executeInference({ + env: this.env, + context: this.inferenceContext, + agentActionName: 'agenticProjectBuilder', + modelConfig: this.modelConfigOverride || AGENT_CONFIG.agenticProjectBuilder, + messages, + tools, + stream: streamCb + ? { chunk_size: 64, onChunk: (c) => streamCb(c) } + : undefined, + }); + + output = result?.string || ''; + + this.logger.info('Project build completed', { + outputLength: output.length + }); + + } catch (error) { + this.logger.error('Project build failed', error); + throw error; + } + + return output; + } +} diff --git a/worker/agents/core/AgentComponent.ts b/worker/agents/core/AgentComponent.ts new file mode 100644 index 00000000..1179c66f --- /dev/null +++ b/worker/agents/core/AgentComponent.ts @@ -0,0 +1,89 @@ +import { AgentInfrastructure } from './AgentCore'; +import { StructuredLogger } from '../../logger'; +import { WebSocketMessageType } from '../../api/websocketTypes'; +import { WebSocketMessageData } from '../../api/websocketTypes'; +import { FileManager } from '../services/implementations/FileManager'; +import { DeploymentManager } from '../services/implementations/DeploymentManager'; +import { GitVersionControl } from '../git'; +import { AgentState, BaseProjectState } from './state'; +import { WebSocketMessageResponses } from '../constants'; + +/** + * Base class for all agent components (behaviors and objectives) + * + * Provides common infrastructure access patterns via protected helpers. + * + * Both BaseCodingBehavior and ProjectObjective extend this class to access: + * - Core infrastructure (state, env, sql, logger) + * - Services (fileManager, deploymentManager, git) + */ +export abstract class AgentComponent { + constructor(protected readonly infrastructure: AgentInfrastructure) {} + + // ========================================== + // PROTECTED HELPERS (Infrastructure access) + // ========================================== + + protected get env(): Env { + return this.infrastructure.env; + } + + get logger(): StructuredLogger { + return this.infrastructure.logger(); + } + + protected getAgentId(): string { + return this.infrastructure.getAgentId(); + } + + public getWebSockets(): WebSocket[] { + return this.infrastructure.getWebSockets(); + } + + protected get state(): TState { + return this.infrastructure.state; + } + + setState(state: TState): void { + try { + this.infrastructure.setState(state); + } catch (error) { + this.broadcastError("Error setting state", error); + this.logger.error("State details:", { + originalState: JSON.stringify(this.state, null, 2), + newState: JSON.stringify(state, null, 2) + }); + } + } + + // ========================================== + // PROTECTED HELPERS (Service access) + // ========================================== + + protected get fileManager(): FileManager { + return this.infrastructure.fileManager; + } + + protected get deploymentManager(): DeploymentManager { + return this.infrastructure.deploymentManager; + } + + public get git(): GitVersionControl { + return this.infrastructure.git; + } + + protected broadcast( + type: T, + data?: WebSocketMessageData + ): void { + this.infrastructure.broadcast(type, data); + } + + protected broadcastError(context: string, error: unknown): void { + const errorMessage = error instanceof Error ? error.message : String(error); + this.logger.error(`${context}:`, error); + this.broadcast(WebSocketMessageResponses.ERROR, { + error: `${context}: ${errorMessage}` + }); + } +} diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts new file mode 100644 index 00000000..77507fc0 --- /dev/null +++ b/worker/agents/core/AgentCore.ts @@ -0,0 +1,37 @@ +import { GitVersionControl } from "../git"; +import { DeploymentManager } from "../services/implementations/DeploymentManager"; +import { FileManager } from "../services/implementations/FileManager"; +import { StructuredLogger } from "../../logger"; +import { BaseProjectState } from "./state"; +import { WebSocketMessageType } from "../../api/websocketTypes"; +import { WebSocketMessageData } from "../../api/websocketTypes"; +import { ConversationMessage, ConversationState } from "../inferutils/common"; + +/** + * Infrastructure interface for agent implementations. + * Provides access to: + * - Core infrastructure (state, env, sql, logger) + * - Services (fileManager, deploymentManager, git) + */ +export interface AgentInfrastructure { + readonly state: TState; + setState(state: TState): void; + getWebSockets(): WebSocket[]; + broadcast( + type: T, + data?: WebSocketMessageData + ): void; + getAgentId(): string; + logger(): StructuredLogger; + readonly env: Env; + + setConversationState(state: ConversationState): void; + getConversationState(): ConversationState; + addConversationMessage(message: ConversationMessage): void; + clearConversation(): void; + + // Services + readonly fileManager: FileManager; + readonly deploymentManager: DeploymentManager; + readonly git: GitVersionControl; +} diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts new file mode 100644 index 00000000..8085351a --- /dev/null +++ b/worker/agents/core/behaviors/agentic.ts @@ -0,0 +1,244 @@ + +import { AgentInitArgs } from '../types'; +import { AgenticState } from '../state'; +import { WebSocketMessageResponses } from '../../constants'; +import { UserConversationProcessor } from '../../operations/UserConversationProcessor'; +import { GenerationContext, AgenticGenerationContext } from '../../domain/values/GenerationContext'; +import { PhaseImplementationOperation } from '../../operations/PhaseImplementation'; +import { FileRegenerationOperation } from '../../operations/FileRegeneration'; +import { AgenticProjectBuilder, BuildSession } from '../../assistants/agenticProjectBuilder'; +import { buildToolCallRenderer } from '../../operations/UserConversationProcessor'; +import { PhaseGenerationOperation } from '../../operations/PhaseGeneration'; +import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; +import { customizeTemplateFiles, generateProjectName } from '../../utils/templateCustomizer'; +import { generateBlueprint } from '../../planning/blueprint'; +import { IdGenerator } from '../../utils/idGenerator'; +import { generateNanoId } from '../../../utils/idGenerator'; +import { BaseCodingBehavior, BaseCodingOperations } from './base'; +import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; +import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; +import { OperationOptions } from 'worker/agents/operations/common'; + +interface AgenticOperations extends BaseCodingOperations { + generateNextPhase: PhaseGenerationOperation; + implementPhase: PhaseImplementationOperation; +} + +/** + * AgenticCodingBehavior + */ +export class AgenticCodingBehavior extends BaseCodingBehavior implements ICodingAgent { + protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; + + protected operations: AgenticOperations = { + regenerateFile: new FileRegenerationOperation(), + fastCodeFixer: new FastCodeFixerOperation(), + processUserMessage: new UserConversationProcessor(), + simpleGenerateFiles: new SimpleCodeGenerationOperation(), + generateNextPhase: new PhaseGenerationOperation(), + implementPhase: new PhaseImplementationOperation(), + }; + + /** + * Initialize the code generator with project blueprint and template + * Sets up services and begins deployment process + */ + async initialize( + initArgs: AgentInitArgs, + ..._args: unknown[] + ): Promise { + await super.initialize(initArgs); + + const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + + // Generate a blueprint + this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); + this.logger.info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); + + const blueprint = await generateBlueprint({ + env: this.env, + inferenceContext, + query, + language: language!, + frameworks: frameworks!, + templateDetails: templateInfo?.templateDetails, + templateMetaInfo: templateInfo?.selection, + images: initArgs.images, + stream: { + chunk_size: 256, + onChunk: (chunk) => { + initArgs.onBlueprintChunk(chunk); + } + } + }) + + const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + + const projectName = generateProjectName( + blueprint.projectName, + generateNanoId(), + AgenticCodingBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH + ); + + this.logger.info('Generated project name', { projectName }); + + this.setState({ + ...this.state, + projectName, + query, + blueprint, + templateName: templateInfo?.templateDetails.name || '', + sandboxInstanceId: undefined, + commandsHistory: [], + lastPackageJson: packageJson, + sessionId: sandboxSessionId!, + hostname, + inferenceContext, + }); + + if (templateInfo) { + // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) + const customizedFiles = customizeTemplateFiles( + templateInfo.templateDetails.allFiles, + { + projectName, + commandsHistory: [] // Empty initially, will be updated later + } + ); + + this.logger.info('Customized template files', { + files: Object.keys(customizedFiles) + }); + + // Save customized files to git + const filesToSave = Object.entries(customizedFiles).map(([filePath, content]) => ({ + filePath, + fileContents: content, + filePurpose: 'Project configuration file' + })); + + await this.fileManager.saveGeneratedFiles( + filesToSave, + 'Initialize project configuration files' + ); + + this.logger.info('Committed customized template files to git'); + } + + this.initializeAsync().catch((error: unknown) => { + this.broadcastError("Initialization failed", error); + }); + this.logger.info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); + return this.state; + } + + async onStart(props?: Record | undefined): Promise { + await super.onStart(props); + } + + getOperationOptions(): OperationOptions { + return { + env: this.env, + agentId: this.getAgentId(), + context: GenerationContext.from(this.state, this.getTemplateDetails(), this.logger) as AgenticGenerationContext, + logger: this.logger, + inferenceContext: this.getInferenceContext(), + agent: this + }; + } + + async build(): Promise { + await this.executeGeneration(); + } + + /** + * Execute the project generation + */ + private async executeGeneration(): Promise { + this.logger.info('Starting project generation', { + query: this.state.query, + projectName: this.state.projectName + }); + + // Generate unique conversation ID for this build session + const buildConversationId = IdGenerator.generateConversationId(); + + // Broadcast generation started + this.broadcast(WebSocketMessageResponses.GENERATION_STARTED, { + message: 'Starting project generation...', + totalFiles: 1 + }); + + // Send initial message to frontend + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: 'Initializing project builder...', + conversationId: buildConversationId, + isStreaming: false + }); + + try { + const generator = new AgenticProjectBuilder( + this.env, + this.state.inferenceContext + ); + + // Create build session for tools + // Note: AgenticCodingBehavior is currently used for 'app' type projects + const session: BuildSession = { + agent: this, + filesIndex: Object.values(this.state.generatedFilesMap), + projectType: 'app' + }; + + // Create tool renderer for UI feedback + const toolCallRenderer = buildToolCallRenderer( + (message: string, conversationId: string, isStreaming: boolean, tool?) => { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message, + conversationId, + isStreaming, + tool + }); + }, + buildConversationId + ); + + // Run the assistant with streaming and tool rendering + await generator.run( + { + query: this.state.query, + projectName: this.state.projectName, + blueprint: this.state.blueprint + }, + session, + // Stream callback - sends text chunks to frontend + (chunk: string) => { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: chunk, + conversationId: buildConversationId, + isStreaming: true + }); + }, + // Tool renderer for visual feedback on tool calls + toolCallRenderer + ); + + this.broadcast(WebSocketMessageResponses.GENERATION_COMPLETED, { + message: 'Project generation completed', + filesGenerated: Object.keys(this.state.generatedFilesMap).length + }); + + this.logger.info('Project generation completed'); + + } catch (error) { + this.logger.error('Project generation failed', error); + this.broadcast(WebSocketMessageResponses.ERROR, { + error: error instanceof Error ? error.message : 'Unknown error during generation' + }); + throw error; + } finally { + this.generationPromise = null; + this.clearAbortController(); + } + } +} diff --git a/worker/agents/core/baseAgent.ts b/worker/agents/core/behaviors/base.ts similarity index 64% rename from worker/agents/core/baseAgent.ts rename to worker/agents/core/behaviors/base.ts index b98d4031..298c0f72 100644 --- a/worker/agents/core/baseAgent.ts +++ b/worker/agents/core/behaviors/base.ts @@ -3,80 +3,53 @@ import { FileConceptType, FileOutputType, Blueprint, -} from '../schemas'; -import { ExecuteCommandsResponse, GitHubPushRequest, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../services/sandbox/sandboxTypes'; -import { GitHubExportResult } from '../../services/github/types'; -import { GitHubService } from '../../services/github/GitHubService'; -import { BaseProjectState } from './state'; -import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType } from './types'; -import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../constants'; -import { broadcastToConnections, handleWebSocketClose, handleWebSocketMessage, sendToConnection } from './websocket'; -import { StructuredLogger } from '../../logger'; -import { ProjectSetupAssistant } from '../assistants/projectsetup'; -import { UserConversationProcessor, RenderToolCall } from '../operations/UserConversationProcessor'; -import { FileManager } from '../services/implementations/FileManager'; -import { StateManager } from '../services/implementations/StateManager'; -import { DeploymentManager } from '../services/implementations/DeploymentManager'; -import { FileRegenerationOperation } from '../operations/FileRegeneration'; +} from '../../schemas'; +import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; +import { BaseProjectState } from '../state'; +import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType } from '../types'; +import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; +import { ProjectSetupAssistant } from '../../assistants/projectsetup'; +import { UserConversationProcessor, RenderToolCall } from '../../operations/UserConversationProcessor'; +import { FileRegenerationOperation } from '../../operations/FileRegeneration'; // Database schema imports removed - using zero-storage OAuth flow -import { BaseSandboxService } from '../../services/sandbox/BaseSandboxService'; -import { WebSocketMessageData, WebSocketMessageType } from '../../api/websocketTypes'; -import { InferenceContext, AgentActionKey } from '../inferutils/config.types'; -import { AGENT_CONFIG } from '../inferutils/config'; -import { ModelConfigService } from '../../database/services/ModelConfigService'; -import { fixProjectIssues } from '../../services/code-fixer'; -import { GitVersionControl, SqlExecutor } from '../git'; -import { FastCodeFixerOperation } from '../operations/PostPhaseCodeFixer'; -import { looksLikeCommand, validateAndCleanBootstrapCommands } from '../utils/common'; -import { customizeTemplateFiles, generateBootstrapScript } from '../utils/templateCustomizer'; -import { AppService } from '../../database'; +import { BaseSandboxService } from '../../../services/sandbox/BaseSandboxService'; +import { WebSocketMessageData, WebSocketMessageType } from '../../../api/websocketTypes'; +import { InferenceContext, AgentActionKey } from '../../inferutils/config.types'; +import { AGENT_CONFIG } from '../../inferutils/config'; +import { ModelConfigService } from '../../../database/services/ModelConfigService'; +import { fixProjectIssues } from '../../../services/code-fixer'; +import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; +import { looksLikeCommand, validateAndCleanBootstrapCommands } from '../../utils/common'; +import { customizeTemplateFiles, generateBootstrapScript } from '../../utils/templateCustomizer'; +import { AppService } from '../../../database'; import { RateLimitExceededError } from 'shared/types/errors'; -import { ImageAttachment, type ProcessedImageAttachment } from '../../types/image-attachment'; -import { OperationOptions } from '../operations/common'; +import { ImageAttachment, type ProcessedImageAttachment } from '../../../types/image-attachment'; +import { OperationOptions } from '../../operations/common'; import { ImageType, uploadImage } from 'worker/utils/images'; -import { ConversationMessage, ConversationState } from '../inferutils/common'; -import { DeepCodeDebugger } from '../assistants/codeDebugger'; -import { DeepDebugResult } from './types'; -import { updatePackageJson } from '../utils/packageSyncer'; -import { ICodingAgent } from '../services/interfaces/ICodingAgent'; -import { SimpleCodeGenerationOperation } from '../operations/SimpleCodeGeneration'; - -const DEFAULT_CONVERSATION_SESSION_ID = 'default'; - -/** - * Infrastructure interface for agent implementations. - * Enables portability across different backends: - * - Durable Objects (current) - * - In-memory (testing) - * - Custom implementations - */ -export interface AgentInfrastructure { - readonly state: TState; - setState(state: TState): void; - readonly sql: SqlExecutor; - getWebSockets(): WebSocket[]; - getAgentId(): string; - logger(): StructuredLogger; - readonly env: Env; -} - -export interface BaseAgentOperations { +import { DeepCodeDebugger } from '../../assistants/codeDebugger'; +import { DeepDebugResult } from '../types'; +import { updatePackageJson } from '../../utils/packageSyncer'; +import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; +import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; +import { AgentComponent } from '../AgentComponent'; +import type { AgentInfrastructure } from '../AgentCore'; +import { sendToConnection } from '../websocket'; + +export interface BaseCodingOperations { regenerateFile: FileRegenerationOperation; fastCodeFixer: FastCodeFixerOperation; processUserMessage: UserConversationProcessor; simpleGenerateFiles: SimpleCodeGenerationOperation; } -export abstract class BaseAgentBehavior implements ICodingAgent { +/** + * Base class for all coding behaviors + */ +export abstract class BaseCodingBehavior + extends AgentComponent implements ICodingAgent { protected static readonly MAX_COMMANDS_HISTORY = 10; - protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; protected projectSetupAssistant: ProjectSetupAssistant | undefined; - protected stateManager!: StateManager; - protected fileManager!: FileManager; - - protected deploymentManager!: DeploymentManager; - protected git: GitVersionControl; protected previewUrlCache: string = ''; protected templateDetailsCache: TemplateDetails | null = null; @@ -87,98 +60,33 @@ export abstract class BaseAgentBehavior impleme protected currentAbortController?: AbortController; protected deepDebugPromise: Promise<{ transcript: string } | { error: string }> | null = null; protected deepDebugConversationId: string | null = null; - - // GitHub token cache (ephemeral, lost on DO eviction) - protected githubTokenCache: { - token: string; - username: string; - expiresAt: number; - } | null = null; - - protected operations: BaseAgentOperations = { + protected operations: BaseCodingOperations = { regenerateFile: new FileRegenerationOperation(), fastCodeFixer: new FastCodeFixerOperation(), processUserMessage: new UserConversationProcessor(), simpleGenerateFiles: new SimpleCodeGenerationOperation(), }; - protected _boundSql: SqlExecutor; - - logger(): StructuredLogger { - return this.infrastructure.logger(); - } - - getAgentId(): string { - return this.infrastructure.getAgentId(); - } - - get sql(): SqlExecutor { - return this._boundSql; - } - - get env(): Env { - return this.infrastructure.env; - } - - get state(): TState { - return this.infrastructure.state; - } - - setState(state: TState): void { - this.infrastructure.setState(state); - } - - getWebSockets(): WebSocket[] { - return this.infrastructure.getWebSockets(); - } - getBehavior(): BehaviorType { return this.state.behaviorType; } - /** - * Update state with partial changes (type-safe) - */ - updateState(updates: Partial): void { - this.setState({ ...this.state, ...updates } as TState); - } - - constructor(public readonly infrastructure: AgentInfrastructure) { - this._boundSql = this.infrastructure.sql.bind(this.infrastructure); - - // Initialize StateManager - this.stateManager = new StateManager( - () => this.state, - (s) => this.setState(s) - ); - - // Initialize GitVersionControl (bind sql to preserve 'this' context) - this.git = new GitVersionControl(this.sql.bind(this)); - - // Initialize FileManager - this.fileManager = new FileManager(this.stateManager, () => this.getTemplateDetails(), this.git); - - // Initialize DeploymentManager first (manages sandbox client caching) - // DeploymentManager will use its own getClient() override for caching - this.deploymentManager = new DeploymentManager( - { - stateManager: this.stateManager, - fileManager: this.fileManager, - getLogger: () => this.logger(), - env: this.env - }, - BaseAgentBehavior.MAX_COMMANDS_HISTORY - ); + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); } public async initialize( _initArgs: AgentInitArgs, ..._args: unknown[] ): Promise { - this.logger().info("Initializing agent"); + this.logger.info("Initializing agent"); return this.state; } + onStart(_props?: Record | undefined): Promise { + return Promise.resolve(); + } + protected async initializeAsync(): Promise { try { const [, setupCommands] = await Promise.all([ @@ -186,73 +94,18 @@ export abstract class BaseAgentBehavior impleme this.getProjectSetupAssistant().generateSetupCommands(), this.generateReadme() ]); - this.logger().info("Deployment to sandbox service and initial commands predictions completed successfully"); + this.logger.info("Deployment to sandbox service and initial commands predictions completed successfully"); await this.executeCommands(setupCommands.commands); - this.logger().info("Initial commands executed successfully"); + this.logger.info("Initial commands executed successfully"); } catch (error) { - this.logger().error("Error during async initialization:", error); + this.logger.error("Error during async initialization:", error); // throw error; } } - - async isInitialized() { - return this.getAgentId() ? true : false - } - - async onStart(props?: Record | undefined): Promise { - this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart`, { props }); - - // Ignore if agent not initialized - if (!this.state.query) { - this.logger().warn(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart ignored, agent not initialized`); - return; - } - - // Ensure state is migrated for any previous versions - this.migrateStateIfNeeded(); - - // Check if this is a read-only operation - const readOnlyMode = props?.readOnlyMode === true; - - if (readOnlyMode) { - this.logger().info(`Agent ${this.getAgentId()} starting in READ-ONLY mode - skipping expensive initialization`); - return; - } - - // Just in case - await this.gitInit(); - - await this.ensureTemplateDetails(); - this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart processed successfully`); - } - - protected async gitInit() { - try { - await this.git.init(); - this.logger().info("Git initialized successfully"); - // Check if there is any commit - const head = await this.git.getHead(); - - if (!head) { - this.logger().info("No commits found, creating initial commit"); - // get all generated files and commit them - const generatedFiles = this.fileManager.getGeneratedFiles(); - if (generatedFiles.length === 0) { - this.logger().info("No generated files found, skipping initial commit"); - return; - } - await this.git.commit(generatedFiles, "Initial commit"); - this.logger().info("Initial commit created successfully"); - } - } catch (error) { - this.logger().error("Error during git init:", error); - } - } - onStateUpdate(_state: TState, _source: "server" | Connection) {} onConnect(connection: Connection, ctx: ConnectionContext) { - this.logger().info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); + this.logger.info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); sendToConnection(connection, 'agent_connected', { state: this.state, templateDetails: this.getTemplateDetails() @@ -261,7 +114,7 @@ export abstract class BaseAgentBehavior impleme async ensureTemplateDetails() { if (!this.templateDetailsCache) { - this.logger().info(`Loading template details for: ${this.state.templateName}`); + this.logger.info(`Loading template details for: ${this.state.templateName}`); const results = await BaseSandboxService.getTemplateDetails(this.state.templateName); if (!results.success || !results.templateDetails) { throw new Error(`Failed to get template details for: ${this.state.templateName}`); @@ -271,7 +124,7 @@ export abstract class BaseAgentBehavior impleme const customizedAllFiles = { ...templateDetails.allFiles }; - this.logger().info('Customizing template files for older app'); + this.logger.info('Customizing template files for older app'); const customizedFiles = customizeTemplateFiles( templateDetails.allFiles, { @@ -285,12 +138,12 @@ export abstract class BaseAgentBehavior impleme ...templateDetails, allFiles: customizedAllFiles }; - this.logger().info('Template details loaded and customized'); + this.logger.info('Template details loaded and customized'); } return this.templateDetailsCache; } - protected getTemplateDetails(): TemplateDetails { + public getTemplateDetails(): TemplateDetails { if (!this.templateDetailsCache) { this.ensureTemplateDetails(); throw new Error('Template details not loaded. Call ensureTemplateDetails() first.'); @@ -322,132 +175,12 @@ export abstract class BaseAgentBehavior impleme 'chore: Update bootstrap script with latest commands' ); - this.logger().info('Updated bootstrap script with commands', { + this.logger.info('Updated bootstrap script with commands', { commandCount: commandsHistory.length, commands: commandsHistory }); } - /* - * Each DO has 10 gb of sqlite storage. However, the way agents sdk works, it stores the 'state' object of the agent as a single row - * in the cf_agents_state table. And row size has a much smaller limit in sqlite. Thus, we only keep current compactified conversation - * in the agent's core state and store the full conversation in a separate DO table. - */ - getConversationState(id: string = DEFAULT_CONVERSATION_SESSION_ID): ConversationState { - const currentConversation = this.state.conversationMessages; - const rows = this.sql<{ messages: string, id: string }>`SELECT * FROM full_conversations WHERE id = ${id}`; - let fullHistory: ConversationMessage[] = []; - if (rows.length > 0 && rows[0].messages) { - try { - const parsed = JSON.parse(rows[0].messages); - if (Array.isArray(parsed)) { - fullHistory = parsed as ConversationMessage[]; - } - } catch (_e) {} - } - if (fullHistory.length === 0) { - fullHistory = currentConversation; - } - // Load compact (running) history from sqlite with fallback to in-memory state for migration - const compactRows = this.sql<{ messages: string, id: string }>`SELECT * FROM compact_conversations WHERE id = ${id}`; - let runningHistory: ConversationMessage[] = []; - if (compactRows.length > 0 && compactRows[0].messages) { - try { - const parsed = JSON.parse(compactRows[0].messages); - if (Array.isArray(parsed)) { - runningHistory = parsed as ConversationMessage[]; - } - } catch (_e) {} - } - if (runningHistory.length === 0) { - runningHistory = currentConversation; - } - - // Remove duplicates - const deduplicateMessages = (messages: ConversationMessage[]): ConversationMessage[] => { - const seen = new Set(); - return messages.filter(msg => { - if (seen.has(msg.conversationId)) { - return false; - } - seen.add(msg.conversationId); - return true; - }); - }; - - runningHistory = deduplicateMessages(runningHistory); - fullHistory = deduplicateMessages(fullHistory); - - return { - id: id, - runningHistory, - fullHistory, - }; - } - - setConversationState(conversations: ConversationState) { - const serializedFull = JSON.stringify(conversations.fullHistory); - const serializedCompact = JSON.stringify(conversations.runningHistory); - try { - this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`); - this.sql`INSERT OR REPLACE INTO compact_conversations (id, messages) VALUES (${conversations.id}, ${serializedCompact})`; - this.sql`INSERT OR REPLACE INTO full_conversations (id, messages) VALUES (${conversations.id}, ${serializedFull})`; - } catch (error) { - this.logger().error(`Failed to save conversation state ${conversations.id}`, error); - } - } - - addConversationMessage(message: ConversationMessage) { - const conversationState = this.getConversationState(); - if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { - conversationState.runningHistory.push(message); - } else { - conversationState.runningHistory = conversationState.runningHistory.map(msg => { - if (msg.conversationId === message.conversationId) { - return message; - } - return msg; - }); - } - if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { - conversationState.fullHistory.push(message); - } else { - conversationState.fullHistory = conversationState.fullHistory.map(msg => { - if (msg.conversationId === message.conversationId) { - return message; - } - return msg; - }); - } - this.setConversationState(conversationState); - } - - protected async saveToDatabase() { - this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); - // Save the app to database (authenticated users only) - const appService = new AppService(this.env); - await appService.createApp({ - id: this.state.inferenceContext.agentId, - userId: this.state.inferenceContext.userId, - sessionToken: null, - title: this.state.blueprint.title || this.state.query.substring(0, 100), - description: this.state.blueprint.description, - originalPrompt: this.state.query, - finalPrompt: this.state.query, - framework: this.state.blueprint.frameworks.join(','), - visibility: 'private', - status: 'generating', - createdAt: new Date(), - updatedAt: new Date() - }); - this.logger().info(`App saved successfully to database for agent ${this.state.inferenceContext.agentId}`, { - agentId: this.state.inferenceContext.agentId, - userId: this.state.inferenceContext.userId, - visibility: 'private' - }); - this.logger().info(`Agent initialized successfully for agent ${this.state.inferenceContext.agentId}`); - } - getPreviewUrlCache() { return this.previewUrlCache; } @@ -474,10 +207,6 @@ export abstract class BaseAgentBehavior impleme return this.deploymentManager.getClient(); } - getGit(): GitVersionControl { - return this.git; - } - isCodeGenerating(): boolean { return this.generationPromise !== null; } @@ -505,7 +234,7 @@ export abstract class BaseAgentBehavior impleme */ public cancelCurrentInference(): boolean { if (this.currentAbortController) { - this.logger().info('Cancelling current inference operation'); + this.logger.info('Cancelling current inference operation'); this.currentAbortController.abort(); this.currentAbortController = undefined; return true; @@ -533,19 +262,11 @@ export abstract class BaseAgentBehavior impleme }; } - protected broadcastError(context: string, error: unknown): void { - const errorMessage = error instanceof Error ? error.message : String(error); - this.logger().error(`${context}:`, error); - this.broadcast(WebSocketMessageResponses.ERROR, { - error: `${context}: ${errorMessage}` - }); - } - async generateReadme() { - this.logger().info('Generating README.md'); + this.logger.info('Generating README.md'); // Only generate if it doesn't exist if (this.fileManager.fileExists('README.md')) { - this.logger().info('README.md already exists'); + this.logger.info('README.md already exists'); return; } @@ -563,7 +284,7 @@ export abstract class BaseAgentBehavior impleme message: 'README.md generated successfully', file: readme }); - this.logger().info('README.md generated successfully'); + this.logger.info('README.md generated successfully'); } async queueUserRequest(request: string, images?: ProcessedImageAttachment[]): Promise { @@ -572,7 +293,7 @@ export abstract class BaseAgentBehavior impleme pendingUserInputs: [...this.state.pendingUserInputs, request] }); if (images && images.length > 0) { - this.logger().info('Storing user images in-memory for phase generation', { + this.logger.info('Storing user images in-memory for phase generation', { imageCount: images.length, }); this.pendingUserImages = [...this.pendingUserImages, ...images]; @@ -596,11 +317,11 @@ export abstract class BaseAgentBehavior impleme */ async generateAllFiles(): Promise { if (this.state.mvpGenerated && this.state.pendingUserInputs.length === 0) { - this.logger().info("Code generation already completed and no user inputs pending"); + this.logger.info("Code generation already completed and no user inputs pending"); return; } if (this.isCodeGenerating()) { - this.logger().info("Code generation already in progress"); + this.logger.info("Code generation already in progress"); return; } this.generationPromise = this.buildWrapper(); @@ -612,7 +333,7 @@ export abstract class BaseAgentBehavior impleme message: 'Starting code generation', totalFiles: this.getTotalFiles() }); - this.logger().info('Starting code generation', { + this.logger.info('Starting code generation', { totalFiles: this.getTotalFiles() }); await this.ensureTemplateDetails(); @@ -620,7 +341,7 @@ export abstract class BaseAgentBehavior impleme await this.build(); } catch (error) { if (error instanceof RateLimitExceededError) { - this.logger().error("Error in state machine:", error); + this.logger.error("Error in state machine:", error); this.broadcast(WebSocketMessageResponses.RATE_LIMIT_ERROR, { error }); } else { this.broadcastError("Error during generation", error); @@ -656,7 +377,6 @@ export abstract class BaseAgentBehavior impleme streamCb: (chunk: string) => void, focusPaths?: string[], ): Promise { - const debugPromise = (async () => { try { const previousTranscript = this.state.lastDeepDebugTranscript ?? undefined; @@ -689,7 +409,7 @@ export abstract class BaseAgentBehavior impleme return { success: true as const, transcript: out }; } catch (e) { - this.logger().error('Deep debugger failed', e); + this.logger.error('Deep debugger failed', e); return { success: false as const, error: `Deep debugger failed: ${String(e)}` }; } finally{ this.deepDebugPromise = null; @@ -760,7 +480,7 @@ export abstract class BaseAgentBehavior impleme defaultConfigs }; } catch (error) { - this.logger().error('Error fetching model configs info:', error); + this.logger.error('Error fetching model configs info:', error); throw error; } } @@ -782,7 +502,7 @@ export abstract class BaseAgentBehavior impleme return this.state; } - protected migrateStateIfNeeded(): void { + migrateStateIfNeeded(): void { // no-op, only older phasic agents need this, for now. } @@ -808,7 +528,7 @@ export abstract class BaseAgentBehavior impleme return errors; } catch (error) { - this.logger().error("Exception fetching runtime errors:", error); + this.logger.error("Exception fetching runtime errors:", error); // If fetch fails, initiate redeploy this.deployToSandbox(); const message = ""; @@ -845,7 +565,7 @@ export abstract class BaseAgentBehavior impleme // Get static analysis and do deterministic fixes const staticAnalysis = await this.runStaticAnalysisCode(); if (staticAnalysis.typecheck.issues.length == 0) { - this.logger().info("No typecheck issues found, skipping deterministic fixes"); + this.logger.info("No typecheck issues found, skipping deterministic fixes"); return staticAnalysis; // So that static analysis is not repeated again } const typeCheckIssues = staticAnalysis.typecheck.issues; @@ -854,7 +574,7 @@ export abstract class BaseAgentBehavior impleme issues: typeCheckIssues }); - this.logger().info(`Attempting to fix ${typeCheckIssues.length} TypeScript issues using deterministic code fixer`); + this.logger.info(`Attempting to fix ${typeCheckIssues.length} TypeScript issues using deterministic code fixer`); const allFiles = this.fileManager.getAllFiles(); const fixResult = fixProjectIssues( @@ -886,13 +606,13 @@ export abstract class BaseAgentBehavior impleme const installCommands = moduleNames.map(moduleName => `bun install ${moduleName}`); await this.executeCommands(installCommands, false); - this.logger().info(`Deterministic code fixer installed missing modules: ${moduleNames.join(', ')}`); + this.logger.info(`Deterministic code fixer installed missing modules: ${moduleNames.join(', ')}`); } else { - this.logger().info(`Deterministic code fixer detected no external modules to install from unfixable TS2307 issues`); + this.logger.info(`Deterministic code fixer detected no external modules to install from unfixable TS2307 issues`); } } if (fixResult.modifiedFiles.length > 0) { - this.logger().info("Applying deterministic fixes to files, Fixes: ", JSON.stringify(fixResult, null, 2)); + this.logger.info("Applying deterministic fixes to files, Fixes: ", JSON.stringify(fixResult, null, 2)); const fixedFiles = fixResult.modifiedFiles.map(file => ({ filePath: file.filePath, filePurpose: allFiles.find(f => f.filePath === file.filePath)?.filePurpose || '', @@ -901,10 +621,10 @@ export abstract class BaseAgentBehavior impleme await this.fileManager.saveGeneratedFiles(fixedFiles, "fix: applied deterministic fixes"); await this.deployToSandbox(fixedFiles, false, "fix: applied deterministic fixes"); - this.logger().info("Deployed deterministic fixes to sandbox"); + this.logger.info("Deployed deterministic fixes to sandbox"); } } - this.logger().info(`Applied deterministic code fixes: ${JSON.stringify(fixResult, null, 2)}`); + this.logger.info(`Applied deterministic code fixes: ${JSON.stringify(fixResult, null, 2)}`); } catch (error) { this.broadcastError('Deterministic code fixer failed', error); } @@ -916,7 +636,7 @@ export abstract class BaseAgentBehavior impleme this.fetchRuntimeErrors(resetIssues), this.runStaticAnalysisCode() ]); - this.logger().info("Fetched all issues:", JSON.stringify({ runtimeErrors, staticAnalysis })); + this.logger.info("Fetched all issues:", JSON.stringify({ runtimeErrors, staticAnalysis })); return { runtimeErrors, staticAnalysis }; } @@ -943,7 +663,7 @@ export abstract class BaseAgentBehavior impleme const dbOk = await appService.updateApp(this.getAgentId(), { title: newName }); ok = ok && dbOk; } catch (error) { - this.logger().error('Error updating project name in database:', error); + this.logger.error('Error updating project name in database:', error); ok = false; } this.broadcast(WebSocketMessageResponses.PROJECT_NAME_UPDATED, { @@ -952,7 +672,7 @@ export abstract class BaseAgentBehavior impleme }); return ok; } catch (error) { - this.logger().error('Error updating project name:', error); + this.logger.error('Error updating project name:', error); return false; } } @@ -1014,7 +734,7 @@ export abstract class BaseAgentBehavior impleme } const resp = await this.getSandboxServiceClient().getFiles(sandboxInstanceId, paths); if (!resp.success) { - this.logger().warn('readFiles failed', { error: resp.error }); + this.logger.warn('readFiles failed', { error: resp.error }); return { files: [] }; } return { files: resp.files.map(f => ({ path: f.filePath, content: f.fileContents })) }; @@ -1094,7 +814,7 @@ export abstract class BaseAgentBehavior impleme requirements: string[], files: FileConceptType[] ): Promise<{ files: Array<{ path: string; purpose: string; diff: string }> }> { - this.logger().info('Generating files for deep debugger', { + this.logger.info('Generating files for deep debugger', { phaseName, requirementsCount: requirements.length, filesCount: files.length @@ -1143,7 +863,7 @@ export abstract class BaseAgentBehavior impleme `feat: ${phaseName}\n\n${phaseDescription}` ); - this.logger().info('Files generated and saved', { + this.logger.info('Files generated and saved', { fileCount: result.files.length }); @@ -1201,11 +921,11 @@ export abstract class BaseAgentBehavior impleme try { // Ensure sandbox instance exists first if (!this.state.sandboxInstanceId) { - this.logger().info('No sandbox instance, deploying to sandbox first'); + this.logger.info('No sandbox instance, deploying to sandbox first'); await this.deployToSandbox(); if (!this.state.sandboxInstanceId) { - this.logger().error('Failed to deploy to sandbox service'); + this.logger.error('Failed to deploy to sandbox service'); this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { message: 'Deployment failed: Failed to deploy to sandbox service', error: 'Sandbox service unavailable' @@ -1247,7 +967,7 @@ export abstract class BaseAgentBehavior impleme return result.deploymentUrl ? { deploymentUrl: result.deploymentUrl } : null; } catch (error) { - this.logger().error('Cloudflare deployment error:', error); + this.logger.error('Cloudflare deployment error:', error); this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { message: 'Deployment failed', error: error instanceof Error ? error.message : String(error) @@ -1260,12 +980,12 @@ export abstract class BaseAgentBehavior impleme if (this.generationPromise) { try { await this.generationPromise; - this.logger().info("Code generation completed successfully"); + this.logger.info("Code generation completed successfully"); } catch (error) { - this.logger().error("Error during code generation:", error); + this.logger.error("Error during code generation:", error); } } else { - this.logger().error("No generation process found"); + this.logger.error("No generation process found"); } } @@ -1284,9 +1004,9 @@ export abstract class BaseAgentBehavior impleme if (this.deepDebugPromise) { try { await this.deepDebugPromise; - this.logger().info("Deep debug session completed successfully"); + this.logger.info("Deep debug session completed successfully"); } catch (error) { - this.logger().error("Error during deep debug session:", error); + this.logger.error("Error during deep debug session:", error); } finally { // Clear promise after waiting completes this.deepDebugPromise = null; @@ -1294,58 +1014,6 @@ export abstract class BaseAgentBehavior impleme } } - /** - * Cache GitHub OAuth token in memory for subsequent exports - * Token is ephemeral - lost on DO eviction - */ - setGitHubToken(token: string, username: string, ttl: number = 3600000): void { - this.githubTokenCache = { - token, - username, - expiresAt: Date.now() + ttl - }; - this.logger().info('GitHub token cached', { - username, - expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() - }); - } - - /** - * Get cached GitHub token if available and not expired - */ - getGitHubToken(): { token: string; username: string } | null { - if (!this.githubTokenCache) { - return null; - } - - if (Date.now() >= this.githubTokenCache.expiresAt) { - this.logger().info('GitHub token expired, clearing cache'); - this.githubTokenCache = null; - return null; - } - - return { - token: this.githubTokenCache.token, - username: this.githubTokenCache.username - }; - } - - /** - * Clear cached GitHub token - */ - clearGitHubToken(): void { - this.githubTokenCache = null; - this.logger().info('GitHub token cleared'); - } - - async onMessage(connection: Connection, message: string): Promise { - handleWebSocketMessage(this, connection, message); - } - - async onClose(connection: Connection): Promise { - handleWebSocketClose(connection); - } - protected async onProjectUpdate(message: string): Promise { this.setState({ ...this.state, @@ -1370,7 +1038,7 @@ export abstract class BaseAgentBehavior impleme } this.onProjectUpdate(message); } - broadcastToConnections(this, msg, data || {} as WebSocketMessageData); + super.broadcast(msg, data); } protected getBootstrapCommands() { @@ -1381,7 +1049,7 @@ export abstract class BaseAgentBehavior impleme } protected async saveExecutedCommands(commands: string[]) { - this.logger().info('Saving executed commands', { commands }); + this.logger.info('Saving executed commands', { commands }); // Merge with existing history const mergedCommands = [...(this.state.commandsHistory || []), ...commands]; @@ -1391,7 +1059,7 @@ export abstract class BaseAgentBehavior impleme // Log what was filtered out if (invalidCommands.length > 0 || deduplicated > 0) { - this.logger().warn('[commands] Bootstrap commands cleaned', { + this.logger.warn('[commands] Bootstrap commands cleaned', { invalidCommands, invalidCount: invalidCommands.length, deduplicatedCount: deduplicated, @@ -1417,7 +1085,7 @@ export abstract class BaseAgentBehavior impleme ); if (hasDependencyCommands) { - this.logger().info('Dependency commands executed, syncing package.json from sandbox'); + this.logger.info('Dependency commands executed, syncing package.json from sandbox'); await this.syncPackageJsonFromSandbox(); } } @@ -1429,19 +1097,19 @@ export abstract class BaseAgentBehavior impleme protected async executeCommands(commands: string[], shouldRetry: boolean = true, chunkSize: number = 5): Promise { const state = this.state; if (!state.sandboxInstanceId) { - this.logger().warn('No sandbox instance available for executing commands'); + this.logger.warn('No sandbox instance available for executing commands'); return; } // Sanitize and prepare commands commands = commands.join('\n').split('\n').filter(cmd => cmd.trim() !== '').filter(cmd => looksLikeCommand(cmd) && !cmd.includes(' undefined')); if (commands.length === 0) { - this.logger().warn("No commands to execute"); + this.logger.warn("No commands to execute"); return; } commands = commands.map(cmd => cmd.trim().replace(/^\s*-\s*/, '').replace(/^npm/, 'bun')); - this.logger().info(`AI suggested ${commands.length} commands to run: ${commands.join(", ")}`); + this.logger.info(`AI suggested ${commands.length} commands to run: ${commands.join(", ")}`); // Remove duplicate commands commands = Array.from(new Set(commands)); @@ -1472,11 +1140,11 @@ export abstract class BaseAgentBehavior impleme currentChunk ); if (!resp.results || !resp.success) { - this.logger().error('Failed to execute commands', { response: resp }); + this.logger.error('Failed to execute commands', { response: resp }); // Check if instance is still running const status = await this.getSandboxServiceClient().getInstanceStatus(state.sandboxInstanceId); if (!status.success || !status.isHealthy) { - this.logger().error(`Instance ${state.sandboxInstanceId} is no longer running`); + this.logger.error(`Instance ${state.sandboxInstanceId} is no longer running`); return; } break; @@ -1489,19 +1157,19 @@ export abstract class BaseAgentBehavior impleme // Track successful commands if (successful.length > 0) { const successfulCmds = successful.map(r => r.command); - this.logger().info(`Successfully executed ${successful.length} commands: ${successfulCmds.join(", ")}`); + this.logger.info(`Successfully executed ${successful.length} commands: ${successfulCmds.join(", ")}`); successfulCommands.push(...successfulCmds); } // If all succeeded, move to next chunk if (failures.length === 0) { - this.logger().info(`All commands in chunk executed successfully`); + this.logger.info(`All commands in chunk executed successfully`); break; } // Handle failures const failedCommands = failures.map(r => r.command); - this.logger().warn(`${failures.length} commands failed: ${failedCommands.join(", ")}`); + this.logger.warn(`${failures.length} commands failed: ${failedCommands.join(", ")}`); // Only retry if shouldRetry is true if (!shouldRetry) { @@ -1522,14 +1190,14 @@ export abstract class BaseAgentBehavior impleme ); if (newCommands?.commands && newCommands.commands.length > 0) { - this.logger().info(`AI suggested ${newCommands.commands.length} alternative commands`); + this.logger.info(`AI suggested ${newCommands.commands.length} alternative commands`); this.broadcast(WebSocketMessageResponses.COMMAND_EXECUTING, { message: "Executing regenerated commands", commands: newCommands.commands }); currentChunk = newCommands.commands.filter(looksLikeCommand); } else { - this.logger().warn('AI could not generate alternative commands'); + this.logger.warn('AI could not generate alternative commands'); currentChunk = []; } } else { @@ -1537,7 +1205,7 @@ export abstract class BaseAgentBehavior impleme currentChunk = []; } } catch (error) { - this.logger().error('Error executing commands:', error); + this.logger.error('Error executing commands:', error); // Stop retrying on error break; } @@ -1550,7 +1218,7 @@ export abstract class BaseAgentBehavior impleme if (failedCommands.length > 0) { this.broadcastError('Failed to execute commands', new Error(failedCommands.join(", "))); } else { - this.logger().info(`All commands executed successfully: ${successfulCommands.join(", ")}`); + this.logger.info(`All commands executed successfully: ${successfulCommands.join(", ")}`); } this.saveExecutedCommands(successfulCommands); @@ -1562,17 +1230,17 @@ export abstract class BaseAgentBehavior impleme */ protected async syncPackageJsonFromSandbox(): Promise { try { - this.logger().info('Fetching current package.json from sandbox'); + this.logger.info('Fetching current package.json from sandbox'); const results = await this.readFiles(['package.json']); if (!results || !results.files || results.files.length === 0) { - this.logger().warn('Failed to fetch package.json from sandbox', { results }); + this.logger.warn('Failed to fetch package.json from sandbox', { results }); return; } const packageJsonContent = results.files[0].content; const { updated, packageJson } = updatePackageJson(this.state.lastPackageJson, packageJsonContent); if (!updated) { - this.logger().info('package.json has not changed, skipping sync'); + this.logger.info('package.json has not changed, skipping sync'); return; } // Update state with latest package.json @@ -1591,7 +1259,7 @@ export abstract class BaseAgentBehavior impleme 'chore: sync package.json dependencies from sandbox' ); - this.logger().info('Successfully synced package.json to git', { + this.logger.info('Successfully synced package.json to git', { filePath: fileState.filePath, }); @@ -1602,7 +1270,7 @@ export abstract class BaseAgentBehavior impleme }); } catch (error) { - this.logger().error('Failed to sync package.json from sandbox', error); + this.logger.error('Failed to sync package.json from sandbox', error); // Non-critical error - don't throw, just log } } @@ -1632,153 +1300,9 @@ export abstract class BaseAgentBehavior impleme this.fileManager.deleteFiles(filePaths); try { await this.executeCommands(deleteCommands, false); - this.logger().info(`Deleted ${filePaths.length} files: ${filePaths.join(", ")}`); - } catch (error) { - this.logger().error('Error deleting files:', error); - } - } - - /** - * Export generated code to a GitHub repository - */ - async pushToGitHub(options: GitHubPushRequest): Promise { - try { - this.logger().info('Starting GitHub export using DO git'); - - // Broadcast export started - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { - message: `Starting GitHub export to repository "${options.cloneUrl}"`, - repositoryName: options.repositoryHtmlUrl, - isPrivate: options.isPrivate - }); - - // Export git objects from DO - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Preparing git repository...', - step: 'preparing', - progress: 20 - }); - - const { gitObjects, query, templateDetails } = await this.exportGitObjects(); - - this.logger().info('Git objects exported', { - objectCount: gitObjects.length, - hasTemplate: !!templateDetails - }); - - // Get app createdAt timestamp for template base commit - let appCreatedAt: Date | undefined = undefined; - try { - const appId = this.getAgentId(); - if (appId) { - const appService = new AppService(this.env); - const app = await appService.getAppDetails(appId); - if (app && app.createdAt) { - appCreatedAt = new Date(app.createdAt); - this.logger().info('Using app createdAt for template base', { - createdAt: appCreatedAt.toISOString() - }); - } - } - } catch (error) { - this.logger().warn('Failed to get app createdAt, using current time', { error }); - appCreatedAt = new Date(); // Fallback to current time - } - - // Push to GitHub using new service - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Uploading to GitHub repository...', - step: 'uploading_files', - progress: 40 - }); - - const result = await GitHubService.exportToGitHub({ - gitObjects, - templateDetails, - appQuery: query, - appCreatedAt, - token: options.token, - repositoryUrl: options.repositoryHtmlUrl, - username: options.username, - email: options.email - }); - - if (!result.success) { - throw new Error(result.error || 'Failed to export to GitHub'); - } - - this.logger().info('GitHub export completed', { - commitSha: result.commitSha - }); - - // Cache token for subsequent exports - if (options.token && options.username) { - try { - this.setGitHubToken(options.token, options.username); - this.logger().info('GitHub token cached after successful export'); - } catch (cacheError) { - // Non-fatal - continue with finalization - this.logger().warn('Failed to cache GitHub token', { error: cacheError }); - } - } - - // Update database - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Finalizing GitHub export...', - step: 'finalizing', - progress: 90 - }); - - const agentId = this.getAgentId(); - this.logger().info('[DB Update] Updating app with GitHub repository URL', { - agentId, - repositoryUrl: options.repositoryHtmlUrl, - visibility: options.isPrivate ? 'private' : 'public' - }); - - const appService = new AppService(this.env); - const updateResult = await appService.updateGitHubRepository( - agentId || '', - options.repositoryHtmlUrl || '', - options.isPrivate ? 'private' : 'public' - ); - - this.logger().info('[DB Update] Database update result', { - agentId, - success: updateResult, - repositoryUrl: options.repositoryHtmlUrl - }); - - // Broadcast success - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { - message: `Successfully exported to GitHub repository: ${options.repositoryHtmlUrl}`, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl, - commitSha: result.commitSha - }); - - this.logger().info('GitHub export completed successfully', { - repositoryUrl: options.repositoryHtmlUrl, - commitSha: result.commitSha - }); - - return { - success: true, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; - + this.logger.info(`Deleted ${filePaths.length} files: ${filePaths.join(", ")}`); } catch (error) { - this.logger().error('GitHub export failed', error); - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { - message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, - error: error instanceof Error ? error.message : 'Unknown error' - }); - return { - success: false, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; + this.logger.error('Error deleting files:', error); } } @@ -1788,7 +1312,7 @@ export abstract class BaseAgentBehavior impleme */ async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { try { - this.logger().info('Processing user input message', { + this.logger.info('Processing user input message', { messageLength: userMessage.length, pendingInputsCount: this.state.pendingUserInputs.length, hasImages: !!images && images.length > 0, @@ -1801,8 +1325,10 @@ export abstract class BaseAgentBehavior impleme // Just fetch runtime errors const errors = await this.fetchRuntimeErrors(false, false); const projectUpdates = await this.getAndResetProjectUpdates(); - this.logger().info('Passing context to user conversation processor', { errors, projectUpdates }); + this.logger.info('Passing context to user conversation processor', { errors, projectUpdates }); + + const conversationState = this.infrastructure.getConversationState(); // If there are images, upload them and pass the URLs to the conversation processor let uploadedImages: ProcessedImageAttachment[] = []; if (images) { @@ -1810,14 +1336,14 @@ export abstract class BaseAgentBehavior impleme return await uploadImage(this.env, image, ImageType.UPLOADS); })); - this.logger().info('Uploaded images', { uploadedImages }); + this.logger.info('Uploaded images', { uploadedImages }); } // Process the user message using conversational assistant const conversationalResponse = await this.operations.processUserMessage.execute( { userMessage, - conversationState: this.getConversationState(), + conversationState, conversationResponseCallback: ( message: string, conversationId: string, @@ -1843,52 +1369,18 @@ export abstract class BaseAgentBehavior impleme this.getOperationOptions() ); - const { conversationResponse, conversationState } = conversationalResponse; - this.setConversationState(conversationState); - - if (!this.generationPromise) { - // If idle, start generation process - this.logger().info('User input during IDLE state, starting generation'); - this.generateAllFiles().catch(error => { - this.logger().error('Error starting generation from user input:', error); - }); - } - - this.logger().info('User input processed successfully', { + const { conversationResponse, conversationState: newConversationState } = conversationalResponse; + this.logger.info('User input processed successfully', { responseLength: conversationResponse.userResponse.length, }); + this.infrastructure.setConversationState(newConversationState); } catch (error) { - if (error instanceof RateLimitExceededError) { - this.logger().error('Rate limit exceeded:', error); - this.broadcast(WebSocketMessageResponses.RATE_LIMIT_ERROR, { - error - }); - return; - } - this.broadcastError('Error processing user input', error); + this.logger.error('Error processing user input', error); + throw error; } } - /** - * Clear conversation history - */ - public clearConversation(): void { - const messageCount = this.state.conversationMessages.length; - - // Clear conversation messages only from agent's running history - this.setState({ - ...this.state, - conversationMessages: [] - }); - - // Send confirmation response - this.broadcast(WebSocketMessageResponses.CONVERSATION_CLEARED, { - message: 'Conversation history cleared', - clearedMessageCount: messageCount - }); - } - /** * Capture screenshot of the given URL using Cloudflare Browser Rendering REST API */ @@ -1898,7 +1390,7 @@ export abstract class BaseAgentBehavior impleme ): Promise { if (!this.env.DB || !this.getAgentId()) { const error = 'Cannot capture screenshot: DB or agentId not available'; - this.logger().warn(error); + this.logger.warn(error); this.broadcast(WebSocketMessageResponses.SCREENSHOT_CAPTURE_ERROR, { error, configurationError: true @@ -1916,7 +1408,7 @@ export abstract class BaseAgentBehavior impleme throw new Error(error); } - this.logger().info('Capturing screenshot via REST API', { url, viewport }); + this.logger.info('Capturing screenshot via REST API', { url, viewport }); // Notify start of screenshot capture this.broadcast(WebSocketMessageResponses.SCREENSHOT_CAPTURE_STARTED, { @@ -2007,7 +1499,7 @@ export abstract class BaseAgentBehavior impleme throw new Error(error); } - this.logger().info('Screenshot captured and stored successfully', { + this.logger.info('Screenshot captured and stored successfully', { url, storage: uploadedImage.publicUrl.startsWith('data:') ? 'database' : (uploadedImage.publicUrl.includes('/api/screenshots/') ? 'r2' : 'images'), length: base64Screenshot.length @@ -2025,7 +1517,7 @@ export abstract class BaseAgentBehavior impleme return uploadedImage.publicUrl; } catch (error) { - this.logger().error('Failed to capture screenshot via REST API:', error); + this.logger.error('Failed to capture screenshot via REST API:', error); // Only broadcast if error wasn't already broadcast above const errorMessage = error instanceof Error ? error.message : 'Unknown error'; @@ -2040,35 +1532,4 @@ export abstract class BaseAgentBehavior impleme throw new Error(`Screenshot capture failed: ${error instanceof Error ? error.message : 'Unknown error'}`); } } - - /** - * Export git objects - * The route handler will build the repo with template rebasing - */ - async exportGitObjects(): Promise<{ - gitObjects: Array<{ path: string; data: Uint8Array }>; - query: string; - hasCommits: boolean; - templateDetails: TemplateDetails | null; - }> { - try { - // Export git objects efficiently (minimal DO memory usage) - const gitObjects = this.git.fs.exportGitObjects(); - - await this.gitInit(); - - // Ensure template details are available - await this.ensureTemplateDetails(); - - return { - gitObjects, - query: this.state.query || 'N/A', - hasCommits: gitObjects.length > 0, - templateDetails: this.templateDetailsCache - }; - } catch (error) { - this.logger().error('exportGitObjects failed', error); - throw error; - } - } } diff --git a/worker/agents/core/phasic/behavior.ts b/worker/agents/core/behaviors/phasic.ts similarity index 84% rename from worker/agents/core/phasic/behavior.ts rename to worker/agents/core/behaviors/phasic.ts index cf69d48e..658dff89 100644 --- a/worker/agents/core/phasic/behavior.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -10,7 +10,6 @@ import { CurrentDevState, MAX_PHASES, PhasicState } from '../state'; import { AllIssues, AgentInitArgs, PhaseExecutionResult, UserContext } from '../types'; import { WebSocketMessageResponses } from '../../constants'; import { UserConversationProcessor } from '../../operations/UserConversationProcessor'; -import { DeploymentManager } from '../../services/implementations/DeploymentManager'; // import { WebSocketBroadcaster } from '../services/implementations/WebSocketBroadcaster'; import { GenerationContext, PhasicGenerationContext } from '../../domain/values/GenerationContext'; import { IssueReport } from '../../domain/values/IssueReport'; @@ -25,22 +24,23 @@ import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; import { customizePackageJson, customizeTemplateFiles, generateProjectName } from '../../utils/templateCustomizer'; import { generateBlueprint } from '../../planning/blueprint'; import { RateLimitExceededError } from 'shared/types/errors'; -import { type ProcessedImageAttachment } from '../../../types/image-attachment'; +import { ImageAttachment, type ProcessedImageAttachment } from '../../../types/image-attachment'; import { OperationOptions } from '../../operations/common'; import { ConversationMessage } from '../../inferutils/common'; import { generateNanoId } from 'worker/utils/idGenerator'; import { IdGenerator } from '../../utils/idGenerator'; -import { BaseAgentBehavior, BaseAgentOperations } from '../baseAgent'; +import { BaseCodingBehavior, BaseCodingOperations } from './base'; import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; +import { StateMigration } from '../stateMigration'; -interface PhasicOperations extends BaseAgentOperations { +interface PhasicOperations extends BaseCodingOperations { generateNextPhase: PhaseGenerationOperation; implementPhase: PhaseImplementationOperation; } /** - * PhasicAgentBehavior - Deterministically orchestrated agent + * PhasicCodingBehavior - Deterministically orchestrated agent * * Manages the lifecycle of code generation including: * - Blueprint, phase generation, phase implementation, review cycles orchestrations @@ -48,7 +48,9 @@ interface PhasicOperations extends BaseAgentOperations { * - Code validation and error correction * - Deployment to sandbox service */ -export class PhasicAgentBehavior extends BaseAgentBehavior implements ICodingAgent { +export class PhasicCodingBehavior extends BaseCodingBehavior implements ICodingAgent { + protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; + protected operations: PhasicOperations = { regenerateFile: new FileRegenerationOperation(), fastCodeFixer: new FastCodeFixerOperation(), @@ -67,13 +69,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen ..._args: unknown[] ): Promise { await super.initialize(initArgs); - - const { query, language, frameworks, hostname, inferenceContext, templateInfo } = initArgs; - const sandboxSessionId = DeploymentManager.generateNewSessionId(); - + const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + // Generate a blueprint - this.logger().info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); - this.logger().info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); + this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); + this.logger.info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); const blueprint = await generateBlueprint({ env: this.env, @@ -81,30 +81,27 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen query, language: language!, frameworks: frameworks!, - templateDetails: templateInfo.templateDetails, - templateMetaInfo: templateInfo.selection, + templateDetails: templateInfo?.templateDetails, + templateMetaInfo: templateInfo?.selection, images: initArgs.images, stream: { chunk_size: 256, onChunk: (chunk) => { - // initArgs.writer.write({chunk}); initArgs.onBlueprintChunk(chunk); } } }) - - const packageJson = templateInfo.templateDetails?.allFiles['package.json']; - - this.templateDetailsCache = templateInfo.templateDetails; - + + const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + const projectName = generateProjectName( - blueprint?.projectName || templateInfo.templateDetails.name, + blueprint?.projectName || templateInfo?.templateDetails.name || '', generateNanoId(), - PhasicAgentBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH + PhasicCodingBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH ); - - this.logger().info('Generated project name', { projectName }); - + + this.logger.info('Generated project name', { projectName }); + this.setState({ ...this.state, projectName, @@ -115,23 +112,20 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen generatedPhases: [], commandsHistory: [], lastPackageJson: packageJson, - sessionId: sandboxSessionId, + sessionId: sandboxSessionId!, hostname, inferenceContext, }); - - await this.gitInit(); - // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) const customizedFiles = customizeTemplateFiles( templateInfo.templateDetails.allFiles, { projectName, - commandsHistory: [] // Empty initially, will be updated later + commandsHistory: [] } ); - this.logger().info('Customized template files', { + this.logger.info('Customized template files', { files: Object.keys(customizedFiles) }); @@ -147,18 +141,24 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen 'Initialize project configuration files' ); - this.logger().info('Committed customized template files to git'); + this.logger.info('Committed customized template files to git'); this.initializeAsync().catch((error: unknown) => { this.broadcastError("Initialization failed", error); }); - this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); - await this.saveToDatabase(); + this.logger.info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); return this.state; } async onStart(props?: Record | undefined): Promise { await super.onStart(props); + } + + migrateStateIfNeeded(): void { + const migratedState = StateMigration.migrateIfNeeded(this.state, this.logger); + if (migratedState) { + this.setState(migratedState); + } // migrate overwritten package.jsons const oldPackageJson = this.fileManager.getFile('package.json')?.fileContents || this.state.lastPackageJson; @@ -174,18 +174,6 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen } } - setState(state: PhasicState): void { - try { - super.setState(state); - } catch (error) { - this.broadcastError("Error setting state", error); - this.logger().error("State details:", { - originalState: JSON.stringify(this.state, null, 2), - newState: JSON.stringify(state, null, 2) - }); - } - } - rechargePhasesCounter(max_phases: number = MAX_PHASES): void { if (this.getPhasesCounter() <= max_phases) { this.setState({ @@ -212,8 +200,8 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen return { env: this.env, agentId: this.getAgentId(), - context: GenerationContext.from(this.state, this.getTemplateDetails(), this.logger()) as PhasicGenerationContext, - logger: this.logger(), + context: GenerationContext.from(this.state, this.getTemplateDetails(), this.logger) as PhasicGenerationContext, + logger: this.logger, inferenceContext: this.getInferenceContext(), agent: this }; @@ -228,14 +216,14 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen }] }) - this.logger().info("Created new incomplete phase:", JSON.stringify(this.state.generatedPhases, null, 2)); + this.logger.info("Created new incomplete phase:", JSON.stringify(this.state.generatedPhases, null, 2)); } private markPhaseComplete(phaseName: string) { // First find the phase const phases = this.state.generatedPhases; if (!phases.some(p => p.name === phaseName)) { - this.logger().warn(`Phase ${phaseName} not found in generatedPhases array, skipping save`); + this.logger.warn(`Phase ${phaseName} not found in generatedPhases array, skipping save`); return; } @@ -245,7 +233,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen generatedPhases: phases.map(p => p.name === phaseName ? { ...p, completed: true } : p) }); - this.logger().info("Completed phases:", JSON.stringify(phases, null, 2)); + this.logger.info("Completed phases:", JSON.stringify(phases, null, 2)); } async queueUserRequest(request: string, images?: ProcessedImageAttachment[]): Promise { @@ -258,7 +246,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen } private async launchStateMachine() { - this.logger().info("Launching state machine"); + this.logger.info("Launching state machine"); let currentDevState = CurrentDevState.PHASE_IMPLEMENTING; const generatedPhases = this.state.generatedPhases; @@ -266,17 +254,17 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen let phaseConcept : PhaseConceptType | undefined; if (incompletedPhases.length > 0) { phaseConcept = incompletedPhases[incompletedPhases.length - 1]; - this.logger().info('Resuming code generation from incompleted phase', { + this.logger.info('Resuming code generation from incompleted phase', { phase: phaseConcept }); } else if (generatedPhases.length > 0) { currentDevState = CurrentDevState.PHASE_GENERATING; - this.logger().info('Resuming code generation after generating all phases', { + this.logger.info('Resuming code generation after generating all phases', { phase: generatedPhases[generatedPhases.length - 1] }); } else { phaseConcept = this.state.blueprint.initialPhase; - this.logger().info('Starting code generation from initial phase', { + this.logger.info('Starting code generation from initial phase', { phase: phaseConcept }); this.createNewIncompletePhase(phaseConcept); @@ -289,7 +277,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen let executionResults: PhaseExecutionResult; // State machine loop - continues until IDLE state while (currentDevState !== CurrentDevState.IDLE) { - this.logger().info(`[generateAllFiles] Executing state: ${currentDevState}`); + this.logger.info(`[generateAllFiles] Executing state: ${currentDevState}`); switch (currentDevState) { case CurrentDevState.PHASE_GENERATING: executionResults = await this.executePhaseGeneration(); @@ -315,9 +303,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen } } - this.logger().info("State machine completed successfully"); + this.logger.info("State machine completed successfully"); } catch (error) { - this.logger().error("Error in state machine:", error); + this.logger.error("Error in state machine:", error); } } @@ -325,7 +313,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen * Execute phase generation state - generate next phase with user suggestions */ async executePhaseGeneration(): Promise { - this.logger().info("Executing PHASE_GENERATING state"); + this.logger.info("Executing PHASE_GENERATING state"); try { const currentIssues = await this.fetchAllIssues(); @@ -342,7 +330,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen if (userContext && userContext?.suggestions && userContext.suggestions.length > 0) { // Only reset pending user inputs if user suggestions were read - this.logger().info("Resetting pending user inputs", { + this.logger.info("Resetting pending user inputs", { userSuggestions: userContext.suggestions, hasImages: !!userContext.images, imageCount: userContext.images?.length || 0 @@ -350,7 +338,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Clear images after they're passed to phase generation if (userContext?.images && userContext.images.length > 0) { - this.logger().info('Clearing stored user images after passing to phase generation'); + this.logger.info('Clearing stored user images after passing to phase generation'); this.pendingUserImages = []; } } @@ -358,7 +346,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen const nextPhase = await this.generateNextPhase(currentIssues, userContext); if (!nextPhase) { - this.logger().info("No more phases to implement, transitioning to FINALIZING"); + this.logger.info("No more phases to implement, transitioning to FINALIZING"); return { currentDevState: CurrentDevState.FINALIZING, }; @@ -392,16 +380,16 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen */ async executePhaseImplementation(phaseConcept?: PhaseConceptType, staticAnalysis?: StaticAnalysisResponse, userContext?: UserContext): Promise<{currentDevState: CurrentDevState, staticAnalysis?: StaticAnalysisResponse}> { try { - this.logger().info("Executing PHASE_IMPLEMENTING state"); + this.logger.info("Executing PHASE_IMPLEMENTING state"); if (phaseConcept === undefined) { phaseConcept = this.state.currentPhase; if (phaseConcept === undefined) { - this.logger().error("No phase concept provided to implement, will call phase generation"); + this.logger.error("No phase concept provided to implement, will call phase generation"); const results = await this.executePhaseGeneration(); phaseConcept = results.result; if (phaseConcept === undefined) { - this.logger().error("No phase concept provided to implement, will return"); + this.logger.error("No phase concept provided to implement, will return"); return {currentDevState: CurrentDevState.FINALIZING}; } } @@ -432,14 +420,14 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Implement the phase with user context (suggestions and images) await this.implementPhase(phaseConcept, currentIssues, userContext); - this.logger().info(`Phase ${phaseConcept.name} completed, generating next phase`); + this.logger.info(`Phase ${phaseConcept.name} completed, generating next phase`); const phasesCounter = this.decrementPhasesCounter(); if ((phaseConcept.lastPhase || phasesCounter <= 0) && this.state.pendingUserInputs.length === 0) return {currentDevState: CurrentDevState.FINALIZING, staticAnalysis: staticAnalysis}; return {currentDevState: CurrentDevState.PHASE_GENERATING, staticAnalysis: staticAnalysis}; } catch (error) { - this.logger().error("Error implementing phase", error); + this.logger.error("Error implementing phase", error); if (error instanceof RateLimitExceededError) { throw error; } @@ -451,9 +439,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen * Execute review cycle state - review and cleanup */ async executeReviewCycle(): Promise { - this.logger().info("Executing REVIEWING state - review and cleanup"); + this.logger.info("Executing REVIEWING state - review and cleanup"); if (this.state.reviewingInitiated) { - this.logger().info("Reviewing already initiated, skipping"); + this.logger.info("Reviewing already initiated, skipping"); return CurrentDevState.IDLE; } this.setState({ @@ -464,14 +452,14 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // If issues/errors found, prompt user if they want to review and cleanup const issues = await this.fetchAllIssues(false); if (issues.runtimeErrors.length > 0 || issues.staticAnalysis.typecheck.issues.length > 0) { - this.logger().info("Reviewing stage - issues found, prompting user to review and cleanup"); + this.logger.info("Reviewing stage - issues found, prompting user to review and cleanup"); const message : ConversationMessage = { role: "assistant", content: `If the user responds with yes, launch the 'deep_debug' tool with the prompt to fix all the issues in the app\nThere might be some bugs in the app. Do you want me to try to fix them?`, conversationId: IdGenerator.generateConversationId(), } // Store the message in the conversation history so user's response can trigger the deep debug tool - this.addConversationMessage(message); + this.infrastructure.addConversationMessage(message); this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: message.content, @@ -487,11 +475,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen * Execute finalizing state - final review and cleanup (runs only once) */ async executeFinalizing(): Promise { - this.logger().info("Executing FINALIZING state - final review and cleanup"); + this.logger.info("Executing FINALIZING state - final review and cleanup"); // Only do finalizing stage if it wasn't done before if (this.state.mvpGenerated) { - this.logger().info("Finalizing stage already done"); + this.logger.info("Finalizing stage already done"); return CurrentDevState.REVIEWING; } this.setState({ @@ -514,7 +502,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen await this.implementPhase(phaseConcept, currentIssues); const numFilesGenerated = this.fileManager.getGeneratedFilePaths().length; - this.logger().info(`Finalization complete. Generated ${numFilesGenerated}/${this.getTotalFiles()} files.`); + this.logger.info(`Finalization complete. Generated ${numFilesGenerated}/${this.getTotalFiles()} files.`); // Transition to IDLE - generation complete return CurrentDevState.REVIEWING; @@ -558,12 +546,12 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Execute delete commands if any const filesToDelete = result.files.filter(f => f.changes?.toLowerCase().trim() === 'delete'); if (filesToDelete.length > 0) { - this.logger().info(`Deleting ${filesToDelete.length} files: ${filesToDelete.map(f => f.path).join(", ")}`); + this.logger.info(`Deleting ${filesToDelete.length} files: ${filesToDelete.map(f => f.path).join(", ")}`); this.deleteFiles(filesToDelete.map(f => f.path)); } if (result.files.length === 0) { - this.logger().info("No files generated for next phase"); + this.logger.info("No files generated for next phase"); // Notify phase generation complete this.broadcast(WebSocketMessageResponses.PHASE_GENERATED, { message: `No files generated for next phase`, @@ -654,11 +642,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen // Update state with completed phase await this.fileManager.saveGeneratedFiles(finalFiles, `feat: ${phase.name}\n\n${phase.description}`); - this.logger().info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); + this.logger.info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); // Execute commands if provided if (result.commands && result.commands.length > 0) { - this.logger().info("Phase implementation suggested install commands:", result.commands); + this.logger.info("Phase implementation suggested install commands:", result.commands); await this.executeCommands(result.commands, false); } @@ -679,9 +667,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen phase: phase }); - this.logger().info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); + this.logger.info("Files generated for phase:", phase.name, finalFiles.map(f => f.filePath)); - this.logger().info(`Validation complete for phase: ${phase.name}`); + this.logger.info(`Validation complete for phase: ${phase.name}`); // Notify phase completion this.broadcast(WebSocketMessageResponses.PHASE_IMPLEMENTED, { @@ -763,7 +751,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen defaultConfigs }; } catch (error) { - this.logger().error('Error fetching model configs info:', error); + this.logger.error('Error fetching model configs info:', error); throw error; } } @@ -775,11 +763,11 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen private async applyFastSmartCodeFixes() : Promise { try { const startTime = Date.now(); - this.logger().info("Applying fast smart code fixes"); + this.logger.info("Applying fast smart code fixes"); // Get static analysis and do deterministic fixes const staticAnalysis = await this.runStaticAnalysisCode(); if (staticAnalysis.typecheck.issues.length + staticAnalysis.lint.issues.length == 0) { - this.logger().info("No issues found, skipping fast smart code fixes"); + this.logger.info("No issues found, skipping fast smart code fixes"); return; } const issues = staticAnalysis.typecheck.issues.concat(staticAnalysis.lint.issues); @@ -794,9 +782,9 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen if (fastCodeFixer.length > 0) { await this.fileManager.saveGeneratedFiles(fastCodeFixer, "fix: Fast smart code fixes"); await this.deployToSandbox(fastCodeFixer); - this.logger().info("Fast smart code fixes applied successfully"); + this.logger.info("Fast smart code fixes applied successfully"); } - this.logger().info(`Fast smart code fixes applied in ${Date.now() - startTime}ms`); + this.logger.info(`Fast smart code fixes applied in ${Date.now() - startTime}ms`); } catch (error) { this.broadcastError("Failed to apply fast smart code fixes", error); return; @@ -809,7 +797,7 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen requirements: string[], files: FileConceptType[] ): Promise<{ files: Array<{ path: string; purpose: string; diff: string }> }> { - this.logger().info('Generating files for deep debugger', { + this.logger.info('Generating files for deep debugger', { phaseName, requirementsCount: requirements.length, filesCount: files.length @@ -849,4 +837,16 @@ export class PhasicAgentBehavior extends BaseAgentBehavior implemen })) }; } + + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + const result = await super.handleUserInput(userMessage, images); + if (!this.generationPromise) { + // If idle, start generation process + this.logger.info('User input during IDLE state, starting generation'); + this.generateAllFiles().catch(error => { + this.logger.error('Error starting generation from user input:', error); + }); + } + return result; + } } diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts new file mode 100644 index 00000000..bd2c9b94 --- /dev/null +++ b/worker/agents/core/codingAgent.ts @@ -0,0 +1,714 @@ +import { Agent, AgentContext } from "agents"; +import { AgentInitArgs, BehaviorType } from "./types"; +import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; +import { BaseCodingBehavior } from "./behaviors/base"; +import { createObjectLogger, StructuredLogger } from '../../logger'; +import { InferenceContext } from "../inferutils/config.types"; +import { FileManager } from '../services/implementations/FileManager'; +import { DeploymentManager } from '../services/implementations/DeploymentManager'; +import { GitVersionControl } from '../git'; +import { StateManager } from '../services/implementations/StateManager'; +import { PhasicCodingBehavior } from './behaviors/phasic'; +import { AgenticCodingBehavior } from './behaviors/agentic'; +import { SqlExecutor } from '../git'; +import { AgentInfrastructure } from "./AgentCore"; +import { ProjectType } from './types'; +import { Connection } from 'agents'; +import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections } from './websocket'; +import { WebSocketMessageData, WebSocketMessageType } from "worker/api/websocketTypes"; +import { GitHubPushRequest, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; +import { GitHubExportResult, GitHubService } from "worker/services/github"; +import { WebSocketMessageResponses } from "../constants"; +import { AppService } from "worker/database"; +import { ConversationMessage, ConversationState } from "../inferutils/common"; +import { ImageAttachment } from "worker/types/image-attachment"; +import { RateLimitExceededError } from "shared/types/errors"; +import { ProjectObjective } from "./objectives/base"; +import { AppObjective } from "./objectives/app"; +import { WorkflowObjective } from "./objectives/workflow"; +import { PresentationObjective } from "./objectives/presentation"; + +const DEFAULT_CONVERSATION_SESSION_ID = 'default'; + +export class CodeGeneratorAgent extends Agent implements AgentInfrastructure { + public _logger: StructuredLogger | undefined; + private behavior: BaseCodingBehavior; + private objective: ProjectObjective; + protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; + + // GitHub token cache (ephemeral, lost on DO eviction) + protected githubTokenCache: { + token: string; + username: string; + expiresAt: number; + } | null = null; + + // Services + readonly fileManager: FileManager; + readonly deploymentManager: DeploymentManager; + readonly git: GitVersionControl; + + // Redeclare as public to satisfy AgentInfrastructure interface + declare public readonly env: Env; + declare public readonly sql: SqlExecutor; + + // ========================================== + // Initialization + // ========================================== + + initialState: AgentState = { + blueprint: {} as any, // Will be populated during initialization + projectName: "", + projectType: 'app', // Default project type + query: "", + generatedPhases: [], + generatedFilesMap: {}, + behaviorType: 'phasic', + sandboxInstanceId: undefined, + templateName: '', + commandsHistory: [], + lastPackageJson: '', + pendingUserInputs: [], + inferenceContext: {} as InferenceContext, + sessionId: '', + hostname: '', + conversationMessages: [], + currentDevState: CurrentDevState.IDLE, + phasesCounter: MAX_PHASES, + mvpGenerated: false, + shouldBeGenerating: false, + reviewingInitiated: false, + projectUpdatesAccumulator: [], + lastDeepDebugTranscript: null, + } as AgentState; + + constructor(ctx: AgentContext, env: Env) { + super(ctx, env); + + this.sql`CREATE TABLE IF NOT EXISTS full_conversations (id TEXT PRIMARY KEY, messages TEXT)`; + this.sql`CREATE TABLE IF NOT EXISTS compact_conversations (id TEXT PRIMARY KEY, messages TEXT)`; + + // Create StateManager + const stateManager = new StateManager( + () => this.state, + (s) => this.setState(s) + ); + + this.git = new GitVersionControl(this.sql.bind(this)); + this.fileManager = new FileManager( + stateManager, + () => this.behavior?.getTemplateDetails?.() || null, + this.git + ); + this.deploymentManager = new DeploymentManager( + { + stateManager, + fileManager: this.fileManager, + getLogger: () => this.logger(), + env: this.env + }, + 10 // MAX_COMMANDS_HISTORY + ); + + const behaviorTypeProp = (ctx.props as Record)?.behaviorType as BehaviorType | undefined; + const behaviorType = this.state.behaviorType || behaviorTypeProp || 'phasic'; + if (behaviorType === 'phasic') { + this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure); + } else { + this.behavior = new AgenticCodingBehavior(this as AgentInfrastructure); + } + + // Create objective based on project type + this.objective = this.createObjective(this.state.projectType || 'app'); + } + + /** + * Factory method to create the appropriate objective based on project type + */ + private createObjective(projectType: ProjectType): ProjectObjective { + const infrastructure = this as AgentInfrastructure; + + switch (projectType) { + case 'app': + return new AppObjective(infrastructure); + case 'workflow': + return new WorkflowObjective(infrastructure); + case 'presentation': + return new PresentationObjective(infrastructure); + default: + // Default to app for backward compatibility + return new AppObjective(infrastructure); + } + } + + /** + * Initialize the agent with project blueprint and template + * Only called once in an app's lifecycle + */ + async initialize( + initArgs: AgentInitArgs, + ..._args: unknown[] + ): Promise { + const { inferenceContext } = initArgs; + const sandboxSessionId = DeploymentManager.generateNewSessionId(); + this.initLogger(inferenceContext.agentId, inferenceContext.userId, sandboxSessionId); + + // Infrastructure setup + await this.gitInit(); + + // Let behavior handle all state initialization (blueprint, projectName, etc.) + await this.behavior.initialize({ + ...initArgs, + sandboxSessionId // Pass generated session ID to behavior + }); + + try { + await this.objective.onProjectCreated(); + } catch (error) { + this.logger().error('Lifecycle hook onProjectCreated failed:', error); + // Don't fail initialization if hook fails + } + await this.saveToDatabase(); + + return this.state; + } + + async isInitialized() { + return this.getAgentId() ? true : false + } + + /** + * Called evertime when agent is started or re-started + * @param props - Optional props + */ + async onStart(props?: Record | undefined): Promise { + this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart`, { props }); + + // Ignore if agent not initialized + if (!this.state.query) { + this.logger().warn(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart ignored, agent not initialized`); + return; + } + + this.behavior.onStart(props); + + // Ensure state is migrated for any previous versions + this.behavior.migrateStateIfNeeded(); + + // Check if this is a read-only operation + const readOnlyMode = props?.readOnlyMode === true; + + if (readOnlyMode) { + this.logger().info(`Agent ${this.getAgentId()} starting in READ-ONLY mode - skipping expensive initialization`); + return; + } + + // Just in case + await this.gitInit(); + + await this.behavior.ensureTemplateDetails(); + this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart processed successfully`); + } + + private initLogger(agentId: string, userId: string, sessionId?: string) { + this._logger = createObjectLogger(this, 'CodeGeneratorAgent'); + this._logger.setObjectId(agentId); + this._logger.setFields({ + agentId, + userId, + }); + if (sessionId) { + this._logger.setField('sessionId', sessionId); + } + return this._logger; + } + + // ========================================== + // Utilities + // ========================================== + + logger(): StructuredLogger { + if (!this._logger) { + this._logger = this.initLogger(this.getAgentId(), this.state.inferenceContext.userId, this.state.sessionId); + } + return this._logger; + } + + getAgentId() { + return this.state.inferenceContext.agentId; + } + + getWebSockets(): WebSocket[] { + return this.ctx.getWebSockets(); + } + + /** + * Get the project objective (defines what is being built) + */ + getObjective(): ProjectObjective { + return this.objective; + } + + /** + * Get the behavior (defines how code is generated) + */ + getBehavior(): BaseCodingBehavior { + return this.behavior; + } + + protected async saveToDatabase() { + this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); + // Save the app to database (authenticated users only) + const appService = new AppService(this.env); + await appService.createApp({ + id: this.state.inferenceContext.agentId, + userId: this.state.inferenceContext.userId, + sessionToken: null, + title: this.state.blueprint.title || this.state.query.substring(0, 100), + description: this.state.blueprint.description, + originalPrompt: this.state.query, + finalPrompt: this.state.query, + framework: this.state.blueprint.frameworks.join(','), + visibility: 'private', + status: 'generating', + createdAt: new Date(), + updatedAt: new Date() + }); + this.logger().info(`App saved successfully to database for agent ${this.state.inferenceContext.agentId}`, { + agentId: this.state.inferenceContext.agentId, + userId: this.state.inferenceContext.userId, + visibility: 'private' + }); + this.logger().info(`Agent initialized successfully for agent ${this.state.inferenceContext.agentId}`); + } + + // ========================================== + // Conversation Management + // ========================================== + + /* + * Each DO has 10 gb of sqlite storage. However, the way agents sdk works, it stores the 'state' object of the agent as a single row + * in the cf_agents_state table. And row size has a much smaller limit in sqlite. Thus, we only keep current compactified conversation + * in the agent's core state and store the full conversation in a separate DO table. + */ + getConversationState(id: string = DEFAULT_CONVERSATION_SESSION_ID): ConversationState { + const currentConversation = this.state.conversationMessages; + const rows = this.sql<{ messages: string, id: string }>`SELECT * FROM full_conversations WHERE id = ${id}`; + let fullHistory: ConversationMessage[] = []; + if (rows.length > 0 && rows[0].messages) { + try { + const parsed = JSON.parse(rows[0].messages); + if (Array.isArray(parsed)) { + fullHistory = parsed as ConversationMessage[]; + } + } catch (_e) {} + } + if (fullHistory.length === 0) { + fullHistory = currentConversation; + } + // Load compact (running) history from sqlite with fallback to in-memory state for migration + const compactRows = this.sql<{ messages: string, id: string }>`SELECT * FROM compact_conversations WHERE id = ${id}`; + let runningHistory: ConversationMessage[] = []; + if (compactRows.length > 0 && compactRows[0].messages) { + try { + const parsed = JSON.parse(compactRows[0].messages); + if (Array.isArray(parsed)) { + runningHistory = parsed as ConversationMessage[]; + } + } catch (_e) {} + } + if (runningHistory.length === 0) { + runningHistory = currentConversation; + } + + // Remove duplicates + const deduplicateMessages = (messages: ConversationMessage[]): ConversationMessage[] => { + const seen = new Set(); + return messages.filter(msg => { + if (seen.has(msg.conversationId)) { + return false; + } + seen.add(msg.conversationId); + return true; + }); + }; + + runningHistory = deduplicateMessages(runningHistory); + fullHistory = deduplicateMessages(fullHistory); + + return { + id: id, + runningHistory, + fullHistory, + }; + } + + setConversationState(conversations: ConversationState) { + const serializedFull = JSON.stringify(conversations.fullHistory); + const serializedCompact = JSON.stringify(conversations.runningHistory); + try { + this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`); + this.sql`INSERT OR REPLACE INTO compact_conversations (id, messages) VALUES (${conversations.id}, ${serializedCompact})`; + this.sql`INSERT OR REPLACE INTO full_conversations (id, messages) VALUES (${conversations.id}, ${serializedFull})`; + } catch (error) { + this.logger().error(`Failed to save conversation state ${conversations.id}`, error); + } + } + + addConversationMessage(message: ConversationMessage) { + const conversationState = this.getConversationState(); + if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + conversationState.runningHistory.push(message); + } else { + conversationState.runningHistory = conversationState.runningHistory.map(msg => { + if (msg.conversationId === message.conversationId) { + return message; + } + return msg; + }); + } + if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { + conversationState.fullHistory.push(message); + } else { + conversationState.fullHistory = conversationState.fullHistory.map(msg => { + if (msg.conversationId === message.conversationId) { + return message; + } + return msg; + }); + } + this.setConversationState(conversationState); + } + + /** + * Clear conversation history + */ + public clearConversation(): void { + const messageCount = this.state.conversationMessages.length; + + // Clear conversation messages only from agent's running history + this.setState({ + ...this.state, + conversationMessages: [] + }); + + // Send confirmation response + this.broadcast(WebSocketMessageResponses.CONVERSATION_CLEARED, { + message: 'Conversation history cleared', + clearedMessageCount: messageCount + }); + } + + /** + * Handle user input during conversational code generation + * Processes user messages and updates pendingUserInputs state + */ + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + try { + this.logger().info('Processing user input message', { + messageLength: userMessage.length, + pendingInputsCount: this.state.pendingUserInputs.length, + hasImages: !!images && images.length > 0, + imageCount: images?.length || 0 + }); + + await this.behavior.handleUserInput(userMessage, images); + + } catch (error) { + if (error instanceof RateLimitExceededError) { + this.logger().error('Rate limit exceeded:', error); + this.broadcast(WebSocketMessageResponses.RATE_LIMIT_ERROR, { + error + }); + return; + } + this.broadcastError('Error processing user input', error); + } + } + // ========================================== + // WebSocket Management + // ========================================== + + /** + * Handle WebSocket message - Agent owns WebSocket lifecycle + * Delegates to centralized handler which can access both behavior and objective + */ + async onMessage(connection: Connection, message: string): Promise { + handleWebSocketMessage(this, connection, message); + } + + /** + * Handle WebSocket close - Agent owns WebSocket lifecycle + */ + async onClose(connection: Connection): Promise { + handleWebSocketClose(connection); + } + + /** + * Broadcast message to all connected WebSocket clients + * Type-safe version using proper WebSocket message types + */ + public broadcast( + type: T, + data?: WebSocketMessageData + ): void { + broadcastToConnections(this, type, data || {} as WebSocketMessageData); + } + + protected broadcastError(context: string, error: unknown): void { + const errorMessage = error instanceof Error ? error.message : String(error); + this.logger().error(`${context}:`, error); + this.broadcast(WebSocketMessageResponses.ERROR, { + error: `${context}: ${errorMessage}` + }); + } + // ========================================== + // Git Management + // ========================================== + + protected async gitInit() { + try { + await this.git.init(); + this.logger().info("Git initialized successfully"); + // Check if there is any commit + const head = await this.git.getHead(); + + if (!head) { + this.logger().info("No commits found, creating initial commit"); + // get all generated files and commit them + const generatedFiles = this.fileManager.getGeneratedFiles(); + if (generatedFiles.length === 0) { + this.logger().info("No generated files found, skipping initial commit"); + return; + } + await this.git.commit(generatedFiles, "Initial commit"); + this.logger().info("Initial commit created successfully"); + } + } catch (error) { + this.logger().error("Error during git init:", error); + } + } + + /** + * Export git objects + * The route handler will build the repo with template rebasing + */ + async exportGitObjects(): Promise<{ + gitObjects: Array<{ path: string; data: Uint8Array }>; + query: string; + hasCommits: boolean; + templateDetails: TemplateDetails | null; + }> { + try { + // Export git objects efficiently (minimal DO memory usage) + const gitObjects = this.git.fs.exportGitObjects(); + + await this.gitInit(); + + // Ensure template details are available + await this.behavior.ensureTemplateDetails(); + + const templateDetails = this.behavior.getTemplateDetails(); + + return { + gitObjects, + query: this.state.query || 'N/A', + hasCommits: gitObjects.length > 0, + templateDetails + }; + } catch (error) { + this.logger().error('exportGitObjects failed', error); + throw error; + } + } + + /** + * Cache GitHub OAuth token in memory for subsequent exports + * Token is ephemeral - lost on DO eviction + */ + setGitHubToken(token: string, username: string, ttl: number = 3600000): void { + this.githubTokenCache = { + token, + username, + expiresAt: Date.now() + ttl + }; + this.logger().info('GitHub token cached', { + username, + expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() + }); + } + + /** + * Get cached GitHub token if available and not expired + */ + getGitHubToken(): { token: string; username: string } | null { + if (!this.githubTokenCache) { + return null; + } + + if (Date.now() >= this.githubTokenCache.expiresAt) { + this.logger().info('GitHub token expired, clearing cache'); + this.githubTokenCache = null; + return null; + } + + return { + token: this.githubTokenCache.token, + username: this.githubTokenCache.username + }; + } + + /** + * Clear cached GitHub token + */ + clearGitHubToken(): void { + this.githubTokenCache = null; + this.logger().info('GitHub token cleared'); + } + + + /** + * Export generated code to a GitHub repository + */ + async pushToGitHub(options: GitHubPushRequest): Promise { + try { + this.logger().info('Starting GitHub export using DO git'); + + // Broadcast export started + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { + message: `Starting GitHub export to repository "${options.cloneUrl}"`, + repositoryName: options.repositoryHtmlUrl, + isPrivate: options.isPrivate + }); + + // Export git objects from DO + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Preparing git repository...', + step: 'preparing', + progress: 20 + }); + + const { gitObjects, query, templateDetails } = await this.exportGitObjects(); + + this.logger().info('Git objects exported', { + objectCount: gitObjects.length, + hasTemplate: !!templateDetails + }); + + // Get app createdAt timestamp for template base commit + let appCreatedAt: Date | undefined = undefined; + try { + const appId = this.getAgentId(); + if (appId) { + const appService = new AppService(this.env); + const app = await appService.getAppDetails(appId); + if (app && app.createdAt) { + appCreatedAt = new Date(app.createdAt); + this.logger().info('Using app createdAt for template base', { + createdAt: appCreatedAt.toISOString() + }); + } + } + } catch (error) { + this.logger().warn('Failed to get app createdAt, using current time', { error }); + appCreatedAt = new Date(); // Fallback to current time + } + + // Push to GitHub using new service + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Uploading to GitHub repository...', + step: 'uploading_files', + progress: 40 + }); + + const result = await GitHubService.exportToGitHub({ + gitObjects, + templateDetails, + appQuery: query, + appCreatedAt, + token: options.token, + repositoryUrl: options.repositoryHtmlUrl, + username: options.username, + email: options.email + }); + + if (!result.success) { + throw new Error(result.error || 'Failed to export to GitHub'); + } + + this.logger().info('GitHub export completed', { + commitSha: result.commitSha + }); + + // Cache token for subsequent exports + if (options.token && options.username) { + try { + this.setGitHubToken(options.token, options.username); + this.logger().info('GitHub token cached after successful export'); + } catch (cacheError) { + // Non-fatal - continue with finalization + this.logger().warn('Failed to cache GitHub token', { error: cacheError }); + } + } + + // Update database + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Finalizing GitHub export...', + step: 'finalizing', + progress: 90 + }); + + const agentId = this.getAgentId(); + this.logger().info('[DB Update] Updating app with GitHub repository URL', { + agentId, + repositoryUrl: options.repositoryHtmlUrl, + visibility: options.isPrivate ? 'private' : 'public' + }); + + const appService = new AppService(this.env); + const updateResult = await appService.updateGitHubRepository( + agentId || '', + options.repositoryHtmlUrl || '', + options.isPrivate ? 'private' : 'public' + ); + + this.logger().info('[DB Update] Database update result', { + agentId, + success: updateResult, + repositoryUrl: options.repositoryHtmlUrl + }); + + // Broadcast success + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { + message: `Successfully exported to GitHub repository: ${options.repositoryHtmlUrl}`, + repositoryUrl: options.repositoryHtmlUrl, + cloneUrl: options.cloneUrl, + commitSha: result.commitSha + }); + + this.logger().info('GitHub export completed successfully', { + repositoryUrl: options.repositoryHtmlUrl, + commitSha: result.commitSha + }); + + return { + success: true, + repositoryUrl: options.repositoryHtmlUrl, + cloneUrl: options.cloneUrl + }; + + } catch (error) { + this.logger().error('GitHub export failed', error); + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { + message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, + error: error instanceof Error ? error.message : 'Unknown error' + }); + return { + success: false, + repositoryUrl: options.repositoryHtmlUrl, + cloneUrl: options.cloneUrl + }; + } + } + +} \ No newline at end of file diff --git a/worker/agents/core/objectives/app.ts b/worker/agents/core/objectives/app.ts new file mode 100644 index 00000000..911ea404 --- /dev/null +++ b/worker/agents/core/objectives/app.ts @@ -0,0 +1,152 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { WebSocketMessageResponses, PREVIEW_EXPIRED_ERROR } from '../../constants'; +import { AppService } from '../../../database/services/AppService'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * AppObjective - Full-Stack Web Applications + * + * Produces: React + Vite + Cloudflare Workers full-stack applications + * Runtime: Cloudflare Containers (sandbox) + * Template: R2-backed React templates + * Export: Deploy to Cloudflare Workers for platform (and soon User's personal Cloudflare account) + * + * This is the EXISTING, ORIGINAL project type. + * All current production apps are AppObjective. + */ +export class AppObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // IDENTITY + // ========================================== + + getType(): ProjectType { + return 'app'; + } + + // ========================================== + // RUNTIME & INFRASTRUCTURE + // ========================================== + + getRuntime(): RuntimeType { + return 'sandbox'; + } + + needsTemplate(): boolean { + return true; + } + + getTemplateType(): string | null { + return this.state.templateName; + } + + // ========================================== + // LIFECYCLE HOOKS + // ========================================== + + /** + * After code generation, auto-deploy to sandbox for preview + */ + async onCodeGenerated(): Promise { + this.logger.info('AppObjective: Code generation complete, auto-deploying to sandbox'); + + try { + await this.deploymentManager.deployToSandbox(); + this.logger.info('AppObjective: Auto-deployment to sandbox successful'); + } catch (error) { + this.logger.error('AppObjective: Auto-deployment to sandbox failed', error); + // Don't throw - generation succeeded even if deployment failed + } + } + + // ========================================== + // EXPORT/DEPLOYMENT + // ========================================== + + async export(_options?: ExportOptions): Promise { + try { + this.logger.info('Exporting app to Cloudflare Workers + Pages'); + + // Ensure sandbox instance exists first + if (!this.state.sandboxInstanceId) { + this.logger.info('No sandbox instance, deploying to sandbox first'); + await this.deploymentManager.deployToSandbox(); + + if (!this.state.sandboxInstanceId) { + this.logger.error('Failed to deploy to sandbox service'); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Deployment failed: Failed to deploy to sandbox service', + error: 'Sandbox service unavailable' + }); + return { + success: false, + error: 'Failed to deploy to sandbox service' + }; + } + } + + // Deploy to Cloudflare Workers + Pages + const result = await this.deploymentManager.deployToCloudflare({ + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + }, + onPreviewExpired: () => { + // Re-deploy sandbox and broadcast error + this.deploymentManager.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } + }); + + // Update database with deployment ID if successful + if (result.deploymentUrl && result.deploymentId) { + const appService = new AppService(this.env); + await appService.updateDeploymentId( + this.getAgentId(), + result.deploymentId + ); + + this.logger.info('Updated app deployment ID in database', { + agentId: this.getAgentId(), + deploymentId: result.deploymentId + }); + } + + return { + success: !!result.deploymentUrl, + url: result.deploymentUrl || undefined, + metadata: { + deploymentId: result.deploymentId, + workersUrl: result.deploymentUrl + } + }; + + } catch (error) { + this.logger.error('Cloudflare deployment error:', error); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Deployment failed', + error: error instanceof Error ? error.message : String(error) + }); + + return { + success: false, + error: error instanceof Error ? error.message : 'Unknown deployment error' + }; + } + } +} diff --git a/worker/agents/core/objectives/base.ts b/worker/agents/core/objectives/base.ts new file mode 100644 index 00000000..2939a7df --- /dev/null +++ b/worker/agents/core/objectives/base.ts @@ -0,0 +1,90 @@ +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { AgentComponent } from '../AgentComponent'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * Abstract base class for project objectives + * + * Defines WHAT is being built (app, workflow, presentation, etc.) + * + * Design principles: + * - Defines project identity (type, name, description) + * - Defines runtime requirements (sandbox, worker, none) + * - Defines template needs + * - Implements export/deployment logic + * - Provides lifecycle hooks + */ +export abstract class ProjectObjective + extends AgentComponent { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // ABSTRACT METHODS (Must be implemented) + // ========================================== + + /** + * Get project type identifier + */ + abstract getType(): ProjectType; + + /** + * Get runtime type (where it runs during development) + */ + abstract getRuntime(): RuntimeType; + + /** + * Does this project need a template? + */ + abstract needsTemplate(): boolean; + + /** + * Get template type if needed + */ + abstract getTemplateType(): string | null; + + /** + * Export/deploy project to target platform + * + * This is where objective-specific deployment logic lives: + * - AppObjective: Deploy to Cloudflare Workers + Pages + * - WorkflowObjective: Deploy to Cloudflare Workers only + * - PresentationObjective: Export to PDF/Google Slides/PowerPoint + */ + abstract export(options?: ExportOptions): Promise; + + // ========================================== + // OPTIONAL LIFECYCLE HOOKS + // ========================================== + + /** + * Called after project is created and initialized + * Override for project-specific setup + */ + async onProjectCreated(): Promise { + // Default: no-op + } + + /** + * Called after code generation completes + * Override for project-specific post-generation actions + */ + async onCodeGenerated(): Promise { + // Default: no-op + } + + // ========================================== + // OPTIONAL VALIDATION + // ========================================== + + /** + * Validate project configuration and state + * Override for project-specific validation + */ + async validate(): Promise<{ valid: boolean; errors?: string[] }> { + return { valid: true }; + } +} diff --git a/worker/agents/core/objectives/presentation.ts b/worker/agents/core/objectives/presentation.ts new file mode 100644 index 00000000..b5411427 --- /dev/null +++ b/worker/agents/core/objectives/presentation.ts @@ -0,0 +1,62 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * WIP - PresentationObjective - Slides/Docs/Marketing Materials + * + * Produces: Spectacle-based presentations + * Runtime: Sandbox + * Template: Spectacle template (R2-backed) + * Export: PDF, Google Slides, PowerPoint + * + */ +export class PresentationObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // IDENTITY + // ========================================== + + getType(): ProjectType { + return 'presentation'; + } + + // ========================================== + // RUNTIME & INFRASTRUCTURE + // ========================================== + + getRuntime(): RuntimeType { + return 'sandbox'; + } + + needsTemplate(): boolean { + return true; + } + + getTemplateType(): string | null { + return 'spectacle'; // New template to be created + } + + // ========================================== + // EXPORT/DEPLOYMENT + // ========================================== + + async export(options?: ExportOptions): Promise { + const format = (options?.format as 'pdf' | 'googleslides' | 'pptx') || 'pdf'; + this.logger.info('Presentation export requested but not yet implemented', { format }); + + return { + success: false, + error: 'Presentation export not yet implemented - coming in Phase 3', + metadata: { + requestedFormat: format + } + }; + } +} diff --git a/worker/agents/core/objectives/workflow.ts b/worker/agents/core/objectives/workflow.ts new file mode 100644 index 00000000..f455ba8b --- /dev/null +++ b/worker/agents/core/objectives/workflow.ts @@ -0,0 +1,58 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import type { AgentInfrastructure } from '../AgentCore'; + +/** + * WIP! + * WorkflowObjective - Backend-Only Workflows + * + * Produces: Cloudflare Workers without UI (APIs, scheduled jobs, queues) + * Runtime: Sandbox for now, Dynamic Worker Loaders in the future + * Template: In-memory (no R2) + * Export: Deploy to Cloudflare Workers in user's account + */ +export class WorkflowObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + // ========================================== + // IDENTITY + // ========================================== + + getType(): ProjectType { + return 'workflow'; + } + + // ========================================== + // RUNTIME & INFRASTRUCTURE + // ========================================== + + getRuntime(): RuntimeType { + return 'worker'; + } + + needsTemplate(): boolean { + return false; // In-memory templates + } + + getTemplateType(): string | null { + return null; + } + + // ========================================== + // EXPORT/DEPLOYMENT + // ========================================== + + async export(_options?: ExportOptions): Promise { + this.logger.info('Workflow export requested but not yet implemented'); + + return { + success: false, + error: 'Workflow deployment not yet implemented' + }; + } +} diff --git a/worker/agents/core/smartGeneratorAgent.ts b/worker/agents/core/smartGeneratorAgent.ts deleted file mode 100644 index 6b9f0998..00000000 --- a/worker/agents/core/smartGeneratorAgent.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { Agent, AgentContext } from "agents"; -import { AgentInitArgs, BehaviorType } from "./types"; -import { AgentState, CurrentDevState, MAX_PHASES } from "./state"; -import { AgentInfrastructure, BaseAgentBehavior } from "./baseAgent"; -import { createObjectLogger, StructuredLogger } from '../../logger'; -import { Blueprint } from "../schemas"; -import { InferenceContext } from "../inferutils/config.types"; - -export class CodeGeneratorAgent extends Agent implements AgentInfrastructure { - public _logger: StructuredLogger | undefined; - private behavior: BaseAgentBehavior; - private onStartDeferred?: { props?: Record; resolve: () => void }; - - - initialState: AgentState = { - blueprint: {} as Blueprint, - projectName: "", - query: "", - generatedPhases: [], - generatedFilesMap: {}, - behaviorType: 'phasic', - sandboxInstanceId: undefined, - templateName: '', - commandsHistory: [], - lastPackageJson: '', - pendingUserInputs: [], - inferenceContext: {} as InferenceContext, - sessionId: '', - hostname: '', - conversationMessages: [], - currentDevState: CurrentDevState.IDLE, - phasesCounter: MAX_PHASES, - mvpGenerated: false, - shouldBeGenerating: false, - reviewingInitiated: false, - projectUpdatesAccumulator: [], - lastDeepDebugTranscript: null, - }; - - constructor(ctx: AgentContext, env: Env) { - super(ctx, env); - - this.sql`CREATE TABLE IF NOT EXISTS full_conversations (id TEXT PRIMARY KEY, messages TEXT)`; - this.sql`CREATE TABLE IF NOT EXISTS compact_conversations (id TEXT PRIMARY KEY, messages TEXT)`; - - const behaviorTypeProp = (ctx.props as Record)?.behaviorType as BehaviorType | undefined; - const behaviorType = this.state.behaviorType || behaviorTypeProp || 'phasic'; - if (behaviorType === 'phasic') { - this.behavior = new PhasicAgentBehavior(this); - } else { - this.behavior = new AgenticAgentBehavior(this); - } - } - - async initialize( - initArgs: AgentInitArgs, - ..._args: unknown[] - ): Promise { - const { inferenceContext } = initArgs; - this.initLogger(inferenceContext.agentId, inferenceContext.userId); - - await this.behavior.initialize(initArgs); - return this.behavior.state; - } - - private initLogger(agentId: string, userId: string, sessionId?: string) { - this._logger = createObjectLogger(this, 'CodeGeneratorAgent'); - this._logger.setObjectId(agentId); - this._logger.setFields({ - agentId, - userId, - }); - if (sessionId) { - this._logger.setField('sessionId', sessionId); - } - return this._logger; - } - - logger(): StructuredLogger { - if (!this._logger) { - this._logger = this.initLogger(this.getAgentId(), this.state.inferenceContext.userId, this.state.sessionId); - } - return this._logger; - } - - getAgentId() { - return this.state.inferenceContext.agentId; - } -} \ No newline at end of file diff --git a/worker/agents/core/state.ts b/worker/agents/core/state.ts index f8c3a5e3..52ed110f 100644 --- a/worker/agents/core/state.ts +++ b/worker/agents/core/state.ts @@ -5,7 +5,7 @@ import type { PhasicBlueprint, AgenticBlueprint, PhaseConceptType , // import type { ScreenshotData } from './types'; import type { ConversationMessage } from '../inferutils/common'; import type { InferenceContext } from '../inferutils/config.types'; -import { BehaviorType, Plan } from './types'; +import { BehaviorType, Plan, ProjectType } from './types'; export interface FileState extends FileOutputType { lastDiff: string; @@ -29,6 +29,8 @@ export const MAX_PHASES = 12; /** Common state fields for all agent behaviors */ export interface BaseProjectState { behaviorType: BehaviorType; + projectType: ProjectType; + // Identity projectName: string; query: string; diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index 4ab3ba65..cb55be77 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -10,6 +10,16 @@ import { ProcessedImageAttachment } from 'worker/types/image-attachment'; export type BehaviorType = 'phasic' | 'agentic'; +export type ProjectType = 'app' | 'workflow' | 'presentation'; + +/** + * Runtime type - WHERE it runs during dev + * - sandbox: Cloudflare Containers (full apps with UI) + * - worker: Dynamic Worker Loaders (backend only) + * - none: No runtime (static export only) + */ +export type RuntimeType = 'sandbox' | 'worker' | 'none'; + /** Base initialization arguments shared by all agents */ interface BaseAgentInitArgs { query: string; @@ -19,6 +29,7 @@ interface BaseAgentInitArgs { frameworks?: string[]; images?: ProcessedImageAttachment[]; onBlueprintChunk: (chunk: string) => void; + sandboxSessionId?: string; // Generated by CodeGeneratorAgent, passed to behavior } /** Phasic agent initialization arguments */ @@ -85,4 +96,23 @@ export interface PhaseExecutionResult { */ export type DeepDebugResult = | { success: true; transcript: string } - | { success: false; error: string }; \ No newline at end of file + | { success: false; error: string }; + +/** + * Result of project export/deployment operation + */ +export interface ExportResult { + success: boolean; + url?: string; + error?: string; + metadata?: Record; +} + +/** + * Options for project export/deployment + */ +export interface ExportOptions { + format?: string; + token?: string; + [key: string]: unknown; +} \ No newline at end of file diff --git a/worker/agents/core/websocket.ts b/worker/agents/core/websocket.ts index be655701..71551e8e 100644 --- a/worker/agents/core/websocket.ts +++ b/worker/agents/core/websocket.ts @@ -3,13 +3,12 @@ import { createLogger } from '../../logger'; import { WebSocketMessageRequests, WebSocketMessageResponses } from '../constants'; import { WebSocketMessage, WebSocketMessageData, WebSocketMessageType } from '../../api/websocketTypes'; import { MAX_IMAGES_PER_MESSAGE, MAX_IMAGE_SIZE_BYTES } from '../../types/image-attachment'; -import { BaseProjectState } from './state'; -import { BaseAgentBehavior } from './baseAgent'; +import type { CodeGeneratorAgent } from './codingAgent'; const logger = createLogger('CodeGeneratorWebSocket'); -export function handleWebSocketMessage( - agent: BaseAgentBehavior, +export function handleWebSocketMessage( + agent: CodeGeneratorAgent, connection: Connection, message: string ): void { @@ -26,7 +25,7 @@ export function handleWebSocketMessage( }); // Check if generation is already active to avoid duplicate processes - if (agent.isCodeGenerating()) { + if (agent.getBehavior().isCodeGenerating()) { logger.info('Generation already in progress, skipping duplicate request'); // sendToConnection(connection, WebSocketMessageResponses.GENERATION_STARTED, { // message: 'Code generation is already in progress' @@ -36,13 +35,13 @@ export function handleWebSocketMessage( // Start generation process logger.info('Starting code generation process'); - agent.generateAllFiles().catch(error => { + agent.getBehavior().generateAllFiles().catch(error => { logger.error('Error during code generation:', error); sendError(connection, `Error generating files: ${error instanceof Error ? error.message : String(error)}`); }).finally(() => { // Only clear shouldBeGenerating on successful completion // (errors might want to retry, so this could be handled differently) - if (!agent.isCodeGenerating()) { + if (!agent.getBehavior().isCodeGenerating()) { agent.setState({ ...agent.state, shouldBeGenerating: false @@ -51,7 +50,8 @@ export function handleWebSocketMessage( }); break; case WebSocketMessageRequests.DEPLOY: - agent.deployToCloudflare().then((deploymentResult) => { + // Use objective.export() for deployment (project-specific logic) + agent.getObjective().export({ type: 'cloudflare' }).then((deploymentResult) => { if (!deploymentResult) { logger.error('Failed to deploy to Cloudflare Workers'); return; @@ -64,14 +64,14 @@ export function handleWebSocketMessage( case WebSocketMessageRequests.PREVIEW: // Deploy current state for preview logger.info('Deploying for preview'); - agent.deployToSandbox().then((deploymentResult) => { + agent.getBehavior().deployToSandbox().then((deploymentResult) => { logger.info(`Preview deployed successfully!, deploymentResult:`, deploymentResult); }).catch((error: unknown) => { logger.error('Error during preview deployment:', error); }); break; case WebSocketMessageRequests.CAPTURE_SCREENSHOT: - agent.captureScreenshot(parsedMessage.data.url, parsedMessage.data.viewport).then((screenshotResult) => { + agent.getBehavior().captureScreenshot(parsedMessage.data.url, parsedMessage.data.viewport).then((screenshotResult) => { if (!screenshotResult) { logger.error('Failed to capture screenshot'); return; @@ -85,7 +85,7 @@ export function handleWebSocketMessage( logger.info('User requested to stop generation'); // Cancel current inference operation - const wasCancelled = agent.cancelCurrentInference(); + const wasCancelled = agent.getBehavior().cancelCurrentInference(); // Clear shouldBeGenerating flag agent.setState({ @@ -107,11 +107,11 @@ export function handleWebSocketMessage( shouldBeGenerating: true }); - if (!agent.isCodeGenerating()) { + if (!agent.getBehavior().isCodeGenerating()) { sendToConnection(connection, WebSocketMessageResponses.GENERATION_RESUMED, { message: 'Code generation resumed' }); - agent.generateAllFiles().catch(error => { + agent.getBehavior().generateAllFiles().catch(error => { logger.error('Error resuming code generation:', error); sendError(connection, `Error resuming generation: ${error instanceof Error ? error.message : String(error)}`); }); @@ -158,14 +158,14 @@ export function handleWebSocketMessage( } } - agent.handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { + agent.getBehavior().handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { logger.error('Error handling user suggestion:', error); sendError(connection, `Error processing user suggestion: ${error instanceof Error ? error.message : String(error)}`); }); break; case WebSocketMessageRequests.GET_MODEL_CONFIGS: logger.info('Fetching model configurations'); - agent.getModelConfigsInfo().then(configsInfo => { + agent.getBehavior().getModelConfigsInfo().then(configsInfo => { sendToConnection(connection, WebSocketMessageResponses.MODEL_CONFIGS_INFO, { message: 'Model configurations retrieved', configs: configsInfo @@ -182,7 +182,7 @@ export function handleWebSocketMessage( case WebSocketMessageRequests.GET_CONVERSATION_STATE: try { const state = agent.getConversationState(); - const debugState = agent.getDeepDebugSessionState(); + const debugState = agent.getBehavior().getDeepDebugSessionState(); logger.info('Conversation state retrieved', state); sendToConnection(connection, WebSocketMessageResponses.CONVERSATION_STATE, { state, diff --git a/worker/agents/inferutils/config.ts b/worker/agents/inferutils/config.ts index 482eff75..85136dec 100644 --- a/worker/agents/inferutils/config.ts +++ b/worker/agents/inferutils/config.ts @@ -160,6 +160,13 @@ export const AGENT_CONFIG: AgentConfig = { temperature: 0.1, fallbackModel: AIModels.GEMINI_2_5_FLASH, }, + agenticProjectBuilder: { + name: AIModels.GEMINI_2_5_PRO, + reasoning_effort: 'high', + max_tokens: 8000, + temperature: 0.7, + fallbackModel: AIModels.GEMINI_2_5_FLASH, + }, }; diff --git a/worker/agents/inferutils/config.types.ts b/worker/agents/inferutils/config.types.ts index a3b12007..26f3be6c 100644 --- a/worker/agents/inferutils/config.types.ts +++ b/worker/agents/inferutils/config.types.ts @@ -67,6 +67,7 @@ export interface AgentConfig { fastCodeFixer: ModelConfig; conversationalResponse: ModelConfig; deepDebugger: ModelConfig; + agenticProjectBuilder: ModelConfig; } // Provider and reasoning effort types for validation diff --git a/worker/agents/services/implementations/FileManager.ts b/worker/agents/services/implementations/FileManager.ts index 3ad856d4..5959d923 100644 --- a/worker/agents/services/implementations/FileManager.ts +++ b/worker/agents/services/implementations/FileManager.ts @@ -3,7 +3,7 @@ import { IFileManager } from '../interfaces/IFileManager'; import { IStateManager } from '../interfaces/IStateManager'; import { FileOutputType } from '../../schemas'; import { FileProcessing } from '../../domain/pure/FileProcessing'; -import { FileState } from 'worker/agents/core/state'; +import { BaseProjectState, FileState } from 'worker/agents/core/state'; import { TemplateDetails } from '../../../services/sandbox/sandboxTypes'; import { GitVersionControl } from 'worker/agents/git'; @@ -13,7 +13,7 @@ import { GitVersionControl } from 'worker/agents/git'; */ export class FileManager implements IFileManager { constructor( - private stateManager: IStateManager, + private stateManager: IStateManager, private getTemplateDetailsFunc: () => TemplateDetails, private git: GitVersionControl ) { diff --git a/worker/agents/services/implementations/StateManager.ts b/worker/agents/services/implementations/StateManager.ts index 388d6c61..25d56261 100644 --- a/worker/agents/services/implementations/StateManager.ts +++ b/worker/agents/services/implementations/StateManager.ts @@ -1,37 +1,29 @@ +import { BaseProjectState } from 'worker/agents/core/state'; import { IStateManager } from '../interfaces/IStateManager'; -import { CodeGenState } from '../../core/state'; /** * State manager implementation for Durable Objects * Works with the Agent's state management */ -export class StateManager implements IStateManager { +export class StateManager implements IStateManager { constructor( - private getStateFunc: () => CodeGenState, - private setStateFunc: (state: CodeGenState) => void + private getStateFunc: () => TState, + private setStateFunc: (state: TState) => void ) {} - getState(): Readonly { + getState(): Readonly { return this.getStateFunc(); } - setState(newState: CodeGenState): void { + setState(newState: TState): void { this.setStateFunc(newState); } - updateField(field: K, value: CodeGenState[K]): void { + updateField(field: K, value: TState[K]): void { const currentState = this.getState(); this.setState({ ...currentState, [field]: value }); } - - batchUpdate(updates: Partial): void { - const currentState = this.getState(); - this.setState({ - ...currentState, - ...updates - }); - } } \ No newline at end of file diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index 547dba07..2cea62f3 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -25,8 +25,6 @@ export interface ICodingAgent { deployPreview(clearLogs?: boolean, forceRedeploy?: boolean): Promise; - clearConversation(): void; - updateProjectName(newName: string): Promise; getOperationOptions(): OperationOptions; @@ -63,7 +61,7 @@ export interface ICodingAgent { focusPaths?: string[], ): Promise; - getGit(): GitVersionControl; + get git(): GitVersionControl; getSandboxServiceClient(): BaseSandboxService; } diff --git a/worker/agents/services/interfaces/IStateManager.ts b/worker/agents/services/interfaces/IStateManager.ts index 935e3be2..8c51767d 100644 --- a/worker/agents/services/interfaces/IStateManager.ts +++ b/worker/agents/services/interfaces/IStateManager.ts @@ -1,27 +1,22 @@ -import { CodeGenState } from '../../core/state'; +import { BaseProjectState } from "worker/agents/core/state"; /** * Interface for state management * Abstracts state persistence and updates */ -export interface IStateManager { +export interface IStateManager { /** * Get current state */ - getState(): Readonly; + getState(): Readonly; /** * Update state immutably */ - setState(newState: CodeGenState): void; + setState(newState: TState): void; /** * Update specific field */ - updateField(field: K, value: CodeGenState[K]): void; - - /** - * Batch update multiple fields - */ - batchUpdate(updates: Partial): void; + updateField(field: K, value: TState[K]): void; } \ No newline at end of file diff --git a/worker/agents/tools/toolkit/git.ts b/worker/agents/tools/toolkit/git.ts index f1f5206c..7aeba29e 100644 --- a/worker/agents/tools/toolkit/git.ts +++ b/worker/agents/tools/toolkit/git.ts @@ -65,7 +65,7 @@ export function createGitTool( }, implementation: async ({ command, message, limit, oid, includeDiff }: GitToolArgs) => { try { - const gitInstance = agent.getGit(); + const gitInstance = agent.git; switch (command) { case 'commit': { diff --git a/worker/index.ts b/worker/index.ts index 449b5a05..eb8560be 100644 --- a/worker/index.ts +++ b/worker/index.ts @@ -1,5 +1,4 @@ import { createLogger } from './logger'; -import { SmartCodeGeneratorAgent } from './agents/core/smartGeneratorAgent'; import { isDispatcherAvailable } from './utils/dispatcherUtils'; import { createApp } from './app'; // import * as Sentry from '@sentry/cloudflare'; @@ -13,10 +12,10 @@ import { handleGitProtocolRequest, isGitProtocolRequest } from './api/handlers/g // Durable Object and Service exports export { UserAppSandboxService, DeployerService } from './services/sandbox/sandboxSdkClient'; +export { CodeGeneratorAgent } from './agents/core/codingAgent'; // export const CodeGeneratorAgent = Sentry.instrumentDurableObjectWithSentry(sentryOptions, SmartCodeGeneratorAgent); // export const DORateLimitStore = Sentry.instrumentDurableObjectWithSentry(sentryOptions, BaseDORateLimitStore); -export const CodeGeneratorAgent = SmartCodeGeneratorAgent; export const DORateLimitStore = BaseDORateLimitStore; // Logger for the main application and handlers From d2a7e02105d779b9f6278ea564caa65406225945 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Sun, 9 Nov 2025 13:20:55 -0500 Subject: [PATCH 26/58] feat: finish most refactor and get it to build --- src/api-types.ts | 4 +- src/routes/chat/chat.tsx | 13 +- src/routes/chat/components/blueprint.tsx | 47 +-- .../chat/utils/handle-websocket-message.ts | 11 +- worker/agents/core/AgentCore.ts | 9 + worker/agents/core/behaviors/agentic.ts | 1 + worker/agents/core/behaviors/base.ts | 76 +++-- worker/agents/core/behaviors/phasic.ts | 41 ++- worker/agents/core/codingAgent.ts | 298 +++++------------- worker/agents/core/objectives/app.ts | 200 ++++++++++-- worker/agents/core/objectives/base.ts | 67 +++- worker/agents/core/objectives/presentation.ts | 87 ++++- worker/agents/core/objectives/workflow.ts | 67 +++- worker/agents/core/stateMigration.ts | 37 ++- worker/agents/core/types.ts | 27 +- worker/agents/core/websocket.ts | 11 +- worker/agents/index.ts | 53 +++- worker/agents/planning/blueprint.ts | 26 +- .../implementations/BaseAgentService.ts | 11 +- .../services/implementations/CodingAgent.ts | 8 +- .../implementations/DeploymentManager.ts | 18 +- .../services/interfaces/ICodingAgent.ts | 7 +- .../services/interfaces/IDeploymentManager.ts | 6 +- .../services/interfaces/IServiceOptions.ts | 5 +- .../agents/tools/toolkit/regenerate-file.ts | 2 +- worker/api/controllers/agent/controller.ts | 28 +- worker/api/controllers/agent/types.ts | 7 +- .../controllers/githubExporter/controller.ts | 18 +- worker/api/websocketTypes.ts | 8 +- worker/index.ts | 2 +- worker/services/sandbox/BaseSandboxService.ts | 5 +- .../services/sandbox/remoteSandboxService.ts | 10 +- worker/services/sandbox/sandboxSdkClient.ts | 51 +-- 33 files changed, 823 insertions(+), 438 deletions(-) diff --git a/src/api-types.ts b/src/api-types.ts index 2fc92e8d..96845105 100644 --- a/src/api-types.ts +++ b/src/api-types.ts @@ -138,13 +138,15 @@ export type { // Agent/Generator Types export type { Blueprint as BlueprintType, + PhasicBlueprint, CodeReviewOutputType, FileConceptType, FileOutputType as GeneratedFile, } from 'worker/agents/schemas'; export type { - CodeGenState + AgentState, + PhasicState } from 'worker/agents/core/state'; export type { diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index 1dcf949c..12bd98db 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -21,7 +21,7 @@ import { ViewModeSwitch } from './components/view-mode-switch'; import { DebugPanel, type DebugMessage } from './components/debug-panel'; import { DeploymentControls } from './components/deployment-controls'; import { useChat, type FileType } from './hooks/use-chat'; -import { type ModelConfigsData, type BlueprintType, SUPPORTED_IMAGE_MIME_TYPES } from '@/api-types'; +import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES } from '@/api-types'; import { Copy } from './components/copy'; import { useFileContentStream } from './hooks/use-file-content-stream'; import { logger } from '@/utils/logger'; @@ -42,6 +42,9 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigge import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'; import { sendWebSocketMessage } from './utils/websocket-helpers'; +const isPhasicBlueprint = (blueprint?: BlueprintType | null): blueprint is PhasicBlueprint => + !!blueprint && 'implementationRoadmap' in blueprint; + export default function Chat() { const { chatId: urlChatId } = useParams(); @@ -471,11 +474,13 @@ export default function Chat() { const completedPhases = phaseTimeline.filter(p => p.status === 'completed').length; // Get predicted phase count from blueprint, fallback to current phase count - const predictedPhaseCount = blueprint?.implementationRoadmap?.length || 0; + const predictedPhaseCount = isPhasicBlueprint(blueprint) + ? blueprint.implementationRoadmap.length + : 0; const totalPhases = Math.max(predictedPhaseCount, phaseTimeline.length, 1); return [completedPhases, totalPhases]; - }, [phaseTimeline, blueprint?.implementationRoadmap]); + }, [phaseTimeline, blueprint]); if (import.meta.env.DEV) { logger.debug({ @@ -1241,4 +1246,4 @@ export default function Chat() { )}
); -} \ No newline at end of file +} diff --git a/src/routes/chat/components/blueprint.tsx b/src/routes/chat/components/blueprint.tsx index 64d1c4e4..40fc6e0c 100644 --- a/src/routes/chat/components/blueprint.tsx +++ b/src/routes/chat/components/blueprint.tsx @@ -1,7 +1,10 @@ -import type { BlueprintType } from '@/api-types'; +import type { BlueprintType, PhasicBlueprint } from '@/api-types'; import clsx from 'clsx'; import { Markdown } from './messages'; +const isPhasicBlueprint = (blueprint: BlueprintType): blueprint is PhasicBlueprint => + 'views' in blueprint; + export function Blueprint({ blueprint, className, @@ -11,6 +14,8 @@ export function Blueprint({ }) { if (!blueprint) return null; + const phasicBlueprint = isPhasicBlueprint(blueprint) ? blueprint : null; + return (
@@ -84,13 +89,13 @@ export function Blueprint({
{/* Views */} - {Array.isArray(blueprint.views) && blueprint.views.length > 0 && ( + {phasicBlueprint && phasicBlueprint.views.length > 0 && (

Views

- {blueprint.views.map((view, index) => ( + {phasicBlueprint.views.map((view, index) => (

{view.name} @@ -105,41 +110,41 @@ export function Blueprint({ )} {/* User Flow */} - {blueprint.userFlow && ( + {phasicBlueprint?.userFlow && (

User Flow

- {blueprint.userFlow?.uiLayout && ( + {phasicBlueprint.userFlow.uiLayout && (

UI Layout

- {blueprint.userFlow.uiLayout} + {phasicBlueprint.userFlow.uiLayout}
)} - {blueprint.userFlow?.uiDesign && ( + {phasicBlueprint.userFlow.uiDesign && (

UI Design

- {blueprint.userFlow.uiDesign} + {phasicBlueprint.userFlow.uiDesign}
)} - {blueprint.userFlow?.userJourney && ( + {phasicBlueprint.userFlow.userJourney && (

User Journey

- {blueprint.userFlow?.userJourney} + {phasicBlueprint.userFlow.userJourney}
)} @@ -148,25 +153,25 @@ export function Blueprint({ )} {/* Data Flow */} - {(blueprint.dataFlow || blueprint.architecture?.dataFlow) && ( + {phasicBlueprint && (phasicBlueprint.dataFlow || phasicBlueprint.architecture?.dataFlow) && (

Data Flow

- {blueprint.dataFlow || blueprint.architecture?.dataFlow} + {phasicBlueprint.dataFlow || phasicBlueprint.architecture?.dataFlow}
)} {/* Implementation Roadmap */} - {Array.isArray(blueprint.implementationRoadmap) && blueprint.implementationRoadmap.length > 0 && ( + {phasicBlueprint && phasicBlueprint.implementationRoadmap.length > 0 && (

Implementation Roadmap

- {blueprint.implementationRoadmap.map((roadmapItem, index) => ( + {phasicBlueprint.implementationRoadmap.map((roadmapItem, index) => (

Phase {index + 1}: {roadmapItem.phase} @@ -181,7 +186,7 @@ export function Blueprint({ )} {/* Initial Phase */} - {blueprint.initialPhase && ( + {phasicBlueprint?.initialPhase && (

Initial Phase @@ -189,18 +194,18 @@ export function Blueprint({

- {blueprint.initialPhase.name} + {phasicBlueprint.initialPhase.name}

- {blueprint.initialPhase.description} + {phasicBlueprint.initialPhase.description} - {Array.isArray(blueprint.initialPhase.files) && blueprint.initialPhase.files.length > 0 && ( + {Array.isArray(phasicBlueprint.initialPhase.files) && phasicBlueprint.initialPhase.files.length > 0 && (
Files to be created:
- {blueprint.initialPhase.files.map((file, fileIndex) => ( + {phasicBlueprint.initialPhase.files.map((file, fileIndex) => (
{file.path}
{file.purpose}
@@ -215,14 +220,14 @@ export function Blueprint({ )} {/* Pitfalls */} - {Array.isArray(blueprint.pitfalls) && blueprint.pitfalls.length > 0 && ( + {phasicBlueprint && phasicBlueprint.pitfalls.length > 0 && (

Pitfalls

    - {blueprint.pitfalls?.map((pitfall, index) => ( + {phasicBlueprint.pitfalls.map((pitfall, index) => (
  • {pitfall}
    • diff --git a/src/routes/chat/utils/handle-websocket-message.ts b/src/routes/chat/utils/handle-websocket-message.ts index 3636aef7..944272bf 100644 --- a/src/routes/chat/utils/handle-websocket-message.ts +++ b/src/routes/chat/utils/handle-websocket-message.ts @@ -1,5 +1,5 @@ import type { WebSocket } from 'partysocket'; -import type { WebSocketMessage, BlueprintType, ConversationMessage } from '@/api-types'; +import type { WebSocketMessage, BlueprintType, ConversationMessage, AgentState, PhasicState } from '@/api-types'; import { deduplicateMessages, isAssistantMessageDuplicate } from './deduplicate-messages'; import { logger } from '@/utils/logger'; import { getFileType } from '@/utils/string'; @@ -23,6 +23,9 @@ import { sendWebSocketMessage } from './websocket-helpers'; import type { FileType, PhaseTimelineItem } from '../hooks/use-chat'; import { toast } from 'sonner'; +const isPhasicState = (state: AgentState): state is PhasicState => + state.behaviorType === 'phasic'; + export interface HandleMessageDeps { // State setters setFiles: React.Dispatch>; @@ -191,12 +194,12 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { ); } - if (state.generatedPhases && state.generatedPhases.length > 0 && phaseTimeline.length === 0) { + if (isPhasicState(state) && state.generatedPhases.length > 0 && phaseTimeline.length === 0) { logger.debug('📋 Restoring phase timeline:', state.generatedPhases); // If not actively generating, mark incomplete phases as cancelled (they were interrupted) const isActivelyGenerating = state.shouldBeGenerating === true; - const timeline = state.generatedPhases.map((phase: any, index: number) => { + const timeline = state.generatedPhases.map((phase, index: number) => { // Determine phase status: // - completed if explicitly marked complete // - cancelled if incomplete and not actively generating (interrupted) @@ -212,7 +215,7 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { name: phase.name, description: phase.description, status: phaseStatus, - files: phase.files.map((filesConcept: any) => { + files: phase.files.map(filesConcept => { const file = state.generatedFilesMap?.[filesConcept.path]; // File status: // - completed if it exists in generated files diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts index 77507fc0..1a6c98b9 100644 --- a/worker/agents/core/AgentCore.ts +++ b/worker/agents/core/AgentCore.ts @@ -6,6 +6,7 @@ import { BaseProjectState } from "./state"; import { WebSocketMessageType } from "../../api/websocketTypes"; import { WebSocketMessageData } from "../../api/websocketTypes"; import { ConversationMessage, ConversationState } from "../inferutils/common"; +import { TemplateDetails } from "worker/services/sandbox/sandboxTypes"; /** * Infrastructure interface for agent implementations. @@ -34,4 +35,12 @@ export interface AgentInfrastructure { readonly fileManager: FileManager; readonly deploymentManager: DeploymentManager; readonly git: GitVersionControl; + + // Git export infrastructure + exportGitObjects(): Promise<{ + gitObjects: Array<{ path: string; data: Uint8Array }>; + query: string; + hasCommits: boolean; + templateDetails: TemplateDetails | null; + }>; } diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 8085351a..dd478cca 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -61,6 +61,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl query, language: language!, frameworks: frameworks!, + projectType: this.state.projectType, templateDetails: templateInfo?.templateDetails, templateMetaInfo: templateInfo?.selection, images: initArgs.images, diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 298c0f72..65a36ac1 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -5,8 +5,9 @@ import { Blueprint, } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; -import { BaseProjectState } from '../state'; -import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType } from '../types'; +import { AgentState, BaseProjectState } from '../state'; +import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget } from '../types'; +import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; import { ProjectSetupAssistant } from '../../assistants/projectsetup'; import { UserConversationProcessor, RenderToolCall } from '../../operations/UserConversationProcessor'; @@ -34,6 +35,7 @@ import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGenera import { AgentComponent } from '../AgentComponent'; import type { AgentInfrastructure } from '../AgentCore'; import { sendToConnection } from '../websocket'; +import { GitVersionControl } from '../../git'; export interface BaseCodingOperations { regenerateFile: FileRegenerationOperation; @@ -107,7 +109,7 @@ export abstract class BaseCodingBehavior onConnect(connection: Connection, ctx: ConnectionContext) { this.logger.info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); sendToConnection(connection, 'agent_connected', { - state: this.state, + state: this.state as unknown as AgentState, templateDetails: this.getTemplateDetails() }); } @@ -311,6 +313,15 @@ export abstract class BaseCodingBehavior return inputs; } + clearConversation(): void { + this.infrastructure.clearConversation(); + } + + getGit(): GitVersionControl { + return this.git; + } + + /** * State machine controller for code generation with user interaction support * Executes phases sequentially with review cycles and proper state transitions @@ -446,8 +457,9 @@ export abstract class BaseCodingBehavior description: config.description })); - const userConfigs: Record = {}; - const defaultConfigs: Record = {}; + type ModelConfigInfo = ModelConfig & { isUserOverride?: boolean }; + const userConfigs: Record = {}; + const defaultConfigs: Record = {}; for (const [actionKey, mergedConfig] of Object.entries(userConfigsRecord)) { if (mergedConfig.isUserOverride) { @@ -460,8 +472,7 @@ export abstract class BaseCodingBehavior isUserOverride: true }; } - - // Always include default config + const defaultConfig = AGENT_CONFIG[actionKey as AgentActionKey]; if (defaultConfig) { defaultConfigs[actionKey] = { @@ -867,14 +878,16 @@ export abstract class BaseCodingBehavior fileCount: result.files.length }); - // Return files with diffs from FileState - return { - files: result.files.map(f => ({ + const savedFiles = result.files.map(f => { + const fileState = this.state.generatedFilesMap[f.filePath]; + return { path: f.filePath, purpose: f.filePurpose || '', - diff: (f as any).lastDiff || '' // FileState has lastDiff - })) - }; + diff: fileState?.lastDiff || '' + }; + }); + + return { files: savedFiles }; } // A wrapper for LLM tool to deploy to sandbox @@ -917,7 +930,7 @@ export abstract class BaseCodingBehavior /** * Deploy the generated code to Cloudflare Workers */ - async deployToCloudflare(): Promise<{ deploymentUrl?: string; workersUrl?: string } | null> { + async deployToCloudflare(target: DeploymentTarget = 'platform'): Promise<{ deploymentUrl?: string; workersUrl?: string } | null> { try { // Ensure sandbox instance exists first if (!this.state.sandboxInstanceId) { @@ -936,22 +949,25 @@ export abstract class BaseCodingBehavior // Call service - handles orchestration, callbacks for broadcasting const result = await this.deploymentManager.deployToCloudflare({ - onStarted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); - }, - onCompleted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); - }, - onError: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); - }, - onPreviewExpired: () => { - // Re-deploy sandbox and broadcast error - this.deployToSandbox(); - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { - message: PREVIEW_EXPIRED_ERROR, - error: PREVIEW_EXPIRED_ERROR - }); + target, + callbacks: { + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + }, + onPreviewExpired: () => { + // Re-deploy sandbox and broadcast error + this.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } } }); diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 658dff89..72c48ab3 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -8,6 +8,7 @@ import { import { StaticAnalysisResponse } from '../../../services/sandbox/sandboxTypes'; import { CurrentDevState, MAX_PHASES, PhasicState } from '../state'; import { AllIssues, AgentInitArgs, PhaseExecutionResult, UserContext } from '../types'; +import { ModelConfig } from '../../inferutils/config.types'; import { WebSocketMessageResponses } from '../../constants'; import { UserConversationProcessor } from '../../operations/UserConversationProcessor'; // import { WebSocketBroadcaster } from '../services/implementations/WebSocketBroadcaster'; @@ -70,6 +71,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem ): Promise { await super.initialize(initArgs); const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + const projectType = initArgs.projectType || this.state.projectType || 'app'; // Generate a blueprint this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); @@ -84,6 +86,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem templateDetails: templateInfo?.templateDetails, templateMetaInfo: templateInfo?.selection, images: initArgs.images, + projectType, stream: { chunk_size: 256, onChunk: (chunk) => { @@ -102,7 +105,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem this.logger.info('Generated project name', { projectName }); - this.setState({ + const nextState: PhasicState = { ...this.state, projectName, query, @@ -115,7 +118,9 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem sessionId: sandboxSessionId!, hostname, inferenceContext, - }); + projectType, + }; + this.setState(nextState); // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) const customizedFiles = customizeTemplateFiles( templateInfo.templateDetails.allFiles, @@ -155,7 +160,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem } migrateStateIfNeeded(): void { - const migratedState = StateMigration.migrateIfNeeded(this.state, this.logger); + const migratedState = StateMigration.migrateIfNeeded(this.state, this.logger) as PhasicState | null; if (migratedState) { this.setState(migratedState); } @@ -717,8 +722,9 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem description: config.description })); - const userConfigs: Record = {}; - const defaultConfigs: Record = {}; + type ModelConfigInfo = ModelConfig & { isUserOverride?: boolean }; + const userConfigs: Record = {}; + const defaultConfigs: Record = {}; for (const [actionKey, mergedConfig] of Object.entries(userConfigsRecord)) { if (mergedConfig.isUserOverride) { @@ -731,8 +737,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem isUserOverride: true }; } - - // Always include default config + const defaultConfig = AGENT_CONFIG[actionKey as AgentActionKey]; if (defaultConfig) { defaultConfigs[actionKey] = { @@ -817,10 +822,10 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem phase, { runtimeErrors: [], - staticAnalysis: { - success: true, - lint: { issues: [] }, - typecheck: { issues: [] } + staticAnalysis: { + success: true, + lint: { issues: [] }, + typecheck: { issues: [] } }, }, { suggestions: requirements }, @@ -828,14 +833,16 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem false // postPhaseFixing = false (skip auto-fixes) ); - // Return files with diffs from FileState - return { - files: result.files.map(f => ({ + const savedFiles = result.files.map(f => { + const fileState = this.state.generatedFilesMap[f.filePath]; + return { path: f.filePath, purpose: f.filePurpose || '', - diff: (f as any).lastDiff || '' // FileState has lastDiff - })) - }; + diff: fileState?.lastDiff || '' + }; + }); + + return { files: savedFiles }; } async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index bd2c9b94..e1023278 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -1,6 +1,7 @@ import { Agent, AgentContext } from "agents"; -import { AgentInitArgs, BehaviorType } from "./types"; +import { AgentInitArgs, AgentSummary, BehaviorType, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget } from "./types"; import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; +import { Blueprint } from "../schemas"; import { BaseCodingBehavior } from "./behaviors/base"; import { createObjectLogger, StructuredLogger } from '../../logger'; import { InferenceContext } from "../inferutils/config.types"; @@ -16,8 +17,7 @@ import { ProjectType } from './types'; import { Connection } from 'agents'; import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections } from './websocket'; import { WebSocketMessageData, WebSocketMessageType } from "worker/api/websocketTypes"; -import { GitHubPushRequest, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; -import { GitHubExportResult, GitHubService } from "worker/services/github"; +import { PreviewType, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; import { WebSocketMessageResponses } from "../constants"; import { AppService } from "worker/database"; import { ConversationMessage, ConversationState } from "../inferutils/common"; @@ -27,22 +27,20 @@ import { ProjectObjective } from "./objectives/base"; import { AppObjective } from "./objectives/app"; import { WorkflowObjective } from "./objectives/workflow"; import { PresentationObjective } from "./objectives/presentation"; +import { FileOutputType } from "../schemas"; const DEFAULT_CONVERSATION_SESSION_ID = 'default'; +interface AgentBootstrapProps { + behaviorType?: BehaviorType; + projectType?: ProjectType; +} + export class CodeGeneratorAgent extends Agent implements AgentInfrastructure { public _logger: StructuredLogger | undefined; - private behavior: BaseCodingBehavior; - private objective: ProjectObjective; + private behavior!: BaseCodingBehavior; + private objective!: ProjectObjective; protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; - - // GitHub token cache (ephemeral, lost on DO eviction) - protected githubTokenCache: { - token: string; - username: string; - expiresAt: number; - } | null = null; - // Services readonly fileManager: FileManager; readonly deploymentManager: DeploymentManager; @@ -56,30 +54,30 @@ export class CodeGeneratorAgent extends Agent implements AgentI // Initialization // ========================================== - initialState: AgentState = { - blueprint: {} as any, // Will be populated during initialization + initialState = { + behaviorType: 'phasic', + projectType: 'app', projectName: "", - projectType: 'app', // Default project type query: "", - generatedPhases: [], + sessionId: '', + hostname: '', + blueprint: {} as unknown as Blueprint, + templateName: '', generatedFilesMap: {}, - behaviorType: 'phasic', + conversationMessages: [], + inferenceContext: {} as InferenceContext, + shouldBeGenerating: false, sandboxInstanceId: undefined, - templateName: '', commandsHistory: [], lastPackageJson: '', pendingUserInputs: [], - inferenceContext: {} as InferenceContext, - sessionId: '', - hostname: '', - conversationMessages: [], - currentDevState: CurrentDevState.IDLE, - phasesCounter: MAX_PHASES, - mvpGenerated: false, - shouldBeGenerating: false, - reviewingInitiated: false, projectUpdatesAccumulator: [], lastDeepDebugTranscript: null, + mvpGenerated: false, + reviewingInitiated: false, + generatedPhases: [], + currentDevState: CurrentDevState.IDLE, + phasesCounter: MAX_PHASES, } as AgentState; constructor(ctx: AgentContext, env: Env) { @@ -110,8 +108,19 @@ export class CodeGeneratorAgent extends Agent implements AgentI 10 // MAX_COMMANDS_HISTORY ); - const behaviorTypeProp = (ctx.props as Record)?.behaviorType as BehaviorType | undefined; - const behaviorType = this.state.behaviorType || behaviorTypeProp || 'phasic'; + const props = (ctx.props as AgentBootstrapProps) || {}; + const isInitialized = Boolean(this.state.query); + const behaviorType = isInitialized + ? this.state.behaviorType + : props.behaviorType ?? this.state.behaviorType ?? 'phasic'; + const projectType = isInitialized + ? this.state.projectType + : props.projectType ?? this.state.projectType ?? 'app'; + + if (isInitialized && this.state.behaviorType !== behaviorType) { + throw new Error(`State behaviorType mismatch: expected ${behaviorType}, got ${this.state.behaviorType}`); + } + if (behaviorType === 'phasic') { this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure); } else { @@ -119,7 +128,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI } // Create objective based on project type - this.objective = this.createObjective(this.state.projectType || 'app'); + this.objective = this.createObjective(projectType); } /** @@ -252,9 +261,42 @@ export class CodeGeneratorAgent extends Agent implements AgentI /** * Get the behavior (defines how code is generated) */ - getBehavior(): BaseCodingBehavior { + getBehavior(): BaseCodingBehavior { return this.behavior; } + + async getFullState(): Promise { + return await this.behavior.getFullState(); + } + + async getSummary(): Promise { + return this.behavior.getSummary(); + } + + getPreviewUrlCache(): string { + return this.behavior.getPreviewUrlCache(); + } + + deployToSandbox( + files: FileOutputType[] = [], + redeploy: boolean = false, + commitMessage?: string, + clearLogs: boolean = false + ): Promise { + return this.behavior.deployToSandbox(files, redeploy, commitMessage, clearLogs); + } + + deployToCloudflare(target?: DeploymentTarget): Promise<{ deploymentUrl?: string; workersUrl?: string } | null> { + return this.behavior.deployToCloudflare(target); + } + + deployProject(options?: DeployOptions): Promise { + return this.objective.deploy(options); + } + + exportProject(options: ExportOptions): Promise { + return this.objective.export(options); + } protected async saveToDatabase() { this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); @@ -521,194 +563,4 @@ export class CodeGeneratorAgent extends Agent implements AgentI throw error; } } - - /** - * Cache GitHub OAuth token in memory for subsequent exports - * Token is ephemeral - lost on DO eviction - */ - setGitHubToken(token: string, username: string, ttl: number = 3600000): void { - this.githubTokenCache = { - token, - username, - expiresAt: Date.now() + ttl - }; - this.logger().info('GitHub token cached', { - username, - expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() - }); - } - - /** - * Get cached GitHub token if available and not expired - */ - getGitHubToken(): { token: string; username: string } | null { - if (!this.githubTokenCache) { - return null; - } - - if (Date.now() >= this.githubTokenCache.expiresAt) { - this.logger().info('GitHub token expired, clearing cache'); - this.githubTokenCache = null; - return null; - } - - return { - token: this.githubTokenCache.token, - username: this.githubTokenCache.username - }; - } - - /** - * Clear cached GitHub token - */ - clearGitHubToken(): void { - this.githubTokenCache = null; - this.logger().info('GitHub token cleared'); - } - - - /** - * Export generated code to a GitHub repository - */ - async pushToGitHub(options: GitHubPushRequest): Promise { - try { - this.logger().info('Starting GitHub export using DO git'); - - // Broadcast export started - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { - message: `Starting GitHub export to repository "${options.cloneUrl}"`, - repositoryName: options.repositoryHtmlUrl, - isPrivate: options.isPrivate - }); - - // Export git objects from DO - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Preparing git repository...', - step: 'preparing', - progress: 20 - }); - - const { gitObjects, query, templateDetails } = await this.exportGitObjects(); - - this.logger().info('Git objects exported', { - objectCount: gitObjects.length, - hasTemplate: !!templateDetails - }); - - // Get app createdAt timestamp for template base commit - let appCreatedAt: Date | undefined = undefined; - try { - const appId = this.getAgentId(); - if (appId) { - const appService = new AppService(this.env); - const app = await appService.getAppDetails(appId); - if (app && app.createdAt) { - appCreatedAt = new Date(app.createdAt); - this.logger().info('Using app createdAt for template base', { - createdAt: appCreatedAt.toISOString() - }); - } - } - } catch (error) { - this.logger().warn('Failed to get app createdAt, using current time', { error }); - appCreatedAt = new Date(); // Fallback to current time - } - - // Push to GitHub using new service - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Uploading to GitHub repository...', - step: 'uploading_files', - progress: 40 - }); - - const result = await GitHubService.exportToGitHub({ - gitObjects, - templateDetails, - appQuery: query, - appCreatedAt, - token: options.token, - repositoryUrl: options.repositoryHtmlUrl, - username: options.username, - email: options.email - }); - - if (!result.success) { - throw new Error(result.error || 'Failed to export to GitHub'); - } - - this.logger().info('GitHub export completed', { - commitSha: result.commitSha - }); - - // Cache token for subsequent exports - if (options.token && options.username) { - try { - this.setGitHubToken(options.token, options.username); - this.logger().info('GitHub token cached after successful export'); - } catch (cacheError) { - // Non-fatal - continue with finalization - this.logger().warn('Failed to cache GitHub token', { error: cacheError }); - } - } - - // Update database - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { - message: 'Finalizing GitHub export...', - step: 'finalizing', - progress: 90 - }); - - const agentId = this.getAgentId(); - this.logger().info('[DB Update] Updating app with GitHub repository URL', { - agentId, - repositoryUrl: options.repositoryHtmlUrl, - visibility: options.isPrivate ? 'private' : 'public' - }); - - const appService = new AppService(this.env); - const updateResult = await appService.updateGitHubRepository( - agentId || '', - options.repositoryHtmlUrl || '', - options.isPrivate ? 'private' : 'public' - ); - - this.logger().info('[DB Update] Database update result', { - agentId, - success: updateResult, - repositoryUrl: options.repositoryHtmlUrl - }); - - // Broadcast success - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { - message: `Successfully exported to GitHub repository: ${options.repositoryHtmlUrl}`, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl, - commitSha: result.commitSha - }); - - this.logger().info('GitHub export completed successfully', { - repositoryUrl: options.repositoryHtmlUrl, - commitSha: result.commitSha - }); - - return { - success: true, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; - - } catch (error) { - this.logger().error('GitHub export failed', error); - this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { - message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, - error: error instanceof Error ? error.message : 'Unknown error' - }); - return { - success: false, - repositoryUrl: options.repositoryHtmlUrl, - cloneUrl: options.cloneUrl - }; - } - } - -} \ No newline at end of file +} diff --git a/worker/agents/core/objectives/app.ts b/worker/agents/core/objectives/app.ts index 911ea404..04631afc 100644 --- a/worker/agents/core/objectives/app.ts +++ b/worker/agents/core/objectives/app.ts @@ -1,9 +1,10 @@ import { ProjectObjective } from './base'; import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import { WebSocketMessageResponses, PREVIEW_EXPIRED_ERROR } from '../../constants'; import { AppService } from '../../../database/services/AppService'; import type { AgentInfrastructure } from '../AgentCore'; +import { GitHubService } from '../../../services/github'; /** * AppObjective - Full-Stack Web Applications @@ -67,12 +68,19 @@ export class AppObjective } // ========================================== - // EXPORT/DEPLOYMENT + // DEPLOYMENT & EXPORT // ========================================== - async export(_options?: ExportOptions): Promise { + async deploy(options?: DeployOptions): Promise { + const target = options?.target ?? 'platform'; + if (target !== 'platform') { + const message = `Unsupported deployment target "${target}" for app projects`; + this.logger.error(message); + return { success: false, target, error: message }; + } + try { - this.logger.info('Exporting app to Cloudflare Workers + Pages'); + this.logger.info('Deploying app to Workers for Platforms'); // Ensure sandbox instance exists first if (!this.state.sandboxInstanceId) { @@ -87,29 +95,32 @@ export class AppObjective }); return { success: false, + target, error: 'Failed to deploy to sandbox service' }; } } - // Deploy to Cloudflare Workers + Pages + // Deploy to Cloudflare Workers for Platforms const result = await this.deploymentManager.deployToCloudflare({ - onStarted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); - }, - onCompleted: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); - }, - onError: (data) => { - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); - }, - onPreviewExpired: () => { - // Re-deploy sandbox and broadcast error - this.deploymentManager.deployToSandbox(); - this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { - message: PREVIEW_EXPIRED_ERROR, - error: PREVIEW_EXPIRED_ERROR - }); + target, + callbacks: { + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + }, + onPreviewExpired: () => { + this.deploymentManager.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } } }); @@ -129,6 +140,7 @@ export class AppObjective return { success: !!result.deploymentUrl, + target, url: result.deploymentUrl || undefined, metadata: { deploymentId: result.deploymentId, @@ -145,8 +157,154 @@ export class AppObjective return { success: false, + target, error: error instanceof Error ? error.message : 'Unknown deployment error' }; } } + + async export(options: ExportOptions): Promise { + if (options.kind !== 'github' || !options.github) { + const error = 'App export requires GitHub context'; + this.logger.error(error, { kind: options.kind }); + return { success: false, error }; + } + + const githubOptions = options.github; + + try { + this.logger.info('Starting GitHub export using DO git'); + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_STARTED, { + message: `Starting GitHub export to repository "${githubOptions.cloneUrl}"`, + repositoryName: githubOptions.repositoryHtmlUrl, + isPrivate: githubOptions.isPrivate + }); + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Preparing git repository...', + step: 'preparing', + progress: 20 + }); + + const { gitObjects, query, templateDetails } = await this.infrastructure.exportGitObjects(); + + this.logger.info('Git objects exported', { + objectCount: gitObjects.length, + hasTemplate: !!templateDetails + }); + + let appCreatedAt: Date | undefined = undefined; + try { + const agentId = this.getAgentId(); + if (agentId) { + const appService = new AppService(this.env); + const app = await appService.getAppDetails(agentId); + if (app && app.createdAt) { + appCreatedAt = new Date(app.createdAt); + this.logger.info('Using app createdAt for template base', { + createdAt: appCreatedAt.toISOString() + }); + } + } + } catch (error) { + this.logger.warn('Failed to get app createdAt, using current time', { error }); + appCreatedAt = new Date(); + } + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Uploading to GitHub repository...', + step: 'uploading_files', + progress: 40 + }); + + const result = await GitHubService.exportToGitHub({ + gitObjects, + templateDetails, + appQuery: query, + appCreatedAt, + token: githubOptions.token, + repositoryUrl: githubOptions.repositoryHtmlUrl, + username: githubOptions.username, + email: githubOptions.email + }); + + if (!result.success) { + throw new Error(result.error || 'Failed to export to GitHub'); + } + + this.logger.info('GitHub export completed', { + commitSha: result.commitSha + }); + + if (githubOptions.token && githubOptions.username) { + try { + this.setGitHubToken(githubOptions.token, githubOptions.username); + this.logger.info('GitHub token cached after successful export'); + } catch (cacheError) { + this.logger.warn('Failed to cache GitHub token', { error: cacheError }); + } + } + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_PROGRESS, { + message: 'Finalizing GitHub export...', + step: 'finalizing', + progress: 90 + }); + + const agentId = this.getAgentId(); + this.logger.info('[DB Update] Updating app with GitHub repository URL', { + agentId, + repositoryUrl: githubOptions.repositoryHtmlUrl, + visibility: githubOptions.isPrivate ? 'private' : 'public' + }); + + const appService = new AppService(this.env); + const updateResult = await appService.updateGitHubRepository( + agentId || '', + githubOptions.repositoryHtmlUrl || '', + githubOptions.isPrivate ? 'private' : 'public' + ); + + this.logger.info('[DB Update] Database update result', { + agentId, + success: updateResult, + repositoryUrl: githubOptions.repositoryHtmlUrl + }); + + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_COMPLETED, { + message: `Successfully exported to GitHub repository: ${githubOptions.repositoryHtmlUrl}`, + repositoryUrl: githubOptions.repositoryHtmlUrl, + cloneUrl: githubOptions.cloneUrl, + commitSha: result.commitSha + }); + + this.logger.info('GitHub export completed successfully', { + repositoryUrl: githubOptions.repositoryHtmlUrl, + commitSha: result.commitSha + }); + + return { + success: true, + url: githubOptions.repositoryHtmlUrl, + metadata: { + repositoryUrl: githubOptions.repositoryHtmlUrl, + cloneUrl: githubOptions.cloneUrl, + commitSha: result.commitSha + } + }; + + } catch (error) { + this.logger.error('GitHub export failed', error); + this.broadcast(WebSocketMessageResponses.GITHUB_EXPORT_ERROR, { + message: `GitHub export failed: ${error instanceof Error ? error.message : 'Unknown error'}`, + error: error instanceof Error ? error.message : 'Unknown error' + }); + return { + success: false, + url: options.github.repositoryHtmlUrl, + error: error instanceof Error ? error.message : 'Unknown error' + }; + } + } } diff --git a/worker/agents/core/objectives/base.ts b/worker/agents/core/objectives/base.ts index 2939a7df..4ee3f4db 100644 --- a/worker/agents/core/objectives/base.ts +++ b/worker/agents/core/objectives/base.ts @@ -1,5 +1,5 @@ import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import { AgentComponent } from '../AgentComponent'; import type { AgentInfrastructure } from '../AgentCore'; @@ -17,6 +17,13 @@ import type { AgentInfrastructure } from '../AgentCore'; */ export abstract class ProjectObjective extends AgentComponent { + + // GitHub token cache (ephemeral, lost on DO eviction) + protected githubTokenCache: { + token: string; + username: string; + expiresAt: number; + } | null = null; constructor(infrastructure: AgentInfrastructure) { super(infrastructure); @@ -47,14 +54,14 @@ export abstract class ProjectObjective; + abstract deploy(options?: DeployOptions): Promise; + + /** + * Export project artifacts (GitHub repo, PDF, etc.) + */ + abstract export(options: ExportOptions): Promise; // ========================================== // OPTIONAL LIFECYCLE HOOKS @@ -87,4 +94,48 @@ export abstract class ProjectObjective { return { valid: true }; } + + /** + * Cache GitHub OAuth token in memory for subsequent exports + * Token is ephemeral - lost on DO eviction + */ + setGitHubToken(token: string, username: string, ttl: number = 3600000): void { + this.githubTokenCache = { + token, + username, + expiresAt: Date.now() + ttl + }; + this.logger.info('GitHub token cached', { + username, + expiresAt: new Date(this.githubTokenCache.expiresAt).toISOString() + }); + } + + /** + * Get cached GitHub token if available and not expired + */ + getGitHubToken(): { token: string; username: string } | null { + if (!this.githubTokenCache) { + return null; + } + + if (Date.now() >= this.githubTokenCache.expiresAt) { + this.logger.info('GitHub token expired, clearing cache'); + this.githubTokenCache = null; + return null; + } + + return { + token: this.githubTokenCache.token, + username: this.githubTokenCache.username + }; + } + + /** + * Clear cached GitHub token + */ + clearGitHubToken(): void { + this.githubTokenCache = null; + this.logger.info('GitHub token cleared'); + } } diff --git a/worker/agents/core/objectives/presentation.ts b/worker/agents/core/objectives/presentation.ts index b5411427..d0a91cfb 100644 --- a/worker/agents/core/objectives/presentation.ts +++ b/worker/agents/core/objectives/presentation.ts @@ -1,7 +1,9 @@ import { ProjectObjective } from './base'; import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import type { AgentInfrastructure } from '../AgentCore'; +import { WebSocketMessageResponses, PREVIEW_EXPIRED_ERROR } from '../../constants'; +import { AppService } from '../../../database/services/AppService'; /** * WIP - PresentationObjective - Slides/Docs/Marketing Materials @@ -44,19 +46,86 @@ export class PresentationObjective { - const format = (options?.format as 'pdf' | 'googleslides' | 'pptx') || 'pdf'; - this.logger.info('Presentation export requested but not yet implemented', { format }); - + async deploy(options?: DeployOptions): Promise { + const target = options?.target ?? 'platform'; + if (target !== 'platform') { + const error = `Unsupported deployment target "${target}" for presentations`; + this.logger.error(error); + return { success: false, target, error }; + } + + try { + this.logger.info('Deploying presentation to Workers for Platforms'); + + if (!this.state.sandboxInstanceId) { + await this.deploymentManager.deployToSandbox(); + + if (!this.state.sandboxInstanceId) { + const error = 'Failed to deploy to sandbox service'; + this.logger.error(error); + return { success: false, target, error }; + } + } + + const result = await this.deploymentManager.deployToCloudflare({ + target, + callbacks: { + onStarted: (data) => this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data), + onCompleted: (data) => this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data), + onError: (data) => this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data), + onPreviewExpired: () => { + this.deploymentManager.deployToSandbox(); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: PREVIEW_EXPIRED_ERROR, + error: PREVIEW_EXPIRED_ERROR + }); + } + } + }); + + if (result.deploymentUrl && result.deploymentId) { + const appService = new AppService(this.env); + await appService.updateDeploymentId(this.getAgentId(), result.deploymentId); + } + + return { + success: !!result.deploymentUrl, + target, + url: result.deploymentUrl || undefined, + metadata: { + deploymentId: result.deploymentId, + workersUrl: result.deploymentUrl + } + }; + } catch (error) { + const message = error instanceof Error ? error.message : 'Unknown presentation deployment error'; + this.logger.error('Presentation deployment error:', error); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Deployment failed', + error: message + }); + return { success: false, target, error: message }; + } + } + + async export(options: ExportOptions): Promise { + const allowedKinds: Array = ['pdf', 'pptx', 'googleslides']; + if (!allowedKinds.includes(options.kind)) { + const error = `Unsupported presentation export kind "${options.kind}"`; + this.logger.warn(error); + return { success: false, error }; + } + + const format = options.format || options.kind; + this.logger.info('Presentation export requested', { format }); + return { success: false, error: 'Presentation export not yet implemented - coming in Phase 3', - metadata: { - requestedFormat: format - } + metadata: { format } }; } } diff --git a/worker/agents/core/objectives/workflow.ts b/worker/agents/core/objectives/workflow.ts index f455ba8b..e53def58 100644 --- a/worker/agents/core/objectives/workflow.ts +++ b/worker/agents/core/objectives/workflow.ts @@ -1,7 +1,8 @@ import { ProjectObjective } from './base'; import { BaseProjectState } from '../state'; -import { ProjectType, RuntimeType, ExportResult, ExportOptions } from '../types'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; import type { AgentInfrastructure } from '../AgentCore'; +import { WebSocketMessageResponses } from '../../constants'; /** * WIP! @@ -44,15 +45,69 @@ export class WorkflowObjective { - this.logger.info('Workflow export requested but not yet implemented'); + async deploy(options?: DeployOptions): Promise { + const target = options?.target ?? 'user'; + try { + this.logger.info('Deploying workflow to Cloudflare Workers (user account)', { target }); + + const result = await this.deploymentManager.deployToCloudflare({ + target, + callbacks: { + onStarted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_STARTED, data); + }, + onCompleted: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_COMPLETED, data); + }, + onError: (data) => { + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, data); + } + } + }); + + return { + success: !!result.deploymentUrl, + target, + url: result.deploymentUrl || undefined, + deploymentId: result.deploymentId, + metadata: { + deploymentId: result.deploymentId, + workersUrl: result.deploymentUrl + } + }; + } catch (error) { + const message = error instanceof Error ? error.message : 'Unknown workflow deployment error'; + this.logger.error('Workflow deployment failed', error); + this.broadcast(WebSocketMessageResponses.CLOUDFLARE_DEPLOYMENT_ERROR, { + message: 'Workflow deployment failed', + error: message + }); + + return { + success: false, + target, + error: message + }; + } + } + + async export(options: ExportOptions): Promise { + if (options.kind !== 'workflow') { + const error = 'Workflow export must be invoked with kind="workflow"'; + this.logger.warn(error, { kind: options.kind }); + return { success: false, error }; + } + + const deployResult = await this.deploy(options); return { - success: false, - error: 'Workflow deployment not yet implemented' + success: deployResult.success, + url: deployResult.url, + error: deployResult.error, + metadata: deployResult.metadata }; } } diff --git a/worker/agents/core/stateMigration.ts b/worker/agents/core/stateMigration.ts index b8228872..e6a7bac9 100644 --- a/worker/agents/core/stateMigration.ts +++ b/worker/agents/core/stateMigration.ts @@ -1,12 +1,13 @@ -import { CodeGenState, FileState } from './state'; +import { AgentState, FileState } from './state'; import { StructuredLogger } from '../../logger'; import { TemplateDetails } from 'worker/services/sandbox/sandboxTypes'; import { generateNanoId } from '../../utils/idGenerator'; import { generateProjectName } from '../utils/templateCustomizer'; export class StateMigration { - static migrateIfNeeded(state: CodeGenState, logger: StructuredLogger): CodeGenState | null { + static migrateIfNeeded(state: AgentState, logger: StructuredLogger): AgentState | null { let needsMigration = false; + const legacyState = state as unknown as Record; //------------------------------------------------------------------------------------ // Migrate files from old schema @@ -170,6 +171,27 @@ export class StateMigration { logger.info('Generating missing projectName', { projectName: migratedProjectName }); } + let migratedProjectType = state.projectType; + if (!('projectType' in legacyState) || !migratedProjectType) { + migratedProjectType = 'app'; + needsMigration = true; + logger.info('Adding default projectType for legacy state', { projectType: migratedProjectType }); + } + + let migratedBehaviorType = state.behaviorType; + if ('agentMode' in legacyState) { + const legacyAgentMode = (legacyState as { agentMode?: string }).agentMode; + const nextBehaviorType = legacyAgentMode === 'smart' ? 'agentic' : 'phasic'; + if (nextBehaviorType !== migratedBehaviorType) { + migratedBehaviorType = nextBehaviorType; + needsMigration = true; + } + logger.info('Migrating behaviorType from agentMode', { + legacyAgentMode, + behaviorType: migratedBehaviorType + }); + } + if (needsMigration) { logger.info('Migrating state: schema format, conversation cleanup, security fixes, and bootstrap setup', { generatedFilesCount: Object.keys(migratedFilesMap).length, @@ -177,15 +199,17 @@ export class StateMigration { removedUserApiKeys: state.inferenceContext && 'userApiKeys' in state.inferenceContext, }); - const newState = { + const newState: AgentState = { ...state, generatedFilesMap: migratedFilesMap, conversationMessages: migratedConversationMessages, inferenceContext: migratedInferenceContext, projectUpdatesAccumulator: [], templateName: migratedTemplateName, - projectName: migratedProjectName - }; + projectName: migratedProjectName, + projectType: migratedProjectType, + behaviorType: migratedBehaviorType + } as AgentState; // Remove deprecated fields if (stateHasDeprecatedProps) { @@ -194,6 +218,9 @@ export class StateMigration { if (hasTemplateDetails) { delete (newState as any).templateDetails; } + if ('agentMode' in legacyState) { + delete (newState as any).agentMode; + } return newState; } diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index cb55be77..381881fa 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -1,5 +1,5 @@ -import type { RuntimeError, StaticAnalysisResponse } from '../../services/sandbox/sandboxTypes'; +import type { RuntimeError, StaticAnalysisResponse, GitHubPushRequest } from '../../services/sandbox/sandboxTypes'; import type { FileOutputType, PhaseConceptType } from '../schemas'; import type { ConversationMessage } from '../inferutils/common'; import type { InferenceContext } from '../inferutils/config.types'; @@ -30,6 +30,8 @@ interface BaseAgentInitArgs { images?: ProcessedImageAttachment[]; onBlueprintChunk: (chunk: string) => void; sandboxSessionId?: string; // Generated by CodeGeneratorAgent, passed to behavior + behaviorType?: BehaviorType; + projectType?: ProjectType; } /** Phasic agent initialization arguments */ @@ -98,6 +100,23 @@ export type DeepDebugResult = | { success: true; transcript: string } | { success: false; error: string }; +export type DeploymentTarget = 'platform' | 'user'; + +export interface DeployResult { + success: boolean; + target: DeploymentTarget; + url?: string; + deploymentId?: string; + error?: string; + metadata?: Record; +} + +export interface DeployOptions { + target?: DeploymentTarget; + token?: string; + metadata?: Record; +} + /** * Result of project export/deployment operation */ @@ -112,7 +131,9 @@ export interface ExportResult { * Options for project export/deployment */ export interface ExportOptions { + kind: 'github' | 'pdf' | 'pptx' | 'googleslides' | 'workflow'; format?: string; token?: string; - [key: string]: unknown; -} \ No newline at end of file + github?: GitHubPushRequest; + metadata?: Record; +} diff --git a/worker/agents/core/websocket.ts b/worker/agents/core/websocket.ts index 71551e8e..666a2124 100644 --- a/worker/agents/core/websocket.ts +++ b/worker/agents/core/websocket.ts @@ -50,13 +50,12 @@ export function handleWebSocketMessage( }); break; case WebSocketMessageRequests.DEPLOY: - // Use objective.export() for deployment (project-specific logic) - agent.getObjective().export({ type: 'cloudflare' }).then((deploymentResult) => { - if (!deploymentResult) { - logger.error('Failed to deploy to Cloudflare Workers'); + agent.deployProject().then((deploymentResult) => { + if (!deploymentResult.success) { + logger.error('Deployment failed', deploymentResult); return; } - logger.info('Successfully deployed to Cloudflare Workers!', deploymentResult); + logger.info('Deployment completed', deploymentResult); }).catch((error: unknown) => { logger.error('Error during deployment:', error); }); @@ -256,4 +255,4 @@ export function sendToConnection( export function sendError(connection: WebSocket, errorMessage: string): void { sendToConnection(connection, 'error', { error: errorMessage }); -} \ No newline at end of file +} diff --git a/worker/agents/index.ts b/worker/agents/index.ts index 102298c0..b4aacc21 100644 --- a/worker/agents/index.ts +++ b/worker/agents/index.ts @@ -8,42 +8,63 @@ import { TemplateDetails } from '../services/sandbox/sandboxTypes'; import { TemplateSelection } from './schemas'; import type { ImageAttachment } from '../types/image-attachment'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; +import { AgentState, CurrentDevState } from './core/state'; +import { CodeGeneratorAgent } from './core/codingAgent'; +import { BehaviorType, ProjectType } from './core/types'; -export async function getAgentStub(env: Env, agentId: string) : Promise> { - return getAgentByName(env.CodeGenObject, agentId); +type AgentStubProps = { + behaviorType?: BehaviorType; + projectType?: ProjectType; +}; + +export async function getAgentStub( + env: Env, + agentId: string, + props?: AgentStubProps +) : Promise> { + const options = props ? { props } : undefined; + return getAgentByName(env.CodeGenObject, agentId, options); } -export async function getAgentStubLightweight(env: Env, agentId: string) : Promise> { - return getAgentByName(env.CodeGenObject, agentId, { +export async function getAgentStubLightweight(env: Env, agentId: string) : Promise> { + return getAgentByName(env.CodeGenObject, agentId, { // props: { readOnlyMode: true } }); } -export async function getAgentState(env: Env, agentId: string) : Promise { +export async function getAgentState(env: Env, agentId: string) : Promise { const agentInstance = await getAgentStub(env, agentId); - return await agentInstance.getFullState() as CodeGenState; + return await agentInstance.getFullState() as AgentState; } -export async function cloneAgent(env: Env, agentId: string) : Promise<{newAgentId: string, newAgent: DurableObjectStub}> { +export async function cloneAgent(env: Env, agentId: string) : Promise<{newAgentId: string, newAgent: DurableObjectStub}> { const agentInstance = await getAgentStub(env, agentId); if (!agentInstance || !await agentInstance.isInitialized()) { throw new Error(`Agent ${agentId} not found`); } const newAgentId = generateId(); - const newAgent = await getAgentStub(env, newAgentId); - const originalState = await agentInstance.getFullState() as CodeGenState; - const newState = { + const originalState = await agentInstance.getFullState(); + + const newState: AgentState = { ...originalState, sessionId: newAgentId, sandboxInstanceId: undefined, pendingUserInputs: [], - currentDevState: 0, - generationPromise: undefined, shouldBeGenerating: false, - // latestScreenshot: undefined, - clientReportedErrors: [], - }; + projectUpdatesAccumulator: [], + reviewingInitiated: false, + mvpGenerated: false, + ...(originalState.behaviorType === 'phasic' ? { + generatedPhases: [], + currentDevState: CurrentDevState.IDLE, + } : {}), + } as AgentState; + + const newAgent = await getAgentStub(env, newAgentId, { + behaviorType: originalState.behaviorType, + projectType: originalState.projectType, + }); await newAgent.setState(newState); return {newAgentId, newAgent}; @@ -90,4 +111,4 @@ export async function getTemplateForQuery( const templateDetails = templateDetailsResponse.templateDetails; return { templateDetails, selection: analyzeQueryResponse }; -} \ No newline at end of file +} diff --git a/worker/agents/planning/blueprint.ts b/worker/agents/planning/blueprint.ts index e319aff6..fa2123b7 100644 --- a/worker/agents/planning/blueprint.ts +++ b/worker/agents/planning/blueprint.ts @@ -10,6 +10,7 @@ import z from 'zod'; import { imagesToBase64 } from 'worker/utils/images'; import { ProcessedImageAttachment } from 'worker/types/image-attachment'; import { getTemplateImportantFiles } from 'worker/services/sandbox/utils'; +import { ProjectType } from '../core/types'; const logger = createLogger('Blueprint'); @@ -225,12 +226,31 @@ Preinstalled dependencies: {{dependencies}} `; +const PROJECT_TYPE_BLUEPRINT_GUIDANCE: Record = { + app: '', + workflow: `## Workflow Project Context +- Focus entirely on backend flows running on Cloudflare Workers (no UI/screens) +- Describe REST endpoints, scheduled jobs, queue consumers, Durable Objects, and data storage bindings in detail +- User flow should outline request/response shapes and operational safeguards +- Implementation roadmap must mention testing strategies (unit tests, integration tests) and deployment validation steps.`, + presentation: `## Presentation Project Context +- Design a Spectacle-based slide deck with a cohesive narrative arc (intro, problem, solution, showcase, CTA) +- Produce visually rich slides with precise layout, typography, imagery, and animation guidance +- User flow should actually be a \"story flow\" describing slide order, transitions, interactions, and speaker cues +- Implementation roadmap must reference Spectacle features (themes, deck index, slide components, animations, print/external export mode) +- Prioritize static data and storytelling polish; avoid backend complexity entirely.`, +}; + +const getProjectTypeGuidance = (projectType: ProjectType): string => + PROJECT_TYPE_BLUEPRINT_GUIDANCE[projectType] || ''; + interface BaseBlueprintGenerationArgs { env: Env; inferenceContext: InferenceContext; query: string; language: string; frameworks: string[]; + projectType: ProjectType; images?: ProcessedImageAttachment[]; stream?: { chunk_size: number; @@ -256,7 +276,7 @@ export async function generateBlueprint(args: AgenticBlueprintGenerationArgs): P export async function generateBlueprint( args: PhasicBlueprintGenerationArgs | AgenticBlueprintGenerationArgs ): Promise { - const { env, inferenceContext, query, language, frameworks, templateDetails, templateMetaInfo, images, stream } = args; + const { env, inferenceContext, query, language, frameworks, templateDetails, templateMetaInfo, images, stream, projectType } = args; const isAgentic = !templateDetails || !templateMetaInfo; try { @@ -277,6 +297,10 @@ export async function generateBlueprint( const fileTreeText = PROMPT_UTILS.serializeTreeNodes(templateDetails.fileTree); systemPrompt = systemPrompt.replace('{{filesText}}', filesText).replace('{{fileTreeText}}', fileTreeText); } + const projectGuidance = getProjectTypeGuidance(projectType); + if (projectGuidance) { + systemPrompt = `${systemPrompt}\n\n${projectGuidance}`; + } const systemPromptMessage = createSystemMessage(generalSystemPromptBuilder(systemPrompt, { query, diff --git a/worker/agents/services/implementations/BaseAgentService.ts b/worker/agents/services/implementations/BaseAgentService.ts index 38de6b7b..5a512998 100644 --- a/worker/agents/services/implementations/BaseAgentService.ts +++ b/worker/agents/services/implementations/BaseAgentService.ts @@ -2,18 +2,19 @@ import { IStateManager } from '../interfaces/IStateManager'; import { IFileManager } from '../interfaces/IFileManager'; import { StructuredLogger } from '../../../logger'; import { ServiceOptions } from '../interfaces/IServiceOptions'; +import { BaseProjectState } from '../../core/state'; /** * Base class for all agent services * Provides common dependencies and DO-compatible access patterns */ -export abstract class BaseAgentService { - protected readonly stateManager: IStateManager; +export abstract class BaseAgentService { + protected readonly stateManager: IStateManager; protected readonly fileManager: IFileManager; protected readonly getLogger: () => StructuredLogger; protected readonly env: Env; - constructor(options: ServiceOptions) { + constructor(options: ServiceOptions) { this.stateManager = options.stateManager; this.fileManager = options.fileManager; this.getLogger = options.getLogger; @@ -23,14 +24,14 @@ export abstract class BaseAgentService { /** * Get current agent state */ - protected getState() { + protected getState(): Readonly { return this.stateManager.getState(); } /** * Update agent state */ - protected setState(newState: ReturnType) { + protected setState(newState: TState) { this.stateManager.setState(newState); } diff --git a/worker/agents/services/implementations/CodingAgent.ts b/worker/agents/services/implementations/CodingAgent.ts index 93f11150..d82db3c1 100644 --- a/worker/agents/services/implementations/CodingAgent.ts +++ b/worker/agents/services/implementations/CodingAgent.ts @@ -3,7 +3,7 @@ import { Blueprint, FileConceptType } from "worker/agents/schemas"; import { ExecuteCommandsResponse, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { ICodingAgent } from "../interfaces/ICodingAgent"; import { OperationOptions } from "worker/agents/operations/common"; -import { DeepDebugResult } from "worker/agents/core/types"; +import { DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; import { WebSocketMessageResponses } from "worker/agents/constants"; @@ -35,8 +35,8 @@ export class CodingAgentInterface { } } - async deployToCloudflare(): Promise { - const response = await this.agentStub.deployToCloudflare(); + async deployToCloudflare(target?: DeploymentTarget): Promise { + const response = await this.agentStub.deployToCloudflare(target); if (response && response.deploymentUrl) { return `Deployment successful: ${response.deploymentUrl}`; } else { @@ -57,7 +57,7 @@ export class CodingAgentInterface { } getGit() { - return this.agentStub.getGit(); + return this.agentStub.git; } updateProjectName(newName: string): Promise { diff --git a/worker/agents/services/implementations/DeploymentManager.ts b/worker/agents/services/implementations/DeploymentManager.ts index 52fe6183..6f2ff022 100644 --- a/worker/agents/services/implementations/DeploymentManager.ts +++ b/worker/agents/services/implementations/DeploymentManager.ts @@ -14,6 +14,8 @@ import { ServiceOptions } from '../interfaces/IServiceOptions'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; import { getSandboxService } from '../../../services/sandbox/factory'; import { validateAndCleanBootstrapCommands } from 'worker/agents/utils/common'; +import { DeploymentTarget } from '../../core/types'; +import { BaseProjectState } from '../../core/state'; const PER_ATTEMPT_TIMEOUT_MS = 60000; // 60 seconds per individual attempt const MASTER_DEPLOYMENT_TIMEOUT_MS = 300000; // 5 minutes total @@ -24,13 +26,13 @@ const HEALTH_CHECK_INTERVAL_MS = 30000; * Handles instance creation, file deployment, analysis, and GitHub/Cloudflare export * Also manages sessionId and health check intervals */ -export class DeploymentManager extends BaseAgentService implements IDeploymentManager { +export class DeploymentManager extends BaseAgentService implements IDeploymentManager { private healthCheckInterval: ReturnType | null = null; private currentDeploymentPromise: Promise | null = null; private cachedSandboxClient: BaseSandboxService | null = null; constructor( - options: ServiceOptions, + options: ServiceOptions, private maxCommandsHistory: number ) { super(options); @@ -622,10 +624,15 @@ export class DeploymentManager extends BaseAgentService implements IDeploymentMa * Deploy to Cloudflare Workers * Returns deployment URL and deployment ID for database updates */ - async deployToCloudflare(callbacks?: CloudflareDeploymentCallbacks): Promise<{ deploymentUrl: string | null; deploymentId?: string }> { + async deployToCloudflare(request?: { + target?: DeploymentTarget; + callbacks?: CloudflareDeploymentCallbacks; + }): Promise<{ deploymentUrl: string | null; deploymentId?: string }> { const state = this.getState(); const logger = this.getLog(); const client = this.getClient(); + const target = request?.target ?? 'platform'; + const callbacks = request?.callbacks; await this.waitForPreview(); @@ -634,7 +641,7 @@ export class DeploymentManager extends BaseAgentService implements IDeploymentMa instanceId: state.sandboxInstanceId ?? '' }); - logger.info('Starting Cloudflare deployment'); + logger.info('Starting Cloudflare deployment', { target }); // Check if we have generated files if (!state.generatedFilesMap || Object.keys(state.generatedFilesMap).length === 0) { @@ -660,7 +667,8 @@ export class DeploymentManager extends BaseAgentService implements IDeploymentMa // Deploy to Cloudflare const deploymentResult = await client.deployToCloudflareWorkers( - state.sandboxInstanceId + state.sandboxInstanceId, + target ); logger.info('Deployment result:', deploymentResult); diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index 2cea62f3..c27bd7d9 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -2,7 +2,7 @@ import { FileOutputType, FileConceptType, Blueprint } from "worker/agents/schema import { BaseSandboxService } from "worker/services/sandbox/BaseSandboxService"; import { ExecuteCommandsResponse, PreviewType, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { ProcessedImageAttachment } from "worker/types/image-attachment"; -import { BehaviorType, DeepDebugResult } from "worker/agents/core/types"; +import { BehaviorType, DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; import { WebSocketMessageType, WebSocketMessageData } from "worker/api/websocketTypes"; import { GitVersionControl } from "worker/agents/git/git"; @@ -19,10 +19,12 @@ export interface ICodingAgent { broadcast(msg: T, data?: WebSocketMessageData): void; - deployToCloudflare(): Promise<{ deploymentUrl?: string; workersUrl?: string } | null>; + deployToCloudflare(target?: DeploymentTarget): Promise<{ deploymentUrl?: string; workersUrl?: string } | null>; queueUserRequest(request: string, images?: ProcessedImageAttachment[]): void; + clearConversation(): void; + deployPreview(clearLogs?: boolean, forceRedeploy?: boolean): Promise; updateProjectName(newName: string): Promise; @@ -62,6 +64,7 @@ export interface ICodingAgent { ): Promise; get git(): GitVersionControl; + getGit(): GitVersionControl; getSandboxServiceClient(): BaseSandboxService; } diff --git a/worker/agents/services/interfaces/IDeploymentManager.ts b/worker/agents/services/interfaces/IDeploymentManager.ts index eab92211..32dc0b93 100644 --- a/worker/agents/services/interfaces/IDeploymentManager.ts +++ b/worker/agents/services/interfaces/IDeploymentManager.ts @@ -2,6 +2,7 @@ import { FileOutputType } from '../../schemas'; import { StaticAnalysisResponse, RuntimeError, PreviewType } from '../../../services/sandbox/sandboxTypes'; import { DeploymentStartedMessage, DeploymentCompletedMessage, DeploymentFailedMessage } from '../../../api/websocketTypes'; import { CloudflareDeploymentStartedMessage, CloudflareDeploymentCompletedMessage, CloudflareDeploymentErrorMessage } from '../../../api/websocketTypes'; +import { DeploymentTarget } from '../../core/types'; /** * Callbacks for sandbox deployment events @@ -97,6 +98,9 @@ export interface IDeploymentManager { * Deploy to Cloudflare Workers * Returns deployment URL and deployment ID for database updates */ - deployToCloudflare(callbacks?: CloudflareDeploymentCallbacks): Promise<{ deploymentUrl: string | null; deploymentId?: string }>; + deployToCloudflare(request?: { + target?: DeploymentTarget; + callbacks?: CloudflareDeploymentCallbacks; + }): Promise<{ deploymentUrl: string | null; deploymentId?: string }>; } diff --git a/worker/agents/services/interfaces/IServiceOptions.ts b/worker/agents/services/interfaces/IServiceOptions.ts index aa5275f7..596fef9c 100644 --- a/worker/agents/services/interfaces/IServiceOptions.ts +++ b/worker/agents/services/interfaces/IServiceOptions.ts @@ -1,13 +1,14 @@ import { IStateManager } from './IStateManager'; import { IFileManager } from './IFileManager'; import { StructuredLogger } from '../../../logger'; +import { BaseProjectState } from '../../core/state'; /** * Common options for all agent services */ -export interface ServiceOptions { +export interface ServiceOptions { env: Env, - stateManager: IStateManager; + stateManager: IStateManager; fileManager: IFileManager; getLogger: () => StructuredLogger; } diff --git a/worker/agents/tools/toolkit/regenerate-file.ts b/worker/agents/tools/toolkit/regenerate-file.ts index 2fcde525..5be23f99 100644 --- a/worker/agents/tools/toolkit/regenerate-file.ts +++ b/worker/agents/tools/toolkit/regenerate-file.ts @@ -38,7 +38,7 @@ CRITICAL: Provide detailed, specific issues - not vague descriptions. See system path, issuesCount: issues.length, }); - return await agent.regenerateFile(path, issues); + return await agent.regenerateFileByPath(path, issues); } catch (error) { return { error: diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index b40454f0..9b1ae22d 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -1,7 +1,8 @@ import { WebSocketMessageResponses } from '../../../agents/constants'; import { BaseController } from '../baseController'; import { generateId } from '../../../utils/idGenerator'; -import { CodeGenState } from '../../../agents/core/state'; +import { AgentState } from '../../../agents/core/state'; +import { BehaviorType, ProjectType } from '../../../agents/core/types'; import { getAgentStub, getTemplateForQuery } from '../../../agents'; import { AgentConnectionData, AgentPreviewResponse, CodeGenArgs } from './types'; import { ApiResponse, ControllerResponse } from '../types'; @@ -22,6 +23,19 @@ const defaultCodeGenArgs: CodeGenArgs = { frameworks: ['react', 'vite'], selectedTemplate: 'auto', agentMode: 'deterministic', + behaviorType: 'phasic', + projectType: 'app', +}; + +const resolveBehaviorType = (body: CodeGenArgs): BehaviorType => { + if (body.behaviorType) { + return body.behaviorType; + } + return body.agentMode === 'smart' ? 'agentic' : 'phasic'; +}; + +const resolveProjectType = (body: CodeGenArgs): ProjectType => { + return body.projectType || defaultCodeGenArgs.projectType || 'app'; }; @@ -77,11 +91,13 @@ export class CodingAgentController extends BaseController { const agentId = generateId(); const modelConfigService = new ModelConfigService(env); + const behaviorType = resolveBehaviorType(body); + const projectType = resolveProjectType(body); // Fetch all user model configs, api keys and agent instance at once const [userConfigsRecord, agentInstance] = await Promise.all([ modelConfigService.getUserModelConfigs(user.id), - getAgentStub(env, agentId) + getAgentStub(env, agentId, { behaviorType, projectType }) ]); // Convert Record to Map and extract only ModelConfig properties @@ -144,9 +160,11 @@ export class CodingAgentController extends BaseController { onBlueprintChunk: (chunk: string) => { writer.write({chunk}); }, + behaviorType, + projectType, templateInfo: { templateDetails, selection }, - }, body.agentMode || defaultCodeGenArgs.agentMode) as Promise; - agentPromise.then(async (_state: CodeGenState) => { + }) as Promise; + agentPromise.then(async (_state: AgentState) => { writer.write("terminate"); writer.close(); this.logger.info(`Agent ${agentId} terminated successfully`); @@ -335,4 +353,4 @@ export class CodingAgentController extends BaseController { return appError; } } -} \ No newline at end of file +} diff --git a/worker/api/controllers/agent/types.ts b/worker/api/controllers/agent/types.ts index 42b8ae6e..3966dcda 100644 --- a/worker/api/controllers/agent/types.ts +++ b/worker/api/controllers/agent/types.ts @@ -1,12 +1,15 @@ import { PreviewType } from "../../../services/sandbox/sandboxTypes"; import type { ImageAttachment } from '../../../types/image-attachment'; +import type { BehaviorType, ProjectType } from '../../../agents/core/types'; export interface CodeGenArgs { query: string; language?: string; frameworks?: string[]; selectedTemplate?: string; - agentMode: 'deterministic' | 'smart'; + agentMode?: 'deterministic' | 'smart'; + behaviorType?: BehaviorType; + projectType?: ProjectType; images?: ImageAttachment[]; } @@ -20,4 +23,4 @@ export interface AgentConnectionData { export interface AgentPreviewResponse extends PreviewType { } - \ No newline at end of file + diff --git a/worker/api/controllers/githubExporter/controller.ts b/worker/api/controllers/githubExporter/controller.ts index 5149d07e..958e2d65 100644 --- a/worker/api/controllers/githubExporter/controller.ts +++ b/worker/api/controllers/githubExporter/controller.ts @@ -5,6 +5,7 @@ import { GitHubExporterOAuthProvider } from '../../../services/oauth/github-expo import { getAgentStub } from '../../../agents'; import { createLogger } from '../../../logger'; import { AppService } from '../../../database/services/AppService'; +import { ExportResult } from 'worker/agents/core/types'; export interface GitHubExportData { success: boolean; @@ -164,13 +165,16 @@ export class GitHubExporterController extends BaseController { this.logger.info('Pushing files to repository', { agentId, repositoryUrl }); const agentStub = await getAgentStub(env, agentId); - const pushResult = await agentStub.pushToGitHub({ - cloneUrl, - repositoryHtmlUrl: repositoryUrl, - isPrivate, - token, - email: 'vibesdk-bot@cloudflare.com', - username + const pushResult: ExportResult = await agentStub.exportProject({ + kind: 'github', + github: { + cloneUrl, + repositoryHtmlUrl: repositoryUrl, + isPrivate, + token, + email: 'vibesdk-bot@cloudflare.com', + username + } }); if (!pushResult?.success) { diff --git a/worker/api/websocketTypes.ts b/worker/api/websocketTypes.ts index 6831ab55..450a6fc9 100644 --- a/worker/api/websocketTypes.ts +++ b/worker/api/websocketTypes.ts @@ -1,5 +1,5 @@ import type { CodeReviewOutputType, FileConceptType, FileOutputType } from "../agents/schemas"; -import type { CodeGenState } from "../agents/core/state"; +import type { AgentState } from "../agents/core/state"; import type { ConversationState } from "../agents/inferutils/common"; import type { CodeIssue, RuntimeError, StaticAnalysisResponse, TemplateDetails } from "../services/sandbox/sandboxTypes"; import type { CodeFixResult } from "../services/code-fixer"; @@ -13,12 +13,12 @@ type ErrorMessage = { type StateMessage = { type: 'cf_agent_state'; - state: CodeGenState; + state: AgentState; }; type AgentConnectedMessage = { type: 'agent_connected'; - state: CodeGenState; + state: AgentState; templateDetails: TemplateDetails; }; @@ -478,4 +478,4 @@ type WebSocketMessagePayload = Extract = Omit, 'type'>; \ No newline at end of file +export type WebSocketMessageData = Omit, 'type'>; diff --git a/worker/index.ts b/worker/index.ts index eb8560be..d0a0bbe4 100644 --- a/worker/index.ts +++ b/worker/index.ts @@ -14,7 +14,7 @@ import { handleGitProtocolRequest, isGitProtocolRequest } from './api/handlers/g export { UserAppSandboxService, DeployerService } from './services/sandbox/sandboxSdkClient'; export { CodeGeneratorAgent } from './agents/core/codingAgent'; -// export const CodeGeneratorAgent = Sentry.instrumentDurableObjectWithSentry(sentryOptions, SmartCodeGeneratorAgent); +// export const CodeGeneratorAgent = Sentry.instrumentDurableObjectWithSentry(sentryOptions, CodeGeneratorAgent); // export const DORateLimitStore = Sentry.instrumentDurableObjectWithSentry(sentryOptions, BaseDORateLimitStore); export const DORateLimitStore = BaseDORateLimitStore; diff --git a/worker/services/sandbox/BaseSandboxService.ts b/worker/services/sandbox/BaseSandboxService.ts index f1056391..f69eaa23 100644 --- a/worker/services/sandbox/BaseSandboxService.ts +++ b/worker/services/sandbox/BaseSandboxService.ts @@ -34,6 +34,7 @@ import { createObjectLogger, StructuredLogger } from '../../logger'; import { env } from 'cloudflare:workers' import { ZipExtractor } from './zipExtractor'; import { FileTreeBuilder } from './fileTreeBuilder'; +import { DeploymentTarget } from 'worker/agents/core/types'; /** * Streaming event for enhanced command execution @@ -305,10 +306,10 @@ export abstract class BaseSandboxService { * Deploy instance to Cloudflare Workers * Returns: { success: boolean, message: string, deployedUrl?: string, deploymentId?: string, error?: string } */ - abstract deployToCloudflareWorkers(instanceId: string): Promise; + abstract deployToCloudflareWorkers(instanceId: string, target?: DeploymentTarget): Promise; // ========================================== // GITHUB INTEGRATION (Required) // ========================================== -} \ No newline at end of file +} diff --git a/worker/services/sandbox/remoteSandboxService.ts b/worker/services/sandbox/remoteSandboxService.ts index 42f06085..b52ce8cd 100644 --- a/worker/services/sandbox/remoteSandboxService.ts +++ b/worker/services/sandbox/remoteSandboxService.ts @@ -31,6 +31,7 @@ import { GitHubPushResponseSchema, } from './sandboxTypes'; import { BaseSandboxService } from "./BaseSandboxService"; +import { DeploymentTarget } from 'worker/agents/core/types'; import { env } from 'cloudflare:workers' import z from 'zod'; import { FileOutputType } from 'worker/agents/schemas'; @@ -193,7 +194,14 @@ export class RemoteSandboxServiceClient extends BaseSandboxService{ * @param instanceId The ID of the runner instance to deploy * @param credentials Optional Cloudflare deployment credentials */ - async deployToCloudflareWorkers(instanceId: string): Promise { + async deployToCloudflareWorkers(instanceId: string, target: DeploymentTarget = 'platform'): Promise { + if (target === 'user') { + return { + success: false, + message: 'User-targeted deployments are not available with remote sandbox runner', + error: 'unsupported_target' + }; + } return this.makeRequest(`/instances/${instanceId}/deploy`, 'POST', DeploymentResultSchema); } diff --git a/worker/services/sandbox/sandboxSdkClient.ts b/worker/services/sandbox/sandboxSdkClient.ts index e987e209..068f1d3e 100644 --- a/worker/services/sandbox/sandboxSdkClient.ts +++ b/worker/services/sandbox/sandboxSdkClient.ts @@ -32,6 +32,7 @@ import { buildDeploymentConfig, parseWranglerConfig, deployToDispatch, + deployWorker, } from '../deployer/deploy'; import { createAssetManifest @@ -43,6 +44,7 @@ import { ResourceProvisioningResult } from './types'; import { getPreviewDomain } from '../../utils/urls'; import { isDev } from 'worker/utils/envs' import { FileTreeBuilder } from './fileTreeBuilder'; +import { DeploymentTarget } from 'worker/agents/core/types'; // Export the Sandbox class in your Worker export { Sandbox as UserAppSandboxService, Sandbox as DeployerService} from "@cloudflare/sandbox"; @@ -1058,8 +1060,6 @@ export class SandboxSdkClient extends BaseSandboxService { instanceId = `i-${generateId()}`; } this.logger.info('Creating sandbox instance', { instanceId, templateName, projectName }); - - let results: {previewURL: string, tunnelURL: string, processId: string, allocatedPort: number} | undefined; await this.ensureTemplateExists(templateName); const [donttouchFiles, redactedFiles] = await Promise.all([ @@ -1080,17 +1080,16 @@ export class SandboxSdkClient extends BaseSandboxService { error: 'Failed to setup instance' }; } - results = setupResult; // Store instance metadata const metadata = { templateName: templateName, projectName: projectName, startTime: new Date().toISOString(), webhookUrl: webhookUrl, - previewURL: results?.previewURL, - processId: results?.processId, - tunnelURL: results?.tunnelURL, - allocatedPort: results?.allocatedPort, + previewURL: setupResult?.previewURL, + processId: setupResult?.processId, + tunnelURL: setupResult?.tunnelURL, + allocatedPort: setupResult?.allocatedPort, donttouch_files: donttouchFiles, redacted_files: redactedFiles, }; @@ -1100,9 +1099,9 @@ export class SandboxSdkClient extends BaseSandboxService { success: true, runId: instanceId, message: `Successfully created instance from template ${templateName}`, - previewURL: results?.previewURL, - tunnelURL: results?.tunnelURL, - processId: results?.processId, + previewURL: setupResult?.previewURL, + tunnelURL: setupResult?.tunnelURL, + processId: setupResult?.processId, }; } catch (error) { this.logger.error('createInstance', error, { templateName: templateName, projectName: projectName }); @@ -1574,8 +1573,6 @@ export class SandboxSdkClient extends BaseSandboxService { async clearInstanceErrors(instanceId: string): Promise { try { - let clearedCount = 0; - // Try enhanced error system first - clear ALL errors try { const cmd = `timeout 10s monitor-cli errors clear -i ${instanceId} --confirm`; @@ -1600,11 +1597,11 @@ export class SandboxSdkClient extends BaseSandboxService { this.logger.warn('Error clearing unavailable, falling back to legacy', enhancedError); } - this.logger.info(`Cleared ${clearedCount} errors for instance ${instanceId}`); + this.logger.info(`Cleared errors for instance ${instanceId}`); return { success: true, - message: `Cleared ${clearedCount} errors` + message: `Cleared errors` }; } catch (error) { this.logger.error('clearInstanceErrors', error, { instanceId }); @@ -1785,7 +1782,7 @@ export class SandboxSdkClient extends BaseSandboxService { // ========================================== // DEPLOYMENT // ========================================== - async deployToCloudflareWorkers(instanceId: string): Promise { + async deployToCloudflareWorkers(instanceId: string, target: DeploymentTarget = 'platform'): Promise { try { this.logger.info('Starting deployment', { instanceId }); @@ -1819,7 +1816,7 @@ export class SandboxSdkClient extends BaseSandboxService { // Step 2: Parse wrangler config from KV this.logger.info('Reading wrangler configuration from KV'); - let wranglerConfigContent = await env.VibecoderStore.get(this.getWranglerKVKey(instanceId)); + const wranglerConfigContent = await env.VibecoderStore.get(this.getWranglerKVKey(instanceId)); if (!wranglerConfigContent) { // This should never happen unless KV itself has some issues @@ -1925,8 +1922,14 @@ export class SandboxSdkClient extends BaseSandboxService { ); // Step 7: Deploy using pure function - this.logger.info('Deploying to Cloudflare'); - if ('DISPATCH_NAMESPACE' in env) { + const useDispatch = target === 'platform'; + this.logger.info('Deploying to Cloudflare', { target }); + + if (useDispatch) { + if (!('DISPATCH_NAMESPACE' in env)) { + throw new Error('DISPATCH_NAMESPACE not found in environment variables, cannot deploy without dispatch namespace'); + } + this.logger.info('Using dispatch namespace', { dispatchNamespace: env.DISPATCH_NAMESPACE }); await deployToDispatch( { @@ -1939,7 +1942,13 @@ export class SandboxSdkClient extends BaseSandboxService { config.assets ); } else { - throw new Error('DISPATCH_NAMESPACE not found in environment variables, cannot deploy without dispatch namespace'); + await deployWorker( + deployConfig, + fileContents, + additionalModules, + config.migrations, + config.assets + ); } // Step 8: Determine deployment URL @@ -1950,7 +1959,7 @@ export class SandboxSdkClient extends BaseSandboxService { instanceId, deployedUrl, deploymentId, - mode: 'dispatch-namespace' + mode: useDispatch ? 'dispatch-namespace' : 'user-worker' }); return { @@ -2041,4 +2050,4 @@ export class SandboxSdkClient extends BaseSandboxService { } return 'https'; } -} \ No newline at end of file +} From f753f8bc1dc587de106dc1b413c11fc796cbd7cb Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:04:09 -0500 Subject: [PATCH 27/58] feat: add ai-based project type detection and workflow support - Implemented AI-powered project type prediction (app/workflow/presentation) with confidence scoring and auto-detection when projectType is 'auto' - Enhanced template selection to filter by project type and skip AI selection for single-template scenarios in workflow/presentation types - Added GitHub token caching in CodeGeneratorAgent for persistent OAuth sessions across exports - Updated commitlint config to allow longer commit messages ( --- commitlint.config.js | 6 +- worker/agents/core/behaviors/agentic.ts | 3 +- worker/agents/core/behaviors/base.ts | 4 +- worker/agents/core/behaviors/phasic.ts | 5 +- worker/agents/core/codingAgent.ts | 26 ++- worker/agents/core/types.ts | 2 - worker/agents/index.ts | 6 +- worker/agents/planning/templateSelector.ts | 203 +++++++++++++++--- worker/agents/schemas.ts | 9 +- worker/api/controllers/agent/controller.ts | 15 +- worker/services/sandbox/BaseSandboxService.ts | 14 +- worker/services/sandbox/sandboxTypes.ts | 1 + 12 files changed, 230 insertions(+), 64 deletions(-) diff --git a/commitlint.config.js b/commitlint.config.js index 2f1da49f..522de8ef 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -22,10 +22,10 @@ export default { 'type-empty': [2, 'never'], 'subject-empty': [2, 'never'], 'subject-full-stop': [2, 'never', '.'], - 'header-max-length': [2, 'always', 100], + 'header-max-length': [2, 'always', 150], 'body-leading-blank': [1, 'always'], - 'body-max-line-length': [2, 'always', 100], + 'body-max-line-length': [2, 'always', 200], 'footer-leading-blank': [1, 'always'], - 'footer-max-line-length': [2, 'always', 100], + 'footer-max-line-length': [2, 'always', 200], }, }; diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index dd478cca..18f4dd53 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -184,11 +184,10 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl ); // Create build session for tools - // Note: AgenticCodingBehavior is currently used for 'app' type projects const session: BuildSession = { agent: this, filesIndex: Object.values(this.state.generatedFilesMap), - projectType: 'app' + projectType: this.state.projectType || 'app' }; // Create tool renderer for UI feedback diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 65a36ac1..54417cd1 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -6,7 +6,7 @@ import { } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; import { AgentState, BaseProjectState } from '../state'; -import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget } from '../types'; +import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; import { ProjectSetupAssistant } from '../../assistants/projectsetup'; @@ -73,7 +73,7 @@ export abstract class BaseCodingBehavior return this.state.behaviorType; } - constructor(infrastructure: AgentInfrastructure) { + constructor(infrastructure: AgentInfrastructure, protected projectType: ProjectType) { super(infrastructure); } diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 72c48ab3..49eb0cca 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -71,7 +71,6 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem ): Promise { await super.initialize(initArgs); const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; - const projectType = initArgs.projectType || this.state.projectType || 'app'; // Generate a blueprint this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); @@ -86,7 +85,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem templateDetails: templateInfo?.templateDetails, templateMetaInfo: templateInfo?.selection, images: initArgs.images, - projectType, + projectType: this.projectType, stream: { chunk_size: 256, onChunk: (chunk) => { @@ -118,7 +117,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem sessionId: sandboxSessionId!, hostname, inferenceContext, - projectType, + projectType: this.projectType, }; this.setState(nextState); // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index e1023278..dd4761ab 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -122,9 +122,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI } if (behaviorType === 'phasic') { - this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure); + this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure, projectType); } else { - this.behavior = new AgenticCodingBehavior(this as AgentInfrastructure); + this.behavior = new AgenticCodingBehavior(this as AgentInfrastructure, projectType); } // Create objective based on project type @@ -563,4 +563,26 @@ export class CodeGeneratorAgent extends Agent implements AgentI throw error; } } + + /** + * Cache GitHub OAuth token in memory for subsequent exports + * Token is ephemeral - lost on DO eviction + */ + setGitHubToken(token: string, username: string, ttl: number = 3600000): void { + this.objective.setGitHubToken(token, username, ttl); + } + + /** + * Get cached GitHub token if available and not expired + */ + getGitHubToken(): { token: string; username: string } | null { + return this.objective.getGitHubToken(); + } + + /** + * Clear cached GitHub token + */ + clearGitHubToken(): void { + this.objective.clearGitHubToken(); + } } diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index 381881fa..d0152ed2 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -30,8 +30,6 @@ interface BaseAgentInitArgs { images?: ProcessedImageAttachment[]; onBlueprintChunk: (chunk: string) => void; sandboxSessionId?: string; // Generated by CodeGeneratorAgent, passed to behavior - behaviorType?: BehaviorType; - projectType?: ProjectType; } /** Phasic agent initialization arguments */ diff --git a/worker/agents/index.ts b/worker/agents/index.ts index b4aacc21..26cb1091 100644 --- a/worker/agents/index.ts +++ b/worker/agents/index.ts @@ -74,9 +74,10 @@ export async function getTemplateForQuery( env: Env, inferenceContext: InferenceContext, query: string, + projectType: ProjectType | 'auto', images: ImageAttachment[] | undefined, logger: StructuredLogger, -) : Promise<{templateDetails: TemplateDetails, selection: TemplateSelection}> { +) : Promise<{templateDetails: TemplateDetails, selection: TemplateSelection, projectType: ProjectType}> { // Fetch available templates const templatesResponse = await SandboxSdkClient.listTemplates(); if (!templatesResponse || !templatesResponse.success) { @@ -87,6 +88,7 @@ export async function getTemplateForQuery( env, inferenceContext, query, + projectType, availableTemplates: templatesResponse.templates, images, }); @@ -110,5 +112,5 @@ export async function getTemplateForQuery( } const templateDetails = templateDetailsResponse.templateDetails; - return { templateDetails, selection: analyzeQueryResponse }; + return { templateDetails, selection: analyzeQueryResponse, projectType: analyzeQueryResponse.projectType }; } diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index c2bea73f..fecbaae7 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -1,47 +1,115 @@ import { createSystemMessage, createUserMessage, createMultiModalUserMessage } from '../inferutils/common'; -import { TemplateListResponse} from '../../services/sandbox/sandboxTypes'; +import { TemplateInfo } from '../../services/sandbox/sandboxTypes'; import { createLogger } from '../../logger'; import { executeInference } from '../inferutils/infer'; import { InferenceContext } from '../inferutils/config.types'; import { RateLimitExceededError, SecurityError } from 'shared/types/errors'; -import { TemplateSelection, TemplateSelectionSchema } from '../../agents/schemas'; +import { TemplateSelection, TemplateSelectionSchema, ProjectTypePredictionSchema } from '../../agents/schemas'; import { generateSecureToken } from 'worker/utils/cryptoUtils'; import type { ImageAttachment } from '../../types/image-attachment'; +import { ProjectType } from '../core/types'; const logger = createLogger('TemplateSelector'); interface SelectTemplateArgs { env: Env; query: string; - availableTemplates: TemplateListResponse['templates']; + projectType?: ProjectType | 'auto'; + availableTemplates: TemplateInfo[]; inferenceContext: InferenceContext; images?: ImageAttachment[]; } /** - * Uses AI to select the most suitable template for a given query. + * Predicts the project type from the user query */ -export async function selectTemplate({ env, query, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { - if (availableTemplates.length === 0) { - logger.info("No templates available for selection."); - return { selectedTemplateName: null, reasoning: "No templates were available to choose from.", useCase: null, complexity: null, styleSelection: null, projectName: '' }; - } - +async function predictProjectType( + env: Env, + query: string, + inferenceContext: InferenceContext, + images?: ImageAttachment[] +): Promise { try { - logger.info(`Asking AI to select a template for the ${retryCount} time`, { - query, - queryLength: query.length, - imagesCount: images?.length || 0, - availableTemplates: availableTemplates.map(t => t.name), - templateCount: availableTemplates.length + logger.info('Predicting project type from query', { queryLength: query.length }); + + const systemPrompt = `You are an Expert Project Type Classifier at Cloudflare. Your task is to analyze user requests and determine what type of project they want to build. + +## PROJECT TYPES: + +**app** - Full-stack web applications +- Interactive websites with frontend and backend +- Dashboards, games, social platforms, e-commerce sites +- Any application requiring user interface and interactivity +- Examples: "Build a todo app", "Create a gaming dashboard", "Make a blog platform" + +**workflow** - Backend workflows and APIs +- Server-side logic without UI +- API endpoints, cron jobs, webhooks +- Data processing, automation tasks +- Examples: "Create an API to process payments", "Build a webhook handler", "Automate data sync" + +**presentation** - Slides and presentation decks +- Slide-based content for presentations +- Marketing decks, pitch decks, educational slides +- Visual storytelling with slides +- Examples: "Create slides about AI", "Make a product pitch deck", "Build a presentation on climate change" + +## RULES: +- Default to 'app' when uncertain +- Choose 'workflow' only when explicitly about APIs, automation, or backend-only tasks +- Choose 'presentation' only when explicitly about slides, decks, or presentations +- Consider the presence of UI/visual requirements as indicator for 'app' +- High confidence when keywords are explicit, medium/low when inferring`; + + const userPrompt = `**User Request:** "${query}" + +**Task:** Determine the project type and provide: +1. Project type (app, workflow, or presentation) +2. Reasoning for your classification +3. Confidence level (high, medium, low) + +Analyze the request carefully and classify accordingly.`; + + const userMessage = images && images.length > 0 + ? createMultiModalUserMessage( + userPrompt, + images.map(img => `data:${img.mimeType};base64,${img.base64Data}`), + 'high' + ) + : createUserMessage(userPrompt); + + const messages = [ + createSystemMessage(systemPrompt), + userMessage + ]; + + const { object: prediction } = await executeInference({ + env, + messages, + agentActionName: "templateSelection", // Reuse existing agent action + schema: ProjectTypePredictionSchema, + context: inferenceContext, + maxTokens: 500, + }); + + logger.info(`Predicted project type: ${prediction.projectType} (${prediction.confidence} confidence)`, { + reasoning: prediction.reasoning }); - const validTemplateNames = availableTemplates.map(t => t.name); + return prediction.projectType; - const templateDescriptions = availableTemplates.map((t, index) => - `### Template #${index + 1} \n Name - ${t.name} \n Language: ${t.language}, Frameworks: ${t.frameworks?.join(', ') || 'None'}\n Description: \`\`\`${t.description.selection}\`\`\`` - ).join('\n\n'); + } catch (error) { + logger.error("Error predicting project type, defaulting to 'app':", error); + return 'app'; + } +} - const systemPrompt = `You are an Expert Software Architect at Cloudflare specializing in template selection for rapid development. Your task is to select the most suitable starting template based on user requirements. +/** + * Generates appropriate system prompt based on project type + */ +function getSystemPromptForProjectType(projectType: ProjectType): string { + if (projectType === 'app') { + // Keep the detailed, original prompt for apps + return `You are an Expert Software Architect at Cloudflare specializing in template selection for rapid development. Your task is to select the most suitable starting template based on user requirements. ## SELECTION EXAMPLES: @@ -85,7 +153,83 @@ Reasoning: "Social template provides user interactions, content sharing, and com - Ignore misleading template names - analyze actual features - **ONLY** Choose from the list of available templates - Focus on functionality over naming conventions -- Provide clear, specific reasoning for selection` +- Provide clear, specific reasoning for selection`; + } + + // Simpler, more general prompts for workflow and presentation + return `You are an Expert Template Selector at Cloudflare. Your task is to select the most suitable ${projectType} template based on user requirements. + +## PROJECT TYPE: ${projectType.toUpperCase()} + +## SELECTION CRITERIA: +1. **Best Match** - Template that best fits the user's requirements +2. **Feature Alignment** - Templates with relevant functionality +3. **Minimal Modification** - Template requiring least customization + +## RULES: +- ALWAYS select a template from the available list +- Analyze template descriptions carefully +- **ONLY** Choose from the provided templates +- Provide clear reasoning for your selection`; +} + +/** + * Uses AI to select the most suitable template for a given query. + */ +export async function selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { + // Step 1: Predict project type if 'auto' + let actualProjectType: ProjectType = projectType === 'auto' + ? await predictProjectType(env, query, inferenceContext, images) + : (projectType || 'app') as ProjectType; + + logger.info(`Using project type: ${actualProjectType}${projectType === 'auto' ? ' (auto-detected)' : ''}`); + + // Step 2: Filter templates by project type + const filteredTemplates = availableTemplates.filter(t => t.projectType === actualProjectType); + + if (filteredTemplates.length === 0) { + logger.warn(`No templates available for project type: ${actualProjectType}`); + return { + selectedTemplateName: null, + reasoning: `No templates were available for project type: ${actualProjectType}`, + useCase: null, + complexity: null, + styleSelection: null, + projectType: actualProjectType || 'app' + }; + } + + // Step 3: Skip template selection if only 1 template for workflow/presentation + if ((actualProjectType === 'workflow' || actualProjectType === 'presentation') && filteredTemplates.length === 1) { + logger.info(`Only one ${actualProjectType} template available, auto-selecting: ${filteredTemplates[0].name}`); + return { + selectedTemplateName: filteredTemplates[0].name, + reasoning: `Auto-selected the only available ${actualProjectType} template`, + useCase: 'General', + complexity: 'simple', + styleSelection: null, + projectType: actualProjectType + }; + } + + try { + logger.info(`Asking AI to select a template for the ${retryCount} time`, { + query, + projectType: actualProjectType, + queryLength: query.length, + imagesCount: images?.length || 0, + availableTemplates: filteredTemplates.map(t => t.name), + templateCount: filteredTemplates.length + }); + + const validTemplateNames = filteredTemplates.map(t => t.name); + + const templateDescriptions = filteredTemplates.map((t, index) => + `### Template #${index + 1} \n Name - ${t.name} \n Language: ${t.language}, Frameworks: ${t.frameworks?.join(', ') || 'None'}\n Description: \`\`\`${t.description.selection}\`\`\`` + ).join('\n\n'); + + // Step 4: Perform AI-based template selection + const systemPrompt = getSystemPromptForProjectType(actualProjectType as ProjectType) const userPrompt = `**User Request:** "${query}" @@ -97,8 +241,8 @@ Template detail: ${templateDescriptions} **Task:** Select the most suitable template and provide: 1. Template name (exact match from list) 2. Clear reasoning for why it fits the user's needs -3. Appropriate style for the project type. Try to come up with unique styles that might look nice and unique. Be creative about your choices. But don't pick brutalist all the time. -4. Descriptive project name +${actualProjectType === 'app' ? '3. Appropriate style for the project type. Try to come up with unique styles that might look nice and unique. Be creative about your choices. But don\'t pick brutalist all the time.' : ''} +${actualProjectType === 'app' ? '4' : '3'}. Descriptive project name Analyze each template's features, frameworks, and architecture to make the best match. ${images && images.length > 0 ? `\n**Note:** User provided ${images.length} image(s) - consider visual requirements and UI style from the images.` : ''} @@ -128,7 +272,12 @@ ENTROPY SEED: ${generateSecureToken(64)} - for unique results`; }); logger.info(`AI template selection result: ${selection.selectedTemplateName || 'None'}, Reasoning: ${selection.reasoning}`); - return selection; + + // Ensure projectType is set correctly + return { + ...selection, + projectType: actualProjectType + }; } catch (error) { logger.error("Error during AI template selection:", error); @@ -137,9 +286,9 @@ ENTROPY SEED: ${generateSecureToken(64)} - for unique results`; } if (retryCount > 0) { - return selectTemplate({ env, query, availableTemplates, inferenceContext, images }, retryCount - 1); + return selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }, retryCount - 1); } // Fallback to no template selection in case of error - return { selectedTemplateName: null, reasoning: "An error occurred during the template selection process.", useCase: null, complexity: null, styleSelection: null, projectName: '' }; + return { selectedTemplateName: null, reasoning: "An error occurred during the template selection process.", useCase: null, complexity: null, styleSelection: null, projectType: actualProjectType }; } } \ No newline at end of file diff --git a/worker/agents/schemas.ts b/worker/agents/schemas.ts index 7ba540fe..48122085 100644 --- a/worker/agents/schemas.ts +++ b/worker/agents/schemas.ts @@ -1,5 +1,12 @@ import z from 'zod'; +// Schema for AI project type prediction +export const ProjectTypePredictionSchema = z.object({ + projectType: z.enum(['app', 'workflow', 'presentation']).describe('The predicted type of project based on the user query'), + reasoning: z.string().describe('Brief explanation for why this project type was selected'), + confidence: z.enum(['high', 'medium', 'low']).describe('Confidence level in the prediction'), +}); + // Schema for AI template selection output export const TemplateSelectionSchema = z.object({ selectedTemplateName: z.string().nullable().describe('The name of the most suitable template, or null if none are suitable.'), @@ -7,7 +14,7 @@ export const TemplateSelectionSchema = z.object({ useCase: z.enum(['SaaS Product Website', 'Dashboard', 'Blog', 'Portfolio', 'E-Commerce', 'General', 'Other']).describe('The use case for which the template is selected, if applicable.').nullable(), complexity: z.enum(['simple', 'moderate', 'complex']).describe('The complexity of developing the project based on the the user query').nullable(), styleSelection: z.enum(['Minimalist Design', 'Brutalism', 'Retro', 'Illustrative', 'Kid_Playful', 'Custom']).describe('Pick a style relevant to the user query').nullable(), - projectName: z.string().describe('The name of the project based on the user query'), + projectType: z.enum(['app', 'workflow', 'presentation']).default('app').describe('The type of project based on the user query'), }); export const FileOutputSchema = z.object({ diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index 9b1ae22d..e6fe7144 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -34,8 +34,8 @@ const resolveBehaviorType = (body: CodeGenArgs): BehaviorType => { return body.agentMode === 'smart' ? 'agentic' : 'phasic'; }; -const resolveProjectType = (body: CodeGenArgs): ProjectType => { - return body.projectType || defaultCodeGenArgs.projectType || 'app'; +const resolveProjectType = (body: CodeGenArgs): ProjectType | 'auto' => { + return body.projectType || defaultCodeGenArgs.projectType || 'auto'; }; @@ -95,10 +95,7 @@ export class CodingAgentController extends BaseController { const projectType = resolveProjectType(body); // Fetch all user model configs, api keys and agent instance at once - const [userConfigsRecord, agentInstance] = await Promise.all([ - modelConfigService.getUserModelConfigs(user.id), - getAgentStub(env, agentId, { behaviorType, projectType }) - ]); + const userConfigsRecord = await modelConfigService.getUserModelConfigs(user.id); // Convert Record to Map and extract only ModelConfig properties const userModelConfigs = new Map(); @@ -126,8 +123,9 @@ export class CodingAgentController extends BaseController { this.logger.info(`Initialized inference context for user ${user.id}`, { modelConfigsCount: Object.keys(userModelConfigs).length, }); + this.logger.info(`Creating project of type: ${projectType}`); - const { templateDetails, selection } = await getTemplateForQuery(env, inferenceContext, query, body.images, this.logger); + const { templateDetails, selection, projectType: finalProjectType } = await getTemplateForQuery(env, inferenceContext, query, projectType, body.images, this.logger); const websocketUrl = `${url.protocol === 'https:' ? 'wss:' : 'ws:'}//${url.host}/api/agent/${agentId}/ws`; const httpStatusUrl = `${url.origin}/api/agent/${agentId}`; @@ -149,6 +147,7 @@ export class CodingAgentController extends BaseController { files: getTemplateImportantFiles(templateDetails), } }); + const agentInstance = await getAgentStub(env, agentId, { behaviorType, projectType: finalProjectType }); const agentPromise = agentInstance.initialize({ query, @@ -160,8 +159,6 @@ export class CodingAgentController extends BaseController { onBlueprintChunk: (chunk: string) => { writer.write({chunk}); }, - behaviorType, - projectType, templateInfo: { templateDetails, selection }, }) as Promise; agentPromise.then(async (_state: AgentState) => { diff --git a/worker/services/sandbox/BaseSandboxService.ts b/worker/services/sandbox/BaseSandboxService.ts index f69eaa23..317c04c5 100644 --- a/worker/services/sandbox/BaseSandboxService.ts +++ b/worker/services/sandbox/BaseSandboxService.ts @@ -28,6 +28,7 @@ import { GetLogsResponse, ListInstancesResponse, TemplateDetails, + TemplateInfo, } from './sandboxTypes'; import { createObjectLogger, StructuredLogger } from '../../logger'; @@ -46,16 +47,6 @@ export interface StreamEvent { error?: string; timestamp: Date; } - -export interface TemplateInfo { - name: string; - language?: string; - frameworks?: string[]; - description: { - selection: string; - usage: string; - }; -} const templateDetailsCache: Record = {}; @@ -101,7 +92,8 @@ export abstract class BaseSandboxService { name: t.name, language: t.language, frameworks: t.frameworks || [], - description: t.description + description: t.description, + projectType: t.projectType || 'app' })), count: filteredTemplates.length }; diff --git a/worker/services/sandbox/sandboxTypes.ts b/worker/services/sandbox/sandboxTypes.ts index a5ab96ab..29000152 100644 --- a/worker/services/sandbox/sandboxTypes.ts +++ b/worker/services/sandbox/sandboxTypes.ts @@ -102,6 +102,7 @@ export const TemplateInfoSchema = z.object({ name: z.string(), language: z.string().optional(), frameworks: z.array(z.string()).optional(), + projectType: z.enum(['app', 'workflow', 'presentation']).default('app'), description: z.object({ selection: z.string(), usage: z.string(), From 7db6ca2a7d8f9f6e418e38379a5e25f0caaf5c0d Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:19:19 -0500 Subject: [PATCH 28/58] fix: template initialization - Initialize template cache during agent setup to avoid redundant fetches - Remove redundant project name prompt from template selection - Clean up default projectType fallback logic --- worker/agents/core/behaviors/base.ts | 7 ++++++- worker/agents/git/git.ts | 2 +- worker/agents/planning/templateSelector.ts | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 54417cd1..225b2b59 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -78,10 +78,15 @@ export abstract class BaseCodingBehavior } public async initialize( - _initArgs: AgentInitArgs, + initArgs: AgentInitArgs, ..._args: unknown[] ): Promise { this.logger.info("Initializing agent"); + const {templateInfo} = initArgs; + if (templateInfo) { + this.templateDetailsCache = templateInfo.templateDetails; + } + await this.ensureTemplateDetails(); return this.state; } diff --git a/worker/agents/git/git.ts b/worker/agents/git/git.ts index f9e79c9c..29a5acd9 100644 --- a/worker/agents/git/git.ts +++ b/worker/agents/git/git.ts @@ -93,7 +93,7 @@ export class GitVersionControl { } } - console.log(`[Git] Staged ${files.length} files`, files); + console.log(`[Git] Staged ${files.length} files: ${files.map(f => f.filePath).join(', ')}`); } private normalizePath(path: string): string { diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index fecbaae7..0660b040 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -195,7 +195,7 @@ export async function selectTemplate({ env, query, projectType, availableTemplat useCase: null, complexity: null, styleSelection: null, - projectType: actualProjectType || 'app' + projectType: actualProjectType }; } @@ -242,7 +242,6 @@ Template detail: ${templateDescriptions} 1. Template name (exact match from list) 2. Clear reasoning for why it fits the user's needs ${actualProjectType === 'app' ? '3. Appropriate style for the project type. Try to come up with unique styles that might look nice and unique. Be creative about your choices. But don\'t pick brutalist all the time.' : ''} -${actualProjectType === 'app' ? '4' : '3'}. Descriptive project name Analyze each template's features, frameworks, and architecture to make the best match. ${images && images.length > 0 ? `\n**Note:** User provided ${images.length} image(s) - consider visual requirements and UI style from the images.` : ''} From 318f6e2620654e3c442c5926c84a296bd940d619 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:33:40 -0500 Subject: [PATCH 29/58] fix: wire up onConnect to coding agent --- worker/agents/core/behaviors/base.ts | 13 ++----------- worker/agents/core/codingAgent.ts | 12 ++++++++++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 225b2b59..b59bc2f0 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -1,11 +1,11 @@ -import { Connection, ConnectionContext } from 'agents'; +import { Connection } from 'agents'; import { FileConceptType, FileOutputType, Blueprint, } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; -import { AgentState, BaseProjectState } from '../state'; +import { BaseProjectState } from '../state'; import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; @@ -34,7 +34,6 @@ import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; import { AgentComponent } from '../AgentComponent'; import type { AgentInfrastructure } from '../AgentCore'; -import { sendToConnection } from '../websocket'; import { GitVersionControl } from '../../git'; export interface BaseCodingOperations { @@ -111,14 +110,6 @@ export abstract class BaseCodingBehavior } onStateUpdate(_state: TState, _source: "server" | Connection) {} - onConnect(connection: Connection, ctx: ConnectionContext) { - this.logger.info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); - sendToConnection(connection, 'agent_connected', { - state: this.state as unknown as AgentState, - templateDetails: this.getTemplateDetails() - }); - } - async ensureTemplateDetails() { if (!this.templateDetailsCache) { this.logger.info(`Loading template details for: ${this.state.templateName}`); diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index dd4761ab..ae574b5c 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -1,4 +1,4 @@ -import { Agent, AgentContext } from "agents"; +import { Agent, AgentContext, ConnectionContext } from "agents"; import { AgentInitArgs, AgentSummary, BehaviorType, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget } from "./types"; import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; import { Blueprint } from "../schemas"; @@ -15,7 +15,7 @@ import { SqlExecutor } from '../git'; import { AgentInfrastructure } from "./AgentCore"; import { ProjectType } from './types'; import { Connection } from 'agents'; -import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections } from './websocket'; +import { handleWebSocketMessage, handleWebSocketClose, broadcastToConnections, sendToConnection } from './websocket'; import { WebSocketMessageData, WebSocketMessageType } from "worker/api/websocketTypes"; import { PreviewType, TemplateDetails } from "worker/services/sandbox/sandboxTypes"; import { WebSocketMessageResponses } from "../constants"; @@ -218,6 +218,14 @@ export class CodeGeneratorAgent extends Agent implements AgentI await this.behavior.ensureTemplateDetails(); this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart processed successfully`); } + + onConnect(connection: Connection, ctx: ConnectionContext) { + this.logger().info(`Agent connected for agent ${this.getAgentId()}`, { connection, ctx }); + sendToConnection(connection, 'agent_connected', { + state: this.state, + templateDetails: this.behavior.getTemplateDetails() + }); + } private initLogger(agentId: string, userId: string, sessionId?: string) { this._logger = createObjectLogger(this, 'CodeGeneratorAgent'); From 1e49bb365c83b9e2fdebf76d36b9401479121cdc Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 10:39:26 -0500 Subject: [PATCH 30/58] feat: improve GitHub Actions workflow reliability - Added concurrency control to prevent duplicate workflow runs on the same PR - Replaced Claude-based comment cleanup with direct GitHub API deletion for better reliability - Enhanced code debugger instructions to handle Vite dev server restarts and config file restrictions --- .github/workflows/claude-reviews.yml | 65 ++++++++++-------------- worker/agents/assistants/codeDebugger.ts | 3 +- 2 files changed, 29 insertions(+), 39 deletions(-) diff --git a/.github/workflows/claude-reviews.yml b/.github/workflows/claude-reviews.yml index f85694c1..3db866ad 100644 --- a/.github/workflows/claude-reviews.yml +++ b/.github/workflows/claude-reviews.yml @@ -8,6 +8,10 @@ on: pull_request_review_comment: types: [created] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: comprehensive-review: name: PR Description & Code Review @@ -30,6 +34,29 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + + - name: Delete Previous Claude Comments + run: | + echo "🧹 Deleting previous Claude comments from github-actions bot..." + + # Get all comments from github-actions bot containing 'Claude' + CLAUDE_COMMENTS=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments \ + --jq '[.[] | select(.user.login == "github-actions[bot]") | select(.body | contains("Claude")) | .id]') + + if [ "$CLAUDE_COMMENTS" = "[]" ] || [ -z "$CLAUDE_COMMENTS" ]; then + echo "No previous Claude comments found" + else + echo "Found Claude comments to delete:" + echo "$CLAUDE_COMMENTS" | jq -r '.[]' | while read comment_id; do + echo "Deleting comment $comment_id" + gh api repos/${{ github.repository }}/issues/comments/$comment_id -X DELETE || echo "Failed to delete comment $comment_id" + done + echo "✅ Deleted previous Claude comments" + fi + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + continue-on-error: true + - name: Detect Critical Paths id: critical_paths run: | @@ -147,41 +174,3 @@ jobs: --max-turns ${{ steps.critical_paths.outputs.is_critical == 'true' && '90' || '65' }} --model claude-sonnet-4-5-20250929 - - name: Intelligent Comment Cleanup - uses: anthropics/claude-code-action@v1 - if: always() - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} - prompt: | - Clean up stale bot comments on PR #${{ github.event.pull_request.number }}. - - **Task:** - 1. Fetch all comments on this PR - 2. Identify bot comments (users ending in [bot]) that are stale/outdated: - - Old reviews superseded by newer ones - - Old PR description suggestions - - Previously collapsed/outdated markers - - Progress/status comments from previous workflow runs - 3. Keep only the most recent comment per category per bot - 4. DELETE all stale comments (do not collapse) - - **Get all comments:** - ```bash - gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments --jq '.[] | {id, user: .user.login, body, created_at}' - ``` - - **Delete a comment:** - ```bash - gh api repos/${{ github.repository }}/issues/comments/COMMENT_ID -X DELETE - ``` - - Be intelligent: - - Preserve the newest useful comment in each category - - Delete everything else that's redundant or stale - - If unsure, keep the comment (conservative approach) - - claude_args: | - --allowed-tools "Bash(gh api repos/*/issues/*/comments:*),Bash(gh api repos/*/issues/comments/*:*)" - --max-turns 8 - --model claude-haiku-4-5-20251001 diff --git a/worker/agents/assistants/codeDebugger.ts b/worker/agents/assistants/codeDebugger.ts index 45157ad8..586f3541 100644 --- a/worker/agents/assistants/codeDebugger.ts +++ b/worker/agents/assistants/codeDebugger.ts @@ -360,6 +360,7 @@ deploy_preview({ clearLogs: true }) - Always check timestamps vs. your deploy times - Cross-reference with get_runtime_errors and actual code - Don't fix issues that were already resolved + - Ignore server restarts - It is a vite dev server running, so it will restart on every source modification. This is normal. - **Before regenerate_file**: Read current code to confirm bug exists - **After regenerate_file**: Check diff to verify correctness @@ -396,7 +397,7 @@ deploy_preview({ clearLogs: true }) - **React**: render loops (state-in-render, missing deps, unstable Zustand selectors) - **Import/export**: named vs default inconsistency - **Type safety**: maintain strict TypeScript compliance -- **Configuration files**: Never try to edit wrangler.jsonc or package.json +- **Configuration files**: Never try to edit wrangler.jsonc, vite.config.ts or package.json **⚠️ CRITICAL: Do NOT "Optimize" Zustand Selectors** If you see this pattern - **LEAVE IT ALONE** (it's already optimal): From 8210b9fe8ab2dc31784b1328d25f4b9fc5d52122 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 11:38:09 -0500 Subject: [PATCH 31/58] refactor: improve type safety in state migration logic - Replaced unsafe type assertions with proper type guards for legacy state detection - Added explicit type definitions for deprecated state fields and legacy file formats - Eliminated all 'any' types while maintaining backward compatibility with legacy states --- worker/agents/core/behaviors/base.ts | 2 +- worker/agents/core/stateMigration.ts | 75 ++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index b59bc2f0..233fa906 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -750,7 +750,7 @@ export abstract class BaseCodingBehavior async execCommands(commands: string[], shouldSave: boolean, timeout?: number): Promise { const { sandboxInstanceId } = this.state; if (!sandboxInstanceId) { - return { success: false, results: [], error: 'No sandbox instance' } as any; + return { success: false, results: [], error: 'No sandbox instance' }; } const result = await this.getSandboxServiceClient().executeCommands(sandboxInstanceId, commands, timeout); if (shouldSave) { diff --git a/worker/agents/core/stateMigration.ts b/worker/agents/core/stateMigration.ts index e6a7bac9..d77dd2dc 100644 --- a/worker/agents/core/stateMigration.ts +++ b/worker/agents/core/stateMigration.ts @@ -4,25 +4,53 @@ import { TemplateDetails } from 'worker/services/sandbox/sandboxTypes'; import { generateNanoId } from '../../utils/idGenerator'; import { generateProjectName } from '../utils/templateCustomizer'; +// Type guards for legacy state detection +type LegacyFileFormat = { + file_path?: string; + file_contents?: string; + file_purpose?: string; +}; + +type StateWithDeprecatedFields = AgentState & { + latestScreenshot?: unknown; + templateDetails?: TemplateDetails; + agentMode?: string; +}; + +function hasLegacyFileFormat(file: unknown): file is LegacyFileFormat { + if (typeof file !== 'object' || file === null) return false; + return 'file_path' in file || 'file_contents' in file || 'file_purpose' in file; +} + +function hasField(state: AgentState, key: K): state is AgentState & Record { + return key in state; +} + +function isStateWithTemplateDetails(state: AgentState): state is StateWithDeprecatedFields & { templateDetails: TemplateDetails } { + return 'templateDetails' in state; +} + +function isStateWithAgentMode(state: AgentState): state is StateWithDeprecatedFields & { agentMode: string } { + return 'agentMode' in state; +} + export class StateMigration { static migrateIfNeeded(state: AgentState, logger: StructuredLogger): AgentState | null { let needsMigration = false; - const legacyState = state as unknown as Record; //------------------------------------------------------------------------------------ // Migrate files from old schema //------------------------------------------------------------------------------------ - const migrateFile = (file: any): any => { - const hasOldFormat = 'file_path' in file || 'file_contents' in file || 'file_purpose' in file; - - if (hasOldFormat) { + const migrateFile = (file: FileState | unknown): FileState => { + if (hasLegacyFileFormat(file)) { return { - filePath: file.filePath || file.file_path, - fileContents: file.fileContents || file.file_contents, - filePurpose: file.filePurpose || file.file_purpose, + filePath: (file as FileState).filePath || file.file_path || '', + fileContents: (file as FileState).fileContents || file.file_contents || '', + filePurpose: (file as FileState).filePurpose || file.file_purpose || '', + lastDiff: (file as FileState).lastDiff || '', }; } - return file; + return file as FileState; }; const migratedFilesMap: Record = {}; @@ -127,19 +155,21 @@ export class StateMigration { ...migratedInferenceContext }; - delete (migratedInferenceContext as any).userApiKeys; + // Remove the deprecated field using type assertion + const contextWithLegacyField = migratedInferenceContext as unknown as Record; + delete contextWithLegacyField.userApiKeys; needsMigration = true; } //------------------------------------------------------------------------------------ // Migrate deprecated props //------------------------------------------------------------------------------------ - const stateHasDeprecatedProps = 'latestScreenshot' in (state as any); + const stateHasDeprecatedProps = hasField(state, 'latestScreenshot'); if (stateHasDeprecatedProps) { needsMigration = true; } - const stateHasProjectUpdatesAccumulator = 'projectUpdatesAccumulator' in (state as any); + const stateHasProjectUpdatesAccumulator = hasField(state, 'projectUpdatesAccumulator'); if (!stateHasProjectUpdatesAccumulator) { needsMigration = true; } @@ -148,10 +178,9 @@ export class StateMigration { // Migrate templateDetails -> templateName //------------------------------------------------------------------------------------ let migratedTemplateName = state.templateName; - const hasTemplateDetails = 'templateDetails' in (state as any); + const hasTemplateDetails = isStateWithTemplateDetails(state); if (hasTemplateDetails) { - const templateDetails = (state as any).templateDetails; - migratedTemplateName = (templateDetails as TemplateDetails).name; + migratedTemplateName = state.templateDetails.name; needsMigration = true; logger.info('Migrating templateDetails to templateName', { templateName: migratedTemplateName }); } @@ -172,15 +201,16 @@ export class StateMigration { } let migratedProjectType = state.projectType; - if (!('projectType' in legacyState) || !migratedProjectType) { + const hasProjectType = hasField(state, 'projectType'); + if (!hasProjectType || !migratedProjectType) { migratedProjectType = 'app'; needsMigration = true; logger.info('Adding default projectType for legacy state', { projectType: migratedProjectType }); } let migratedBehaviorType = state.behaviorType; - if ('agentMode' in legacyState) { - const legacyAgentMode = (legacyState as { agentMode?: string }).agentMode; + if (isStateWithAgentMode(state)) { + const legacyAgentMode = state.agentMode; const nextBehaviorType = legacyAgentMode === 'smart' ? 'agentic' : 'phasic'; if (nextBehaviorType !== migratedBehaviorType) { migratedBehaviorType = nextBehaviorType; @@ -212,14 +242,15 @@ export class StateMigration { } as AgentState; // Remove deprecated fields + const stateWithDeprecated = newState as StateWithDeprecatedFields; if (stateHasDeprecatedProps) { - delete (newState as any).latestScreenshot; + delete stateWithDeprecated.latestScreenshot; } if (hasTemplateDetails) { - delete (newState as any).templateDetails; + delete stateWithDeprecated.templateDetails; } - if ('agentMode' in legacyState) { - delete (newState as any).agentMode; + if (isStateWithAgentMode(state)) { + delete stateWithDeprecated.agentMode; } return newState; From 2a2d86c6d2afe45b4445e70d617e39d3367fd90d Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 10 Nov 2025 11:46:59 -0500 Subject: [PATCH 32/58] fix: add optional chaining to prevent runtime errors in blueprint rendering --- src/routes/chat/components/blueprint.tsx | 12 ++++++------ worker/agents/assistants/agenticProjectBuilder.ts | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/routes/chat/components/blueprint.tsx b/src/routes/chat/components/blueprint.tsx index 40fc6e0c..bf8bf40c 100644 --- a/src/routes/chat/components/blueprint.tsx +++ b/src/routes/chat/components/blueprint.tsx @@ -89,13 +89,13 @@ export function Blueprint({
{/* Views */} - {phasicBlueprint && phasicBlueprint.views.length > 0 && ( + {phasicBlueprint && phasicBlueprint.views?.length > 0 && (

Views

- {phasicBlueprint.views.map((view, index) => ( + {phasicBlueprint.views?.map((view, index) => (

{view.name} @@ -165,13 +165,13 @@ export function Blueprint({ )} {/* Implementation Roadmap */} - {phasicBlueprint && phasicBlueprint.implementationRoadmap.length > 0 && ( + {phasicBlueprint && phasicBlueprint.implementationRoadmap?.length > 0 && (

Implementation Roadmap

- {phasicBlueprint.implementationRoadmap.map((roadmapItem, index) => ( + {phasicBlueprint.implementationRoadmap?.map((roadmapItem, index) => (

Phase {index + 1}: {roadmapItem.phase} @@ -220,14 +220,14 @@ export function Blueprint({ )} {/* Pitfalls */} - {phasicBlueprint && phasicBlueprint.pitfalls.length > 0 && ( + {phasicBlueprint && phasicBlueprint.pitfalls?.length > 0 && (

Pitfalls

    - {phasicBlueprint.pitfalls.map((pitfall, index) => ( + {phasicBlueprint.pitfalls?.map((pitfall, index) => (
  • {pitfall}
    • diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 01ba66d8..9c22fdf1 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -52,7 +52,6 @@ Build a complete, functional, polished project from the user's requirements usin - **Testing**: Sandbox/Container preview with live reload ## Platform Constraints -- **NEVER edit wrangler.jsonc or package.json** - these are locked - **Only use dependencies from project's package.json** - no others exist - All projects run in Cloudflare Workers environment - **No Node.js APIs** (no fs, path, process, etc.) From 45eb5c087d3b42651027516edd8c4be34958fc13 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 00:10:51 -0500 Subject: [PATCH 33/58] feat: general agent --- .../assistants/agenticProjectBuilder.ts | 335 ++++++------------ worker/agents/core/behaviors/agentic.ts | 44 +-- worker/agents/core/behaviors/base.ts | 91 ++++- worker/agents/core/behaviors/phasic.ts | 8 +- worker/agents/core/codingAgent.ts | 54 +-- worker/agents/core/objectives/general.ts | 38 ++ worker/agents/core/types.ts | 2 +- worker/agents/index.ts | 20 +- worker/agents/planning/blueprint.ts | 5 + worker/agents/planning/templateSelector.ts | 13 +- worker/agents/schemas.ts | 4 +- .../services/interfaces/ICodingAgent.ts | 8 +- worker/agents/tools/customTools.ts | 82 +++-- .../agents/tools/toolkit/alter-blueprint.ts | 99 +++--- .../tools/toolkit/generate-blueprint.ts | 56 +++ .../agents/tools/toolkit/generate-images.ts | 35 ++ .../agents/tools/toolkit/initialize-slides.ts | 46 +++ worker/agents/utils/templates.ts | 21 ++ worker/api/controllers/agent/controller.ts | 47 ++- worker/api/controllers/agent/types.ts | 6 +- 20 files changed, 623 insertions(+), 391 deletions(-) create mode 100644 worker/agents/core/objectives/general.ts create mode 100644 worker/agents/tools/toolkit/generate-blueprint.ts create mode 100644 worker/agents/tools/toolkit/generate-images.ts create mode 100644 worker/agents/tools/toolkit/initialize-slides.ts create mode 100644 worker/agents/utils/templates.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 9c22fdf1..e5c665a6 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -8,13 +8,13 @@ import { executeInference } from '../inferutils/infer'; import { InferenceContext, ModelConfig } from '../inferutils/config.types'; import { createObjectLogger } from '../../logger'; import { AGENT_CONFIG } from '../inferutils/config'; -import { buildDebugTools } from '../tools/customTools'; +import { buildAgenticBuilderTools } from '../tools/customTools'; import { RenderToolCall } from '../operations/UserConversationProcessor'; import { PROMPT_UTILS } from '../prompts'; import { FileState } from '../core/state'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { ProjectType } from '../core/types'; -import { Blueprint } from '../schemas'; +import { Blueprint, AgenticBlueprint } from '../schemas'; export type BuildSession = { filesIndex: FileState[]; @@ -29,210 +29,77 @@ export type BuildInputs = { }; /** - * Get base system prompt with project type specific instructions + * Build a rich, dynamic system prompt similar in rigor to DeepCodeDebugger, + * but oriented for autonomous building. Avoids leaking internal taxonomy. */ -const getSystemPrompt = (projectType: ProjectType): string => { - const baseInstructions = `You are an elite Autonomous Project Builder at Cloudflare, specialized in building complete, production-ready applications using an LLM-driven tool-calling approach. - -## CRITICAL: Communication Mode -**You have EXTREMELY HIGH reasoning capability. Use it strategically.** -- Conduct analysis and planning INTERNALLY -- Output should be CONCISE but informative: status updates, key decisions, and tool calls -- NO lengthy thought processes or verbose play-by-play narration -- Think deeply internally → Act decisively externally → Report progress clearly - -## Your Mission -Build a complete, functional, polished project from the user's requirements using available tools. You orchestrate the entire build process autonomously - from scaffolding to deployment to verification. - -## Platform Environment -- **Runtime**: Cloudflare Workers (V8 isolates, not Node.js) -- **Language**: TypeScript -- **Build Tool**: Vite (for frontend projects) -- **Deployment**: wrangler to Cloudflare edge -- **Testing**: Sandbox/Container preview with live reload - -## Platform Constraints -- **Only use dependencies from project's package.json** - no others exist -- All projects run in Cloudflare Workers environment -- **No Node.js APIs** (no fs, path, process, etc.) - -## Available Tools - -**File Management:** -- **generate_files**: Create new files or rewrite existing files - - Use for scaffolding components, utilities, API routes, pages - - Requires: phase_name, phase_description, requirements[], files[] - - Automatically commits changes to git - - This is your PRIMARY tool for building the project - -- **regenerate_file**: Make surgical fixes to existing files - - Use for targeted bug fixes and updates - - Requires: path, issues[] - - Files are automatically staged (need manual commit with git tool) - -- **read_files**: Read file contents (batch multiple for efficiency) - -**Deployment & Testing:** -- **deploy_preview**: Deploy to Cloudflare Workers preview - - REQUIRED before verification - - Use clearLogs=true to start fresh - - Deployment URL will be available for testing - -- **run_analysis**: Fast static analysis (lint + typecheck) - - Use FIRST for verification after generation - - No user interaction needed - - Catches syntax errors, type errors, import issues - -- **get_runtime_errors**: Recent runtime errors (requires user interaction with deployed app) -- **get_logs**: Cumulative logs (use sparingly, verbose, requires user interaction) - -**Commands & Git:** -- **exec_commands**: Execute shell commands from project root - - Use for installing dependencies (if needed), running tests, etc. - - Set shouldSave=true to persist changes - -- **git**: Version control (commit, log, show) - - Commit regularly with descriptive messages - - Use after significant milestones - -**Utilities:** -- **wait**: Sleep for N seconds (use after deploy to allow user interaction time) - -## Core Build Workflow - -1. **Understand Requirements**: Analyze user query and blueprint (if provided) -2. **Plan Structure**: Decide what files/components to create -3. **Scaffold Project**: Use generate_files to create initial structure -4. **Deploy & Test**: deploy_preview to verify in sandbox -5. **Verify Quality**: run_analysis for static checks -6. **Fix Issues**: Use regenerate_file or generate_files for corrections -7. **Commit Progress**: git commit with descriptive messages -8. **Iterate**: Repeat steps 4-7 until project is complete and polished -9. **Final Verification**: Comprehensive check before declaring complete - -## Critical Build Principles`; - - // Add project-type specific instructions - let typeSpecificInstructions = ''; - - if (projectType === 'app') { - typeSpecificInstructions = ` - -## Project Type: Full-Stack Web Application - -**Stack:** -- Frontend: React + Vite + TypeScript -- Backend: Cloudflare Workers (Durable Objects when needed) -- Styling: Tailwind CSS + shadcn/ui components -- State: Zustand for client state -- API: REST/JSON endpoints in Workers - -**CRITICAL: Visual Excellence Requirements** - -YOU MUST CREATE VISUALLY STUNNING APPLICATIONS. - -Every component must demonstrate: -- **Modern UI Design**: Clean, professional, beautiful interfaces -- **Perfect Spacing**: Harmonious padding, margins, and layout rhythm -- **Visual Hierarchy**: Clear information flow and structure -- **Interactive Polish**: Smooth hover states, transitions, micro-interactions -- **Responsive Excellence**: Flawless on mobile, tablet, and desktop -- **Professional Depth**: Thoughtful shadows, borders, and elevation -- **Color Harmony**: Consistent, accessible color schemes -- **Typography**: Clear hierarchy with perfect font sizes and weights - -${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} - -${PROMPT_UTILS.COMMON_PITFALLS} - -**Success Criteria for Apps:** -✅ All features work as specified -✅ Can be demoed immediately without errors -✅ Visually stunning and professional-grade -✅ Responsive across all device sizes -✅ No runtime errors or TypeScript issues -✅ Smooth interactions with proper feedback -✅ Code is clean, type-safe, and maintainable`; - - } else if (projectType === 'workflow') { - typeSpecificInstructions = ` - -## Project Type: Backend Workflow - -**Focus:** -- Backend-only Cloudflare Workers -- REST APIs, scheduled jobs, queue processing, webhooks, data pipelines -- No UI components needed -- Durable Objects for stateful workflows - -**Success Criteria for Workflows:** -✅ All endpoints/handlers work correctly -✅ Robust error handling and validation -✅ No runtime errors or TypeScript issues -✅ Clean, maintainable architecture -✅ Proper logging for debugging -✅ Type-safe throughout`; - - } else if (projectType === 'presentation') { - typeSpecificInstructions = ` - -## Project Type: Presentation/Slides - -**Stack:** -- Spectacle (React-based presentation library) -- Tailwind CSS for styling -- Web-based slides (can export to PDF) - -**Success Criteria for Presentations:** -✅ All slides implemented with content -✅ Visually stunning and engaging design -✅ Clear content hierarchy and flow -✅ Smooth transitions between slides -✅ No rendering or TypeScript errors -✅ Professional-grade visual polish`; - } - - const completionGuidelines = ` - -## Communication & Progress Updates - -**DO:** -- Report key milestones: "Scaffolding complete", "Deployment successful", "All tests passing" -- Explain critical decisions: "Using Zustand for state management because..." -- Share verification results: "Static analysis passed", "3 TypeScript errors found" -- Update on iterations: "Fixed rendering issue, redeploying..." - -**DON'T:** -- Output verbose thought processes -- Narrate every single step -- Repeat yourself unnecessarily -- Over-explain obvious actions - -## When You're Done - -**Success Completion:** -1. Write: "BUILD_COMPLETE: [brief summary]" -2. Provide final report: - - What was built (key files/features) - - Verification results (all checks passed) - - Deployment URL - - Any notes for the user -3. **CRITICAL: Once you write "BUILD_COMPLETE", IMMEDIATELY HALT with no more tool calls.** - -**If Stuck:** -1. State: "BUILD_STUCK: [reason]" + what you tried -2. **CRITICAL: Once you write "BUILD_STUCK", IMMEDIATELY HALT with no more tool calls.** - -## Working Style -- Use your internal reasoning capability - think deeply, output concisely -- Be decisive - analyze internally, act externally -- Focus on delivering working, polished results -- Quality through reasoning, not verbose output -- Build incrementally: scaffold → deploy → verify → fix → iterate - -The goal is a complete, functional, polished project. Think internally, act decisively, report progress.`; - - return baseInstructions + typeSpecificInstructions + completionGuidelines; +const getSystemPrompt = (dynamicHints: string): string => { + const persona = `You are an elite autonomous project builder with deep expertise in Cloudflare Workers (and Durable Objects as needed), TypeScript, Vite, and modern web application and content generation. You operate with extremely high reasoning capability. Think internally, act decisively, and report concisely.`; + + const comms = `CRITICAL: Communication Mode +- Perform all analysis, planning, and reasoning INTERNALLY +- Output should be CONCISE: brief status updates and tool calls only +- No verbose explanations or step-by-step narrations in output +- Think deeply internally → Act externally with tools → Report briefly`; + + const environment = `Project Environment +- Runtime: Cloudflare Workers (no Node.js fs/path/process) +- Fetch API standard (Request/Response), Web streams +- Frontend when applicable: React + Vite + TypeScript +- Deployments: wrangler → preview sandbox (live URL)`; + + const constraints = `Platform Constraints +- Prefer minimal dependencies; do not edit wrangler.jsonc or package.json unless necessary +- Logs and runtime errors are user-driven +- Paths are relative to project root; commands execute at project root; never use cd`; + + const toolsCatalog = `Available Tools & Usage Notes +- generate_blueprint: Produce initial PRD from the backend generator (plan for autonomous builds). Use FIRST if blueprint/plan is missing. +- alter_blueprint: Patch PRD fields (title, projectName, description, colorPalette, frameworks, plan). Use to refine after generation. +- generate_files: Create or rewrite multiple files for milestones. Be precise and include explicit file lists with purposes. +- regenerate_file: Apply targeted fixes to a single file. Prefer this for surgical changes before resorting to generate_files. +- read_files: Batch read code for analysis or confirmation. +- deploy_preview: Deploy only when a runtime exists (interactive UI, slide deck, or backend endpoints). Not for documents-only work. +- run_analysis: Lint + typecheck for verification. Use after deployment when a runtime is required; otherwise run locally for static code. +- get_runtime_errors / get_logs: Runtime diagnostics. Logs are cumulative; verify recency and avoid double-fixing. +- exec_commands: Execute commands sparingly; persist commands only when necessary. +- git: Commit, log, show; use clear conventional commit messages. +- initialize_slides: Import Spectacle and scaffold a deck when appropriate before deploying preview. +- generate_images: Stub for future image generation. Do not rely on it for critical paths.`; + + const protocol = `Execution Protocol +1) If blueprint or plan is missing → generate_blueprint. Then refine with alter_blueprint as needed. +2) Implement milestones via generate_files (or regenerate_file for targeted fixes). +3) When a runtime exists (UI/slides/backend endpoints), deploy_preview before verification. + - Documents-only: do NOT deploy; focus on content quality and structure. +4) Verify: run_analysis; then use runtime diagnostics (get_runtime_errors, get_logs) if needed. +5) Iterate: fix → commit → test until complete. +6) Finish with BUILD_COMPLETE: . If blocked, BUILD_STUCK: . Stop tool calls immediately after either.`; + + const quality = `Quality Bar +- Type-safe, minimal, and maintainable code +- Thoughtful architecture; avoid unnecessary config churn +- Professional visual polish for UI when applicable (spacing, hierarchy, interaction states, responsiveness)`; + + const reactSafety = `${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE}\n${PROMPT_UTILS.COMMON_PITFALLS}`; + + const completion = `Completion Discipline +- BUILD_COMPLETE: → stop +- BUILD_STUCK: → stop`; + + return [ + persona, + comms, + environment, + constraints, + toolsCatalog, + protocol, + quality, + 'Dynamic Guidance', + dynamicHints, + 'React/General Safety Notes', + reactSafety, + completion, + ].join('\n\n'); }; /** @@ -240,25 +107,12 @@ The goal is a complete, functional, polished project. Think internally, act deci */ const getUserPrompt = ( inputs: BuildInputs, - session: BuildSession, fileSummaries: string, templateInfo?: string ): string => { const { query, projectName, blueprint } = inputs; - const { projectType } = session; - - let projectTypeDescription = ''; - if (projectType === 'app') { - projectTypeDescription = 'Full-Stack Web Application (React + Vite + Cloudflare Workers)'; - } else if (projectType === 'workflow') { - projectTypeDescription = 'Backend Workflow (Cloudflare Workers)'; - } else if (projectType === 'presentation') { - projectTypeDescription = 'Presentation/Slides (Spectacle)'; - } - return `## Build Task **Project Name**: ${projectName} -**Project Type**: ${projectTypeDescription} **User Request**: ${query} ${blueprint ? `## Project Blueprint @@ -289,25 +143,25 @@ This is a new project. Start from the template or scratch.`} ## Your Mission -Build a complete, production-ready, ${projectType === 'app' ? 'visually stunning full-stack web application' : projectType === 'workflow' ? 'robust backend workflow' : 'visually stunning presentation'} that fulfills the user's request. +Build a complete, production-ready solution that best fulfills the request. If it needs a full web experience, build it. If it’s a backend workflow, implement it. If it’s narrative content, write documents; if slides are appropriate, build a deck and verify via preview. -**Approach:** -1. Understand requirements deeply -2. Plan the architecture${projectType === 'app' ? ' (frontend + backend)' : ''} -3. Scaffold the ${projectType === 'app' ? 'application' : 'project'} structure with generate_files -4. Deploy and test with deploy_preview -5. Verify with run_analysis -6. Fix any issues found -7. Polish ${projectType === 'app' ? 'the UI' : 'the code'} to perfection -8. Commit your work with git -9. Repeat until complete +**Approach (internal planning):** +1. Understand requirements and decide representation (UI, backend, slides, documents) +2. Generate PRD (if missing) and refine +3. Scaffold with generate_files, preferring regenerate_file for targeted edits +4. When a runtime exists: deploy_preview, then verify with run_analysis +5. Iterate and polish; commit meaningful checkpoints **Remember:** -${projectType === 'app' ? '- Create stunning, modern UI that users love\n' : ''}- Write clean, type-safe, maintainable code +- Write clean, type-safe, maintainable code - Test thoroughly with deploy_preview and run_analysis - Fix all issues before claiming completion - Commit regularly with descriptive messages +## Execution Reminder +- If no blueprint or plan is present: generate_blueprint FIRST, then alter_blueprint if needed. Do not implement until a plan exists. +- Deploy only when a runtime exists; do not deploy for documents-only work. + Begin building.`; }; @@ -368,16 +222,31 @@ export class AgenticProjectBuilder extends Assistant { ? PROMPT_UTILS.serializeTemplate(operationOptions.context.templateDetails) : undefined; + // Build dynamic hints from current context + const hasFiles = (session.filesIndex || []).length > 0; + const isAgenticBlueprint = (bp?: Blueprint): bp is AgenticBlueprint => { + return !!bp && Array.isArray((bp as any).plan); + }; + const hasTSX = session.filesIndex?.some(f => /\.(t|j)sx$/i.test(f.filePath)) || false; + const hasMD = session.filesIndex?.some(f => /\.(md|mdx)$/i.test(f.filePath)) || false; + const hasPlan = isAgenticBlueprint(inputs.blueprint) && inputs.blueprint.plan.length > 0; + const dynamicHints = [ + !hasPlan ? '- No plan detected: Start with generate_blueprint to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', + hasTSX ? '- UI/slides detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + hasMD && !hasTSX ? '- Documents detected without UI: Do NOT deploy; focus on Markdown/MDX quality and structure.' : '', + !hasFiles ? '- No files yet: After PRD, scaffold initial structure with generate_files. If a deck is appropriate, call initialize_slides before deploying preview.' : '', + ].filter(Boolean).join('\n'); + // Build prompts - const systemPrompt = getSystemPrompt(session.projectType); - const userPrompt = getUserPrompt(inputs, session, fileSummaries, templateInfo); + const systemPrompt = getSystemPrompt(dynamicHints); + const userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); const system = createSystemMessage(systemPrompt); const user = createUserMessage(userPrompt); const messages: Message[] = this.save([system, user]); // Prepare tools (same as debugger) - const tools = buildDebugTools(session, this.logger, toolRenderer); + const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer); let output = ''; diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 18f4dd53..931c2a22 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -11,7 +11,6 @@ import { buildToolCallRenderer } from '../../operations/UserConversationProcesso import { PhaseGenerationOperation } from '../../operations/PhaseGeneration'; import { FastCodeFixerOperation } from '../../operations/PostPhaseCodeFixer'; import { customizeTemplateFiles, generateProjectName } from '../../utils/templateCustomizer'; -import { generateBlueprint } from '../../planning/blueprint'; import { IdGenerator } from '../../utils/idGenerator'; import { generateNanoId } from '../../../utils/idGenerator'; import { BaseCodingBehavior, BaseCodingOperations } from './base'; @@ -49,34 +48,13 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl ): Promise { await super.initialize(initArgs); - const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; - - // Generate a blueprint - this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); - this.logger.info(`Using language: ${language}, frameworks: ${frameworks ? frameworks.join(", ") : "none"}`); - - const blueprint = await generateBlueprint({ - env: this.env, - inferenceContext, - query, - language: language!, - frameworks: frameworks!, - projectType: this.state.projectType, - templateDetails: templateInfo?.templateDetails, - templateMetaInfo: templateInfo?.selection, - images: initArgs.images, - stream: { - chunk_size: 256, - onChunk: (chunk) => { - initArgs.onBlueprintChunk(chunk); - } - } - }) + const { query, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + const baseName = (query || 'project').toString(); const projectName = generateProjectName( - blueprint.projectName, + baseName, generateNanoId(), AgenticCodingBehavior.PROJECT_NAME_PREFIX_MAX_LENGTH ); @@ -87,14 +65,22 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl ...this.state, projectName, query, - blueprint, - templateName: templateInfo?.templateDetails.name || '', + blueprint: { + title: baseName, + projectName, + description: query, + colorPalette: ['#1e1e1e'], + frameworks: [], + plan: [] + }, + templateName: templateInfo?.templateDetails?.name || (this.projectType === 'general' ? 'scratch' : ''), sandboxInstanceId: undefined, commandsHistory: [], lastPackageJson: packageJson, sessionId: sandboxSessionId!, hostname, inferenceContext, + projectType: this.projectType, }); if (templateInfo) { @@ -125,10 +111,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl this.logger.info('Committed customized template files to git'); } - - this.initializeAsync().catch((error: unknown) => { - this.broadcastError("Initialization failed", error); - }); this.logger.info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} initialized successfully`); return this.state; } diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 233fa906..7c725db7 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -3,9 +3,11 @@ import { FileConceptType, FileOutputType, Blueprint, + AgenticBlueprint, + PhasicBlueprint, } from '../../schemas'; import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; -import { BaseProjectState } from '../state'; +import { BaseProjectState, AgenticState } from '../state'; import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; import { PREVIEW_EXPIRED_ERROR, WebSocketMessageResponses } from '../../constants'; @@ -14,6 +16,7 @@ import { UserConversationProcessor, RenderToolCall } from '../../operations/User import { FileRegenerationOperation } from '../../operations/FileRegeneration'; // Database schema imports removed - using zero-storage OAuth flow import { BaseSandboxService } from '../../../services/sandbox/BaseSandboxService'; +import { createScratchTemplateDetails } from '../../utils/templates'; import { WebSocketMessageData, WebSocketMessageType } from '../../../api/websocketTypes'; import { InferenceContext, AgentActionKey } from '../../inferutils/config.types'; import { AGENT_CONFIG } from '../../inferutils/config'; @@ -72,6 +75,10 @@ export abstract class BaseCodingBehavior return this.state.behaviorType; } + protected isAgenticState(state: BaseProjectState): state is AgenticState { + return state.behaviorType === 'agentic'; + } + constructor(infrastructure: AgentInfrastructure, protected projectType: ProjectType) { super(infrastructure); } @@ -81,11 +88,12 @@ export abstract class BaseCodingBehavior ..._args: unknown[] ): Promise { this.logger.info("Initializing agent"); - const {templateInfo} = initArgs; + const { templateInfo } = initArgs; if (templateInfo) { this.templateDetailsCache = templateInfo.templateDetails; + + await this.ensureTemplateDetails(); } - await this.ensureTemplateDetails(); return this.state; } @@ -101,8 +109,8 @@ export abstract class BaseCodingBehavior this.generateReadme() ]); this.logger.info("Deployment to sandbox service and initial commands predictions completed successfully"); - await this.executeCommands(setupCommands.commands); - this.logger.info("Initial commands executed successfully"); + await this.executeCommands(setupCommands.commands); + this.logger.info("Initial commands executed successfully"); } catch (error) { this.logger.error("Error during async initialization:", error); // throw error; @@ -111,7 +119,12 @@ export abstract class BaseCodingBehavior onStateUpdate(_state: TState, _source: "server" | Connection) {} async ensureTemplateDetails() { + // Skip fetching details for "scratch" baseline if (!this.templateDetailsCache) { + if (this.state.templateName === 'scratch') { + this.logger.info('Skipping template details fetch for scratch baseline'); + return; + } this.logger.info(`Loading template details for: ${this.state.templateName}`); const results = await BaseSandboxService.getTemplateDetails(this.state.templateName); if (!results.success || !results.templateDetails) { @@ -143,6 +156,11 @@ export abstract class BaseCodingBehavior public getTemplateDetails(): TemplateDetails { if (!this.templateDetailsCache) { + // Synthesize a minimal scratch template when starting from scratch + if (this.state.templateName === 'scratch') { + this.templateDetailsCache = createScratchTemplateDetails(); + return this.templateDetailsCache; + } this.ensureTemplateDetails(); throw new Error('Template details not loaded. Call ensureTemplateDetails() first.'); } @@ -285,6 +303,21 @@ export abstract class BaseCodingBehavior this.logger.info('README.md generated successfully'); } + async setBlueprint(blueprint: Blueprint): Promise { + this.setState({ + ...this.state, + blueprint: blueprint as AgenticBlueprint | PhasicBlueprint, + }); + this.broadcast(WebSocketMessageResponses.BLUEPRINT_UPDATED, { + message: 'Blueprint updated', + updatedKeys: Object.keys(blueprint || {}) + }); + } + + getProjectType() { + return this.state.projectType; + } + async queueUserRequest(request: string, images?: ProcessedImageAttachment[]): Promise { this.setState({ ...this.state, @@ -536,8 +569,10 @@ export abstract class BaseCodingBehavior return errors; } catch (error) { this.logger.error("Exception fetching runtime errors:", error); - // If fetch fails, initiate redeploy - this.deployToSandbox(); + // If fetch fails, optionally redeploy in phasic mode only + if (this.state.behaviorType === 'phasic') { + this.deployToSandbox(); + } const message = ""; return [{ message, timestamp: new Date().toISOString(), level: 0, rawOutput: message }]; } @@ -690,7 +725,7 @@ export abstract class BaseCodingBehavior */ async updateBlueprint(patch: Partial): Promise { // Fields that are safe to update after generation starts - // Excludes: initialPhase (breaks generation), plan (internal state) + // Excludes: initialPhase (breaks phasic generation) const safeUpdatableFields = new Set([ 'title', 'description', @@ -713,6 +748,15 @@ export abstract class BaseCodingBehavior } } + // Agentic: allow initializing plan if not set yet (first-time plan initialization only) + if (this.isAgenticState(this.state)) { + const currentPlan = this.state.blueprint?.plan; + const patchPlan = 'plan' in patch ? patch.plan : undefined; + if (Array.isArray(patchPlan) && (!Array.isArray(currentPlan) || currentPlan.length === 0)) { + filtered['plan'] = patchPlan; + } + } + // projectName requires sandbox update, handle separately if ('projectName' in patch && typeof patch.projectName === 'string') { await this.updateProjectName(patch.projectName); @@ -988,6 +1032,37 @@ export abstract class BaseCodingBehavior } } + async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number }> { + this.logger.info(`Importing template into project: ${templateName}`); + const results = await BaseSandboxService.getTemplateDetails(templateName); + if (!results.success || !results.templateDetails) { + throw new Error(`Failed to get template details for: ${templateName}`); + } + + const templateDetails = results.templateDetails; + const customizedFiles = customizeTemplateFiles(templateDetails.allFiles, { + projectName: this.state.projectName, + commandsHistory: this.getBootstrapCommands() + }); + + const filesToSave = Object.entries(customizedFiles).map(([filePath, content]) => ({ + filePath, + fileContents: content, + filePurpose: 'Template file' + })); + + await this.fileManager.saveGeneratedFiles(filesToSave, commitMessage); + + // Update state + this.setState({ + ...this.state, + templateName: templateDetails.name, + lastPackageJson: templateDetails.allFiles['package.json'] || this.state.lastPackageJson, + }); + + return { templateName: templateDetails.name, filesImported: filesToSave.length }; + } + async waitForGeneration(): Promise { if (this.generationPromise) { try { diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 49eb0cca..cbceec4d 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -70,7 +70,11 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem ..._args: unknown[] ): Promise { await super.initialize(initArgs); - const { query, language, frameworks, hostname, inferenceContext, templateInfo, sandboxSessionId } = initArgs; + const { templateInfo } = initArgs; + if (!templateInfo || !templateInfo.templateDetails) { + throw new Error('Phasic initialization requires templateInfo.templateDetails'); + } + const { query, language, frameworks, hostname, inferenceContext, sandboxSessionId } = initArgs; // Generate a blueprint this.logger.info('Generating blueprint', { query, queryLength: query.length, imagesCount: initArgs.images?.length || 0 }); @@ -94,7 +98,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem } }) - const packageJson = templateInfo?.templateDetails?.allFiles['package.json']; + const packageJson = templateInfo.templateDetails.allFiles['package.json']; const projectName = generateProjectName( blueprint?.projectName || templateInfo?.templateDetails.name || '', diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index ae574b5c..d5059611 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -1,5 +1,5 @@ import { Agent, AgentContext, ConnectionContext } from "agents"; -import { AgentInitArgs, AgentSummary, BehaviorType, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget } from "./types"; +import { AgentInitArgs, AgentSummary, DeployOptions, DeployResult, ExportOptions, ExportResult, DeploymentTarget, BehaviorType } from "./types"; import { AgenticState, AgentState, BaseProjectState, CurrentDevState, MAX_PHASES, PhasicState } from "./state"; import { Blueprint } from "../schemas"; import { BaseCodingBehavior } from "./behaviors/base"; @@ -27,6 +27,7 @@ import { ProjectObjective } from "./objectives/base"; import { AppObjective } from "./objectives/app"; import { WorkflowObjective } from "./objectives/workflow"; import { PresentationObjective } from "./objectives/presentation"; +import { GeneralObjective } from "./objectives/general"; import { FileOutputType } from "../schemas"; const DEFAULT_CONVERSATION_SESSION_ID = 'default'; @@ -107,19 +108,12 @@ export class CodeGeneratorAgent extends Agent implements AgentI }, 10 // MAX_COMMANDS_HISTORY ); - - const props = (ctx.props as AgentBootstrapProps) || {}; - const isInitialized = Boolean(this.state.query); - const behaviorType = isInitialized - ? this.state.behaviorType - : props.behaviorType ?? this.state.behaviorType ?? 'phasic'; - const projectType = isInitialized - ? this.state.projectType - : props.projectType ?? this.state.projectType ?? 'app'; - - if (isInitialized && this.state.behaviorType !== behaviorType) { - throw new Error(`State behaviorType mismatch: expected ${behaviorType}, got ${this.state.behaviorType}`); - } + } + + onFirstInit(props?: AgentBootstrapProps): void { + this.logger().info('Bootstrapping CodeGeneratorAgent', { props }); + const behaviorType = props?.behaviorType ?? this.state.behaviorType ?? 'phasic'; + const projectType = props?.projectType ?? this.state.projectType ?? 'app'; if (behaviorType === 'phasic') { this.behavior = new PhasicCodingBehavior(this as AgentInfrastructure, projectType); @@ -144,6 +138,8 @@ export class CodeGeneratorAgent extends Agent implements AgentI return new WorkflowObjective(infrastructure); case 'presentation': return new PresentationObjective(infrastructure); + case 'general': + return new GeneralObjective(infrastructure); default: // Default to app for backward compatibility return new AppObjective(infrastructure); @@ -161,7 +157,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI const { inferenceContext } = initArgs; const sandboxSessionId = DeploymentManager.generateNewSessionId(); this.initLogger(inferenceContext.agentId, inferenceContext.userId, sandboxSessionId); - + // Infrastructure setup await this.gitInit(); @@ -192,14 +188,20 @@ export class CodeGeneratorAgent extends Agent implements AgentI */ async onStart(props?: Record | undefined): Promise { this.logger().info(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart`, { props }); - + + if (!this.behavior) { + // First-time initialization + this.logger().info('First-time onStart initialization detected, invoking onFirstInit'); + this.onFirstInit(props as AgentBootstrapProps); + } + + this.behavior.onStart(props); + // Ignore if agent not initialized if (!this.state.query) { this.logger().warn(`Agent ${this.getAgentId()} session: ${this.state.sessionId} onStart ignored, agent not initialized`); return; } - - this.behavior.onStart(props); // Ensure state is migrated for any previous versions this.behavior.migrateStateIfNeeded(); @@ -305,6 +307,10 @@ export class CodeGeneratorAgent extends Agent implements AgentI exportProject(options: ExportOptions): Promise { return this.objective.export(options); } + + importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }> { + return this.behavior.importTemplate(templateName, commitMessage); + } protected async saveToDatabase() { this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); @@ -321,9 +327,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI framework: this.state.blueprint.frameworks.join(','), visibility: 'private', status: 'generating', - createdAt: new Date(), + createdAt: new Date(), updatedAt: new Date() - }); + }); this.logger().info(`App saved successfully to database for agent ${this.state.inferenceContext.agentId}`, { agentId: this.state.inferenceContext.agentId, userId: this.state.inferenceContext.userId, @@ -351,7 +357,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI if (Array.isArray(parsed)) { fullHistory = parsed as ConversationMessage[]; } - } catch (_e) {} + } catch (_e) { + this.logger().warn('Failed to parse full conversation history', _e); + } } if (fullHistory.length === 0) { fullHistory = currentConversation; @@ -365,7 +373,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI if (Array.isArray(parsed)) { runningHistory = parsed as ConversationMessage[]; } - } catch (_e) {} + } catch (_e) { + this.logger().warn('Failed to parse compact conversation history', _e); + } } if (runningHistory.length === 0) { runningHistory = currentConversation; diff --git a/worker/agents/core/objectives/general.ts b/worker/agents/core/objectives/general.ts new file mode 100644 index 00000000..858a7c96 --- /dev/null +++ b/worker/agents/core/objectives/general.ts @@ -0,0 +1,38 @@ +import { ProjectObjective } from './base'; +import { BaseProjectState } from '../state'; +import { ProjectType, RuntimeType, ExportResult, ExportOptions, DeployResult, DeployOptions } from '../types'; +import type { AgentInfrastructure } from '../AgentCore'; + +export class GeneralObjective + extends ProjectObjective { + + constructor(infrastructure: AgentInfrastructure) { + super(infrastructure); + } + + getType(): ProjectType { + return 'general'; + } + + getRuntime(): RuntimeType { + // No runtime assumed; agentic behavior will initialize slides/app runtime if needed + return 'none'; + } + + needsTemplate(): boolean { + return false; + } + + getTemplateType(): string | null { + return null; // scratch + } + + async deploy(_options?: DeployOptions): Promise { + return { success: false, target: 'platform', error: 'Deploy not applicable for general projects. Use tools to initialize a runtime first.' }; + } + + async export(_options: ExportOptions): Promise { + return { success: false, error: 'Export not applicable for general projects.' }; + } +} + diff --git a/worker/agents/core/types.ts b/worker/agents/core/types.ts index d0152ed2..618db851 100644 --- a/worker/agents/core/types.ts +++ b/worker/agents/core/types.ts @@ -10,7 +10,7 @@ import { ProcessedImageAttachment } from 'worker/types/image-attachment'; export type BehaviorType = 'phasic' | 'agentic'; -export type ProjectType = 'app' | 'workflow' | 'presentation'; +export type ProjectType = 'app' | 'workflow' | 'presentation' | 'general'; /** * Runtime type - WHERE it runs during dev diff --git a/worker/agents/index.ts b/worker/agents/index.ts index 26cb1091..61474d69 100644 --- a/worker/agents/index.ts +++ b/worker/agents/index.ts @@ -5,6 +5,7 @@ import { InferenceContext } from './inferutils/config.types'; import { SandboxSdkClient } from '../services/sandbox/sandboxSdkClient'; import { selectTemplate } from './planning/templateSelector'; import { TemplateDetails } from '../services/sandbox/sandboxTypes'; +import { createScratchTemplateDetails } from './utils/templates'; import { TemplateSelection } from './schemas'; import type { ImageAttachment } from '../types/image-attachment'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; @@ -78,6 +79,19 @@ export async function getTemplateForQuery( images: ImageAttachment[] | undefined, logger: StructuredLogger, ) : Promise<{templateDetails: TemplateDetails, selection: TemplateSelection, projectType: ProjectType}> { + // In 'general' mode, we intentionally start from scratch without a real template + if (projectType === 'general') { + const scratch: TemplateDetails = createScratchTemplateDetails(); + const selection: TemplateSelection = { + selectedTemplateName: null, + reasoning: 'General (from-scratch) mode: no template selected', + useCase: 'General', + complexity: 'moderate', + styleSelection: 'Custom', + projectType: 'general', + } as TemplateSelection; // satisfies schema shape + return { templateDetails: scratch, selection, projectType: 'general' }; + } // Fetch available templates const templatesResponse = await SandboxSdkClient.listTemplates(); if (!templatesResponse || !templatesResponse.success) { @@ -96,8 +110,10 @@ export async function getTemplateForQuery( logger.info('Selected template', { selectedTemplate: analyzeQueryResponse }); if (!analyzeQueryResponse.selectedTemplateName) { - logger.error('No suitable template found for code generation'); - throw new Error('No suitable template found for code generation'); + // For non-general requests when no template is selected, fall back to scratch + logger.warn('No suitable template found; falling back to scratch'); + const scratch: TemplateDetails = createScratchTemplateDetails(); + return { templateDetails: scratch, selection: analyzeQueryResponse, projectType: analyzeQueryResponse.projectType }; } const selectedTemplate = templatesResponse.templates.find(template => template.name === analyzeQueryResponse.selectedTemplateName); diff --git a/worker/agents/planning/blueprint.ts b/worker/agents/planning/blueprint.ts index fa2123b7..0b7cacb8 100644 --- a/worker/agents/planning/blueprint.ts +++ b/worker/agents/planning/blueprint.ts @@ -239,6 +239,11 @@ const PROJECT_TYPE_BLUEPRINT_GUIDANCE: Record = { - User flow should actually be a \"story flow\" describing slide order, transitions, interactions, and speaker cues - Implementation roadmap must reference Spectacle features (themes, deck index, slide components, animations, print/external export mode) - Prioritize static data and storytelling polish; avoid backend complexity entirely.`, + general: `## Objective Context +- Start from scratch; choose the most suitable representation for the request. +- If the outcome is documentation/specs/notes, prefer Markdown/MDX and do not assume any runtime. +- If a slide deck is helpful, outline the deck structure and content. Avoid assuming a specific file layout; keep the plan flexible. +- Keep dependencies minimal; introduce runtime only when clearly needed.`, }; const getProjectTypeGuidance = (projectType: ProjectType): string => diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index 0660b040..fce55bda 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -53,17 +53,24 @@ async function predictProjectType( - Visual storytelling with slides - Examples: "Create slides about AI", "Make a product pitch deck", "Build a presentation on climate change" +**general** - From-scratch content or mixed artifacts +- Docs/notes/specs in Markdown/MDX, or a slide deck initialized later +- Start with docs when users ask for write-ups; initialize slides if explicitly requested or clearly appropriate +- No sandbox/runtime unless slides/app are initialized by the builder +- Examples: "Write a spec", "Draft an outline and slides if helpful", "Create teaching materials" + ## RULES: - Default to 'app' when uncertain - Choose 'workflow' only when explicitly about APIs, automation, or backend-only tasks - Choose 'presentation' only when explicitly about slides, decks, or presentations +- Choose 'general' for docs/notes/specs or when the user asks to start from scratch without a specific runtime template - Consider the presence of UI/visual requirements as indicator for 'app' - High confidence when keywords are explicit, medium/low when inferring`; const userPrompt = `**User Request:** "${query}" **Task:** Determine the project type and provide: -1. Project type (app, workflow, or presentation) +1. Project type (app, workflow, presentation, or general) 2. Reasoning for your classification 3. Confidence level (high, medium, low) @@ -178,7 +185,7 @@ Reasoning: "Social template provides user interactions, content sharing, and com */ export async function selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { // Step 1: Predict project type if 'auto' - let actualProjectType: ProjectType = projectType === 'auto' + const actualProjectType: ProjectType = projectType === 'auto' ? await predictProjectType(env, query, inferenceContext, images) : (projectType || 'app') as ProjectType; @@ -290,4 +297,4 @@ ENTROPY SEED: ${generateSecureToken(64)} - for unique results`; // Fallback to no template selection in case of error return { selectedTemplateName: null, reasoning: "An error occurred during the template selection process.", useCase: null, complexity: null, styleSelection: null, projectType: actualProjectType }; } -} \ No newline at end of file +} diff --git a/worker/agents/schemas.ts b/worker/agents/schemas.ts index 48122085..f37eb618 100644 --- a/worker/agents/schemas.ts +++ b/worker/agents/schemas.ts @@ -2,7 +2,7 @@ import z from 'zod'; // Schema for AI project type prediction export const ProjectTypePredictionSchema = z.object({ - projectType: z.enum(['app', 'workflow', 'presentation']).describe('The predicted type of project based on the user query'), + projectType: z.enum(['app', 'workflow', 'presentation', 'general']).describe('The predicted type of project based on the user query'), reasoning: z.string().describe('Brief explanation for why this project type was selected'), confidence: z.enum(['high', 'medium', 'low']).describe('Confidence level in the prediction'), }); @@ -14,7 +14,7 @@ export const TemplateSelectionSchema = z.object({ useCase: z.enum(['SaaS Product Website', 'Dashboard', 'Blog', 'Portfolio', 'E-Commerce', 'General', 'Other']).describe('The use case for which the template is selected, if applicable.').nullable(), complexity: z.enum(['simple', 'moderate', 'complex']).describe('The complexity of developing the project based on the the user query').nullable(), styleSelection: z.enum(['Minimalist Design', 'Brutalism', 'Retro', 'Illustrative', 'Kid_Playful', 'Custom']).describe('Pick a style relevant to the user query').nullable(), - projectType: z.enum(['app', 'workflow', 'presentation']).default('app').describe('The type of project based on the user query'), + projectType: z.enum(['app', 'workflow', 'presentation', 'general']).default('app').describe('The type of project based on the user query'), }); export const FileOutputSchema = z.object({ diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index c27bd7d9..416f1074 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -2,7 +2,7 @@ import { FileOutputType, FileConceptType, Blueprint } from "worker/agents/schema import { BaseSandboxService } from "worker/services/sandbox/BaseSandboxService"; import { ExecuteCommandsResponse, PreviewType, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { ProcessedImageAttachment } from "worker/types/image-attachment"; -import { BehaviorType, DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; +import { BehaviorType, DeepDebugResult, DeploymentTarget, ProjectType } from "worker/agents/core/types"; import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; import { WebSocketMessageType, WebSocketMessageData } from "worker/api/websocketTypes"; import { GitVersionControl } from "worker/agents/git/git"; @@ -28,6 +28,12 @@ export interface ICodingAgent { deployPreview(clearLogs?: boolean, forceRedeploy?: boolean): Promise; updateProjectName(newName: string): Promise; + + setBlueprint(blueprint: Blueprint): Promise; + + getProjectType(): ProjectType; + + importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }>; getOperationOptions(): OperationOptions; diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index 92fc9940..ec0508ab 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -9,6 +9,7 @@ import { createDeployPreviewTool } from './toolkit/deploy-preview'; import { createDeepDebuggerTool } from "./toolkit/deep-debugger"; import { createRenameProjectTool } from './toolkit/rename-project'; import { createAlterBlueprintTool } from './toolkit/alter-blueprint'; +import { createGenerateBlueprintTool } from './toolkit/generate-blueprint'; import { DebugSession } from '../assistants/codeDebugger'; import { createReadFilesTool } from './toolkit/read-files'; import { createExecCommandsTool } from './toolkit/exec-commands'; @@ -21,6 +22,8 @@ import { createWaitForGenerationTool } from './toolkit/wait-for-generation'; import { createWaitForDebugTool } from './toolkit/wait-for-debug'; import { createGitTool } from './toolkit/git'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; +import { createInitializeSlidesTool } from './toolkit/initialize-slides'; +import { createGenerateImagesTool } from './toolkit/generate-images'; export async function executeToolWithDefinition( toolDef: ToolDefinition, @@ -60,32 +63,61 @@ export function buildTools( } export function buildDebugTools(session: DebugSession, logger: StructuredLogger, toolRenderer?: RenderToolCall): ToolDefinition[] { - const tools = [ - createGetLogsTool(session.agent, logger), - createGetRuntimeErrorsTool(session.agent, logger), - createReadFilesTool(session.agent, logger), - createRunAnalysisTool(session.agent, logger), - createExecCommandsTool(session.agent, logger), - createRegenerateFileTool(session.agent, logger), - createGenerateFilesTool(session.agent, logger), - createDeployPreviewTool(session.agent, logger), - createWaitTool(logger), - createGitTool(session.agent, logger), - ]; + const tools = [ + createGetLogsTool(session.agent, logger), + createGetRuntimeErrorsTool(session.agent, logger), + createReadFilesTool(session.agent, logger), + createRunAnalysisTool(session.agent, logger), + createExecCommandsTool(session.agent, logger), + createRegenerateFileTool(session.agent, logger), + createGenerateFilesTool(session.agent, logger), + createDeployPreviewTool(session.agent, logger), + createWaitTool(logger), + createGitTool(session.agent, logger), + ]; + return withRenderer(tools, toolRenderer); +} - // Attach tool renderer for UI visualization if provided - if (toolRenderer) { +/** + * Toolset for the Agentic Project Builder (autonomous build assistant) + */ +export function buildAgenticBuilderTools(session: DebugSession, logger: StructuredLogger, toolRenderer?: RenderToolCall): ToolDefinition[] { + const tools = [ + // PRD generation + refinement + createGenerateBlueprintTool(session.agent, logger), + createAlterBlueprintTool(session.agent, logger), + // Build + analysis toolchain + createReadFilesTool(session.agent, logger), + createGenerateFilesTool(session.agent, logger), + createRegenerateFileTool(session.agent, logger), + createRunAnalysisTool(session.agent, logger), + // Runtime + deploy + createInitializeSlidesTool(session.agent, logger), + createDeployPreviewTool(session.agent, logger), + createGetRuntimeErrorsTool(session.agent, logger), + createGetLogsTool(session.agent, logger), + // Utilities + createExecCommandsTool(session.agent, logger), + createWaitTool(logger), + createGitTool(session.agent, logger), + // Optional future: images + createGenerateImagesTool(session.agent, logger), + ]; + + return withRenderer(tools, toolRenderer); +} + +/** Decorate tool definitions with a renderer for UI visualization */ +function withRenderer(tools: ToolDefinition[], toolRenderer?: RenderToolCall): ToolDefinition[] { + if (!toolRenderer) return tools; return tools.map(td => ({ - ...td, - onStart: (args: Record) => toolRenderer({ name: td.function.name, status: 'start', args }), - onComplete: (args: Record, result: unknown) => toolRenderer({ - name: td.function.name, - status: 'success', - args, - result: typeof result === 'string' ? result : JSON.stringify(result) - }) + ...td, + onStart: (args: Record) => toolRenderer({ name: td.function.name, status: 'start', args }), + onComplete: (args: Record, result: unknown) => toolRenderer({ + name: td.function.name, + status: 'success', + args, + result: typeof result === 'string' ? result : JSON.stringify(result) + }) })); - } - - return tools; } diff --git a/worker/agents/tools/toolkit/alter-blueprint.ts b/worker/agents/tools/toolkit/alter-blueprint.ts index 96d5dec1..e11eaaaa 100644 --- a/worker/agents/tools/toolkit/alter-blueprint.ts +++ b/worker/agents/tools/toolkit/alter-blueprint.ts @@ -4,50 +4,69 @@ import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { Blueprint } from 'worker/agents/schemas'; type AlterBlueprintArgs = { - patch: Partial & { - projectName?: string; - }; + patch: Record; }; export function createAlterBlueprintTool( - agent: ICodingAgent, - logger: StructuredLogger + agent: ICodingAgent, + logger: StructuredLogger ): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'alter_blueprint', - description: 'Apply a validated patch to the current blueprint. Only allowed keys are accepted.', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - patch: { - type: 'object', - additionalProperties: false, - properties: { - title: { type: 'string' }, - projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, - detailedDescription: { type: 'string' }, - description: { type: 'string' }, - colorPalette: { type: 'array', items: { type: 'string' } }, - views: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { name: { type: 'string' }, description: { type: 'string' } }, required: ['name', 'description'] } }, - userFlow: { type: 'object', additionalProperties: false, properties: { uiLayout: { type: 'string' }, uiDesign: { type: 'string' }, userJourney: { type: 'string' } } }, - dataFlow: { type: 'string' }, - architecture: { type: 'object', additionalProperties: false, properties: { dataFlow: { type: 'string' } } }, - pitfalls: { type: 'array', items: { type: 'string' } }, - frameworks: { type: 'array', items: { type: 'string' } }, - implementationRoadmap: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { phase: { type: 'string' }, description: { type: 'string' } }, required: ['phase', 'description'] } }, + // Build behavior-aware schema at tool creation time (tools are created per-agent) + const isAgentic = agent.getBehavior() === 'agentic'; + + const agenticProperties = { + title: { type: 'string' }, + projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, + description: { type: 'string' }, + detailedDescription: { type: 'string' }, + colorPalette: { type: 'array', items: { type: 'string' } }, + frameworks: { type: 'array', items: { type: 'string' } }, + // Agentic-only: plan + plan: { type: 'array', items: { type: 'string' } }, + } as const; + + const phasicProperties = { + title: { type: 'string' }, + projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, + description: { type: 'string' }, + detailedDescription: { type: 'string' }, + colorPalette: { type: 'array', items: { type: 'string' } }, + frameworks: { type: 'array', items: { type: 'string' } }, + views: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { name: { type: 'string' }, description: { type: 'string' } }, required: ['name', 'description'] } }, + userFlow: { type: 'object', additionalProperties: false, properties: { uiLayout: { type: 'string' }, uiDesign: { type: 'string' }, userJourney: { type: 'string' } } }, + dataFlow: { type: 'string' }, + architecture: { type: 'object', additionalProperties: false, properties: { dataFlow: { type: 'string' } } }, + pitfalls: { type: 'array', items: { type: 'string' } }, + implementationRoadmap: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { phase: { type: 'string' }, description: { type: 'string' } }, required: ['phase', 'description'] } }, + // No plan here; phasic handles phases separately + } as const; + + const dynamicPatchSchema = isAgentic ? agenticProperties : phasicProperties; + + return { + type: 'function' as const, + function: { + name: 'alter_blueprint', + description: isAgentic + ? 'Apply a patch to the agentic blueprint (title, description, colorPalette, frameworks, plan, projectName).' + : 'Apply a patch to the phasic blueprint (title, description, colorPalette, frameworks, views, userFlow, architecture, dataFlow, pitfalls, implementationRoadmap, projectName).', + parameters: { + type: 'object', + additionalProperties: false, + properties: { + patch: { + type: 'object', + additionalProperties: false, + properties: dynamicPatchSchema as Record, + }, + }, + required: ['patch'], }, - }, }, - required: ['patch'], - }, - }, - implementation: async (args) => { - logger.info('Altering blueprint', { keys: Object.keys(args.patch) }); - const updated = await agent.updateBlueprint(args.patch); - return updated; - }, - }; + implementation: async ({ patch }) => { + logger.info('Altering blueprint', { keys: Object.keys(patch || {}) }); + const updated = await agent.updateBlueprint(patch as Partial); + return updated; + }, + }; } diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts new file mode 100644 index 00000000..9d99b5dc --- /dev/null +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -0,0 +1,56 @@ +import { ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; +import type { Blueprint } from 'worker/agents/schemas'; + +type GenerateBlueprintArgs = Record; +type GenerateBlueprintResult = { message: string; blueprint: Blueprint }; + +/** + * Generates a blueprint + */ +export function createGenerateBlueprintTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'generate_blueprint', + description: + 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic.', + parameters: { type: 'object', properties: {}, additionalProperties: false }, + }, + implementation: async () => { + const { env, inferenceContext, context } = agent.getOperationOptions(); + + const isAgentic = agent.getBehavior() === 'agentic'; + + // Language/frameworks are optional; provide sensible defaults + const language = 'typescript'; + const frameworks: string[] = []; + + const args: AgenticBlueprintGenerationArgs = { + env, + inferenceContext, + query: context.query, + language, + frameworks, + templateDetails: context.templateDetails, + projectType: agent.getProjectType(), + }; + const blueprint = await generateBlueprint(args); + + // Persist in state for subsequent steps + await agent.setBlueprint(blueprint); + + logger.info('Blueprint generated via tool', { + behavior: isAgentic ? 'agentic' : 'phasic', + title: blueprint.title, + }); + + return { message: 'Blueprint generated successfully', blueprint }; + }, + }; +} diff --git a/worker/agents/tools/toolkit/generate-images.ts b/worker/agents/tools/toolkit/generate-images.ts new file mode 100644 index 00000000..7a971185 --- /dev/null +++ b/worker/agents/tools/toolkit/generate-images.ts @@ -0,0 +1,35 @@ +import { ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; + +type GenerateImagesArgs = { + prompts: string[]; + style?: string; +}; + +type GenerateImagesResult = { message: string }; + +export function createGenerateImagesTool( + _agent: ICodingAgent, + _logger: StructuredLogger, +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'generate_images', + description: 'Generate images for the project (stub). Use later when the image generation pipeline is available.', + parameters: { + type: 'object', + properties: { + prompts: { type: 'array', items: { type: 'string' } }, + style: { type: 'string' }, + }, + required: ['prompts'], + }, + }, + implementation: async ({ prompts, style }: GenerateImagesArgs) => { + return { message: `Image generation not implemented yet. Requested ${prompts.length} prompt(s)${style ? ` with style ${style}` : ''}.` }; + }, + }; +} + diff --git a/worker/agents/tools/toolkit/initialize-slides.ts b/worker/agents/tools/toolkit/initialize-slides.ts new file mode 100644 index 00000000..5e7ce4ef --- /dev/null +++ b/worker/agents/tools/toolkit/initialize-slides.ts @@ -0,0 +1,46 @@ +import { ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; + +type InitializeSlidesArgs = { + theme?: string; + force_preview?: boolean; +}; + +type InitializeSlidesResult = { message: string }; + +/** + * Initializes a Spectacle-based slides runtime in from-scratch projects. + * - Imports the Spectacle template files into the repository + * - Commits them + * - Deploys a preview (agent policy will allow because slides exist) + */ +export function createInitializeSlidesTool( + agent: ICodingAgent, + logger: StructuredLogger, +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'initialize_slides', + description: 'Initialize a Spectacle slides project inside the current workspace and deploy a live preview. Use only if the user wants a slide deck.', + parameters: { + type: 'object', + properties: { + theme: { type: 'string', description: 'Optional theme preset name' }, + force_preview: { type: 'boolean', description: 'Force redeploy sandbox after import' }, + }, + required: [], + }, + }, + implementation: async ({ theme, force_preview }: InitializeSlidesArgs) => { + logger.info('Initializing slides via Spectacle template', { theme }); + const { templateName, filesImported } = await agent.importTemplate('spectacle', `chore: init slides (theme=${theme || 'default'})`); + logger.info('Imported template', { templateName, filesImported }); + + const deployMsg = await agent.deployPreview(true, !!force_preview); + return { message: `Slides initialized with template '${templateName}', files: ${filesImported}. ${deployMsg}` }; + }, + }; +} + diff --git a/worker/agents/utils/templates.ts b/worker/agents/utils/templates.ts new file mode 100644 index 00000000..b3c5aede --- /dev/null +++ b/worker/agents/utils/templates.ts @@ -0,0 +1,21 @@ +import type { TemplateDetails } from '../../services/sandbox/sandboxTypes'; + +/** + * Single source of truth for an in-memory "scratch" template. + * Used when starting from-scratch (general mode) or when no template fits. + */ +export function createScratchTemplateDetails(): TemplateDetails { + return { + name: 'scratch', + description: { selection: 'from-scratch baseline', usage: 'No template. Agent will scaffold as needed.' }, + fileTree: { path: '/', type: 'directory', children: [] }, + allFiles: {}, + language: 'typescript', + deps: {}, + frameworks: [], + importantFiles: [], + dontTouchFiles: [], + redactedFiles: [], + }; +} + diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index e6fe7144..44a2290d 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -17,25 +17,22 @@ import { ImageType, uploadImage } from 'worker/utils/images'; import { ProcessedImageAttachment } from 'worker/types/image-attachment'; import { getTemplateImportantFiles } from 'worker/services/sandbox/utils'; -const defaultCodeGenArgs: CodeGenArgs = { - query: '', +const defaultCodeGenArgs: Partial = { language: 'typescript', frameworks: ['react', 'vite'], selectedTemplate: 'auto', - agentMode: 'deterministic', - behaviorType: 'phasic', - projectType: 'app', }; const resolveBehaviorType = (body: CodeGenArgs): BehaviorType => { - if (body.behaviorType) { - return body.behaviorType; - } - return body.agentMode === 'smart' ? 'agentic' : 'phasic'; + if (body.behaviorType) return body.behaviorType; + const pt = body.projectType; + if (pt === 'presentation' || pt === 'workflow' || pt === 'general') return 'agentic'; + // default (including 'app' and when projectType omitted) + return 'phasic'; }; const resolveProjectType = (body: CodeGenArgs): ProjectType | 'auto' => { - return body.projectType || defaultCodeGenArgs.projectType || 'auto'; + return body.projectType || 'auto'; }; @@ -93,6 +90,8 @@ export class CodingAgentController extends BaseController { const modelConfigService = new ModelConfigService(env); const behaviorType = resolveBehaviorType(body); const projectType = resolveProjectType(body); + + this.logger.info(`Resolved behaviorType: ${behaviorType}, projectType: ${projectType} for agent ${agentId}`); // Fetch all user model configs, api keys and agent instance at once const userConfigsRecord = await modelConfigService.getUserModelConfigs(user.id); @@ -137,19 +136,28 @@ export class CodingAgentController extends BaseController { })); } + const isPhasic = behaviorType === 'phasic'; + writer.write({ message: 'Code generation started', agentId: agentId, websocketUrl, httpStatusUrl, - template: { - name: templateDetails.name, - files: getTemplateImportantFiles(templateDetails), - } + behaviorType, + projectType: finalProjectType, + template: isPhasic + ? { + name: templateDetails.name, + files: getTemplateImportantFiles(templateDetails), + } + : { + name: 'scratch', + files: [], + } }); const agentInstance = await getAgentStub(env, agentId, { behaviorType, projectType: finalProjectType }); - const agentPromise = agentInstance.initialize({ + const baseInitArgs = { query, language: body.language || defaultCodeGenArgs.language, frameworks: body.frameworks || defaultCodeGenArgs.frameworks, @@ -159,8 +167,13 @@ export class CodingAgentController extends BaseController { onBlueprintChunk: (chunk: string) => { writer.write({chunk}); }, - templateInfo: { templateDetails, selection }, - }) as Promise; + } as const; + + const initArgs = isPhasic + ? { ...baseInitArgs, templateInfo: { templateDetails, selection } } + : baseInitArgs; + + const agentPromise = agentInstance.initialize(initArgs) as Promise; agentPromise.then(async (_state: AgentState) => { writer.write("terminate"); writer.close(); diff --git a/worker/api/controllers/agent/types.ts b/worker/api/controllers/agent/types.ts index 3966dcda..4c411d54 100644 --- a/worker/api/controllers/agent/types.ts +++ b/worker/api/controllers/agent/types.ts @@ -1,4 +1,4 @@ -import { PreviewType } from "../../../services/sandbox/sandboxTypes"; +import type { PreviewType } from "../../../services/sandbox/sandboxTypes"; import type { ImageAttachment } from '../../../types/image-attachment'; import type { BehaviorType, ProjectType } from '../../../agents/core/types'; @@ -7,7 +7,6 @@ export interface CodeGenArgs { language?: string; frameworks?: string[]; selectedTemplate?: string; - agentMode?: 'deterministic' | 'smart'; behaviorType?: BehaviorType; projectType?: ProjectType; images?: ImageAttachment[]; @@ -21,6 +20,5 @@ export interface AgentConnectionData { agentId: string; } -export interface AgentPreviewResponse extends PreviewType { -} +export type AgentPreviewResponse = PreviewType; From 7ba6257d27966e6ca396ec0170e564410136d05c Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:02:38 -0500 Subject: [PATCH 34/58] refactor: reorganize project builder architecture + sandbox templateless design - Sandbox layer does not rely on templates now, instead expects raw files list - Tools to init/list templates, files - Templates can be chosen by agentic mode after creation - Restructured system prompt with detailed architecture explanations covering virtual filesystem, sandbox environment, and deployment flow - Better tool descriptions - Improved communication guidelines and workflow steps for better agent reasoning and execution --- .../assistants/agenticProjectBuilder.ts | 675 ++++++++++++++++-- worker/agents/core/behaviors/base.ts | 52 +- .../implementations/DeploymentManager.ts | 22 +- .../services/interfaces/ICodingAgent.ts | 10 +- worker/agents/tools/customTools.ts | 11 +- .../tools/toolkit/generate-blueprint.ts | 21 +- .../agents/tools/toolkit/template-manager.ts | 130 ++++ .../tools/toolkit/virtual-filesystem.ts | 81 +++ worker/api/controllers/agent/controller.ts | 21 +- worker/services/sandbox/BaseSandboxService.ts | 6 +- .../services/sandbox/remoteSandboxService.ts | 14 +- worker/services/sandbox/sandboxSdkClient.ts | 259 +++---- worker/services/sandbox/sandboxTypes.ts | 71 +- 13 files changed, 1035 insertions(+), 338 deletions(-) create mode 100644 worker/agents/tools/toolkit/template-manager.ts create mode 100644 worker/agents/tools/toolkit/virtual-filesystem.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index e5c665a6..1744a94b 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -20,6 +20,7 @@ export type BuildSession = { filesIndex: FileState[]; agent: ICodingAgent; projectType: ProjectType; + selectedTemplate?: string; // Template chosen by agent (minimal-vite, etc.) }; export type BuildInputs = { @@ -28,77 +29,613 @@ export type BuildInputs = { blueprint?: Blueprint; }; -/** - * Build a rich, dynamic system prompt similar in rigor to DeepCodeDebugger, - * but oriented for autonomous building. Avoids leaking internal taxonomy. - */ const getSystemPrompt = (dynamicHints: string): string => { - const persona = `You are an elite autonomous project builder with deep expertise in Cloudflare Workers (and Durable Objects as needed), TypeScript, Vite, and modern web application and content generation. You operate with extremely high reasoning capability. Think internally, act decisively, and report concisely.`; - - const comms = `CRITICAL: Communication Mode -- Perform all analysis, planning, and reasoning INTERNALLY -- Output should be CONCISE: brief status updates and tool calls only -- No verbose explanations or step-by-step narrations in output -- Think deeply internally → Act externally with tools → Report briefly`; - - const environment = `Project Environment -- Runtime: Cloudflare Workers (no Node.js fs/path/process) -- Fetch API standard (Request/Response), Web streams -- Frontend when applicable: React + Vite + TypeScript -- Deployments: wrangler → preview sandbox (live URL)`; - - const constraints = `Platform Constraints -- Prefer minimal dependencies; do not edit wrangler.jsonc or package.json unless necessary -- Logs and runtime errors are user-driven -- Paths are relative to project root; commands execute at project root; never use cd`; - - const toolsCatalog = `Available Tools & Usage Notes -- generate_blueprint: Produce initial PRD from the backend generator (plan for autonomous builds). Use FIRST if blueprint/plan is missing. -- alter_blueprint: Patch PRD fields (title, projectName, description, colorPalette, frameworks, plan). Use to refine after generation. -- generate_files: Create or rewrite multiple files for milestones. Be precise and include explicit file lists with purposes. -- regenerate_file: Apply targeted fixes to a single file. Prefer this for surgical changes before resorting to generate_files. -- read_files: Batch read code for analysis or confirmation. -- deploy_preview: Deploy only when a runtime exists (interactive UI, slide deck, or backend endpoints). Not for documents-only work. -- run_analysis: Lint + typecheck for verification. Use after deployment when a runtime is required; otherwise run locally for static code. -- get_runtime_errors / get_logs: Runtime diagnostics. Logs are cumulative; verify recency and avoid double-fixing. -- exec_commands: Execute commands sparingly; persist commands only when necessary. -- git: Commit, log, show; use clear conventional commit messages. -- initialize_slides: Import Spectacle and scaffold a deck when appropriate before deploying preview. -- generate_images: Stub for future image generation. Do not rely on it for critical paths.`; - - const protocol = `Execution Protocol -1) If blueprint or plan is missing → generate_blueprint. Then refine with alter_blueprint as needed. -2) Implement milestones via generate_files (or regenerate_file for targeted fixes). -3) When a runtime exists (UI/slides/backend endpoints), deploy_preview before verification. - - Documents-only: do NOT deploy; focus on content quality and structure. -4) Verify: run_analysis; then use runtime diagnostics (get_runtime_errors, get_logs) if needed. -5) Iterate: fix → commit → test until complete. -6) Finish with BUILD_COMPLETE: . If blocked, BUILD_STUCK: . Stop tool calls immediately after either.`; - - const quality = `Quality Bar -- Type-safe, minimal, and maintainable code -- Thoughtful architecture; avoid unnecessary config churn -- Professional visual polish for UI when applicable (spacing, hierarchy, interaction states, responsiveness)`; - - const reactSafety = `${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE}\n${PROMPT_UTILS.COMMON_PITFALLS}`; - - const completion = `Completion Discipline -- BUILD_COMPLETE: → stop -- BUILD_STUCK: → stop`; + const identity = `# Identity +You are an elite autonomous project builder with deep expertise in Cloudflare Workers, Durable Objects, TypeScript, React, Vite, and modern web applications. You operate with EXTREMELY HIGH reasoning capability.`; + + const comms = `# CRITICAL: Communication Mode +- Perform ALL analysis, planning, and reasoning INTERNALLY using your high reasoning capability +- Your output should be CONCISE: brief status updates and tool calls ONLY +- NO verbose explanations, NO step-by-step narrations in your output +- Think deeply internally → Act externally with precise tool calls → Report results briefly +- This is NOT negotiable - verbose output wastes tokens and degrades user experience`; + + const architecture = `# System Architecture (CRITICAL - Understand This) + +## How Your Environment Works + +**You operate in a Durable Object with TWO distinct layers:** + +### 1. Virtual Filesystem (Your Workspace) +- Lives in Durable Object storage (persistent) +- Managed by FileManager + Git (isomorphic-git with SQLite) +- ALL files you generate go here FIRST +- Files exist in memory/DO storage, NOT in actual sandbox yet +- Full git history maintained (commits, diffs, log, show) +- This is YOUR primary working area + +### 2. Sandbox Environment (Execution Layer) +- Separate container running Bun + Vite dev server +- Has its own filesystem (NOT directly accessible to you) +- Created when deploy_preview is called +- Runs 'bun run dev' and exposes preview URL +- THIS is where code actually executes + +## The Deploy Process (What deploy_preview Does) + +When you call deploy_preview: +1. Checks if sandbox instance exists +2. If NOT: Creates new sandbox instance + - Template mode: Downloads template from R2, sets it up + - Virtual-first mode: Uses minimal-vite + your virtual files as overlay + - Runs: bun install → bun run dev + - Exposes port → preview URL +3. If YES: Uses existing sandbox +4. Syncs ALL virtual files → sandbox filesystem (writeFiles) +5. Returns preview URL + +**KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. + +## File Flow Diagram +\`\`\` +You (LLM) + → generate_files / regenerate_file + → Virtual Filesystem (FileManager + Git) + → [Files stored in DO, committed to git] + +deploy_preview called + → DeploymentManager.deployToSandbox() + → Checks if sandbox exists + → If not: createNewInstance() + → Syncs virtual files → Sandbox filesystem + → Sandbox runs: bun run dev + → Preview URL returned +\`\`\` + +## Common Failure Scenarios & What They Mean + +**"No sandbox instance available"** +- Sandbox was never created OR crashed +- Solution: Call deploy_preview to create/recreate + +**"Failed to install dependencies"** +- package.json has issues (missing deps, wrong format) +- Sandbox can't run 'bun install' +- Solution: Fix package.json, redeploy + +**"Preview URL not responding"** +- Dev server failed to start +- Usually: Missing vite.config.js OR 'bun run dev' script broken +- Solution: Check package.json scripts, ensure vite configured + +**"Type errors after deploy"** +- Virtual files are fine, but TypeScript fails in sandbox +- Solution: Run run_analysis to catch before deploy + +**"Runtime errors in logs"** +- Code deployed but crashes when executed +- Check with get_runtime_errors, fix issues, redeploy + +**"File not found in sandbox"** +- You generated file in virtual filesystem +- But forgot to call deploy_preview to sync +- Solution: Always deploy after generating files + +## State Persistence + +**What Persists:** +- Virtual filesystem (all generated files) +- Git history (commits, branches) +- Blueprint +- Conversation messages +- Sandbox instance ID (once created) + +**What Doesn't Persist:** +- Sandbox filesystem state (unless you writeFiles) +- Running processes (dev server restarts on redeploy) +- Logs (cumulative but can be cleared) + +## When Things Break + +**Sandbox becomes unhealthy:** +- DeploymentManager auto-detects via health checks +- Will auto-redeploy after failures +- You may see retry messages - this is normal + +**Need fresh start:** +- Use force_redeploy=true in deploy_preview +- Destroys current sandbox, creates new one +- Expensive operation - only when truly stuck + +## Troubleshooting Workflow + +**Problem: "I generated files but preview shows old code"** +→ You forgot to deploy_preview after generating files +→ Solution: Call deploy_preview to sync virtual → sandbox + +**Problem: "run_analysis says file doesn't exist"** +→ File is in virtual FS but not synced to sandbox yet +→ Solution: deploy_preview first, then run_analysis + +**Problem: "exec_commands fails with 'no instance'"** +→ Sandbox doesn't exist yet +→ Solution: deploy_preview first to create sandbox + +**Problem: "get_logs returns empty"** +→ User hasn't interacted with preview yet, OR logs were cleared +→ Solution: Wait for user interaction or check timestamps + +**Problem: "Same error keeps appearing after fix"** +→ Logs are cumulative - you're seeing old errors +→ Solution: Clear logs with deploy_preview(clearLogs=true) + +**Problem: "Types look correct but still errors"** +→ You're reading from virtual FS, but sandbox has old versions +→ Solution: deploy_preview to sync latest changes`; + + const environment = `# Project Environment +- Runtime: Cloudflare Workers (NO Node.js fs/path/process APIs available) +- Fetch API standard (Request/Response), Web Streams API +- Frontend: React 19 + Vite + TypeScript + TailwindCSS +- Build tool: Bun (commands: bun run dev/build/lint/deploy) +- All projects MUST be Cloudflare Worker projects with wrangler.jsonc`; + + const constraints = `# Platform Constraints +- NO Node.js APIs (fs, path, process, etc.) - Workers runtime only +- Logs and errors are user-driven; check recency before fixing +- Paths are ALWAYS relative to project root +- Commands execute at project root - NEVER use cd +- NEVER modify wrangler.jsonc or package.json unless absolutely necessary`; + + const workflow = `# Your Workflow (Execute This Rigorously) + +## Step 1: Understand Requirements +- Read user request carefully +- Identify project type: app, presentation, documentation, tool, workflow +- Determine if clarifying questions are needed (rare - usually requirements are clear) + +## Step 2: Determine Approach +**Static Content** (documentation, guides, markdown): +- Generate files in docs/ directory structure +- NO sandbox needed +- Focus on content quality, organization, formatting + +**Interactive Projects** (apps, presentations, APIs, tools): +- Require sandbox with template +- Must have runtime environment +- Will use deploy_preview for testing + +## Step 3: Template Selection (Interactive Projects Only) +CRITICAL - Read this carefully: + +**TWO APPROACHES:** + +**A) Template-based (Recommended for most cases):** +- DEFAULT: Use 'minimal-vite' template (99% of cases) + - Minimal Vite+Bun+Cloudflare Worker boilerplate + - Has wrangler.jsonc and vite.config.js pre-configured + - Supports: bun run dev/build/lint/deploy + - CRITICAL: 'bun run dev' MUST work or sandbox creation FAILS +- Alternative templates: Use template_manager(command: "list") to see options +- Template switching allowed but STRONGLY DISCOURAGED + +**B) Virtual-first (Advanced - for custom setups):** +- Skip template selection entirely +- Generate all required config files yourself: + - package.json (with dependencies, scripts: dev/build/lint) + - wrangler.jsonc (Cloudflare Worker config) + - vite.config.js (Vite configuration) +- When you call deploy_preview, sandbox will be created with minimal-vite + your files +- ONLY use this if you have very specific config needs +- DEFAULT to template-based approach unless necessary + +## Step 4: Generate Blueprint +- Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) +- Blueprint defines: title, description, features, architecture, plan +- Refine with alter_blueprint if needed +- NEVER start building without a plan + +## Step 5: Build Incrementally +- Use generate_files for new features/components (goes to virtual FS) +- Use regenerate_file for surgical fixes to existing files (goes to virtual FS) +- Commit frequently with clear messages (git operates on virtual FS) +- For interactive projects: + - After generating files: deploy_preview (syncs virtual → sandbox) + - Then verify with run_analysis or runtime tools + - Fix issues → iterate +- **Remember**: Files in virtual FS won't execute until you deploy_preview + +## Step 6: Verification & Polish +- run_analysis for type checking and linting +- get_runtime_errors / get_logs for runtime issues +- Fix all issues before completion +- Ensure professional quality and polish`; + + const tools = `# Available Tools (Detailed Reference) + +## Planning & Architecture + +**generate_blueprint** - Create structured project plan (Product Requirements Document) + +**What it is:** +- Your planning tool - creates a PRD defining WHAT to build before you start +- Becomes the source of truth for implementation +- Stored in agent state (persists across all requests) +- Accepts optional **prompt** parameter for providing additional context beyond user's initial request + +**What it generates:** +- title: Project name +- projectName: Technical identifier +- description: What the project does +- colorPalette: Brand colors for UI +- frameworks: Tech stack being used +- plan[]: Phased implementation roadmap with requirements per phase + +**When to call:** +- ✅ FIRST STEP when no blueprint exists +- ✅ User provides vague requirements (you need to design structure) +- ✅ Complex project needing phased approach + +**When NOT to call:** +- ❌ Blueprint already exists (use alter_blueprint to modify) +- ❌ Simple one-file tasks (just generate directly) + +**Optional prompt parameter:** +- Use to provide additional context, clarifications, or refined specifications +- If omitted, uses user's original request +- Useful when you've learned more through conversation + +**CRITICAL After-Effects:** +1. Blueprint stored in agent state +2. You now have clear plan to follow +3. Use plan phases to guide generate_files calls +4. **Do NOT start building without blueprint** (fundamental rule) + +**Example workflow:** +\`\`\` +User: "Build a todo app" + ↓ +You: generate_blueprint (creates PRD with phases) + ↓ +Review blueprint, refine with alter_blueprint if needed + ↓ +Follow phases: generate_files for phase-1, then phase-2, etc. +\`\`\` + +**alter_blueprint** +- Patch specific fields in existing blueprint +- Use to refine after generation or requirements change +- Surgical updates only - don't regenerate entire blueprint + +## Template Management +**template_manager** - Unified template operations with command parameter + +Commands available: +- **"list"**: Browse available template catalog +- **"select"**: Choose a template for your project (requires templateName parameter) + +**What templates are:** +- Pre-built project scaffolds with working configs +- Each has wrangler.jsonc, vite.config.js, package.json already set up +- When you select a template, it becomes the BASE layer when sandbox is created +- Your generated files OVERLAY on top of template files + +**How it works:** +\`\`\` +You call: template_manager(command: "select", templateName: "minimal-vite") + ↓ +Template marked for use + ↓ +You call: deploy_preview + ↓ +Template downloaded and extracted to sandbox + ↓ +Your generated files synced on top + ↓ +Sandbox runs 'bun run dev' from template +\`\`\` + +**Default choice: "minimal-vite"** (use for 99% of cases) +- Vite + Bun + Cloudflare Worker boilerplate +- Has working 'bun run dev' script (CRITICAL - sandbox fails without this) +- Includes wrangler.jsonc and vite.config.js pre-configured +- Template choice persists for entire session + +**CRITICAL Caveat:** +- If template selected, deploy_preview REQUIRES that template's 'bun run dev' works +- If template broken, sandbox creation FAILS completely +- Template switching allowed but DISCOURAGED (requires sandbox recreation) + +**When to use templates:** +- ✅ Interactive apps (need dev server, hot reload) +- ✅ Want pre-configured build setup +- ✅ Need Cloudflare Worker or Durable Object scaffolding + +**When NOT to use templates:** +- ❌ Static documentation (no runtime needed) +- ❌ Want full control over every config file (use virtual-first mode) + +## File Operations (Understanding Your Two-Layer System) + +**CRITICAL: Where Your Files Live** + +You work with TWO separate filesystems: + +1. **Virtual Filesystem** (Your persistent workspace) + - Lives in Durable Object storage + - Managed by git (full commit history) + - Files here do NOT execute - just stored + - Persists across all requests/sessions + +2. **Sandbox Filesystem** (Where code runs) + - Separate container running Bun + Vite dev server + - Files here CAN execute and be tested + - Created when you call deploy_preview + - Destroyed/recreated on redeploy + +**The File Flow You Control:** +\`\`\` +You call: generate_files or regenerate_file + ↓ +Files written to VIRTUAL filesystem (Durable Object storage) + ↓ +Auto-committed to git (generate_files) or staged (regenerate_file) + ↓ +[Files NOT in sandbox yet - sandbox can't see them] + ↓ +You call: deploy_preview + ↓ +Files synced from virtual filesystem → sandbox filesystem + ↓ +Now sandbox can execute your code +\`\`\` + +--- + +**virtual_filesystem** - List and read files from your persistent workspace + +Commands available: +- **"list"**: See all files in your virtual filesystem +- **"read"**: Read file contents by paths (requires paths parameter) + +**What it does:** +- Lists/reads from your persistent workspace (template files + generated files) +- Shows you what exists BEFORE deploying to sandbox +- Useful for: discovering files, verifying changes, understanding structure + +**Where it reads from (priority order):** +1. Your generated/modified files (highest priority) +2. Template files (if template selected) +3. Returns empty if file doesn't exist + +**When to use:** +- ✅ Before editing (understand what exists) +- ✅ After generate_files/regenerate_file (verify changes worked) +- ✅ Exploring template structure +- ✅ Checking if file exists before regenerating + +**CRITICAL Caveat:** +- Reads from VIRTUAL filesystem, not sandbox +- Sandbox may have older versions if you haven't called deploy_preview +- If sandbox behaving weird, check if virtual FS and sandbox are in sync + +--- + +**generate_files** - Create or completely rewrite files + +**What it does:** +- Generates complete file contents from scratch +- Can create multiple files in one call (batch operation) +- Automatically commits to git with descriptive message +- **Where files go**: Virtual filesystem only (not in sandbox yet) + +**When to use:** +- ✅ Creating brand new files that don't exist +- ✅ Scaffolding features requiring multiple coordinated files +- ✅ When regenerate_file failed 2+ times (file too broken to patch) +- ✅ Initial project structure + +**When NOT to use:** +- ❌ Small fixes to existing files (use regenerate_file - faster) +- ❌ Tweaking single functions (use regenerate_file) + +**CRITICAL After-Effects:** +1. Files now exist in virtual filesystem +2. Automatically committed to git +3. Sandbox does NOT see them yet +4. **You MUST call deploy_preview to sync virtual → sandbox** +5. Only after deploy_preview can you test or run_analysis + +--- + +**regenerate_file** - Surgical fixes to single existing file + +**What it does:** +- Applies minimal, targeted changes to one file +- Uses smart pattern matching internally +- Makes multiple passes (up to 3) to fix issues +- Returns diff showing exactly what changed +- **Where files go**: Virtual filesystem only + +**When to use:** +- ✅ Fixing TypeScript/JavaScript errors +- ✅ Adding missing imports or exports +- ✅ Patching bugs or logic errors +- ✅ Small feature additions to existing components + +**When NOT to use:** +- ❌ File doesn't exist yet (use generate_files) +- ❌ File is too broken to patch (use generate_files to rewrite) +- ❌ Haven't read the file yet (read it first!) + +**How to describe issues (CRITICAL for success):** +- BE SPECIFIC: Include exact error messages, line numbers +- ONE PROBLEM PER ISSUE: Don't combine unrelated problems +- PROVIDE CONTEXT: Explain what's broken and why +- SUGGEST SOLUTION: Share your best idea for fixing it + +**CRITICAL After-Effects:** +1. File updated in virtual filesystem +2. Changes are STAGED (git add) but NOT committed +3. **You MUST manually call git commit** (unlike generate_files) +4. Sandbox does NOT see changes yet +5. **You MUST call deploy_preview to sync virtual → sandbox** + +**PARALLEL EXECUTION:** +- You can call regenerate_file on MULTIPLE different files simultaneously +- Much faster than sequential calls + +## Deployment & Testing +**deploy_preview** +- Deploy to sandbox and get preview URL +- Only for interactive projects (apps, presentations, APIs) +- NOT for static documentation +- Creates sandbox on first call if needed +- TWO MODES: + 1. **Template-based**: If you called template_manager(command: "select"), uses that template + 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with minimal-vite + your files as overlay +- Syncs all files from virtual filesystem to sandbox + +**run_analysis** +- TypeScript checking + ESLint +- **Where**: Runs in sandbox on deployed files +- **Requires**: Sandbox must exist +- Run after changes to catch errors early +- Much faster than runtime testing +- Analyzes files you specify (or all generated files) + +**get_runtime_errors** +- Fetch runtime exceptions from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running, user has interacted with app +- Check recency - logs are cumulative +- Use after deploy_preview for verification +- Errors only appear when code actually executes + +**get_logs** +- Get console logs from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running +- Cumulative - check timestamps +- Useful for debugging runtime behavior +- Logs appear when user interacts with preview + +## Utilities +**exec_commands** +- Execute shell commands in sandbox +- **Where**: Sandbox environment (NOT virtual filesystem) +- **Requires**: Sandbox must exist (call deploy_preview first) +- Use sparingly - most needs covered by other tools +- Commands run at project root +- Examples: bun add package, custom build scripts + +**git** +- Operations: commit, log, show +- **Where**: Virtual filesystem (isomorphic-git on DO storage) +- Commit frequently with conventional messages +- Use for: saving progress, reviewing changes +- Full git history maintained +- **Note**: This is YOUR git, not sandbox git + +**generate_images** +- Future image generation capability +- Currently a stub - do NOT rely on this`; + + const staticVsSandbox = `# CRITICAL: Static vs Sandbox Detection + +**Static Content (NO Sandbox)**: +- Markdown files (.md, .mdx) +- Documentation in docs/ directory +- Plain text files +- Configuration without runtime +→ Generate files, NO deploy_preview needed +→ Focus on content quality and organization + +**Interactive Projects (Require Sandbox)**: +- React apps, presentations, APIs +- Anything with bun run dev +- UI with interactivity +- Backend endpoints +→ Must select template +→ Use deploy_preview for testing +→ Verify with run_analysis + runtime tools`; + + const quality = `# Quality Standards + +**Code Quality:** +- Type-safe TypeScript (no any, proper interfaces) +- Minimal dependencies - reuse what exists +- Clean architecture - separation of concerns +- Professional error handling + +**UI Quality (when applicable):** +- Responsive design (mobile, tablet, desktop) +- Proper spacing and visual hierarchy +- Interactive states (hover, focus, active, disabled) +- Accessibility basics (semantic HTML, ARIA when needed) +- TailwindCSS for styling (theme-consistent) + +**Testing & Verification:** +- All TypeScript errors resolved +- No lint warnings +- Runtime tested via preview +- Edge cases considered`; + + const reactSafety = `# React Safety & Common Pitfalls + +${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} + +${PROMPT_UTILS.COMMON_PITFALLS} + +**Additional Warnings:** +- NEVER modify state during render +- useEffect dependencies must be complete +- Memoize expensive computations +- Avoid inline object/function creation in JSX`; + + const completion = `# Completion Discipline + +When you're done: +**BUILD_COMPLETE: ** +- All requirements met +- All errors fixed +- Testing completed +- Ready for user + +If blocked: +**BUILD_STUCK: ** +- Clear explanation of blocker +- What you tried +- What you need to proceed + +STOP ALL TOOL CALLS IMMEDIATELY after either signal.`; + + const warnings = `# Critical Warnings + +1. TEMPLATE CHOICE IS IMPORTANT - Choose with future scope in mind +2. For template-based: minimal-vite MUST have working 'bun run dev' or sandbox fails +3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview +4. Do NOT deploy static documentation - wastes resources +5. Check log timestamps - they're cumulative, may contain old data +6. NEVER create verbose step-by-step explanations - use tools directly +7. Template switching allowed but strongly discouraged +8. Virtual-first is advanced mode - default to template-based unless necessary`; return [ - persona, + identity, comms, + architecture, environment, constraints, - toolsCatalog, - protocol, + workflow, + tools, + staticVsSandbox, quality, - 'Dynamic Guidance', - dynamicHints, - 'React/General Safety Notes', reactSafety, completion, + warnings, + '# Dynamic Context-Specific Guidance', + dynamicHints, ].join('\n\n'); }; @@ -159,7 +696,7 @@ Build a complete, production-ready solution that best fulfills the request. If i - Commit regularly with descriptive messages ## Execution Reminder -- If no blueprint or plan is present: generate_blueprint FIRST, then alter_blueprint if needed. Do not implement until a plan exists. +- If no blueprint or plan is present: generate_blueprint FIRST (optionally with prompt parameter for additional context), then alter_blueprint if needed. Do not implement until a plan exists. - Deploy only when a runtime exists; do not deploy for documents-only work. Begin building.`; @@ -230,11 +767,15 @@ export class AgenticProjectBuilder extends Assistant { const hasTSX = session.filesIndex?.some(f => /\.(t|j)sx$/i.test(f.filePath)) || false; const hasMD = session.filesIndex?.some(f => /\.(md|mdx)$/i.test(f.filePath)) || false; const hasPlan = isAgenticBlueprint(inputs.blueprint) && inputs.blueprint.plan.length > 0; + const hasTemplate = !!session.selectedTemplate; + const needsSandbox = hasTSX || session.projectType === 'presentation' || session.projectType === 'app'; + const dynamicHints = [ - !hasPlan ? '- No plan detected: Start with generate_blueprint to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', - hasTSX ? '- UI/slides detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', - hasMD && !hasTSX ? '- Documents detected without UI: Do NOT deploy; focus on Markdown/MDX quality and structure.' : '', - !hasFiles ? '- No files yet: After PRD, scaffold initial structure with generate_files. If a deck is appropriate, call initialize_slides before deploying preview.' : '', + !hasPlan ? '- No plan detected: Start with generate_blueprint (optionally with prompt parameter) to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', + needsSandbox && !hasTemplate ? '- Interactive project without template: Use template_manager(command: "list") then template_manager(command: "select", templateName: "minimal-vite") before first deploy.' : '', + hasTSX ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + hasMD && !hasTSX ? '- Documents detected without UI: This is STATIC content - generate files in docs/, NO deploy_preview needed.' : '', + !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', ].filter(Boolean).join('\n'); // Build prompts diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 7c725db7..2cc4cbf3 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -6,7 +6,7 @@ import { AgenticBlueprint, PhasicBlueprint, } from '../../schemas'; -import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails } from '../../../services/sandbox/sandboxTypes'; +import { ExecuteCommandsResponse, PreviewType, RuntimeError, StaticAnalysisResponse, TemplateDetails, TemplateFile } from '../../../services/sandbox/sandboxTypes'; import { BaseProjectState, AgenticState } from '../state'; import { AllIssues, AgentSummary, AgentInitArgs, BehaviorType, DeploymentTarget, ProjectType } from '../types'; import { ModelConfig } from '../../inferutils/config.types'; @@ -16,6 +16,7 @@ import { UserConversationProcessor, RenderToolCall } from '../../operations/User import { FileRegenerationOperation } from '../../operations/FileRegeneration'; // Database schema imports removed - using zero-storage OAuth flow import { BaseSandboxService } from '../../../services/sandbox/BaseSandboxService'; +import { getTemplateImportantFiles } from '../../../services/sandbox/utils'; import { createScratchTemplateDetails } from '../../utils/templates'; import { WebSocketMessageData, WebSocketMessageType } from '../../../api/websocketTypes'; import { InferenceContext, AgentActionKey } from '../../inferutils/config.types'; @@ -778,17 +779,39 @@ export abstract class BaseCodingBehavior } // ===== Debugging helpers for assistants ===== + listFiles(): FileOutputType[] { + return this.fileManager.getAllRelevantFiles(); + } + async readFiles(paths: string[]): Promise<{ files: { path: string; content: string }[] }> { - const { sandboxInstanceId } = this.state; - if (!sandboxInstanceId) { - return { files: [] }; + const results: { path: string; content: string }[] = []; + const notFoundInFileManager: string[] = []; + + // First, try to read from FileManager (template + generated files) + for (const path of paths) { + const file = this.fileManager.getFile(path); + if (file) { + results.push({ path, content: file.fileContents }); + } else { + notFoundInFileManager.push(path); + } } - const resp = await this.getSandboxServiceClient().getFiles(sandboxInstanceId, paths); - if (!resp.success) { - this.logger.warn('readFiles failed', { error: resp.error }); - return { files: [] }; + + // If some files not found in FileManager and sandbox exists, try sandbox + if (notFoundInFileManager.length > 0 && this.state.sandboxInstanceId) { + const resp = await this.getSandboxServiceClient().getFiles( + this.state.sandboxInstanceId, + notFoundInFileManager + ); + if (resp.success) { + results.push(...resp.files.map(f => ({ + path: f.filePath, + content: f.fileContents + }))); + } } - return { files: resp.files.map(f => ({ path: f.filePath, content: f.fileContents })) }; + + return { files: results }; } async execCommands(commands: string[], shouldSave: boolean, timeout?: number): Promise { @@ -1032,7 +1055,7 @@ export abstract class BaseCodingBehavior } } - async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number }> { + async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }> { this.logger.info(`Importing template into project: ${templateName}`); const results = await BaseSandboxService.getTemplateDetails(templateName); if (!results.success || !results.templateDetails) { @@ -1060,7 +1083,14 @@ export abstract class BaseCodingBehavior lastPackageJson: templateDetails.allFiles['package.json'] || this.state.lastPackageJson, }); - return { templateName: templateDetails.name, filesImported: filesToSave.length }; + // Get important files for return value + const importantFiles = getTemplateImportantFiles(templateDetails); + + return { + templateName: templateDetails.name, + filesImported: filesToSave.length, + files: importantFiles + }; } async waitForGeneration(): Promise { diff --git a/worker/agents/services/implementations/DeploymentManager.ts b/worker/agents/services/implementations/DeploymentManager.ts index 6f2ff022..1915090e 100644 --- a/worker/agents/services/implementations/DeploymentManager.ts +++ b/worker/agents/services/implementations/DeploymentManager.ts @@ -554,7 +554,6 @@ export class DeploymentManager extends BaseAgentService implem */ private async createNewInstance(): Promise { const state = this.getState(); - const templateName = state.templateName; const projectName = state.projectName; // Add AI proxy vars if AI template @@ -572,18 +571,21 @@ export class DeploymentManager extends BaseAgentService implem }; } } - + + // Get latest files + const files = this.fileManager.getAllFiles(); + // Create instance const client = this.getClient(); const logger = this.getLog(); - - const createResponse = await client.createInstance( - templateName, - `v1-${projectName}`, - undefined, - localEnvVars - ); - + + const createResponse = await client.createInstance({ + files, + projectName, + initCommand: 'bun run dev', + envVars: localEnvVars + }); + if (!createResponse || !createResponse.success || !createResponse.runId) { throw new Error(`Failed to create sandbox instance: ${createResponse?.error || 'Unknown error'}`); } diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index 416f1074..a44101d4 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -7,6 +7,7 @@ import { RenderToolCall } from "worker/agents/operations/UserConversationProcess import { WebSocketMessageType, WebSocketMessageData } from "worker/api/websocketTypes"; import { GitVersionControl } from "worker/agents/git/git"; import { OperationOptions } from "worker/agents/operations/common"; +import { TemplateFile } from "worker/services/sandbox/sandboxTypes"; export interface ICodingAgent { getBehavior(): BehaviorType; @@ -33,10 +34,12 @@ export interface ICodingAgent { getProjectType(): ProjectType; - importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }>; - + importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }>; + getOperationOptions(): OperationOptions; - + + listFiles(): FileOutputType[]; + readFiles(paths: string[]): Promise<{ files: { path: string; content: string }[] }>; runStaticAnalysisCode(files?: string[]): Promise; @@ -70,7 +73,6 @@ export interface ICodingAgent { ): Promise; get git(): GitVersionControl; - getGit(): GitVersionControl; getSandboxServiceClient(): BaseSandboxService; } diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index ec0508ab..f78d9738 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -22,7 +22,8 @@ import { createWaitForGenerationTool } from './toolkit/wait-for-generation'; import { createWaitForDebugTool } from './toolkit/wait-for-debug'; import { createGitTool } from './toolkit/git'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; -import { createInitializeSlidesTool } from './toolkit/initialize-slides'; +import { createTemplateManagerTool } from './toolkit/template-manager'; +import { createVirtualFilesystemTool } from './toolkit/virtual-filesystem'; import { createGenerateImagesTool } from './toolkit/generate-images'; export async function executeToolWithDefinition( @@ -86,13 +87,15 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur // PRD generation + refinement createGenerateBlueprintTool(session.agent, logger), createAlterBlueprintTool(session.agent, logger), + // Template management (combined list + select) + createTemplateManagerTool(session.agent, logger), + // Virtual filesystem operations (list + read from Durable Object storage) + createVirtualFilesystemTool(session.agent, logger), // Build + analysis toolchain - createReadFilesTool(session.agent, logger), createGenerateFilesTool(session.agent, logger), createRegenerateFileTool(session.agent, logger), createRunAnalysisTool(session.agent, logger), // Runtime + deploy - createInitializeSlidesTool(session.agent, logger), createDeployPreviewTool(session.agent, logger), createGetRuntimeErrorsTool(session.agent, logger), createGetLogsTool(session.agent, logger), @@ -100,7 +103,7 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur createExecCommandsTool(session.agent, logger), createWaitTool(logger), createGitTool(session.agent, logger), - // Optional future: images + // WIP: images createGenerateImagesTool(session.agent, logger), ]; diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts index 9d99b5dc..cf821b01 100644 --- a/worker/agents/tools/toolkit/generate-blueprint.ts +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -4,7 +4,9 @@ import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; import type { Blueprint } from 'worker/agents/schemas'; -type GenerateBlueprintArgs = Record; +type GenerateBlueprintArgs = { + prompt: string; +}; type GenerateBlueprintResult = { message: string; blueprint: Blueprint }; /** @@ -19,10 +21,19 @@ export function createGenerateBlueprintTool( function: { name: 'generate_blueprint', description: - 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic.', - parameters: { type: 'object', properties: {}, additionalProperties: false }, + 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic. Provide a description/prompt for the project to generate a blueprint.', + parameters: { + type: 'object', + properties: { + prompt: { + type: 'string', + description: 'Prompt/user query for building the project. Use this to provide clarifications, additional requirements, or refined specifications based on conversation context.' + } + }, + required: ['prompt'], + }, }, - implementation: async () => { + implementation: async ({ prompt }: GenerateBlueprintArgs) => { const { env, inferenceContext, context } = agent.getOperationOptions(); const isAgentic = agent.getBehavior() === 'agentic'; @@ -34,7 +45,7 @@ export function createGenerateBlueprintTool( const args: AgenticBlueprintGenerationArgs = { env, inferenceContext, - query: context.query, + query: prompt, language, frameworks, templateDetails: context.templateDetails, diff --git a/worker/agents/tools/toolkit/template-manager.ts b/worker/agents/tools/toolkit/template-manager.ts new file mode 100644 index 00000000..974ceb36 --- /dev/null +++ b/worker/agents/tools/toolkit/template-manager.ts @@ -0,0 +1,130 @@ +import { ToolDefinition, ErrorResult } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; + +export type TemplateManagerArgs = { + command: 'list' | 'select'; + templateName?: string; +}; + +export type TemplateManagerResult = + | { summary: string } + | { message: string; templateName: string; files: Array<{ path: string; content: string }> } + | ErrorResult; + +/** + * Manages project templates - list available templates or select one for the project. + * Use 'list' to see all available templates with descriptions. + * Use 'select' with templateName to choose and import a template. + */ +export function createTemplateManagerTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'template_manager', + description: 'Manage project templates. Use command="list" to see available templates with their descriptions, frameworks, and use cases. Use command="select" with templateName to select and import a template. Default to "minimal-vite" for 99% of cases unless you have specific requirements.', + parameters: { + type: 'object', + properties: { + command: { + type: 'string', + enum: ['list', 'select'], + description: 'Action to perform: "list" shows all templates, "select" imports a template', + }, + templateName: { + type: 'string', + description: 'Name of template to select (required when command="select"). Examples: "minimal-vite", "c-code-react-runner"', + }, + }, + required: ['command'], + }, + }, + implementation: async ({ command, templateName }: TemplateManagerArgs) => { + try { + if (command === 'list') { + logger.info('Listing available templates'); + + const response = await BaseSandboxService.listTemplates(); + + if (!response.success || !response.templates) { + return { + error: `Failed to fetch templates: ${response.error || 'Unknown error'}` + }; + } + + const templates = response.templates; + + // Format template catalog for LLM + const formattedOutput = templates.map((template, index) => { + const frameworks = template.frameworks?.join(', ') || 'None specified'; + const selectionDesc = template.description?.selection || 'No description'; + const usageDesc = template.description?.usage || 'No usage notes'; + + return ` +${index + 1}. **${template.name}** + - Language: ${template.language} + - Frameworks: ${frameworks} + - Selection Guide: +${selectionDesc} + - Usage Notes: +${usageDesc} +`.trim(); + }).join('\n\n'); + + const summaryText = `# Available Templates (${templates.length} total) +${formattedOutput}`; + + return { summary: summaryText }; + } else if (command === 'select') { + if (!templateName) { + return { + error: 'templateName is required when command is "select"' + }; + } + + logger.info('Selecting template', { templateName }); + + // Validate template exists + const templatesResponse = await BaseSandboxService.listTemplates(); + + if (!templatesResponse.success || !templatesResponse.templates) { + return { + error: `Failed to validate template: ${templatesResponse.error || 'Could not fetch template list'}` + }; + } + + const templateExists = templatesResponse.templates.some(t => t.name === templateName); + if (!templateExists) { + const availableNames = templatesResponse.templates.map(t => t.name).join(', '); + return { + error: `Template "${templateName}" not found. Available templates: ${availableNames}` + }; + } + + // Import template into the agent's virtual filesystem + // This returns important template files + const result = await agent.importTemplate(templateName, `Selected template: ${templateName}`); + + return { + message: `Template "${templateName}" selected and imported successfully. ${result.files.length} important files available. You can now use deploy_preview to create the sandbox.`, + templateName: result.templateName, + files: result.files + }; + } else { + return { + error: `Invalid command: ${command}. Must be "list" or "select"` + }; + } + } catch (error) { + logger.error('Error in template_manager', error); + return { + error: `Error managing templates: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }; +} diff --git a/worker/agents/tools/toolkit/virtual-filesystem.ts b/worker/agents/tools/toolkit/virtual-filesystem.ts new file mode 100644 index 00000000..0b1e0d7f --- /dev/null +++ b/worker/agents/tools/toolkit/virtual-filesystem.ts @@ -0,0 +1,81 @@ +import { ToolDefinition, ErrorResult } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; + +export type VirtualFilesystemArgs = { + command: 'list' | 'read'; + paths?: string[]; +}; + +export type VirtualFilesystemResult = + | { files: Array<{ path: string; purpose?: string; size: number }> } + | { files: Array<{ path: string; content: string }> } + | ErrorResult; + +export function createVirtualFilesystemTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'virtual_filesystem', + description: `Interact with the virtual persistent workspace. +IMPORTANT: This reads from the VIRTUAL filesystem, NOT the sandbox. Files appear here immediately after generation and may not be deployed to sandbox yet.`, + parameters: { + type: 'object', + properties: { + command: { + type: 'string', + enum: ['list', 'read'], + description: 'Action to perform: "list" shows all files, "read" returns file contents', + }, + paths: { + type: 'array', + items: { type: 'string' }, + description: 'File paths to read (required when command="read"). Use relative paths from project root.', + }, + }, + required: ['command'], + }, + }, + implementation: async ({ command, paths }: VirtualFilesystemArgs) => { + try { + if (command === 'list') { + logger.info('Listing virtual filesystem files'); + + const files = agent.listFiles(); + + const fileList = files.map(file => ({ + path: file.filePath, + purpose: file.filePurpose, + size: file.fileContents.length + })); + + return { + files: fileList + }; + } else if (command === 'read') { + if (!paths || paths.length === 0) { + return { + error: 'paths array is required when command is "read"' + }; + } + + logger.info('Reading files from virtual filesystem', { count: paths.length }); + + return await agent.readFiles(paths); + } else { + return { + error: `Invalid command: ${command}. Must be "list" or "read"` + }; + } + } catch (error) { + logger.error('Error in virtual_filesystem', error); + return { + error: `Error accessing virtual filesystem: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }; +} diff --git a/worker/api/controllers/agent/controller.ts b/worker/api/controllers/agent/controller.ts index 44a2290d..12cceda4 100644 --- a/worker/api/controllers/agent/controller.ts +++ b/worker/api/controllers/agent/controller.ts @@ -88,8 +88,8 @@ export class CodingAgentController extends BaseController { const agentId = generateId(); const modelConfigService = new ModelConfigService(env); - const behaviorType = resolveBehaviorType(body); const projectType = resolveProjectType(body); + const behaviorType = resolveBehaviorType(body); this.logger.info(`Resolved behaviorType: ${behaviorType}, projectType: ${projectType} for agent ${agentId}`); @@ -135,8 +135,6 @@ export class CodingAgentController extends BaseController { return uploadImage(env, image, ImageType.UPLOADS); })); } - - const isPhasic = behaviorType === 'phasic'; writer.write({ message: 'Code generation started', @@ -145,15 +143,10 @@ export class CodingAgentController extends BaseController { httpStatusUrl, behaviorType, projectType: finalProjectType, - template: isPhasic - ? { - name: templateDetails.name, - files: getTemplateImportantFiles(templateDetails), - } - : { - name: 'scratch', - files: [], - } + template: { + name: templateDetails.name, + files: getTemplateImportantFiles(templateDetails), + } }); const agentInstance = await getAgentStub(env, agentId, { behaviorType, projectType: finalProjectType }); @@ -169,9 +162,7 @@ export class CodingAgentController extends BaseController { }, } as const; - const initArgs = isPhasic - ? { ...baseInitArgs, templateInfo: { templateDetails, selection } } - : baseInitArgs; + const initArgs = { ...baseInitArgs, templateInfo: { templateDetails, selection } } const agentPromise = agentInstance.initialize(initArgs) as Promise; agentPromise.then(async (_state: AgentState) => { diff --git a/worker/services/sandbox/BaseSandboxService.ts b/worker/services/sandbox/BaseSandboxService.ts index 317c04c5..cef1a8cb 100644 --- a/worker/services/sandbox/BaseSandboxService.ts +++ b/worker/services/sandbox/BaseSandboxService.ts @@ -29,6 +29,7 @@ import { ListInstancesResponse, TemplateDetails, TemplateInfo, + InstanceCreationRequest, } from './sandboxTypes'; import { createObjectLogger, StructuredLogger } from '../../logger'; @@ -207,8 +208,11 @@ export abstract class BaseSandboxService { /** * Create a new instance from a template * Returns: { success: boolean, instanceId?: string, error?: string } + * @param options - Instance creation options */ - abstract createInstance(templateName: string, projectName: string, webhookUrl?: string, localEnvVars?: Record): Promise; + abstract createInstance( + options: InstanceCreationRequest + ): Promise; /** * List all instances across all sessions diff --git a/worker/services/sandbox/remoteSandboxService.ts b/worker/services/sandbox/remoteSandboxService.ts index b52ce8cd..3d33622e 100644 --- a/worker/services/sandbox/remoteSandboxService.ts +++ b/worker/services/sandbox/remoteSandboxService.ts @@ -14,7 +14,6 @@ import { GetLogsResponse, ListInstancesResponse, BootstrapResponseSchema, - BootstrapRequest, GetInstanceResponseSchema, BootstrapStatusResponseSchema, WriteFilesResponseSchema, @@ -29,6 +28,7 @@ import { GitHubPushRequest, GitHubPushResponse, GitHubPushResponseSchema, + InstanceCreationRequest, } from './sandboxTypes'; import { BaseSandboxService } from "./BaseSandboxService"; import { DeploymentTarget } from 'worker/agents/core/types'; @@ -118,14 +118,10 @@ export class RemoteSandboxServiceClient extends BaseSandboxService{ /** * Create a new runner instance. */ - async createInstance(templateName: string, projectName: string, webhookUrl?: string, localEnvVars?: Record): Promise { - const requestBody: BootstrapRequest = { - templateName, - projectName, - ...(webhookUrl && { webhookUrl }), - ...(localEnvVars && { envVars: localEnvVars }) - }; - return this.makeRequest('/instances', 'POST', BootstrapResponseSchema, requestBody); + async createInstance( + options: InstanceCreationRequest + ): Promise { + return this.makeRequest('/instances', 'POST', BootstrapResponseSchema, options); } /** diff --git a/worker/services/sandbox/sandboxSdkClient.ts b/worker/services/sandbox/sandboxSdkClient.ts index 068f1d3e..224152f6 100644 --- a/worker/services/sandbox/sandboxSdkClient.ts +++ b/worker/services/sandbox/sandboxSdkClient.ts @@ -22,6 +22,8 @@ import { GetLogsResponse, ListInstancesResponse, StoredError, + TemplateFile, + InstanceCreationRequest, } from './sandboxTypes'; import { createObjectLogger } from '../../logger'; @@ -50,7 +52,6 @@ export { Sandbox as UserAppSandboxService, Sandbox as DeployerService} from "@cl interface InstanceMetadata { - templateName: string; projectName: string; startTime: string; webhookUrl?: string; @@ -232,24 +233,24 @@ export class SandboxSdkClient extends BaseSandboxService { } } - /** Write a binary file to the sandbox using small base64 chunks to avoid large control messages. */ - private async writeBinaryFileViaBase64(targetPath: string, data: ArrayBuffer, bytesPerChunk: number = 16 * 1024): Promise { - const dir = targetPath.includes('/') ? targetPath.slice(0, targetPath.lastIndexOf('/')) : '.'; - // Ensure directory and clean target file - await this.safeSandboxExec(`mkdir -p '${dir}'`); - await this.safeSandboxExec(`rm -f '${targetPath}'`); - - const buffer = new Uint8Array(data); - for (let i = 0; i < buffer.length; i += bytesPerChunk) { - const chunk = buffer.subarray(i, Math.min(i + bytesPerChunk, buffer.length)); - const base64Chunk = btoa(String.fromCharCode(...chunk)); - // Append decoded bytes into the target file inside the sandbox - const appendResult = await this.safeSandboxExec(`printf '%s' '${base64Chunk}' | base64 -d >> '${targetPath}'`); - if (appendResult.exitCode !== 0) { - throw new Error(`Failed to append to ${targetPath}: ${appendResult.stderr}`); - } - } - } + // /** Write a binary file to the sandbox using small base64 chunks to avoid large control messages. */ + // private async writeBinaryFileViaBase64(targetPath: string, data: ArrayBuffer, bytesPerChunk: number = 16 * 1024): Promise { + // const dir = targetPath.includes('/') ? targetPath.slice(0, targetPath.lastIndexOf('/')) : '.'; + // // Ensure directory and clean target file + // await this.safeSandboxExec(`mkdir -p '${dir}'`); + // await this.safeSandboxExec(`rm -f '${targetPath}'`); + + // const buffer = new Uint8Array(data); + // for (let i = 0; i < buffer.length; i += bytesPerChunk) { + // const chunk = buffer.subarray(i, Math.min(i + bytesPerChunk, buffer.length)); + // const base64Chunk = btoa(String.fromCharCode(...chunk)); + // // Append decoded bytes into the target file inside the sandbox + // const appendResult = await this.safeSandboxExec(`printf '%s' '${base64Chunk}' | base64 -d >> '${targetPath}'`); + // if (appendResult.exitCode !== 0) { + // throw new Error(`Failed to append to ${targetPath}: ${appendResult.stderr}`); + // } + // } + // } /** * Write multiple files efficiently using a single shell script @@ -257,7 +258,7 @@ export class SandboxSdkClient extends BaseSandboxService { * Uses base64 encoding to handle all content safely */ private async writeFilesViaScript( - files: Array<{path: string, content: string}>, + files: TemplateFile[], session: ExecutionSession ): Promise> { if (files.length === 0) return []; @@ -267,8 +268,8 @@ export class SandboxSdkClient extends BaseSandboxService { // Generate shell script const scriptLines = ['#!/bin/bash']; - for (const { path, content } of files) { - const utf8Bytes = new TextEncoder().encode(content); + for (const { filePath, fileContents } of files) { + const utf8Bytes = new TextEncoder().encode(fileContents); // Convert bytes to base64 in chunks to avoid stack overflow const chunkSize = 8192; @@ -288,7 +289,7 @@ export class SandboxSdkClient extends BaseSandboxService { const base64 = base64Chunks.join(''); scriptLines.push( - `mkdir -p "$(dirname "${path}")" && echo '${base64}' | base64 -d > "${path}" && echo "OK:${path}" || echo "FAIL:${path}"` + `mkdir -p "$(dirname "${filePath}")" && echo '${base64}' | base64 -d > "${filePath}" && echo "OK:${filePath}" || echo "FAIL:${filePath}"` ); } @@ -297,7 +298,7 @@ export class SandboxSdkClient extends BaseSandboxService { try { // Write script (1 request) - const writeResult = await session.writeFile(scriptPath, script); + const writeResult = await session.writeFile(scriptPath, script); // TODO: Checksum integrity verification if (!writeResult.success) { throw new Error('Failed to write batch script'); } @@ -313,10 +314,10 @@ export class SandboxSdkClient extends BaseSandboxService { if (match[1]) successPaths.add(match[1]); } - const results = files.map(({ path }) => ({ - file: path, - success: successPaths.has(path), - error: successPaths.has(path) ? undefined : 'Write failed' + const results = files.map(({ filePath }) => ({ + file: filePath, + success: successPaths.has(filePath), + error: successPaths.has(filePath) ? undefined : 'Write failed' })); const successCount = successPaths.size; @@ -339,14 +340,50 @@ export class SandboxSdkClient extends BaseSandboxService { } catch (error) { this.logger.error('Batch write failed', error); - return files.map(({ path }) => ({ - file: path, + return files.map(({ filePath }) => ({ + file: filePath, success: false, error: error instanceof Error ? error.message : 'Unknown error' })); } } + async writeFilesBulk(instanceId: string, files: TemplateFile[]): Promise { + try { + const session = await this.getInstanceSession(instanceId); + // Use batch script for efficient writing (3 requests for any number of files) + const filesToWrite = files.map(file => ({ + filePath: `/workspace/${instanceId}/${file.filePath}`, + fileContents: file.fileContents + })); + + const writeResults = await this.writeFilesViaScript(filesToWrite, session); + + // Map results back to original format + const results: WriteFilesResponse['results'] = []; + for (const writeResult of writeResults) { + results.push({ + file: writeResult.file.replace(`/workspace/${instanceId}/`, ''), + success: writeResult.success, + error: writeResult.error + }); + } + + return { + success: true, + results, + message: 'Files written successfully' + }; + } catch (error) { + this.logger.error('writeFiles', error, { instanceId }); + return { + success: false, + results: files.map(f => ({ file: f.filePath, success: false, error: 'Instance error' })), + message: 'Failed to write files' + }; + } + } + async updateProjectName(instanceId: string, projectName: string): Promise { try { await this.updateProjectConfiguration(instanceId, projectName); @@ -433,48 +470,6 @@ export class SandboxSdkClient extends BaseSandboxService { throw new Error('No available ports found in range 8001-8999'); } - - private async checkTemplateExists(templateName: string): Promise { - // Single command to check if template directory and package.json both exist - const checkResult = await this.safeSandboxExec(`test -f ${templateName}/package.json && echo "exists" || echo "missing"`); - return checkResult.exitCode === 0 && checkResult.stdout.trim() === "exists"; - } - - async downloadTemplate(templateName: string, downloadDir?: string) : Promise { - // Fetch the zip file from R2 - const downloadUrl = downloadDir ? `${downloadDir}/${templateName}.zip` : `${templateName}.zip`; - this.logger.info(`Fetching object: ${downloadUrl} from R2 bucket`); - const r2Object = await env.TEMPLATES_BUCKET.get(downloadUrl); - - if (!r2Object) { - throw new Error(`Object '${downloadUrl}' not found in bucket`); - } - - const zipData = await r2Object.arrayBuffer(); - - this.logger.info(`Downloaded zip file (${zipData.byteLength} bytes)`); - return zipData; - } - - private async ensureTemplateExists(templateName: string, downloadDir?: string, isInstance: boolean = false) { - if (!await this.checkTemplateExists(templateName)) { - // Download and extract template - this.logger.info(`Template doesnt exist, Downloading template from: ${templateName}`); - - const zipData = await this.downloadTemplate(templateName, downloadDir); - // Stream zip to sandbox in safe base64 chunks and write directly as binary - await this.writeBinaryFileViaBase64(`${templateName}.zip`, zipData); - this.logger.info(`Wrote zip file to sandbox in chunks: ${templateName}.zip`); - - const setupResult = await this.safeSandboxExec(`unzip -o -q ${templateName}.zip -d ${isInstance ? '.' : templateName}`); - - if (setupResult.exitCode !== 0) { - throw new Error(`Failed to download/extract template: ${setupResult.stderr}`); - } - } else { - this.logger.info(`Template already exists`); - } - } private async buildFileTree(instanceId: string): Promise { try { @@ -539,7 +534,6 @@ export class SandboxSdkClient extends BaseSandboxService { // Create lightweight instance details from metadata const instanceDetails: InstanceDetails = { runId: instanceId, - templateName: metadata.templateName, startTime: new Date(metadata.startTime), uptime: Math.floor((Date.now() - new Date(metadata.startTime).getTime()) / 1000), directory: instanceId, @@ -633,7 +627,7 @@ export class SandboxSdkClient extends BaseSandboxService { return false; } - private async startDevServer(instanceId: string, port: number): Promise { + private async startDevServer(instanceId: string, initCommand: string, port: number): Promise { try { // Use session-based process management // Note: Environment variables should already be set via setLocalEnvVars @@ -641,7 +635,7 @@ export class SandboxSdkClient extends BaseSandboxService { // Start process with env vars inline for those not in .dev.vars const process = await session.startProcess( - `VITE_LOGGER_TYPE=json PORT=${port} monitor-cli process start --instance-id ${instanceId} --port ${port} -- bun run dev` + `VITE_LOGGER_TYPE=json PORT=${port} monitor-cli process start --instance-id ${instanceId} --port ${port} -- ${initCommand}` ); this.logger.info('Development server started', { instanceId, processId: process.id }); @@ -900,7 +894,12 @@ export class SandboxSdkClient extends BaseSandboxService { } } - private async setupInstance(instanceId: string, projectName: string, localEnvVars?: Record): Promise<{previewURL: string, tunnelURL: string, processId: string, allocatedPort: number} | undefined> { + private async setupInstance( + instanceId: string, + projectName: string, + initCommand: string, + localEnvVars?: Record, + ): Promise<{previewURL: string, tunnelURL: string, processId: string, allocatedPort: number} | undefined> { try { const sandbox = this.getSandbox(); // Update project configuration with the specified project name @@ -926,12 +925,11 @@ export class SandboxSdkClient extends BaseSandboxService { this.logger.warn('Failed to store wrangler config in KV', { instanceId, error: error instanceof Error ? error.message : 'Unknown error' }); // Non-blocking - continue with setup } - + // If on local development, start cloudflared tunnel + let tunnelUrlPromise = Promise.resolve(''); // Allocate single port for both dev server and tunnel const allocatedPort = await this.allocateAvailablePort(); - // If on local development, start cloudflared tunnel - let tunnelUrlPromise = Promise.resolve(''); if (isDev(env) || env.USE_TUNNEL_FOR_PREVIEW) { this.logger.info('Starting cloudflared tunnel for local development', { instanceId }); tunnelUrlPromise = this.startCloudflaredTunnel(instanceId, allocatedPort); @@ -951,7 +949,7 @@ export class SandboxSdkClient extends BaseSandboxService { await this.setLocalEnvVars(instanceId, localEnvVars); } // Start dev server on allocated port - const processId = await this.startDevServer(instanceId, allocatedPort); + const processId = await this.startDevServer(instanceId, initCommand, allocatedPort); this.logger.info('Instance created successfully', { instanceId, processId, port: allocatedPort }); // Expose the same port for preview URL @@ -986,46 +984,15 @@ export class SandboxSdkClient extends BaseSandboxService { return undefined; } - - private async fetchDontTouchFiles(templateName: string): Promise { - let donttouchFiles: string[] = []; - try { - // Read .donttouch_files.json using default session with full path - const session = await this.getDefaultSession(); - const donttouchFile = await session.readFile(`${templateName}/.donttouch_files.json`); - if (!donttouchFile.success) { - this.logger.warn('Failed to read .donttouch_files.json'); - return donttouchFiles; - } - donttouchFiles = JSON.parse(donttouchFile.content) as string[]; - } catch (error) { - this.logger.warn(`Failed to read .donttouch_files.json: ${error instanceof Error ? error.message : 'Unknown error'}`); - } - return donttouchFiles; - } - - private async fetchRedactedFiles(templateName: string): Promise { - let redactedFiles: string[] = []; - try { - // Read .redacted_files.json using default session with full path - const session = await this.getDefaultSession(); - const redactedFile = await session.readFile(`${templateName}/.redacted_files.json`); - if (!redactedFile.success) { - this.logger.warn('Failed to read .redacted_files.json'); - return redactedFiles; - } - redactedFiles = JSON.parse(redactedFile.content) as string[]; - } catch (error) { - this.logger.warn(`Failed to read .redacted_files.json: ${error instanceof Error ? error.message : 'Unknown error'}`); - } - return redactedFiles; - } - - async createInstance(templateName: string, projectName: string, webhookUrl?: string, localEnvVars?: Record): Promise { + + async createInstance( + options: InstanceCreationRequest + ): Promise { + const { files, projectName, webhookUrl, envVars, initCommand } = options; try { // Environment variables will be set via session creation on first use - if (localEnvVars && Object.keys(localEnvVars).length > 0) { - this.logger.info('Environment variables will be configured via session', { envVars: Object.keys(localEnvVars) }); + if (envVars && Object.keys(envVars).length > 0) { + this.logger.info('Environment variables will be configured via session', { envVars: Object.keys(envVars) }); } let instanceId: string; if (env.ALLOCATION_STRATEGY === 'one_to_one') { @@ -1059,20 +1026,24 @@ export class SandboxSdkClient extends BaseSandboxService { } else { instanceId = `i-${generateId()}`; } - this.logger.info('Creating sandbox instance', { instanceId, templateName, projectName }); - await this.ensureTemplateExists(templateName); + this.logger.info('Creating sandbox instance', { instanceId, projectName }); - const [donttouchFiles, redactedFiles] = await Promise.all([ - this.fetchDontTouchFiles(templateName), - this.fetchRedactedFiles(templateName) - ]); + const dontTouchFile = files.find(f => f.filePath === '.donttouch_files.json'); + const dontTouchFiles = dontTouchFile ? JSON.parse(dontTouchFile.fileContents) : []; - const moveTemplateResult = await this.safeSandboxExec(`mv ${templateName} ${instanceId}`); - if (moveTemplateResult.exitCode !== 0) { - throw new Error(`Failed to move template: ${moveTemplateResult.stderr}`); + const redactedFile = files.find(f => f.filePath === '.redacted_files.json'); + const redactedFiles = redactedFile ? JSON.parse(redactedFile.fileContents) : []; + + // Write files in bulk to sandbox + const rawResults = await this.writeFilesBulk(instanceId, files); + if (!rawResults.success) { + return { + success: false, + error: 'Failed to write files to sandbox' + }; } - - const setupPromise = () => this.setupInstance(instanceId, projectName, localEnvVars); + + const setupPromise = () => this.setupInstance(instanceId, projectName, initCommand, envVars); const setupResult = await setupPromise(); if (!setupResult) { return { @@ -1082,7 +1053,6 @@ export class SandboxSdkClient extends BaseSandboxService { } // Store instance metadata const metadata = { - templateName: templateName, projectName: projectName, startTime: new Date().toISOString(), webhookUrl: webhookUrl, @@ -1090,7 +1060,7 @@ export class SandboxSdkClient extends BaseSandboxService { processId: setupResult?.processId, tunnelURL: setupResult?.tunnelURL, allocatedPort: setupResult?.allocatedPort, - donttouch_files: donttouchFiles, + donttouch_files: dontTouchFiles, redacted_files: redactedFiles, }; await this.storeInstanceMetadata(instanceId, metadata); @@ -1098,13 +1068,13 @@ export class SandboxSdkClient extends BaseSandboxService { return { success: true, runId: instanceId, - message: `Successfully created instance from template ${templateName}`, + message: `Successfully created instance ${instanceId}`, previewURL: setupResult?.previewURL, tunnelURL: setupResult?.tunnelURL, processId: setupResult?.processId, }; } catch (error) { - this.logger.error('createInstance', error, { templateName: templateName, projectName: projectName }); + this.logger.error(`Failed to create instance for project ${projectName}`, error); return { success: false, error: `Failed to create instance: ${error instanceof Error ? error.message : 'Unknown error'}` @@ -1134,7 +1104,6 @@ export class SandboxSdkClient extends BaseSandboxService { const instanceDetails: InstanceDetails = { runId: instanceId, - templateName: metadata.templateName, startTime, uptime, directory: instanceId, @@ -1275,31 +1244,13 @@ export class SandboxSdkClient extends BaseSandboxService { async writeFiles(instanceId: string, files: WriteFilesRequest['files']): Promise { try { const session = await this.getInstanceSession(instanceId); - - const results = []; - // Filter out donttouch files const metadata = await this.getInstanceMetadata(instanceId); const donttouchFiles = new Set(metadata.donttouch_files); const filteredFiles = files.filter(file => !donttouchFiles.has(file.filePath)); - - // Use batch script for efficient writing (3 requests for any number of files) - const filesToWrite = filteredFiles.map(file => ({ - path: `/workspace/${instanceId}/${file.filePath}`, - content: file.fileContents - })); - - const writeResults = await this.writeFilesViaScript(filesToWrite, session); - - // Map results back to original format - for (const writeResult of writeResults) { - results.push({ - file: writeResult.file.replace(`/workspace/${instanceId}/`, ''), - success: writeResult.success, - error: writeResult.error - }); - } + const rawResults = await this.writeFilesBulk(instanceId, filteredFiles); + const results = rawResults.results; // Add files that were not written to results const wereDontTouchFiles = files.filter(file => donttouchFiles.has(file.filePath)); diff --git a/worker/services/sandbox/sandboxTypes.ts b/worker/services/sandbox/sandboxTypes.ts index 29000152..8ad56c96 100644 --- a/worker/services/sandbox/sandboxTypes.ts +++ b/worker/services/sandbox/sandboxTypes.ts @@ -66,11 +66,21 @@ export type StoredError = z.infer; export const RuntimeErrorSchema = SimpleErrorSchema export type RuntimeError = z.infer +// -- Instance creation options -- + +export const InstanceCreationRequestSchema = z.object({ + files: z.array(TemplateFileSchema), + projectName: z.string(), + webhookUrl: z.string().url().optional(), + envVars: z.record(z.string(), z.string()).optional(), + initCommand: z.string().default('bun run dev'), +}) +export type InstanceCreationRequest = z.infer + // --- Instance Details --- export const InstanceDetailsSchema = z.object({ runId: z.string(), - templateName: z.string(), startTime: z.union([z.string(), z.date()]), uptime: z.number(), previewURL: z.string().optional(), @@ -140,12 +150,7 @@ export const GetTemplateFilesResponseSchema = z.object({ }) export type GetTemplateFilesResponse = z.infer -export const BootstrapRequestSchema = z.object({ - templateName: z.string(), - projectName: z.string(), - webhookUrl: z.string().url().optional(), - envVars: z.record(z.string(), z.string()).optional(), -}) +export const BootstrapRequestSchema = InstanceCreationRequestSchema export type BootstrapRequest = z.infer export const PreviewSchema = z.object({ @@ -291,44 +296,6 @@ export const ShutdownResponseSchema = z.object({ }) export type ShutdownResponse = z.infer -// /templates/from-instance (POST) -export const PromoteToTemplateRequestSchema = z.object({ - instanceId: z.string(), - templateName: z.string().optional(), -}) -export type PromoteToTemplateRequest = z.infer - -export const PromoteToTemplateResponseSchema = z.object({ - success: z.boolean(), - message: z.string().optional(), - templateName: z.string().optional(), - error: z.string().optional(), -}) -export type PromoteToTemplateResponse = z.infer - -// /templates (POST) - AI template generation -export const GenerateTemplateRequestSchema = z.object({ - prompt: z.string(), - templateName: z.string(), - options: z.object({ - framework: z.string().optional(), - language: z.enum(['javascript', 'typescript']).optional(), - styling: z.enum(['tailwind', 'css', 'scss']).optional(), - features: z.array(z.string()).optional(), - }).optional(), -}) -export type GenerateTemplateRequest = z.infer - -export const GenerateTemplateResponseSchema = z.object({ - success: z.boolean(), - templateName: z.string(), - summary: z.string().optional(), - fileCount: z.number().optional(), - fileTree: FileTreeNodeSchema.optional(), - error: z.string().optional(), -}) -export type GenerateTemplateResponse = z.infer - // /instances/:id/lint (GET) export const LintSeveritySchema = z.enum(['error', 'warning', 'info']) export type LintSeverity = z.infer @@ -400,7 +367,7 @@ export const WebhookRuntimeErrorEventSchema = WebhookEventBaseSchema.extend({ runId: z.string(), error: RuntimeErrorSchema, instanceInfo: z.object({ - templateName: z.string().optional(), + instanceId: z.string(), serviceDirectory: z.string().optional(), }), }), @@ -477,18 +444,6 @@ export const WebhookPayloadSchema = z.object({ event: WebhookEventSchema, }) export type WebhookPayload = z.infer - -// Current runner service payload (direct payload without wrapper) -export const RunnerServiceWebhookPayloadSchema = z.object({ - runId: z.string(), - error: RuntimeErrorSchema, - instanceInfo: z.object({ - templateName: z.string().optional(), - serviceDirectory: z.string().optional(), - }), -}) -export type RunnerServiceWebhookPayload = z.infer - /** * GitHub integration types for exporting generated applications */ From b34c7079153ee0455a2d2b650a4256365a11e9d7 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:03:14 -0500 Subject: [PATCH 35/58] feat: add project mode selector with agentic behavior support - Replaced agent mode toggle with project mode selector (App/Slides/Chat) that determines behavior type - Implemented agentic behavior detection for static content (docs, markdown) with automatic editor view - Conditionally render PhaseTimeline and deployment controls based on behavior type (phasic vs agentic) --- src/api-types.ts | 11 +- src/components/project-mode-selector.tsx | 83 +++++++++++++++ src/lib/api-client.ts | 6 +- src/routes/chat/chat.tsx | 122 +++++++++++++---------- src/routes/chat/hooks/use-chat.ts | 36 ++++++- src/routes/home.tsx | 32 +++--- 6 files changed, 208 insertions(+), 82 deletions(-) create mode 100644 src/components/project-mode-selector.tsx diff --git a/src/api-types.ts b/src/api-types.ts index 96845105..cf4ae0f9 100644 --- a/src/api-types.ts +++ b/src/api-types.ts @@ -136,7 +136,7 @@ export type { } from 'worker/database/types'; // Agent/Generator Types -export type { +export type { Blueprint as BlueprintType, PhasicBlueprint, CodeReviewOutputType, @@ -144,11 +144,16 @@ export type { FileOutputType as GeneratedFile, } from 'worker/agents/schemas'; -export type { +export type { AgentState, PhasicState } from 'worker/agents/core/state'; +export type { + BehaviorType, + ProjectType +} from 'worker/agents/core/types'; + export type { ConversationMessage, } from 'worker/agents/inferutils/common'; @@ -170,7 +175,7 @@ export type { export type { RateLimitError } from "worker/services/rate-limit/errors"; export type { AgentPreviewResponse, CodeGenArgs } from 'worker/api/controllers/agent/types'; export type { RateLimitErrorResponse } from 'worker/api/responses'; -export { RateLimitExceededError, SecurityError, SecurityErrorType } from 'shared/types/errors'; +export { RateLimitExceededError, SecurityError, SecurityErrorType } from '../shared/types/errors.js'; export type { AIModels } from 'worker/agents/inferutils/config.types'; // Model selection types diff --git a/src/components/project-mode-selector.tsx b/src/components/project-mode-selector.tsx new file mode 100644 index 00000000..c09df5fa --- /dev/null +++ b/src/components/project-mode-selector.tsx @@ -0,0 +1,83 @@ +import { useState } from 'react'; + +export type ProjectMode = 'app' | 'presentation' | 'general'; + +interface ProjectModeSelectorProps { + value: ProjectMode; + onChange: (mode: ProjectMode) => void; + disabled?: boolean; + className?: string; +} + +export function ProjectModeSelector({ value, onChange, disabled = false, className = '' }: ProjectModeSelectorProps) { + const [hoveredMode, setHoveredMode] = useState(null); + + const modes = [ + { + id: 'app' as const, + label: 'App', + description: 'Full-stack applications', + }, + { + id: 'presentation' as const, + label: 'Slides', + description: 'Interactive presentations', + }, + { + id: 'general' as const, + label: 'Chat', + description: 'Conversational assistant', + }, + ]; + + return ( +
    + {modes.map((mode, index) => { + const isSelected = value === mode.id; + const isHovered = hoveredMode === mode.id; + + return ( +
    + + + {/* Separator dot (except after last item) */} + {index < modes.length - 1 && ( +
    + )} +
    + ); + })} +
    + ); +} diff --git a/src/lib/api-client.ts b/src/lib/api-client.ts index a6ea0952..7b46ffa7 100644 --- a/src/lib/api-client.ts +++ b/src/lib/api-client.ts @@ -57,13 +57,13 @@ import type{ AgentPreviewResponse, PlatformStatusData, RateLimitError -} from '@/api-types'; +} from '../api-types.js'; import { - + RateLimitExceededError, SecurityError, SecurityErrorType, -} from '@/api-types'; +} from '../api-types.js'; import { toast } from 'sonner'; /** diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index 12bd98db..b43bab33 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -21,13 +21,12 @@ import { ViewModeSwitch } from './components/view-mode-switch'; import { DebugPanel, type DebugMessage } from './components/debug-panel'; import { DeploymentControls } from './components/deployment-controls'; import { useChat, type FileType } from './hooks/use-chat'; -import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES } from '@/api-types'; +import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES, ProjectType } from '@/api-types'; import { Copy } from './components/copy'; import { useFileContentStream } from './hooks/use-file-content-stream'; import { logger } from '@/utils/logger'; import { useApp } from '@/hooks/use-app'; import { useAuth } from '@/contexts/auth-context'; -import { AgentModeDisplay } from '@/components/agent-mode-display'; import { useGitHubExport } from '@/hooks/use-github-export'; import { GitHubExportModal } from '@/components/github-export-modal'; import { GitCloneModal } from '@/components/shared/GitCloneModal'; @@ -50,8 +49,8 @@ export default function Chat() { const [searchParams] = useSearchParams(); const userQuery = searchParams.get('query'); - const agentMode = searchParams.get('agentMode') || 'deterministic'; - + const projectType = searchParams.get('projectType') || 'app'; + // Extract images from URL params if present const userImages = useMemo(() => { const imagesParam = searchParams.get('images'); @@ -142,11 +141,13 @@ export default function Chat() { runtimeErrorCount, staticIssueCount, isDebugging, + // Behavior type from backend + behaviorType, } = useChat({ chatId: urlChatId, query: userQuery, images: userImages, - agentMode: agentMode as 'deterministic' | 'smart', + projectType: projectType as ProjectType, onDebugMessage: addDebugMessage, }); @@ -340,13 +341,29 @@ export default function Chat() { return isPhase1Complete && !!urlChatId; }, [isPhase1Complete, urlChatId]); - const showMainView = useMemo( - () => - streamedBootstrapFiles.length > 0 || - !!blueprint || - files.length > 0, - [streamedBootstrapFiles, blueprint, files.length], - ); + // Detect if agentic mode is showing static content (docs, markdown) + const isStaticContent = useMemo(() => { + if (behaviorType !== 'agentic' || files.length === 0) return false; + + // Check if all files are static (markdown, text, or in docs/ directory) + return files.every(file => { + const path = file.filePath.toLowerCase(); + return path.endsWith('.md') || + path.endsWith('.mdx') || + path.endsWith('.txt') || + path.startsWith('docs/') || + path.includes('/docs/'); + }); + }, [behaviorType, files]); + + const showMainView = useMemo(() => { + // For agentic mode: show preview panel when blueprint generation starts, files appear, or preview URL is available + if (behaviorType === 'agentic') { + return isGeneratingBlueprint || !!blueprint || files.length > 0 || !!previewUrl; + } + // For phasic mode: keep existing logic + return streamedBootstrapFiles.length > 0 || !!blueprint || files.length > 0; + }, [behaviorType, isGeneratingBlueprint, blueprint, files.length, previewUrl, streamedBootstrapFiles.length]); const [mainMessage, ...otherMessages] = useMemo(() => messages, [messages]); @@ -363,14 +380,22 @@ export default function Chat() { }, [messages.length, scrollToBottom]); useEffect(() => { - if (previewUrl && !hasSeenPreview.current && isPhase1Complete) { + // For static content in agentic mode, show editor view instead of preview + if (isStaticContent && files.length > 0 && !hasSeenPreview.current) { + setView('editor'); + // Auto-select first file if none selected + if (!activeFilePath) { + setActiveFilePath(files[0].filePath); + } + hasSeenPreview.current = true; + } else if (previewUrl && !hasSeenPreview.current && isPhase1Complete) { setView('preview'); setShowTooltip(true); setTimeout(() => { setShowTooltip(false); }, 3000); // Auto-hide tooltip after 3 seconds } - }, [previewUrl, isPhase1Complete]); + }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath]); useEffect(() => { if (chatId) { @@ -538,18 +563,6 @@ export default function Chat() { - {import.meta.env - .VITE_AGENT_MODE_ENABLED && ( -
    - -
    - )} )} @@ -611,34 +624,37 @@ export default function Chat() {
    )} - { - setView(viewMode); - hasSwitchedFile.current = true; - }} - chatId={chatId} - isDeploying={isDeploying} - handleDeployToCloudflare={handleDeployToCloudflare} - runtimeErrorCount={runtimeErrorCount} - staticIssueCount={staticIssueCount} - isDebugging={isDebugging} - isGenerating={isGenerating} - isThinking={isThinking} - /> + {/* Only show PhaseTimeline for phasic mode */} + {behaviorType !== 'agentic' && ( + { + setView(viewMode); + hasSwitchedFile.current = true; + }} + chatId={chatId} + isDeploying={isDeploying} + handleDeployToCloudflare={handleDeployToCloudflare} + runtimeErrorCount={runtimeErrorCount} + staticIssueCount={staticIssueCount} + isDebugging={isDebugging} + isGenerating={isGenerating} + isThinking={isThinking} + /> + )} - {/* Deployment and Generation Controls */} - {chatId && ( + {/* Deployment and Generation Controls - Only for phasic mode */} + {chatId && behaviorType !== 'agentic' && ( void; onTerminalMessage?: (log: { id: string; content: string; type: 'command' | 'stdout' | 'stderr' | 'info' | 'error' | 'warn' | 'debug'; timestamp: number; source?: string }) => void; }) { + // Derive initial behavior type from project type + const getInitialBehaviorType = (): BehaviorType => { + if (projectType === 'presentation' || projectType === 'general') { + return 'agentic'; + } + return 'phasic'; + }; + const connectionStatus = useRef<'idle' | 'connecting' | 'connected' | 'failed' | 'retrying'>('idle'); const retryCount = useRef(0); const maxRetries = 5; @@ -80,6 +90,7 @@ export function useChat({ const [blueprint, setBlueprint] = useState(); const [previewUrl, setPreviewUrl] = useState(); const [query, setQuery] = useState(); + const [behaviorType, setBehaviorType] = useState(getInitialBehaviorType()); const [websocket, setWebsocket] = useState(); @@ -405,7 +416,7 @@ export function useChat({ // Start new code generation using API client const response = await apiClient.createAgentSession({ query: userQuery, - agentMode, + projectType, images: userImages, // Pass images from URL params for multi-modal blueprint }); @@ -414,12 +425,16 @@ export function useChat({ const result: { websocketUrl: string; agentId: string; + behaviorType: BehaviorType; + projectType: ProjectType; template: { files: FileType[]; }; } = { websocketUrl: '', agentId: '', + behaviorType: 'phasic', + projectType: 'app', template: { files: [], }, @@ -447,7 +462,7 @@ export function useChat({ } catch (e) { logger.error('Error parsing JSON:', e, obj.chunk); } - } + } if (obj.agentId) { result.agentId = obj.agentId; } @@ -455,6 +470,15 @@ export function useChat({ result.websocketUrl = obj.websocketUrl; logger.debug('📡 Received WebSocket URL from server:', result.websocketUrl) } + if (obj.behaviorType) { + result.behaviorType = obj.behaviorType; + setBehaviorType(obj.behaviorType); + logger.debug('Received behaviorType from server:', obj.behaviorType); + } + if (obj.projectType) { + result.projectType = obj.projectType; + logger.debug('Received projectType from server:', obj.projectType); + } if (obj.template) { logger.debug('Received template from server:', obj.template); result.template = obj.template; @@ -658,5 +682,7 @@ export function useChat({ runtimeErrorCount, staticIssueCount, isDebugging, + // Behavior type from backend + behaviorType, }; } diff --git a/src/routes/home.tsx b/src/routes/home.tsx index 7bf6c0ff..bfb5b4c8 100644 --- a/src/routes/home.tsx +++ b/src/routes/home.tsx @@ -3,9 +3,9 @@ import { ArrowRight, Info } from 'react-feather'; import { useNavigate } from 'react-router'; import { useAuth } from '@/contexts/auth-context'; import { - AgentModeToggle, - type AgentMode, -} from '../components/agent-mode-toggle'; + ProjectModeSelector, + type ProjectMode, +} from '../components/project-mode-selector'; import { useAuthGuard } from '../hooks/useAuthGuard'; import { usePaginatedApps } from '@/hooks/use-paginated-apps'; import { AnimatePresence, LayoutGroup, motion } from 'framer-motion'; @@ -21,7 +21,7 @@ export default function Home() { const navigate = useNavigate(); const { requireAuth } = useAuthGuard(); const textareaRef = useRef(null); - const [agentMode, setAgentMode] = useState('deterministic'); + const [projectMode, setProjectMode] = useState('app'); const [query, setQuery] = useState(''); const { user } = useAuth(); @@ -60,13 +60,13 @@ export default function Home() { // Discover section should appear only when enough apps are available and loading is done const discoverReady = useMemo(() => !loading && (apps?.length ?? 0) > 5, [loading, apps]); - const handleCreateApp = (query: string, mode: AgentMode) => { + const handleCreateApp = (query: string, mode: ProjectMode) => { const encodedQuery = encodeURIComponent(query); const encodedMode = encodeURIComponent(mode); - + // Encode images as JSON if present const imageParam = images.length > 0 ? `&images=${encodeURIComponent(JSON.stringify(images))}` : ''; - const intendedUrl = `/chat/new?query=${encodedQuery}&agentMode=${encodedMode}${imageParam}`; + const intendedUrl = `/chat/new?query=${encodedQuery}&projectType=${encodedMode}${imageParam}`; if ( !requireAuth({ @@ -179,7 +179,7 @@ export default function Home() { onSubmit={(e) => { e.preventDefault(); const query = textareaRef.current!.value; - handleCreateApp(query, agentMode); + handleCreateApp(query, projectMode); }} className="flex z-10 flex-col w-full min-h-[150px] bg-bg-4 border border-accent/30 dark:border-accent/50 dark:bg-bg-2 rounded-[18px] shadow-textarea p-5 transition-all duration-200" > @@ -210,7 +210,7 @@ export default function Home() { if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); const query = textareaRef.current!.value; - handleCreateApp(query, agentMode); + handleCreateApp(query, projectMode); } }} /> @@ -224,15 +224,11 @@ export default function Home() { )}
- {import.meta.env.VITE_AGENT_MODE_ENABLED ? ( - - ) : ( -
- )} +
Date: Tue, 11 Nov 2025 17:05:34 -0500 Subject: [PATCH 36/58] fix: files format --- worker/agents/tools/toolkit/template-manager.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/agents/tools/toolkit/template-manager.ts b/worker/agents/tools/toolkit/template-manager.ts index 974ceb36..d62be55e 100644 --- a/worker/agents/tools/toolkit/template-manager.ts +++ b/worker/agents/tools/toolkit/template-manager.ts @@ -2,6 +2,7 @@ import { ToolDefinition, ErrorResult } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; +import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; export type TemplateManagerArgs = { command: 'list' | 'select'; @@ -10,7 +11,7 @@ export type TemplateManagerArgs = { export type TemplateManagerResult = | { summary: string } - | { message: string; templateName: string; files: Array<{ path: string; content: string }> } + | { message: string; templateName: string; files: TemplateFile[] } | ErrorResult; /** From 17258f3094e405360e1461dd04d8ae5b1af4cebd Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:52:36 -0500 Subject: [PATCH 37/58] fix: ensure workspace directory exists before writing files --- worker/services/sandbox/sandboxSdkClient.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/worker/services/sandbox/sandboxSdkClient.ts b/worker/services/sandbox/sandboxSdkClient.ts index 224152f6..858ea534 100644 --- a/worker/services/sandbox/sandboxSdkClient.ts +++ b/worker/services/sandbox/sandboxSdkClient.ts @@ -1034,6 +1034,9 @@ export class SandboxSdkClient extends BaseSandboxService { const redactedFile = files.find(f => f.filePath === '.redacted_files.json'); const redactedFiles = redactedFile ? JSON.parse(redactedFile.fileContents) : []; + // Create directory for instance + await this.sandbox.exec(`mkdir -p /workspace/${instanceId}`); + // Write files in bulk to sandbox const rawResults = await this.writeFilesBulk(instanceId, files); if (!rawResults.success) { From ca8e7e41b7bff0ad64f129138c8c446145597416 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 17:53:38 -0500 Subject: [PATCH 38/58] feat: replace template manager with ai template selector - Replaced manual template_manager tool with init_suitable_template that uses the original template selector ai - Updated system prompts to emphasize template-first workflow for interactive projects with AI selector as mandatory first step - Simplified template selection process by removing manual list/select commands in favor of intelligent matching ``` --- .../assistants/agenticProjectBuilder.ts | 214 ++++++++---------- worker/agents/tools/customTools.ts | 6 +- .../tools/toolkit/init-suitable-template.ts | 133 +++++++++++ .../agents/tools/toolkit/template-manager.ts | 131 ----------- 4 files changed, 232 insertions(+), 252 deletions(-) create mode 100644 worker/agents/tools/toolkit/init-suitable-template.ts delete mode 100644 worker/agents/tools/toolkit/template-manager.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 1744a94b..81013d2f 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -20,7 +20,7 @@ export type BuildSession = { filesIndex: FileState[]; agent: ICodingAgent; projectType: ProjectType; - selectedTemplate?: string; // Template chosen by agent (minimal-vite, etc.) + selectedTemplate?: string; // Template chosen by agent (e.g. spectacle-runner, react-game-starter, etc.) }; export type BuildInputs = { @@ -50,15 +50,16 @@ You are an elite autonomous project builder with deep expertise in Cloudflare Wo - Lives in Durable Object storage (persistent) - Managed by FileManager + Git (isomorphic-git with SQLite) - ALL files you generate go here FIRST -- Files exist in memory/DO storage, NOT in actual sandbox yet +- Files exist in DO storage, NOT in actual sandbox yet - Full git history maintained (commits, diffs, log, show) - This is YOUR primary working area ### 2. Sandbox Environment (Execution Layer) -- Separate container running Bun + Vite dev server +- A docker-like container that can run arbitary code +- Suitable for running bun + vite dev server - Has its own filesystem (NOT directly accessible to you) -- Created when deploy_preview is called -- Runs 'bun run dev' and exposes preview URL +- Provisioned/deployed to when deploy_preview is called +- Runs 'bun run dev' and exposes preview URL when initialized - THIS is where code actually executes ## The Deploy Process (What deploy_preview Does) @@ -66,12 +67,11 @@ You are an elite autonomous project builder with deep expertise in Cloudflare Wo When you call deploy_preview: 1. Checks if sandbox instance exists 2. If NOT: Creates new sandbox instance - - Template mode: Downloads template from R2, sets it up - - Virtual-first mode: Uses minimal-vite + your virtual files as overlay + - Writes all virtual files to sandbox filesystem (including template files and then your generated files on top) - Runs: bun install → bun run dev - Exposes port → preview URL 3. If YES: Uses existing sandbox -4. Syncs ALL virtual files → sandbox filesystem (writeFiles) +4. Syncs any provided/freshly generated files to sandbox filesystem 5. Returns preview URL **KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. @@ -84,57 +84,10 @@ You (LLM) → [Files stored in DO, committed to git] deploy_preview called - → DeploymentManager.deployToSandbox() - → Checks if sandbox exists - → If not: createNewInstance() → Syncs virtual files → Sandbox filesystem - → Sandbox runs: bun run dev - → Preview URL returned + → Returns preview URL \`\`\` -## Common Failure Scenarios & What They Mean - -**"No sandbox instance available"** -- Sandbox was never created OR crashed -- Solution: Call deploy_preview to create/recreate - -**"Failed to install dependencies"** -- package.json has issues (missing deps, wrong format) -- Sandbox can't run 'bun install' -- Solution: Fix package.json, redeploy - -**"Preview URL not responding"** -- Dev server failed to start -- Usually: Missing vite.config.js OR 'bun run dev' script broken -- Solution: Check package.json scripts, ensure vite configured - -**"Type errors after deploy"** -- Virtual files are fine, but TypeScript fails in sandbox -- Solution: Run run_analysis to catch before deploy - -**"Runtime errors in logs"** -- Code deployed but crashes when executed -- Check with get_runtime_errors, fix issues, redeploy - -**"File not found in sandbox"** -- You generated file in virtual filesystem -- But forgot to call deploy_preview to sync -- Solution: Always deploy after generating files - -## State Persistence - -**What Persists:** -- Virtual filesystem (all generated files) -- Git history (commits, branches) -- Blueprint -- Conversation messages -- Sandbox instance ID (once created) - -**What Doesn't Persist:** -- Sandbox filesystem state (unless you writeFiles) -- Running processes (dev server restarts on redeploy) -- Logs (cumulative but can be cleared) - ## When Things Break **Sandbox becomes unhealthy:** @@ -166,8 +119,8 @@ deploy_preview called → Solution: Wait for user interaction or check timestamps **Problem: "Same error keeps appearing after fix"** -→ Logs are cumulative - you're seeing old errors -→ Solution: Clear logs with deploy_preview(clearLogs=true) +→ Logs are cumulative - you're seeing old errors. +→ Solution: Clear logs with deploy_preview(clearLogs=true) and try again. **Problem: "Types look correct but still errors"** → You're reading from virtual FS, but sandbox has old versions @@ -206,28 +159,33 @@ deploy_preview called - Will use deploy_preview for testing ## Step 3: Template Selection (Interactive Projects Only) -CRITICAL - Read this carefully: - -**TWO APPROACHES:** - -**A) Template-based (Recommended for most cases):** -- DEFAULT: Use 'minimal-vite' template (99% of cases) - - Minimal Vite+Bun+Cloudflare Worker boilerplate - - Has wrangler.jsonc and vite.config.js pre-configured - - Supports: bun run dev/build/lint/deploy - - CRITICAL: 'bun run dev' MUST work or sandbox creation FAILS -- Alternative templates: Use template_manager(command: "list") to see options -- Template switching allowed but STRONGLY DISCOURAGED - -**B) Virtual-first (Advanced - for custom setups):** -- Skip template selection entirely -- Generate all required config files yourself: - - package.json (with dependencies, scripts: dev/build/lint) - - wrangler.jsonc (Cloudflare Worker config) - - vite.config.js (Vite configuration) -- When you call deploy_preview, sandbox will be created with minimal-vite + your files -- ONLY use this if you have very specific config needs -- DEFAULT to template-based approach unless necessary +CRITICAL - This step is MANDATORY for interactive projects: + +**Use AI-Powered Template Selector:** +1. Call \`init_suitable_template\` - AI analyzes requirements and selects best template + - Automatically searches template library (rich collection of templates) + - Matches project type, complexity, style to available templates + - Returns: selection reasoning + automatically imports template files + - Trust the AI selector - it knows the template library well + +2. Review the selection reasoning + - AI explains why template was chosen + - Template files now in your virtual filesystem + - Ready for blueprint generation with template context + +**What if no suitable template?** +- Rare case: AI returns null if no template matches +- Fallback: Virtual-first mode (generate all config files yourself) +- Manual configs: package.json, wrangler.jsonc, vite.config.js +- Use this ONLY when AI couldn't find a match + +**Why template-first matters:** +- Templates have working configs and features +- Blueprint can leverage existing template structure +- Avoids recreating what template already provides +- Better architecture from day one + +**CRITICAL**: Do NOT skip template selection for interactive projects. Always call \`init_suitable_template\` first. ## Step 4: Generate Blueprint - Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) @@ -307,53 +265,73 @@ Follow phases: generate_files for phase-1, then phase-2, etc. - Use to refine after generation or requirements change - Surgical updates only - don't regenerate entire blueprint -## Template Management -**template_manager** - Unified template operations with command parameter - -Commands available: -- **"list"**: Browse available template catalog -- **"select"**: Choose a template for your project (requires templateName parameter) +## Template Selection +**init_suitable_template** - AI-powered template selection and import -**What templates are:** -- Pre-built project scaffolds with working configs -- Each has wrangler.jsonc, vite.config.js, package.json already set up -- When you select a template, it becomes the BASE layer when sandbox is created -- Your generated files OVERLAY on top of template files +**What it does:** +- Analyzes your requirements against entire template library +- Uses AI to match project type, complexity, style to available templates +- Automatically selects and imports best matching template +- Returns: selection reasoning + imported template files **How it works:** \`\`\` -You call: template_manager(command: "select", templateName: "minimal-vite") +You call: init_suitable_template() ↓ -Template marked for use +AI fetches all available templates from library ↓ -You call: deploy_preview +AI analyzes: project type, requirements, complexity, style ↓ -Template downloaded and extracted to sandbox +AI selects best matching template ↓ -Your generated files synced on top +Template automatically imported to virtual filesystem ↓ -Sandbox runs 'bun run dev' from template +Returns: selection object + reasoning + imported files \`\`\` -**Default choice: "minimal-vite"** (use for 99% of cases) -- Vite + Bun + Cloudflare Worker boilerplate -- Has working 'bun run dev' script (CRITICAL - sandbox fails without this) -- Includes wrangler.jsonc and vite.config.js pre-configured -- Template choice persists for entire session +**What you get back:** +- selection.selectedTemplateName: Chosen template name (or null if none suitable) +- selection.reasoning: Why this template was chosen +- selection.projectType: Detected/confirmed project type +- selection.complexity: simple/moderate/complex +- selection.styleSelection: UI style recommendation +- importedFiles[]: Array of important template files now in virtual FS + +**Template Library Coverage:** +The library includes templates for: +- React/Vue/Svelte apps with various configurations +- Game starters (canvas-based, WebGL) +- Presentation frameworks (Spectacle, Reveal.js) +- Dashboard/Admin templates +- Landing pages and marketing sites +- API/Worker templates +- And many more specialized templates -**CRITICAL Caveat:** -- If template selected, deploy_preview REQUIRES that template's 'bun run dev' works -- If template broken, sandbox creation FAILS completely -- Template switching allowed but DISCOURAGED (requires sandbox recreation) +**When to use:** +- ✅ ALWAYS for interactive projects (app/presentation/workflow) +- ✅ Before generate_blueprint (template context enriches blueprint) +- ✅ First step after understanding requirements -**When to use templates:** -- ✅ Interactive apps (need dev server, hot reload) -- ✅ Want pre-configured build setup -- ✅ Need Cloudflare Worker or Durable Object scaffolding +**When NOT to use:** +- ❌ Static documentation projects (no runtime needed) +- ❌ After template already imported -**When NOT to use templates:** -- ❌ Static documentation (no runtime needed) -- ❌ Want full control over every config file (use virtual-first mode) +**CRITICAL Caveat:** +- If AI returns null (no suitable template), fall back to virtual-first mode +- This is RARE - trust the AI selector to find a match +- Template's 'bun run dev' MUST work or sandbox creation fails +- If using virtual-first fallback, YOU must ensure working dev script + +**Example workflow:** +\`\`\` +1. init_suitable_template() + → AI: "Selected react-game-starter because: user wants 2D game, template has canvas setup and scoring system..." + → Imported 15 important files +2. generate_blueprint(prompt: "Template has canvas and game loop. Build on this...") + → Blueprint leverages existing template features +3. generate_files(...) + → Build on top of template foundation +\`\`\` ## File Operations (Understanding Your Two-Layer System) @@ -492,8 +470,8 @@ Commands available: - NOT for static documentation - Creates sandbox on first call if needed - TWO MODES: - 1. **Template-based**: If you called template_manager(command: "select"), uses that template - 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with minimal-vite + your files as overlay + 1. **Template-based**: If you called init_suitable_template(), uses that selected template + 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with fallback template + your files as overlay - Syncs all files from virtual filesystem to sandbox **run_analysis** @@ -612,8 +590,8 @@ STOP ALL TOOL CALLS IMMEDIATELY after either signal.`; const warnings = `# Critical Warnings -1. TEMPLATE CHOICE IS IMPORTANT - Choose with future scope in mind -2. For template-based: minimal-vite MUST have working 'bun run dev' or sandbox fails +1. TEMPLATE SELECTION IS CRITICAL - Use init_suitable_template() for interactive projects, trust AI selector +2. For template-based: Selected template MUST have working 'bun run dev' or sandbox fails 3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview 4. Do NOT deploy static documentation - wastes resources 5. Check log timestamps - they're cumulative, may contain old data @@ -772,7 +750,7 @@ export class AgenticProjectBuilder extends Assistant { const dynamicHints = [ !hasPlan ? '- No plan detected: Start with generate_blueprint (optionally with prompt parameter) to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', - needsSandbox && !hasTemplate ? '- Interactive project without template: Use template_manager(command: "list") then template_manager(command: "select", templateName: "minimal-vite") before first deploy.' : '', + needsSandbox && !hasTemplate ? '- Interactive project without template: Use init_suitable_template() to let AI select and import best matching template before first deploy.' : '', hasTSX ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', hasMD && !hasTSX ? '- Documents detected without UI: This is STATIC content - generate files in docs/, NO deploy_preview needed.' : '', !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index f78d9738..ae535c12 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -22,7 +22,7 @@ import { createWaitForGenerationTool } from './toolkit/wait-for-generation'; import { createWaitForDebugTool } from './toolkit/wait-for-debug'; import { createGitTool } from './toolkit/git'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; -import { createTemplateManagerTool } from './toolkit/template-manager'; +import { createInitSuitableTemplateTool } from './toolkit/init-suitable-template'; import { createVirtualFilesystemTool } from './toolkit/virtual-filesystem'; import { createGenerateImagesTool } from './toolkit/generate-images'; @@ -87,8 +87,8 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur // PRD generation + refinement createGenerateBlueprintTool(session.agent, logger), createAlterBlueprintTool(session.agent, logger), - // Template management (combined list + select) - createTemplateManagerTool(session.agent, logger), + // Template selection + createInitSuitableTemplateTool(session.agent, logger), // Virtual filesystem operations (list + read from Durable Object storage) createVirtualFilesystemTool(session.agent, logger), // Build + analysis toolchain diff --git a/worker/agents/tools/toolkit/init-suitable-template.ts b/worker/agents/tools/toolkit/init-suitable-template.ts new file mode 100644 index 00000000..6f3957cd --- /dev/null +++ b/worker/agents/tools/toolkit/init-suitable-template.ts @@ -0,0 +1,133 @@ +import { ToolDefinition, ErrorResult } from '../types'; +import { StructuredLogger } from '../../../logger'; +import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; +import { selectTemplate } from '../../planning/templateSelector'; +import { TemplateSelection } from '../../schemas'; +import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; + +export type InitSuitableTemplateArgs = { + query: string; +}; + +export type InitSuitableTemplateResult = + | { + selection: TemplateSelection; + importedFiles: TemplateFile[]; + reasoning: string; + message: string; + } + | ErrorResult; + +/** + * template selection and import. + * Analyzes user requirements, selects best matching template from library, + * and automatically imports it to the virtual filesystem. + */ +export function createInitSuitableTemplateTool( + agent: ICodingAgent, + logger: StructuredLogger +): ToolDefinition { + return { + type: 'function' as const, + function: { + name: 'init_suitable_template', + description: 'Analyze user requirements and automatically select + import the most suitable template from library. Uses AI to match requirements against available templates. Returns selection with reasoning and imported files. For interactive projects (app/presentation/workflow) only. Call this BEFORE generate_blueprint.', + parameters: { + type: 'object', + properties: { + query: { + type: 'string', + description: 'User requirements and project description. Provide clear description of what needs to be built.', + }, + }, + required: ['query'], + }, + }, + implementation: async ({ query }: InitSuitableTemplateArgs) => { + try { + const projectType = agent.getProjectType(); + const operationOptions = agent.getOperationOptions(); + + logger.info('Analyzing template suitability and importing', { + projectType, + queryLength: query.length + }); + + // Fetch available templates + const templatesResponse = await BaseSandboxService.listTemplates(); + if (!templatesResponse.success || !templatesResponse.templates) { + return { + error: `Failed to fetch templates: ${templatesResponse.error || 'Unknown error'}` + }; + } + + logger.info('Templates fetched', { count: templatesResponse.templates.length }); + + // Use AI selector to find best match + const selection = await selectTemplate({ + env: operationOptions.env, + query, + projectType, + availableTemplates: templatesResponse.templates, + inferenceContext: operationOptions.inferenceContext, + }); + + logger.info('Template selection completed', { + selected: selection.selectedTemplateName, + projectType: selection.projectType + }); + + // If no suitable template found, return error suggesting scratch mode + if (!selection.selectedTemplateName) { + return { + error: `No suitable template found for this project. Reasoning: ${selection.reasoning}. Consider using virtual-first mode (generate all config files yourself) or refine requirements.` + }; + } + + // Import the selected template + const importResult = await agent.importTemplate( + selection.selectedTemplateName, + `Selected template: ${selection.selectedTemplateName}` + ); + + logger.info('Template imported successfully', { + templateName: importResult.templateName, + filesCount: importResult.files.length + }); + + // Build detailed reasoning message + const reasoningMessage = ` +**AI Template Selection Complete** + +**Selected Template**: ${selection.selectedTemplateName} +**Project Type**: ${selection.projectType} +**Complexity**: ${selection.complexity || 'N/A'} +**Style**: ${selection.styleSelection || 'N/A'} +**Use Case**: ${selection.useCase || 'N/A'} + +**Why This Template**: +${selection.reasoning} + +**Template Files Imported**: ${importResult.files.length} important files +**Ready for**: Blueprint generation with template context + +**Next Step**: Use generate_blueprint() to create project plan that leverages this template's features. +`.trim(); + + return { + selection, + importedFiles: importResult.files, + reasoning: reasoningMessage, + message: `Template "${selection.selectedTemplateName}" selected and imported successfully.` + }; + + } catch (error) { + logger.error('Error in init_suitable_template', error); + return { + error: `Error selecting/importing template: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }; +} diff --git a/worker/agents/tools/toolkit/template-manager.ts b/worker/agents/tools/toolkit/template-manager.ts deleted file mode 100644 index d62be55e..00000000 --- a/worker/agents/tools/toolkit/template-manager.ts +++ /dev/null @@ -1,131 +0,0 @@ -import { ToolDefinition, ErrorResult } from '../types'; -import { StructuredLogger } from '../../../logger'; -import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; -import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; - -export type TemplateManagerArgs = { - command: 'list' | 'select'; - templateName?: string; -}; - -export type TemplateManagerResult = - | { summary: string } - | { message: string; templateName: string; files: TemplateFile[] } - | ErrorResult; - -/** - * Manages project templates - list available templates or select one for the project. - * Use 'list' to see all available templates with descriptions. - * Use 'select' with templateName to choose and import a template. - */ -export function createTemplateManagerTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'template_manager', - description: 'Manage project templates. Use command="list" to see available templates with their descriptions, frameworks, and use cases. Use command="select" with templateName to select and import a template. Default to "minimal-vite" for 99% of cases unless you have specific requirements.', - parameters: { - type: 'object', - properties: { - command: { - type: 'string', - enum: ['list', 'select'], - description: 'Action to perform: "list" shows all templates, "select" imports a template', - }, - templateName: { - type: 'string', - description: 'Name of template to select (required when command="select"). Examples: "minimal-vite", "c-code-react-runner"', - }, - }, - required: ['command'], - }, - }, - implementation: async ({ command, templateName }: TemplateManagerArgs) => { - try { - if (command === 'list') { - logger.info('Listing available templates'); - - const response = await BaseSandboxService.listTemplates(); - - if (!response.success || !response.templates) { - return { - error: `Failed to fetch templates: ${response.error || 'Unknown error'}` - }; - } - - const templates = response.templates; - - // Format template catalog for LLM - const formattedOutput = templates.map((template, index) => { - const frameworks = template.frameworks?.join(', ') || 'None specified'; - const selectionDesc = template.description?.selection || 'No description'; - const usageDesc = template.description?.usage || 'No usage notes'; - - return ` -${index + 1}. **${template.name}** - - Language: ${template.language} - - Frameworks: ${frameworks} - - Selection Guide: -${selectionDesc} - - Usage Notes: -${usageDesc} -`.trim(); - }).join('\n\n'); - - const summaryText = `# Available Templates (${templates.length} total) -${formattedOutput}`; - - return { summary: summaryText }; - } else if (command === 'select') { - if (!templateName) { - return { - error: 'templateName is required when command is "select"' - }; - } - - logger.info('Selecting template', { templateName }); - - // Validate template exists - const templatesResponse = await BaseSandboxService.listTemplates(); - - if (!templatesResponse.success || !templatesResponse.templates) { - return { - error: `Failed to validate template: ${templatesResponse.error || 'Could not fetch template list'}` - }; - } - - const templateExists = templatesResponse.templates.some(t => t.name === templateName); - if (!templateExists) { - const availableNames = templatesResponse.templates.map(t => t.name).join(', '); - return { - error: `Template "${templateName}" not found. Available templates: ${availableNames}` - }; - } - - // Import template into the agent's virtual filesystem - // This returns important template files - const result = await agent.importTemplate(templateName, `Selected template: ${templateName}`); - - return { - message: `Template "${templateName}" selected and imported successfully. ${result.files.length} important files available. You can now use deploy_preview to create the sandbox.`, - templateName: result.templateName, - files: result.files - }; - } else { - return { - error: `Invalid command: ${command}. Must be "list" or "select"` - }; - } - } catch (error) { - logger.error('Error in template_manager', error); - return { - error: `Error managing templates: ${error instanceof Error ? error.message : 'Unknown error'}` - }; - } - }, - }; -} From bb1dc96bb16a48303507c54a9c096a8ab5552f2e Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 21:37:38 -0500 Subject: [PATCH 39/58] refactor: integrate conversation history and sync for agentic builder - Added conversation history support to AgenticProjectBuilder with message preparation and context tracking - Implemented tool call completion callbacks to sync messages and trigger periodic compactification - Modified AgenticCodingBehavior to queue user inputs during builds and inject them between tool call chains using abort mechanism --- .../assistants/agenticProjectBuilder.ts | 55 ++- worker/agents/core/behaviors/agentic.ts | 201 ++++++++++- worker/agents/inferutils/common.ts | 1 + worker/agents/inferutils/core.ts | 88 +++-- worker/agents/inferutils/infer.ts | 8 +- .../operations/UserConversationProcessor.ts | 335 +----------------- worker/agents/tools/customTools.ts | 61 +++- worker/agents/tools/types.ts | 6 +- worker/agents/utils/common.ts | 24 ++ .../agents/utils/conversationCompactifier.ts | 317 +++++++++++++++++ 10 files changed, 697 insertions(+), 399 deletions(-) create mode 100644 worker/agents/utils/conversationCompactifier.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 81013d2f..095334d3 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -3,6 +3,7 @@ import { createSystemMessage, createUserMessage, Message, + ConversationMessage, } from '../inferutils/common'; import { executeInference } from '../inferutils/infer'; import { InferenceContext, ModelConfig } from '../inferutils/config.types'; @@ -15,6 +16,7 @@ import { FileState } from '../core/state'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { ProjectType } from '../core/types'; import { Blueprint, AgenticBlueprint } from '../schemas'; +import { prepareMessagesForInference } from '../utils/common'; export type BuildSession = { filesIndex: FileState[]; @@ -697,12 +699,6 @@ function summarizeFiles(filesIndex: FileState[]): string { return `Generated Files (${filesIndex.length} total):\n${summary}`; } -/** - * AgenticProjectBuilder - * - * Similar to DeepCodeDebugger but for building entire projects. - * Uses tool-calling approach to scaffold, deploy, verify, and iterate. - */ export class AgenticProjectBuilder extends Assistant { logger = createObjectLogger(this, 'AgenticProjectBuilder'); modelConfigOverride?: ModelConfig; @@ -721,6 +717,9 @@ export class AgenticProjectBuilder extends Assistant { session: BuildSession, streamCb?: (chunk: string) => void, toolRenderer?: RenderToolCall, + onToolComplete?: (message: Message) => Promise, + onAssistantMessage?: (message: Message) => Promise, + conversationHistory?: ConversationMessage[] ): Promise { this.logger.info('Starting project build', { projectName: inputs.projectName, @@ -756,16 +755,39 @@ export class AgenticProjectBuilder extends Assistant { !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', ].filter(Boolean).join('\n'); - // Build prompts - const systemPrompt = getSystemPrompt(dynamicHints); - const userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); - + let historyMessages: Message[] = []; + if (conversationHistory && conversationHistory.length > 0) { + const prepared = await prepareMessagesForInference(this.env, conversationHistory); + historyMessages = prepared as Message[]; + + this.logger.info('Loaded conversation history', { + messageCount: historyMessages.length + }); + } + + let systemPrompt = getSystemPrompt(dynamicHints); + + if (historyMessages.length > 0) { + systemPrompt += `\n\n# Conversation History\nYou are being provided with the full conversation history from your previous interactions. Review it to understand context and avoid repeating work.`; + } + + let userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); + + if (historyMessages.length > 0) { + userPrompt = ` +## Timestamp: +${new Date().toISOString()} + + +${userPrompt}`; + } + const system = createSystemMessage(systemPrompt); const user = createUserMessage(userPrompt); - const messages: Message[] = this.save([system, user]); + const messages: Message[] = this.save([system, ...historyMessages, user]); - // Prepare tools (same as debugger) - const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer); + // Build tools with renderer and conversation sync callback + const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); let output = ''; @@ -780,14 +802,15 @@ export class AgenticProjectBuilder extends Assistant { stream: streamCb ? { chunk_size: 64, onChunk: (c) => streamCb(c) } : undefined, + onAssistantMessage, }); - + output = result?.string || ''; - + this.logger.info('Project build completed', { outputLength: output.length }); - + } catch (error) { this.logger.error('Project build failed', error); throw error; diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 931c2a22..a3814e26 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -17,6 +17,11 @@ import { BaseCodingBehavior, BaseCodingOperations } from './base'; import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; import { OperationOptions } from 'worker/agents/operations/common'; +import { ImageAttachment, ProcessedImageAttachment } from '../../../types/image-attachment'; +import { compactifyContext } from '../../utils/conversationCompactifier'; +import { ConversationMessage, createMultiModalUserMessage, createUserMessage, Message } from '../../inferutils/common'; +import { uploadImage, ImageType } from '../../../utils/images'; +import { AbortError } from 'worker/agents/inferutils/core'; interface AgenticOperations extends BaseCodingOperations { generateNextPhase: PhaseGenerationOperation; @@ -28,7 +33,7 @@ interface AgenticOperations extends BaseCodingOperations { */ export class AgenticCodingBehavior extends BaseCodingBehavior implements ICodingAgent { protected static readonly PROJECT_NAME_PREFIX_MAX_LENGTH = 20; - + protected operations: AgenticOperations = { regenerateFile: new FileRegenerationOperation(), fastCodeFixer: new FastCodeFixerOperation(), @@ -38,6 +43,12 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl implementPhase: new PhaseImplementationOperation(), }; + // Conversation sync tracking + private toolCallCounter: number = 0; + private readonly COMPACTIFY_CHECK_INTERVAL = 9; // Check compactification every 9 tool calls + + private currentConversationId: string | undefined; + /** * Initialize the code generator with project blueprint and template * Sets up services and begins deployment process @@ -119,6 +130,97 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl await super.onStart(props); } + /** + * Override handleUserInput to just queue messages without AI processing + * Messages will be injected into conversation after tool call completions + */ + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + let processedImages: ProcessedImageAttachment[] | undefined; + + if (images && images.length > 0) { + processedImages = await Promise.all(images.map(async (image) => { + return await uploadImage(this.env, image, ImageType.UPLOADS); + })); + + this.logger.info('Uploaded images for queued request', { + imageCount: processedImages.length + }); + } + + await this.queueUserRequest(userMessage, processedImages); + + this.logger.info('User message queued during agentic build', { + message: userMessage, + queueSize: this.state.pendingUserInputs.length, + hasImages: !!processedImages && processedImages.length > 0 + }); + } + + /** + * Handle tool call completion - sync to conversation and check queue/compactification + */ + private async handleMessageCompletion(conversationMessage: ConversationMessage): Promise { + this.toolCallCounter++; + + this.infrastructure.addConversationMessage(conversationMessage); + + this.logger.debug('Message synced to conversation', { + role: conversationMessage.role, + toolCallCount: this.toolCallCounter + }); + + if (this.toolCallCounter % this.COMPACTIFY_CHECK_INTERVAL === 0) { + await this.compactifyIfNeeded(); + } + } + + private resetConversationId(): string { + this.currentConversationId = undefined; + return this.getCurrentConversationId(); + } + + private getCurrentConversationId(): string { + if (!this.currentConversationId) { + this.currentConversationId = IdGenerator.generateConversationId(); + } + return this.currentConversationId; + } + + /** + * Compactify conversation state if needed + */ + private async compactifyIfNeeded(): Promise { + const conversationState = this.infrastructure.getConversationState(); + + const compactedHistory = await compactifyContext( + conversationState.runningHistory, + this.env, + this.getOperationOptions(), + (args) => { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: '', + conversationId: this.getCurrentConversationId(), + isStreaming: false, + tool: args + }); + }, + this.logger + ); + + // Update if compactification occurred + if (compactedHistory.length !== conversationState.runningHistory.length) { + this.infrastructure.setConversationState({ + ...conversationState, + runningHistory: compactedHistory + }); + + this.logger.info('Conversation compactified', { + originalSize: conversationState.runningHistory.length, + compactedSize: compactedHistory.length + }); + } + } + getOperationOptions(): OperationOptions { return { env: this.env, @@ -131,47 +233,78 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl } async build(): Promise { - await this.executeGeneration(); + while (!this.state.mvpGenerated || this.state.pendingUserInputs.length > 0) { + await this.executeGeneration(); + } } /** * Execute the project generation */ private async executeGeneration(): Promise { + // Reset tool call counter for this build session + this.toolCallCounter = 0; + this.logger.info('Starting project generation', { query: this.state.query, projectName: this.state.projectName }); - + // Generate unique conversation ID for this build session - const buildConversationId = IdGenerator.generateConversationId(); - + const buildConversationId = this.resetConversationId(); + // Broadcast generation started this.broadcast(WebSocketMessageResponses.GENERATION_STARTED, { message: 'Starting project generation...', totalFiles: 1 }); - + // Send initial message to frontend this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: 'Initializing project builder...', conversationId: buildConversationId, isStreaming: false }); - + try { const generator = new AgenticProjectBuilder( this.env, this.state.inferenceContext ); + + const pendingUserInputs = this.fetchPendingUserRequests(); + if (pendingUserInputs.length > 0) { + this.logger.info('Processing user requests', { + requests: pendingUserInputs, + }); + let compiledMessage: Message; + const images = this.pendingUserImages; + if (images && images.length > 0) { + compiledMessage = createMultiModalUserMessage( + pendingUserInputs.join('\n'), + images.map(img => img.r2Key), + 'high' + ); + } else { + compiledMessage = createUserMessage(pendingUserInputs.join('\n')); + } + // Save the message to conversation history + this.infrastructure.addConversationMessage({ + ...compiledMessage, + conversationId: buildConversationId, + }); + this.logger.info('User requests processed', { + conversationId: buildConversationId, + }); + } // Create build session for tools const session: BuildSession = { agent: this, filesIndex: Object.values(this.state.generatedFilesMap), - projectType: this.state.projectType || 'app' + projectType: this.state.projectType || 'app', }; - + // Create tool renderer for UI feedback const toolCallRenderer = buildToolCallRenderer( (message: string, conversationId: string, isStreaming: boolean, tool?) => { @@ -184,8 +317,31 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl }, buildConversationId ); - - // Run the assistant with streaming and tool rendering + + // Create conversation sync callback + const onToolComplete = async (toolMessage: Message) => { + await this.handleMessageCompletion({ + ...toolMessage, + conversationId: this.getCurrentConversationId() + }); + + // If user messages are queued, we throw an abort error, that shall break the tool call chain. + if (this.state.pendingUserInputs.length > 0) { + throw new AbortError('User messages are queued'); + } + }; + + const onAssistantMessage = async (message: Message) => { + const conversationMessage: ConversationMessage = { + ...message, + content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content), + conversationId: this.getCurrentConversationId(), + }; + await this.handleMessageCompletion(conversationMessage); + }; + + const conversationState = this.infrastructure.getConversationState(); + await generator.run( { query: this.state.query, @@ -193,23 +349,34 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl blueprint: this.state.blueprint }, session, - // Stream callback - sends text chunks to frontend (chunk: string) => { this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: chunk, - conversationId: buildConversationId, + conversationId: this.getCurrentConversationId(), isStreaming: true }); }, - // Tool renderer for visual feedback on tool calls - toolCallRenderer + toolCallRenderer, + onToolComplete, + onAssistantMessage, + conversationState.runningHistory ); - + // TODO: If user messages pending, start another execution run + + if (!this.state.mvpGenerated) { + // TODO: Should this be moved to a tool that the agent can call? + this.state.mvpGenerated = true; + this.logger.info('MVP generated'); + } + this.broadcast(WebSocketMessageResponses.GENERATION_COMPLETED, { message: 'Project generation completed', filesGenerated: Object.keys(this.state.generatedFilesMap).length }); - + + // Final checks after generation completes + await this.compactifyIfNeeded(); + this.logger.info('Project generation completed'); } catch (error) { diff --git a/worker/agents/inferutils/common.ts b/worker/agents/inferutils/common.ts index f4e5c968..57df50c8 100644 --- a/worker/agents/inferutils/common.ts +++ b/worker/agents/inferutils/common.ts @@ -25,6 +25,7 @@ export type Message = { content: MessageContent; name?: string; // Optional name field required for function messages tool_calls?: ChatCompletionMessageToolCall[]; + tool_call_id?: string; // For role = tool }; export interface ConversationMessage extends Message { diff --git a/worker/agents/inferutils/core.ts b/worker/agents/inferutils/core.ts index 7ad6991a..dd4f624e 100644 --- a/worker/agents/inferutils/core.ts +++ b/worker/agents/inferutils/core.ts @@ -320,6 +320,7 @@ type InferArgsBase = { providerOverride?: 'cloudflare' | 'direct'; userApiKeys?: Record; abortSignal?: AbortSignal; + onAssistantMessage?: (message: Message) => Promise; }; type InferArgsStructured = InferArgsBase & { @@ -417,7 +418,7 @@ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionTo if (!td) { throw new Error(`Tool ${tc.function.name} not found`); } - const result = await executeToolWithDefinition(td, args); + const result = await executeToolWithDefinition(tc, td, args); console.log(`Tool execution result for ${tc.function.name}:`, result); return { id: tc.id, @@ -427,6 +428,11 @@ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionTo }; } catch (error) { console.error(`Tool execution failed for ${tc.function.name}:`, error); + // Check if error is an abort error + if (error instanceof AbortError) { + console.warn(`Tool call was aborted while executing ${tc.function.name}, ending tool call chain with the latest tool call result`); + throw error; + } return { id: tc.id, name: tc.function.name, @@ -438,6 +444,28 @@ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionTo ); } +function updateToolCallContext(toolCallContext: ToolCallContext | undefined, assistantMessage: Message, executedToolCalls: ToolCallResult[]) { + const newMessages = [ + ...(toolCallContext?.messages || []), + assistantMessage, + ...executedToolCalls + .filter(result => result.name && result.name.trim() !== '') + .map((result, _) => ({ + role: "tool" as MessageRole, + content: result.result ? JSON.stringify(result.result) : 'done', + name: result.name, + tool_call_id: result.id, + })), + ]; + + const newDepth = (toolCallContext?.depth ?? 0) + 1; + const newToolCallContext = { + messages: newMessages, + depth: newDepth + }; + return newToolCallContext; +} + export function infer( args: InferArgsStructured, toolCallContext?: ToolCallContext, @@ -471,6 +499,7 @@ export async function infer({ reasoning_effort, temperature, abortSignal, + onAssistantMessage, }: InferArgsBase & { schema?: OutputSchema; schemaName?: string; @@ -622,6 +651,10 @@ export async function infer({ } let toolCalls: ChatCompletionMessageFunctionToolCall[] = []; + /* + * Handle LLM response + */ + let content = ''; if (stream) { // If streaming is enabled, handle the stream response @@ -715,6 +748,16 @@ export async function infer({ console.log(`Total tokens used in prompt: ${totalTokens}`); } + const assistantMessage = { role: "assistant" as MessageRole, content, tool_calls: toolCalls }; + + if (onAssistantMessage) { + await onAssistantMessage(assistantMessage); + } + + /* + * Handle tool calls + */ + if (!content && !stream && !toolCalls.length) { // // Only error if not streaming and no content // console.error('No content received from OpenAI', JSON.stringify(response, null, 2)); @@ -725,33 +768,32 @@ export async function infer({ let executedToolCalls: ToolCallResult[] = []; if (tools) { // console.log(`Tool calls:`, JSON.stringify(toolCalls, null, 2), 'definition:', JSON.stringify(tools, null, 2)); - executedToolCalls = await executeToolCalls(toolCalls, tools); + try { + executedToolCalls = await executeToolCalls(toolCalls, tools); + } catch (error) { + console.error(`Tool execution failed for ${toolCalls[0].function.name}:`, error); + // Check if error is an abort error + if (error instanceof AbortError) { + console.warn(`Tool call was aborted, ending tool call chain with the latest tool call result`); + + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); + return { string: content, toolCallContext: newToolCallContext }; + } + // Otherwise, continue + } } + /* + * Handle tool call results + */ + if (executedToolCalls.length) { console.log(`Tool calls executed:`, JSON.stringify(executedToolCalls, null, 2)); - // Generate a new response with the tool calls executed - const newMessages = [ - ...(toolCallContext?.messages || []), - { role: "assistant" as MessageRole, content, tool_calls: toolCalls }, - ...executedToolCalls - .filter(result => result.name && result.name.trim() !== '') - .map((result, _) => ({ - role: "tool" as MessageRole, - content: result.result ? JSON.stringify(result.result) : 'done', - name: result.name, - tool_call_id: result.id, - })), - ]; - - const newDepth = (toolCallContext?.depth ?? 0) + 1; - const newToolCallContext = { - messages: newMessages, - depth: newDepth - }; + + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); const executedCallsWithResults = executedToolCalls.filter(result => result.result); - console.log(`${actionKey}: Tool calling depth: ${newDepth}/${getMaxToolCallingDepth(actionKey)}`); + console.log(`${actionKey}: Tool calling depth: ${newToolCallContext.depth}/${getMaxToolCallingDepth(actionKey)}`); if (executedCallsWithResults.length) { if (schema && schemaName) { @@ -771,6 +813,7 @@ export async function infer({ reasoning_effort, temperature, abortSignal, + onAssistantMessage, }, newToolCallContext); return output; } else { @@ -786,6 +829,7 @@ export async function infer({ reasoning_effort, temperature, abortSignal, + onAssistantMessage, }, newToolCallContext); return output; } diff --git a/worker/agents/inferutils/infer.ts b/worker/agents/inferutils/infer.ts index a03530f3..db0907fd 100644 --- a/worker/agents/inferutils/infer.ts +++ b/worker/agents/inferutils/infer.ts @@ -39,6 +39,7 @@ interface InferenceParamsBase { reasoning_effort?: ReasoningEffort; modelConfig?: ModelConfig; context: InferenceContext; + onAssistantMessage?: (message: Message) => Promise; } interface InferenceParamsStructured extends InferenceParamsBase { @@ -60,7 +61,7 @@ export async function executeInference( { messages, temperature, maxTokens, - retryLimit = 5, // Increased retry limit for better reliability + retryLimit = 5, stream, tools, reasoning_effort, @@ -69,7 +70,8 @@ export async function executeInference( { format, modelName, modelConfig, - context + context, + onAssistantMessage }: InferenceParamsBase & { schema?: T; format?: SchemaFormat; @@ -124,6 +126,7 @@ export async function executeInference( { reasoning_effort: useCheaperModel ? undefined : reasoning_effort, temperature, abortSignal: context.abortSignal, + onAssistantMessage, }) : await infer({ env, metadata: context, @@ -136,6 +139,7 @@ export async function executeInference( { reasoning_effort: useCheaperModel ? undefined : reasoning_effort, temperature, abortSignal: context.abortSignal, + onAssistantMessage, }); logger.info(`Successfully completed ${agentActionName} operation`); // console.log(result); diff --git a/worker/agents/operations/UserConversationProcessor.ts b/worker/agents/operations/UserConversationProcessor.ts index 915b3e25..4cc000e8 100644 --- a/worker/agents/operations/UserConversationProcessor.ts +++ b/worker/agents/operations/UserConversationProcessor.ts @@ -1,7 +1,6 @@ import { ConversationalResponseType } from "../schemas"; -import { createAssistantMessage, createUserMessage, createMultiModalUserMessage, MessageRole, mapImagesInMultiModalMessage } from "../inferutils/common"; +import { createAssistantMessage, createUserMessage, createMultiModalUserMessage } from "../inferutils/common"; import { executeInference } from "../inferutils/infer"; -import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; import { WebSocketMessageResponses } from "../constants"; import { WebSocketMessageData } from "../../api/websocketTypes"; import { AgentOperation, OperationOptions, getSystemPromptWithProjectContext } from "../operations/common"; @@ -15,22 +14,17 @@ import { PROMPT_UTILS } from "../prompts"; import { RuntimeError } from "worker/services/sandbox/sandboxTypes"; import { CodeSerializerType } from "../utils/codeSerializers"; import { ConversationState } from "../inferutils/common"; -import { downloadR2Image, imagesToBase64, imageToBase64 } from "worker/utils/images"; +import { imagesToBase64 } from "worker/utils/images"; import { ProcessedImageAttachment } from "worker/types/image-attachment"; import { AbortError, InferResponseString } from "../inferutils/core"; import { GenerationContext } from "../domain/values/GenerationContext"; +import { compactifyContext } from "../utils/conversationCompactifier"; +import { ChatCompletionMessageFunctionToolCall } from "openai/resources"; +import { prepareMessagesForInference } from "../utils/common"; // Constants const CHUNK_SIZE = 64; -// Compactification thresholds -const COMPACTIFICATION_CONFIG = { - MAX_TURNS: 40, // Trigger after 50 conversation turns - MAX_ESTIMATED_TOKENS: 100000, - PRESERVE_RECENT_MESSAGES: 10, // Always keep last 10 messages uncompacted - CHARS_PER_TOKEN: 4, // Rough estimation: 1 token ≈ 4 characters -} as const; - export interface ToolCallStatusArgs { name: string; status: 'start' | 'success' | 'error'; @@ -305,34 +299,7 @@ function buildUserMessageWithContext(userMessage: string, errors: RuntimeError[] } } -async function prepareMessagesForInference(env: Env, messages: ConversationMessage[]) : Promise { - // For each multimodal image, convert the image to base64 data url - const processedMessages = await Promise.all(messages.map(m => { - return mapImagesInMultiModalMessage(structuredClone(m), async (c) => { - let url = c.image_url.url; - if (url.includes('base64,')) { - return c; - } - const image = await downloadR2Image(env, url); - return { - ...c, - image_url: { - ...c.image_url, - url: await imageToBase64(env, image) - }, - }; - }); - })); - return processedMessages; -} - export class UserConversationProcessor extends AgentOperation { - /** - * Remove system context tags from message content - */ - private stripSystemContext(text: string): string { - return text.replace(/[\s\S]*?<\/system_context>\n?/gi, '').trim(); - } async execute(inputs: UserConversationInputs, options: OperationOptions): Promise { const { env, logger, context, agent } = options; @@ -373,18 +340,18 @@ export class UserConversationProcessor extends AgentOperation inputs.conversationResponseCallback(chunk, aiConversationId, true) ).map(td => ({ ...td, - onStart: (args: Record) => toolCallRenderer({ name: td.function.name, status: 'start', args }), - onComplete: (args: Record, result: unknown) => toolCallRenderer({ + onStart: (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => Promise.resolve(toolCallRenderer({ name: td.function.name, status: 'start', args })), + onComplete: (_tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => Promise.resolve(toolCallRenderer({ name: td.function.name, status: 'success', args, result: typeof result === 'string' ? result : JSON.stringify(result) - }) + })) })); const runningHistory = await prepareMessagesForInference(env, conversationState.runningHistory); - const compactHistory = await this.compactifyContext(runningHistory, env, options, toolCallRenderer, logger); + const compactHistory = await compactifyContext(runningHistory, env, options, toolCallRenderer, logger); if (compactHistory.length !== runningHistory.length) { logger.info("Conversation history compactified", { fullHistoryLength: conversationState.fullHistory.length, @@ -521,290 +488,6 @@ export class UserConversationProcessor extends AgentOperation m.role === 'user').length; - } - - /** - * Convert character count to estimated token count - */ - private tokensFromChars(chars: number): number { - return Math.ceil(chars / COMPACTIFICATION_CONFIG.CHARS_PER_TOKEN); - } - - /** - * Estimate token count for messages (4 chars ≈ 1 token) - */ - private estimateTokens(messages: ConversationMessage[]): number { - let totalChars = 0; - - for (const msg of messages) { - if (typeof msg.content === 'string') { - totalChars += msg.content.length; - } else if (Array.isArray(msg.content)) { - // Multi-modal content - for (const part of msg.content) { - if (part.type === 'text') { - totalChars += part.text.length; - } else if (part.type === 'image_url') { - // Images use ~1000 tokens each (approximate) - totalChars += 4000; - } - } - } - - // Account for tool calls - if (msg.tool_calls && Array.isArray(msg.tool_calls)) { - for (const tc of msg.tool_calls as ChatCompletionMessageFunctionToolCall[]) { - // Function name - if (tc.function?.name) { - totalChars += tc.function.name.length; - } - // Function arguments (JSON string) - if (tc.function?.arguments) { - totalChars += tc.function.arguments.length; - } - // Tool call structure overhead (id, type, etc.) - rough estimate - totalChars += 50; - } - } - } - - return this.tokensFromChars(totalChars); - } - - /** - * Check if compactification should be triggered - */ - private shouldCompactify(messages: ConversationMessage[]): { - should: boolean; - reason?: 'turns' | 'tokens'; - turns: number; - estimatedTokens: number; - } { - const turns = this.countTurns(messages); - const estimatedTokens = this.estimateTokens(messages); - - console.log(`[UserConversationProcessor] shouldCompactify: turns=${turns}, estimatedTokens=${estimatedTokens}`); - - if (turns >= COMPACTIFICATION_CONFIG.MAX_TURNS) { - return { should: true, reason: 'turns', turns, estimatedTokens }; - } - - if (estimatedTokens >= COMPACTIFICATION_CONFIG.MAX_ESTIMATED_TOKENS) { - return { should: true, reason: 'tokens', turns, estimatedTokens }; - } - - return { should: false, turns, estimatedTokens }; - } - - /** - * Find the last valid turn boundary before the preserve threshold - * A turn boundary is right before a user message - */ - private findTurnBoundary(messages: ConversationMessage[], preserveCount: number): number { - // Start from the point where we want to split - const targetSplitIndex = messages.length - preserveCount; - - if (targetSplitIndex <= 0) { - return 0; - } - - // Walk backwards to find the nearest user message boundary - for (let i = targetSplitIndex; i >= 0; i--) { - if (messages[i].role === 'user') { - // Split right before this user message to preserve turn integrity - return i; - } - } - - // If no user message found, don't split - return 0; - } - - /** - * Generate LLM-powered conversation summary - * Sends the full conversation history as-is to the LLM with a summarization instruction - */ - private async generateConversationSummary( - messages: ConversationMessage[], - env: Env, - options: OperationOptions, - logger: StructuredLogger - ): Promise { - try { - // Prepare summarization instruction - const summarizationInstruction = createUserMessage( - `Please provide a comprehensive summary of the entire conversation above. Your summary should: - -1. Capture the key features, changes, and fixes discussed -2. Note any recurring issues or important bugs mentioned -3. Highlight the current state of the project -4. Preserve critical technical details and decisions made -5. Maintain chronological flow of major changes and developments - -Format your summary as a cohesive, well-structured narrative. Focus on what matters for understanding the project's evolution and current state. - -Provide the summary now:` - ); - - logger.info('Generating conversation summary via LLM', { - messageCount: messages.length, - estimatedInputTokens: this.estimateTokens(messages) - }); - - // Send full conversation history + summarization request - const summaryResult = await executeInference({ - env, - messages: [...messages, summarizationInstruction], - agentActionName: 'conversationalResponse', - context: options.inferenceContext, - }); - - const summary = summaryResult.string.trim(); - - logger.info('Generated conversation summary', { - summaryLength: summary.length, - summaryTokens: this.tokensFromChars(summary.length) - }); - - return summary; - } catch (error) { - logger.error('Failed to generate conversation summary', { error }); - // Fallback to simple concatenation - return messages - .map(m => { - const content = typeof m.content === 'string' ? m.content : '[complex content]'; - return `${m.role}: ${this.stripSystemContext(content).substring(0, 200)}`; - }) - .join('\n') - .substring(0, 2000); - } - } - - /** - * Intelligent conversation compactification system - * - * Strategy: - * - Monitors turns (user message to user message) and token count - * - Triggers at 50 turns OR ~100k tokens - * - Uses LLM to generate intelligent summary - * - Preserves last 10 messages in full - * - Respects turn boundaries to avoid tool call fragmentation - */ - async compactifyContext( - runningHistory: ConversationMessage[], - env: Env, - options: OperationOptions, - toolCallRenderer: RenderToolCall, - logger: StructuredLogger - ): Promise { - try { - // Check if compactification is needed on the running history - const analysis = this.shouldCompactify(runningHistory); - - if (!analysis.should) { - // No compactification needed - return runningHistory; - } - - logger.info('Compactification triggered', { - reason: analysis.reason, - turns: analysis.turns, - estimatedTokens: analysis.estimatedTokens, - totalRunningMessages: runningHistory.length, - }); - - // Currently compactification would be done on the running history, but should we consider doing it on the full history? - - // Find turn boundary for splitting - const splitIndex = this.findTurnBoundary( - runningHistory, - COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES - ); - - // Safety check: ensure we have something to compactify - if (splitIndex <= 0) { - logger.warn('Cannot find valid turn boundary for compactification, preserving all messages'); - return runningHistory; - } - - // Split messages - const messagesToSummarize = runningHistory.slice(0, splitIndex); - const recentMessages = runningHistory.slice(splitIndex); - - logger.info('Compactification split determined', { - summarizeCount: messagesToSummarize.length, - preserveCount: recentMessages.length, - splitIndex - }); - - toolCallRenderer({ - name: 'summarize_history', - status: 'start', - args: { - messageCount: messagesToSummarize.length, - recentCount: recentMessages.length - } - }); - - // Generate LLM-powered summary - const summary = await this.generateConversationSummary( - messagesToSummarize, - env, - options, - logger - ); - - // Create summary message - its conversationId will be the archive ID - const summarizedTurns = this.countTurns(messagesToSummarize); - const archiveId = `archive-${Date.now()}-${IdGenerator.generateConversationId()}`; - - const summaryMessage: ConversationMessage = { - role: 'assistant' as MessageRole, - content: `[Conversation History Summary: ${messagesToSummarize.length} messages, ${summarizedTurns} turns]\n[Archive ID: ${archiveId}]\n\n${summary}`, - conversationId: archiveId - }; - - toolCallRenderer({ - name: 'summarize_history', - status: 'success', - args: { - summary: summary.substring(0, 200) + '...', - archiveId - } - }); - - // Return summary + recent messages - const compactifiedHistory = [summaryMessage, ...recentMessages]; - - logger.info('Compactification completed with archival', { - originalMessageCount: runningHistory.length, - newMessageCount: compactifiedHistory.length, - compressionRatio: (compactifiedHistory.length / runningHistory.length).toFixed(2), - estimatedTokenSavings: analysis.estimatedTokens - this.estimateTokens(compactifiedHistory), - archivedMessageCount: messagesToSummarize.length, - archiveId - }); - - return compactifiedHistory; - - } catch (error) { - logger.error('Compactification failed, preserving original messages', { error }); - - // Safe fallback: if we have too many messages, keep recent ones - if (runningHistory.length > COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 3) { - const fallbackCount = COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 2; - logger.warn(`Applying emergency fallback: keeping last ${fallbackCount} messages`); - return runningHistory.slice(-fallbackCount); - } - - return runningHistory; - } - } processProjectUpdates(updateType: T, _data: WebSocketMessageData, logger: StructuredLogger) : ConversationMessage[] { diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index ae535c12..500719b8 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -25,14 +25,17 @@ import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { createInitSuitableTemplateTool } from './toolkit/init-suitable-template'; import { createVirtualFilesystemTool } from './toolkit/virtual-filesystem'; import { createGenerateImagesTool } from './toolkit/generate-images'; +import { Message } from '../inferutils/common'; +import { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; export async function executeToolWithDefinition( + toolCall: ChatCompletionMessageFunctionToolCall, toolDef: ToolDefinition, args: TArgs ): Promise { - toolDef.onStart?.(args); + await toolDef.onStart?.(toolCall, args); const result = await toolDef.implementation(args); - toolDef.onComplete?.(args, result); + await toolDef.onComplete?.(toolCall, args, result); return result; } @@ -82,7 +85,12 @@ export function buildDebugTools(session: DebugSession, logger: StructuredLogger, /** * Toolset for the Agentic Project Builder (autonomous build assistant) */ -export function buildAgenticBuilderTools(session: DebugSession, logger: StructuredLogger, toolRenderer?: RenderToolCall): ToolDefinition[] { +export function buildAgenticBuilderTools( + session: DebugSession, + logger: StructuredLogger, + toolRenderer?: RenderToolCall, + onToolComplete?: (message: Message) => Promise +): ToolDefinition[] { const tools = [ // PRD generation + refinement createGenerateBlueprintTool(session.agent, logger), @@ -107,20 +115,47 @@ export function buildAgenticBuilderTools(session: DebugSession, logger: Structur createGenerateImagesTool(session.agent, logger), ]; - return withRenderer(tools, toolRenderer); + return withRenderer(tools, toolRenderer, onToolComplete); } -/** Decorate tool definitions with a renderer for UI visualization */ -function withRenderer(tools: ToolDefinition[], toolRenderer?: RenderToolCall): ToolDefinition[] { +/** + * Decorate tool definitions with a renderer for UI visualization and conversation sync + */ +function withRenderer( + tools: ToolDefinition[], + toolRenderer?: RenderToolCall, + onComplete?: (message: Message) => Promise +): ToolDefinition[] { if (!toolRenderer) return tools; + return tools.map(td => ({ ...td, - onStart: (args: Record) => toolRenderer({ name: td.function.name, status: 'start', args }), - onComplete: (args: Record, result: unknown) => toolRenderer({ - name: td.function.name, - status: 'success', - args, - result: typeof result === 'string' ? result : JSON.stringify(result) - }) + onStart: async (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => { + if (toolRenderer) { + toolRenderer({ name: td.function.name, status: 'start', args }); + } + }, + onComplete: async (tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => { + // UI rendering + if (toolRenderer) { + toolRenderer({ + name: td.function.name, + status: 'success', + args, + result: typeof result === 'string' ? result : JSON.stringify(result) + }); + } + + // Conversation sync callback + if (onComplete) { + const toolMessage: Message = { + role: 'tool', + content: typeof result === 'string' ? result : JSON.stringify(result), + name: td.function.name, + tool_call_id: tc.id, + }; + await onComplete(toolMessage); + } + } })); } diff --git a/worker/agents/tools/types.ts b/worker/agents/tools/types.ts index 3683227f..37f80502 100644 --- a/worker/agents/tools/types.ts +++ b/worker/agents/tools/types.ts @@ -1,4 +1,4 @@ -import { ChatCompletionFunctionTool } from 'openai/resources'; +import { ChatCompletionFunctionTool, ChatCompletionMessageFunctionToolCall } from 'openai/resources'; export interface MCPServerConfig { name: string; sseUrl: string; @@ -26,8 +26,8 @@ export type ToolDefinition< TResult = unknown > = ChatCompletionFunctionTool & { implementation: ToolImplementation; - onStart?: (args: TArgs) => void; - onComplete?: (args: TArgs, result: TResult) => void; + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; }; export type ExtractToolArgs = T extends ToolImplementation ? A : never; diff --git a/worker/agents/utils/common.ts b/worker/agents/utils/common.ts index 0b1625f5..a85dee62 100644 --- a/worker/agents/utils/common.ts +++ b/worker/agents/utils/common.ts @@ -1,3 +1,6 @@ +import { downloadR2Image, imageToBase64 } from "../../utils/images"; +import { ConversationMessage, mapImagesInMultiModalMessage } from "../inferutils/common"; + export function extractCommands(rawOutput: string, onlyInstallCommands: boolean = false): string[] { const commands: string[] = []; @@ -215,4 +218,25 @@ export function looksLikeCommand(text: string): boolean { ]; return commandIndicators.some((pattern) => pattern.test(text)); +} + +export async function prepareMessagesForInference(env: Env, messages: ConversationMessage[]) : Promise { + // For each multimodal image, convert the image to base64 data url + const processedMessages = await Promise.all(messages.map(m => { + return mapImagesInMultiModalMessage(structuredClone(m), async (c) => { + let url = c.image_url.url; + if (url.includes('base64,')) { + return c; + } + const image = await downloadR2Image(env, url); + return { + ...c, + image_url: { + ...c.image_url, + url: await imageToBase64(env, image) + }, + }; + }); + })); + return processedMessages; } \ No newline at end of file diff --git a/worker/agents/utils/conversationCompactifier.ts b/worker/agents/utils/conversationCompactifier.ts new file mode 100644 index 00000000..3804c9d4 --- /dev/null +++ b/worker/agents/utils/conversationCompactifier.ts @@ -0,0 +1,317 @@ +import { ConversationMessage, MessageRole, createUserMessage } from "../inferutils/common"; +import { executeInference } from "../inferutils/infer"; +import { StructuredLogger } from "../../logger"; +import { IdGenerator } from './idGenerator'; +import { OperationOptions } from "../operations/common"; +import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; + +/** + * Compactification configuration constants + */ +export const COMPACTIFICATION_CONFIG = { + MAX_TURNS: 40, // Trigger after 40 conversation turns + MAX_ESTIMATED_TOKENS: 100000, + PRESERVE_RECENT_MESSAGES: 10, // Always keep last 10 messages uncompacted + CHARS_PER_TOKEN: 4, // Rough estimation: 1 token ≈ 4 characters +} as const; + +/** + * Tool call renderer type for UI feedback during compactification + * Compatible with RenderToolCall from UserConversationProcessor + */ +export type CompactificationRenderer = (args: { + name: string; + status: 'start' | 'success' | 'error'; + args?: Record; + result?: string; +}) => void; + +/** + * Count conversation turns (user message to next user message) + */ +function countTurns(messages: ConversationMessage[]): number { + return messages.filter(m => m.role === 'user').length; +} + +/** + * Convert character count to estimated token count + */ +function tokensFromChars(chars: number): number { + return Math.ceil(chars / COMPACTIFICATION_CONFIG.CHARS_PER_TOKEN); +} + +/** + * Remove system context tags from message content + */ +function stripSystemContext(text: string): string { + return text.replace(/[\s\S]*?<\/system_context>\n?/gi, '').trim(); +} + +/** + * Estimate token count for messages (4 chars ≈ 1 token) + */ +function estimateTokens(messages: ConversationMessage[]): number { + let totalChars = 0; + + for (const msg of messages) { + if (typeof msg.content === 'string') { + totalChars += msg.content.length; + } else if (Array.isArray(msg.content)) { + // Multi-modal content + for (const part of msg.content) { + if (part.type === 'text') { + totalChars += part.text.length; + } else if (part.type === 'image_url') { + // Images use ~1000 tokens each (approximate) + totalChars += 4000; + } + } + } + + // Account for tool calls + if (msg.tool_calls && Array.isArray(msg.tool_calls)) { + for (const tc of msg.tool_calls as ChatCompletionMessageFunctionToolCall[]) { + // Function name + if (tc.function?.name) { + totalChars += tc.function.name.length; + } + // Function arguments (JSON string) + if (tc.function?.arguments) { + totalChars += tc.function.arguments.length; + } + // Tool call structure overhead (id, type, etc.) - rough estimate + totalChars += 50; + } + } + } + + return tokensFromChars(totalChars); +} + +/** + * Check if compactification should be triggered + */ +export function shouldCompactify(messages: ConversationMessage[]): { + should: boolean; + reason?: 'turns' | 'tokens'; + turns: number; + estimatedTokens: number; +} { + const turns = countTurns(messages); + const estimatedTokens = estimateTokens(messages); + + console.log(`[ConversationCompactifier] shouldCompactify: turns=${turns}, estimatedTokens=${estimatedTokens}`); + + if (turns >= COMPACTIFICATION_CONFIG.MAX_TURNS) { + return { should: true, reason: 'turns', turns, estimatedTokens }; + } + + if (estimatedTokens >= COMPACTIFICATION_CONFIG.MAX_ESTIMATED_TOKENS) { + return { should: true, reason: 'tokens', turns, estimatedTokens }; + } + + return { should: false, turns, estimatedTokens }; +} + +/** + * Find the last valid turn boundary before the preserve threshold + * A turn boundary is right before a user message + */ +function findTurnBoundary(messages: ConversationMessage[], preserveCount: number): number { + // Start from the point where we want to split + const targetSplitIndex = messages.length - preserveCount; + + if (targetSplitIndex <= 0) { + return 0; + } + + // Walk backwards to find the nearest user message boundary + for (let i = targetSplitIndex; i >= 0; i--) { + if (messages[i].role === 'user') { + // Split right before this user message to preserve turn integrity + return i; + } + } + + // If no user message found, don't split + return 0; +} + +/** + * Generate LLM-powered conversation summary + * Sends the full conversation history as-is to the LLM with a summarization instruction + */ +async function generateConversationSummary( + messages: ConversationMessage[], + env: Env, + options: OperationOptions, + logger: StructuredLogger +): Promise { + try { + // Prepare summarization instruction + const summarizationInstruction = createUserMessage( + `Please provide a comprehensive summary of the entire conversation above. Your summary should: + +1. Capture the key features, changes, and fixes discussed +2. Note any recurring issues or important bugs mentioned +3. Highlight the current state of the project +4. Preserve critical technical details and decisions made +5. Maintain chronological flow of major changes and developments + +Format your summary as a cohesive, well-structured narrative. Focus on what matters for understanding the project's evolution and current state. + +Provide the summary now:` + ); + + logger.info('Generating conversation summary via LLM', { + messageCount: messages.length, + estimatedInputTokens: estimateTokens(messages) + }); + + // Send full conversation history + summarization request + const summaryResult = await executeInference({ + env, + messages: [...messages, summarizationInstruction], + agentActionName: 'conversationalResponse', + context: options.inferenceContext, + }); + + const summary = summaryResult.string.trim(); + + logger.info('Generated conversation summary', { + summaryLength: summary.length, + summaryTokens: tokensFromChars(summary.length) + }); + + return summary; + } catch (error) { + logger.error('Failed to generate conversation summary', { error }); + // Fallback to simple concatenation + return messages + .map(m => { + const content = typeof m.content === 'string' ? m.content : '[complex content]'; + return `${m.role}: ${stripSystemContext(content).substring(0, 200)}`; + }) + .join('\n') + .substring(0, 2000); + } +} + +/** + * Intelligent conversation compactification system + * + * Strategy: + * - Monitors turns (user message to user message) and token count + * - Triggers at 40 turns OR ~100k tokens + * - Uses LLM to generate intelligent summary + * - Preserves last 10 messages in full + * - Respects turn boundaries to avoid tool call fragmentation + */ +export async function compactifyContext( + runningHistory: ConversationMessage[], + env: Env, + options: OperationOptions, + toolCallRenderer: CompactificationRenderer, + logger: StructuredLogger +): Promise { + try { + // Check if compactification is needed on the running history + const analysis = shouldCompactify(runningHistory); + + if (!analysis.should) { + // No compactification needed + return runningHistory; + } + + logger.info('Compactification triggered', { + reason: analysis.reason, + turns: analysis.turns, + estimatedTokens: analysis.estimatedTokens, + totalRunningMessages: runningHistory.length, + }); + + // Find turn boundary for splitting + const splitIndex = findTurnBoundary( + runningHistory, + COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES + ); + + // Safety check: ensure we have something to compactify + if (splitIndex <= 0) { + logger.warn('Cannot find valid turn boundary for compactification, preserving all messages'); + return runningHistory; + } + + // Split messages + const messagesToSummarize = runningHistory.slice(0, splitIndex); + const recentMessages = runningHistory.slice(splitIndex); + + logger.info('Compactification split determined', { + summarizeCount: messagesToSummarize.length, + preserveCount: recentMessages.length, + splitIndex + }); + + toolCallRenderer({ + name: 'summarize_history', + status: 'start', + args: { + messageCount: messagesToSummarize.length, + recentCount: recentMessages.length + } + }); + + // Generate LLM-powered summary + const summary = await generateConversationSummary( + messagesToSummarize, + env, + options, + logger + ); + + // Create summary message - its conversationId will be the archive ID + const summarizedTurns = countTurns(messagesToSummarize); + const archiveId = `archive-${Date.now()}-${IdGenerator.generateConversationId()}`; + + const summaryMessage: ConversationMessage = { + role: 'assistant' as MessageRole, + content: `[Conversation History Summary: ${messagesToSummarize.length} messages, ${summarizedTurns} turns]\n[Archive ID: ${archiveId}]\n\n${summary}`, + conversationId: archiveId + }; + + toolCallRenderer({ + name: 'summarize_history', + status: 'success', + args: { + summary: summary.substring(0, 200) + '...', + archiveId + } + }); + + // Return summary + recent messages + const compactifiedHistory = [summaryMessage, ...recentMessages]; + + logger.info('Compactification completed with archival', { + originalMessageCount: runningHistory.length, + newMessageCount: compactifiedHistory.length, + compressionRatio: (compactifiedHistory.length / runningHistory.length).toFixed(2), + estimatedTokenSavings: analysis.estimatedTokens - estimateTokens(compactifiedHistory), + archivedMessageCount: messagesToSummarize.length, + archiveId + }); + + return compactifiedHistory; + + } catch (error) { + logger.error('Compactification failed, preserving original messages', { error }); + + // Safe fallback: if we have too many messages, keep recent ones + if (runningHistory.length > COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 3) { + const fallbackCount = COMPACTIFICATION_CONFIG.PRESERVE_RECENT_MESSAGES * 2; + logger.warn(`Applying emergency fallback: keeping last ${fallbackCount} messages`); + return runningHistory.slice(-fallbackCount); + } + + return runningHistory; + } +} From 9f5f787a8c1a40e04e02c220ab3c900eb44b3ca6 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 22:28:36 -0500 Subject: [PATCH 40/58] fix: template import and state init - Fix importTemplate to actually work - Fixed template filtering logic to respect 'general' project type - Added behaviorType to logger context for better debugging - fixed not saving behaviorType to state --- worker/agents/core/behaviors/agentic.ts | 3 +- worker/agents/core/behaviors/base.ts | 31 +++++++------------ worker/agents/core/behaviors/phasic.ts | 1 + worker/agents/core/codingAgent.ts | 8 +++-- worker/agents/core/stateMigration.ts | 16 ---------- worker/agents/planning/templateSelector.ts | 4 +-- .../services/interfaces/ICodingAgent.ts | 2 +- 7 files changed, 22 insertions(+), 43 deletions(-) diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index a3814e26..bf9de555 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -92,9 +92,10 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl hostname, inferenceContext, projectType: this.projectType, + behaviorType: 'agentic' }); - if (templateInfo) { + if (templateInfo && templateInfo.templateDetails.name !== 'scratch') { // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) const customizedFiles = customizeTemplateFiles( templateInfo.templateDetails.allFiles, diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index 2cc4cbf3..efac8704 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -1055,31 +1055,22 @@ export abstract class BaseCodingBehavior } } - async importTemplate(templateName: string, commitMessage: string = `chore: init template ${templateName}`): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }> { + async importTemplate(templateName: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }> { this.logger.info(`Importing template into project: ${templateName}`); - const results = await BaseSandboxService.getTemplateDetails(templateName); - if (!results.success || !results.templateDetails) { - throw new Error(`Failed to get template details for: ${templateName}`); - } - - const templateDetails = results.templateDetails; - const customizedFiles = customizeTemplateFiles(templateDetails.allFiles, { - projectName: this.state.projectName, - commandsHistory: this.getBootstrapCommands() + + // Update state + this.setState({ + ...this.state, + templateName: templateName, }); - const filesToSave = Object.entries(customizedFiles).map(([filePath, content]) => ({ - filePath, - fileContents: content, - filePurpose: 'Template file' - })); - - await this.fileManager.saveGeneratedFiles(filesToSave, commitMessage); + const templateDetails = await this.ensureTemplateDetails(); + if (!templateDetails) { + throw new Error(`Failed to get template details for: ${templateName}`); + } - // Update state this.setState({ ...this.state, - templateName: templateDetails.name, lastPackageJson: templateDetails.allFiles['package.json'] || this.state.lastPackageJson, }); @@ -1088,7 +1079,7 @@ export abstract class BaseCodingBehavior return { templateName: templateDetails.name, - filesImported: filesToSave.length, + filesImported: Object.keys(templateDetails.allFiles).length, files: importantFiles }; } diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index cbceec4d..75d3de56 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -122,6 +122,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem hostname, inferenceContext, projectType: this.projectType, + behaviorType: 'phasic' }; this.setState(nextState); // Customize template files (package.json, wrangler.jsonc, .bootstrap.js, .gitignore) diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index d5059611..24224626 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -235,6 +235,8 @@ export class CodeGeneratorAgent extends Agent implements AgentI this._logger.setFields({ agentId, userId, + projectType: this.state.projectType, + behaviorType: this.state.behaviorType }); if (sessionId) { this._logger.setField('sessionId', sessionId); @@ -308,12 +310,12 @@ export class CodeGeneratorAgent extends Agent implements AgentI return this.objective.export(options); } - importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number }> { - return this.behavior.importTemplate(templateName, commitMessage); + importTemplate(templateName: string): Promise<{ templateName: string; filesImported: number }> { + return this.behavior.importTemplate(templateName); } protected async saveToDatabase() { - this.logger().info(`Blueprint generated successfully for agent ${this.getAgentId()}`); + this.logger().info(`Saving agent ${this.getAgentId()} to database`); // Save the app to database (authenticated users only) const appService = new AppService(this.env); await appService.createApp({ diff --git a/worker/agents/core/stateMigration.ts b/worker/agents/core/stateMigration.ts index d77dd2dc..f77a13bb 100644 --- a/worker/agents/core/stateMigration.ts +++ b/worker/agents/core/stateMigration.ts @@ -207,21 +207,6 @@ export class StateMigration { needsMigration = true; logger.info('Adding default projectType for legacy state', { projectType: migratedProjectType }); } - - let migratedBehaviorType = state.behaviorType; - if (isStateWithAgentMode(state)) { - const legacyAgentMode = state.agentMode; - const nextBehaviorType = legacyAgentMode === 'smart' ? 'agentic' : 'phasic'; - if (nextBehaviorType !== migratedBehaviorType) { - migratedBehaviorType = nextBehaviorType; - needsMigration = true; - } - logger.info('Migrating behaviorType from agentMode', { - legacyAgentMode, - behaviorType: migratedBehaviorType - }); - } - if (needsMigration) { logger.info('Migrating state: schema format, conversation cleanup, security fixes, and bootstrap setup', { generatedFilesCount: Object.keys(migratedFilesMap).length, @@ -238,7 +223,6 @@ export class StateMigration { templateName: migratedTemplateName, projectName: migratedProjectName, projectType: migratedProjectType, - behaviorType: migratedBehaviorType } as AgentState; // Remove deprecated fields diff --git a/worker/agents/planning/templateSelector.ts b/worker/agents/planning/templateSelector.ts index fce55bda..bd202316 100644 --- a/worker/agents/planning/templateSelector.ts +++ b/worker/agents/planning/templateSelector.ts @@ -185,14 +185,14 @@ Reasoning: "Social template provides user interactions, content sharing, and com */ export async function selectTemplate({ env, query, projectType, availableTemplates, inferenceContext, images }: SelectTemplateArgs, retryCount: number = 3): Promise { // Step 1: Predict project type if 'auto' - const actualProjectType: ProjectType = projectType === 'auto' + const actualProjectType: ProjectType = projectType === 'auto' ? await predictProjectType(env, query, inferenceContext, images) : (projectType || 'app') as ProjectType; logger.info(`Using project type: ${actualProjectType}${projectType === 'auto' ? ' (auto-detected)' : ''}`); // Step 2: Filter templates by project type - const filteredTemplates = availableTemplates.filter(t => t.projectType === actualProjectType); + const filteredTemplates = projectType === 'general' ? availableTemplates : availableTemplates.filter(t => t.projectType === actualProjectType); if (filteredTemplates.length === 0) { logger.warn(`No templates available for project type: ${actualProjectType}`); diff --git a/worker/agents/services/interfaces/ICodingAgent.ts b/worker/agents/services/interfaces/ICodingAgent.ts index a44101d4..cbb34c27 100644 --- a/worker/agents/services/interfaces/ICodingAgent.ts +++ b/worker/agents/services/interfaces/ICodingAgent.ts @@ -34,7 +34,7 @@ export interface ICodingAgent { getProjectType(): ProjectType; - importTemplate(templateName: string, commitMessage?: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }>; + importTemplate(templateName: string): Promise<{ templateName: string; filesImported: number; files: TemplateFile[] }>; getOperationOptions(): OperationOptions; From c6a329e13b34e02da3ff3631b40738154a5de2da Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Tue, 11 Nov 2025 23:12:17 -0500 Subject: [PATCH 41/58] fix: template cache clear before import + init meta in behavior constructor - Moved behaviorType and projectType initialization from hardcoded values to constructor-based setup - Changed initial state values to 'unknown' to ensure proper initialization through behavior constructor - Cleared template details cache when importing new templates to prevent stale data --- worker/agents/core/behaviors/base.ts | 9 +++++++++ worker/agents/core/codingAgent.ts | 4 ++-- .../agents/services/implementations/DeploymentManager.ts | 4 ++++ worker/agents/tools/toolkit/init-suitable-template.ts | 3 +-- worker/agents/tools/toolkit/initialize-slides.ts | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/worker/agents/core/behaviors/base.ts b/worker/agents/core/behaviors/base.ts index efac8704..a8a80b5c 100644 --- a/worker/agents/core/behaviors/base.ts +++ b/worker/agents/core/behaviors/base.ts @@ -82,6 +82,12 @@ export abstract class BaseCodingBehavior constructor(infrastructure: AgentInfrastructure, protected projectType: ProjectType) { super(infrastructure); + + this.setState({ + ...this.state, + behaviorType: this.getBehavior(), + projectType: this.projectType, + }); } public async initialize( @@ -95,6 +101,8 @@ export abstract class BaseCodingBehavior await this.ensureTemplateDetails(); } + + // Reset the logg return this.state; } @@ -1064,6 +1072,7 @@ export abstract class BaseCodingBehavior templateName: templateName, }); + this.templateDetailsCache = null; // Clear template details cache const templateDetails = await this.ensureTemplateDetails(); if (!templateDetails) { throw new Error(`Failed to get template details for: ${templateName}`); diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index 24224626..eaf98e11 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -56,8 +56,8 @@ export class CodeGeneratorAgent extends Agent implements AgentI // ========================================== initialState = { - behaviorType: 'phasic', - projectType: 'app', + behaviorType: 'unknown' as BehaviorType, + projectType: 'unknown' as ProjectType, projectName: "", query: "", sessionId: '', diff --git a/worker/agents/services/implementations/DeploymentManager.ts b/worker/agents/services/implementations/DeploymentManager.ts index 1915090e..2b81a7fa 100644 --- a/worker/agents/services/implementations/DeploymentManager.ts +++ b/worker/agents/services/implementations/DeploymentManager.ts @@ -575,6 +575,10 @@ export class DeploymentManager extends BaseAgentService implem // Get latest files const files = this.fileManager.getAllFiles(); + this.getLog().info('Files to deploy', { + files: files.map(f => f.filePath) + }); + // Create instance const client = this.getClient(); const logger = this.getLog(); diff --git a/worker/agents/tools/toolkit/init-suitable-template.ts b/worker/agents/tools/toolkit/init-suitable-template.ts index 6f3957cd..e970bdb6 100644 --- a/worker/agents/tools/toolkit/init-suitable-template.ts +++ b/worker/agents/tools/toolkit/init-suitable-template.ts @@ -87,8 +87,7 @@ export function createInitSuitableTemplateTool( // Import the selected template const importResult = await agent.importTemplate( - selection.selectedTemplateName, - `Selected template: ${selection.selectedTemplateName}` + selection.selectedTemplateName ); logger.info('Template imported successfully', { diff --git a/worker/agents/tools/toolkit/initialize-slides.ts b/worker/agents/tools/toolkit/initialize-slides.ts index 5e7ce4ef..7cb529b2 100644 --- a/worker/agents/tools/toolkit/initialize-slides.ts +++ b/worker/agents/tools/toolkit/initialize-slides.ts @@ -35,7 +35,7 @@ export function createInitializeSlidesTool( }, implementation: async ({ theme, force_preview }: InitializeSlidesArgs) => { logger.info('Initializing slides via Spectacle template', { theme }); - const { templateName, filesImported } = await agent.importTemplate('spectacle', `chore: init slides (theme=${theme || 'default'})`); + const { templateName, filesImported } = await agent.importTemplate('spectacle'); logger.info('Imported template', { templateName, filesImported }); const deployMsg = await agent.deployPreview(true, !!force_preview); From 0323c7a04e20a6abae41ee1ca7483b6360e4698f Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 12 Nov 2025 00:11:42 -0500 Subject: [PATCH 42/58] fix: ui and convo state management - Moved user input idle check from PhasicCodingBehavior to CodeGeneratorAgent for consistent behavior across all modes - Fixed message order in agenticProjectBuilder to place history after user message instead of before - Added replaceExisting parameter to addConversationMessage for better control over message updates - Enhanced initial state restoration to include queued user messages and behaviorType - Added status and queuePosition fields --- src/routes/chat/hooks/use-chat.ts | 3 ++ .../chat/utils/handle-websocket-message.ts | 29 +++++++++++++++++-- src/routes/chat/utils/message-helpers.ts | 2 ++ .../assistants/agenticProjectBuilder.ts | 11 +------ worker/agents/core/AgentCore.ts | 2 +- worker/agents/core/behaviors/agentic.ts | 4 +-- worker/agents/core/behaviors/phasic.ts | 9 +----- worker/agents/core/codingAgent.ts | 13 +++++++-- worker/agents/core/websocket.ts | 2 +- 9 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/routes/chat/hooks/use-chat.ts b/src/routes/chat/hooks/use-chat.ts index 2ed284bb..b50a7ef3 100644 --- a/src/routes/chat/hooks/use-chat.ts +++ b/src/routes/chat/hooks/use-chat.ts @@ -201,6 +201,7 @@ export function useChat({ setRuntimeErrorCount, setStaticIssueCount, setIsDebugging, + setBehaviorType, // Current state isInitialStateRestored, blueprint, @@ -212,6 +213,7 @@ export function useChat({ projectStages, isGenerating, urlChatId, + behaviorType, // Functions updateStage, sendMessage, @@ -230,6 +232,7 @@ export function useChat({ projectStages, isGenerating, urlChatId, + behaviorType, updateStage, sendMessage, loadBootstrapFiles, diff --git a/src/routes/chat/utils/handle-websocket-message.ts b/src/routes/chat/utils/handle-websocket-message.ts index 944272bf..37386c60 100644 --- a/src/routes/chat/utils/handle-websocket-message.ts +++ b/src/routes/chat/utils/handle-websocket-message.ts @@ -1,5 +1,5 @@ import type { WebSocket } from 'partysocket'; -import type { WebSocketMessage, BlueprintType, ConversationMessage, AgentState, PhasicState } from '@/api-types'; +import type { WebSocketMessage, BlueprintType, ConversationMessage, AgentState, PhasicState, BehaviorType } from '@/api-types'; import { deduplicateMessages, isAssistantMessageDuplicate } from './deduplicate-messages'; import { logger } from '@/utils/logger'; import { getFileType } from '@/utils/string'; @@ -50,7 +50,8 @@ export interface HandleMessageDeps { setRuntimeErrorCount: React.Dispatch>; setStaticIssueCount: React.Dispatch>; setIsDebugging: React.Dispatch>; - + setBehaviorType: React.Dispatch>; + // Current state isInitialStateRestored: boolean; blueprint: BlueprintType | undefined; @@ -62,6 +63,7 @@ export interface HandleMessageDeps { projectStages: any[]; isGenerating: boolean; urlChatId: string | undefined; + behaviorType: BehaviorType; // Functions updateStage: (stageId: string, updates: any) => void; @@ -118,6 +120,7 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { setIsGenerating, setIsPhaseProgressActive, setIsDebugging, + setBehaviorType, isInitialStateRestored, blueprint, query, @@ -128,6 +131,7 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { projectStages, isGenerating, urlChatId, + behaviorType, updateStage, sendMessage, loadBootstrapFiles, @@ -162,7 +166,12 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { if (!isInitialStateRestored) { logger.debug('📥 Performing initial state restoration'); - + + if (state.behaviorType && state.behaviorType !== behaviorType) { + setBehaviorType(state.behaviorType); + logger.debug('🔄 Restored behaviorType from backend:', state.behaviorType); + } + if (state.blueprint && !blueprint) { setBlueprint(state.blueprint); updateStage('blueprint', { status: 'completed' }); @@ -253,6 +262,20 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { } } + // Display queued user messages from state + const queuedInputs = state.pendingUserInputs || []; + if (queuedInputs.length > 0) { + logger.debug('📋 Restoring queued user messages:', queuedInputs); + const queuedMessages: ChatMessage[] = queuedInputs.map((msg, idx) => ({ + role: 'user', + content: msg, + conversationId: `queued-${idx}`, + status: 'queued' as const, + queuePosition: idx + 1 + })); + setMessages(prev => [...prev, ...queuedMessages]); + } + setIsInitialStateRestored(true); if (state.shouldBeGenerating && !isGenerating) { diff --git a/src/routes/chat/utils/message-helpers.ts b/src/routes/chat/utils/message-helpers.ts index eddba260..1f36ff1a 100644 --- a/src/routes/chat/utils/message-helpers.ts +++ b/src/routes/chat/utils/message-helpers.ts @@ -16,6 +16,8 @@ export type ChatMessage = Omit & { isThinking?: boolean; toolEvents?: ToolEvent[]; }; + status?: 'queued' | 'active'; + queuePosition?: number; }; /** diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 095334d3..4c9a22fc 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -773,18 +773,9 @@ export class AgenticProjectBuilder extends Assistant { let userPrompt = getUserPrompt(inputs, fileSummaries, templateInfo); - if (historyMessages.length > 0) { - userPrompt = ` -## Timestamp: -${new Date().toISOString()} - - -${userPrompt}`; - } - const system = createSystemMessage(systemPrompt); const user = createUserMessage(userPrompt); - const messages: Message[] = this.save([system, ...historyMessages, user]); + const messages: Message[] = this.save([system, user, ...historyMessages]); // Build tools with renderer and conversation sync callback const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts index 1a6c98b9..c0038784 100644 --- a/worker/agents/core/AgentCore.ts +++ b/worker/agents/core/AgentCore.ts @@ -28,7 +28,7 @@ export interface AgentInfrastructure { setConversationState(state: ConversationState): void; getConversationState(): ConversationState; - addConversationMessage(message: ConversationMessage): void; + addConversationMessage(message: ConversationMessage, replaceExisting: boolean): void; clearConversation(): void; // Services diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index bf9de555..c9c43672 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -163,7 +163,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl private async handleMessageCompletion(conversationMessage: ConversationMessage): Promise { this.toolCallCounter++; - this.infrastructure.addConversationMessage(conversationMessage); + this.infrastructure.addConversationMessage(conversationMessage, false); this.logger.debug('Message synced to conversation', { role: conversationMessage.role, @@ -293,7 +293,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl this.infrastructure.addConversationMessage({ ...compiledMessage, conversationId: buildConversationId, - }); + }, false); this.logger.info('User requests processed', { conversationId: buildConversationId, }); diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index 75d3de56..c29f751a 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -468,7 +468,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem conversationId: IdGenerator.generateConversationId(), } // Store the message in the conversation history so user's response can trigger the deep debug tool - this.infrastructure.addConversationMessage(message); + this.infrastructure.addConversationMessage(message, true); this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: message.content, @@ -851,13 +851,6 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { const result = await super.handleUserInput(userMessage, images); - if (!this.generationPromise) { - // If idle, start generation process - this.logger.info('User input during IDLE state, starting generation'); - this.generateAllFiles().catch(error => { - this.logger.error('Error starting generation from user input:', error); - }); - } return result; } } diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index eaf98e11..01583b36 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -417,9 +417,9 @@ export class CodeGeneratorAgent extends Agent implements AgentI } } - addConversationMessage(message: ConversationMessage) { + addConversationMessage(message: ConversationMessage, replaceExisting: boolean = false) { const conversationState = this.getConversationState(); - if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!replaceExisting || !conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { conversationState.runningHistory.push(message); } else { conversationState.runningHistory = conversationState.runningHistory.map(msg => { @@ -429,7 +429,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI return msg; }); } - if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!replaceExisting || !conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { conversationState.fullHistory.push(message); } else { conversationState.fullHistory = conversationState.fullHistory.map(msg => { @@ -475,6 +475,13 @@ export class CodeGeneratorAgent extends Agent implements AgentI }); await this.behavior.handleUserInput(userMessage, images); + if (!this.behavior.isCodeGenerating()) { + // If idle, start generation process + this.logger().info('User input during IDLE state, starting generation'); + this.behavior.generateAllFiles().catch(error => { + this.logger().error('Error starting generation from user input:', error); + }); + } } catch (error) { if (error instanceof RateLimitExceededError) { diff --git a/worker/agents/core/websocket.ts b/worker/agents/core/websocket.ts index 666a2124..9b18032d 100644 --- a/worker/agents/core/websocket.ts +++ b/worker/agents/core/websocket.ts @@ -157,7 +157,7 @@ export function handleWebSocketMessage( } } - agent.getBehavior().handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { + agent.handleUserInput(parsedMessage.message, parsedMessage.images).catch((error: unknown) => { logger.error('Error handling user suggestion:', error); sendError(connection, `Error processing user suggestion: ${error instanceof Error ? error.message : String(error)}`); }); From d4ae61d6357d1c107b2ed5148ea5cbb18bfd6248 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 12 Nov 2025 01:11:17 -0500 Subject: [PATCH 43/58] fix: convo id uniqueness and improve message deduplication - Single convo id needs to be broadcasted but messages need to be saved with unique ids. - Fix message deduplication to use composite key (conversationId + role + tool_call_id) - Improved tool message filtering to validate against parent assistant tool_calls - Removed unused CodingAgentInterface stub file - Simplified addConversationMessage interface by removing replaceExisting parameter --- worker/agents/constants.ts | 2 + worker/agents/core/AgentCore.ts | 2 +- worker/agents/core/behaviors/agentic.ts | 54 +++----- worker/agents/core/behaviors/phasic.ts | 2 +- worker/agents/core/codingAgent.ts | 21 ++- worker/agents/inferutils/core.ts | 32 ++++- .../services/implementations/CodingAgent.ts | 123 ------------------ 7 files changed, 60 insertions(+), 176 deletions(-) delete mode 100644 worker/agents/services/implementations/CodingAgent.ts diff --git a/worker/agents/constants.ts b/worker/agents/constants.ts index 907f3a84..d10b3788 100644 --- a/worker/agents/constants.ts +++ b/worker/agents/constants.ts @@ -114,6 +114,8 @@ export const getMaxToolCallingDepth = (agentActionKey: AgentActionKey | 'testMod switch (agentActionKey) { case 'deepDebugger': return 100; + case 'agenticProjectBuilder': + return 100; default: return MAX_TOOL_CALLING_DEPTH_DEFAULT; } diff --git a/worker/agents/core/AgentCore.ts b/worker/agents/core/AgentCore.ts index c0038784..1a6c98b9 100644 --- a/worker/agents/core/AgentCore.ts +++ b/worker/agents/core/AgentCore.ts @@ -28,7 +28,7 @@ export interface AgentInfrastructure { setConversationState(state: ConversationState): void; getConversationState(): ConversationState; - addConversationMessage(message: ConversationMessage, replaceExisting: boolean): void; + addConversationMessage(message: ConversationMessage): void; clearConversation(): void; // Services diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index c9c43672..50b0f8ba 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -47,8 +47,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl private toolCallCounter: number = 0; private readonly COMPACTIFY_CHECK_INTERVAL = 9; // Check compactification every 9 tool calls - private currentConversationId: string | undefined; - /** * Initialize the code generator with project blueprint and template * Sets up services and begins deployment process @@ -163,7 +161,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl private async handleMessageCompletion(conversationMessage: ConversationMessage): Promise { this.toolCallCounter++; - this.infrastructure.addConversationMessage(conversationMessage, false); + this.infrastructure.addConversationMessage(conversationMessage); this.logger.debug('Message synced to conversation', { role: conversationMessage.role, @@ -175,18 +173,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl } } - private resetConversationId(): string { - this.currentConversationId = undefined; - return this.getCurrentConversationId(); - } - - private getCurrentConversationId(): string { - if (!this.currentConversationId) { - this.currentConversationId = IdGenerator.generateConversationId(); - } - return this.currentConversationId; - } - /** * Compactify conversation state if needed */ @@ -200,7 +186,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl (args) => { this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: '', - conversationId: this.getCurrentConversationId(), + conversationId: IdGenerator.generateConversationId(), isStreaming: false, tool: args }); @@ -251,21 +237,21 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl projectName: this.state.projectName }); - // Generate unique conversation ID for this build session - const buildConversationId = this.resetConversationId(); - // Broadcast generation started this.broadcast(WebSocketMessageResponses.GENERATION_STARTED, { message: 'Starting project generation...', totalFiles: 1 }); - // Send initial message to frontend - this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { - message: 'Initializing project builder...', - conversationId: buildConversationId, - isStreaming: false - }); + const aiConversationId = IdGenerator.generateConversationId(); + + if (!this.state.mvpGenerated) { + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: 'Initializing project builder...', + conversationId: aiConversationId, + isStreaming: false + }); + } try { const generator = new AgenticProjectBuilder( @@ -292,10 +278,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl // Save the message to conversation history this.infrastructure.addConversationMessage({ ...compiledMessage, - conversationId: buildConversationId, - }, false); - this.logger.info('User requests processed', { - conversationId: buildConversationId, + conversationId: IdGenerator.generateConversationId(), }); } @@ -316,14 +299,14 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl tool }); }, - buildConversationId + aiConversationId ); // Create conversation sync callback const onToolComplete = async (toolMessage: Message) => { await this.handleMessageCompletion({ ...toolMessage, - conversationId: this.getCurrentConversationId() + conversationId: IdGenerator.generateConversationId() }); // If user messages are queued, we throw an abort error, that shall break the tool call chain. @@ -336,7 +319,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl const conversationMessage: ConversationMessage = { ...message, content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content), - conversationId: this.getCurrentConversationId(), + conversationId: IdGenerator.generateConversationId(), }; await this.handleMessageCompletion(conversationMessage); }; @@ -353,7 +336,7 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl (chunk: string) => { this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: chunk, - conversationId: this.getCurrentConversationId(), + conversationId: aiConversationId, isStreaming: true }); }, @@ -370,11 +353,6 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl this.logger.info('MVP generated'); } - this.broadcast(WebSocketMessageResponses.GENERATION_COMPLETED, { - message: 'Project generation completed', - filesGenerated: Object.keys(this.state.generatedFilesMap).length - }); - // Final checks after generation completes await this.compactifyIfNeeded(); diff --git a/worker/agents/core/behaviors/phasic.ts b/worker/agents/core/behaviors/phasic.ts index c29f751a..14fd5e3a 100644 --- a/worker/agents/core/behaviors/phasic.ts +++ b/worker/agents/core/behaviors/phasic.ts @@ -468,7 +468,7 @@ export class PhasicCodingBehavior extends BaseCodingBehavior implem conversationId: IdGenerator.generateConversationId(), } // Store the message in the conversation history so user's response can trigger the deep debug tool - this.infrastructure.addConversationMessage(message, true); + this.infrastructure.addConversationMessage(message); this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { message: message.content, diff --git a/worker/agents/core/codingAgent.ts b/worker/agents/core/codingAgent.ts index 01583b36..e0a710f5 100644 --- a/worker/agents/core/codingAgent.ts +++ b/worker/agents/core/codingAgent.ts @@ -387,16 +387,19 @@ export class CodeGeneratorAgent extends Agent implements AgentI const deduplicateMessages = (messages: ConversationMessage[]): ConversationMessage[] => { const seen = new Set(); return messages.filter(msg => { - if (seen.has(msg.conversationId)) { + const key = `${msg.conversationId}-${msg.role}-${msg.tool_call_id || ''}`; + if (seen.has(key)) { return false; } - seen.add(msg.conversationId); + seen.add(key); return true; }); }; runningHistory = deduplicateMessages(runningHistory); fullHistory = deduplicateMessages(fullHistory); + + this.logger().info(`Loaded conversation state ${id}, full_length: ${fullHistory.length}, compact_length: ${runningHistory.length}`, fullHistory); return { id: id, @@ -409,7 +412,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI const serializedFull = JSON.stringify(conversations.fullHistory); const serializedCompact = JSON.stringify(conversations.runningHistory); try { - this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`); + this.logger().info(`Saving conversation state ${conversations.id}, full_length: ${serializedFull.length}, compact_length: ${serializedCompact.length}`, serializedFull); this.sql`INSERT OR REPLACE INTO compact_conversations (id, messages) VALUES (${conversations.id}, ${serializedCompact})`; this.sql`INSERT OR REPLACE INTO full_conversations (id, messages) VALUES (${conversations.id}, ${serializedFull})`; } catch (error) { @@ -417,9 +420,15 @@ export class CodeGeneratorAgent extends Agent implements AgentI } } - addConversationMessage(message: ConversationMessage, replaceExisting: boolean = false) { + addConversationMessage(message: ConversationMessage) { const conversationState = this.getConversationState(); - if (!replaceExisting || !conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!conversationState.runningHistory.find(msg => msg.conversationId === message.conversationId)) { + this.logger().info('Adding conversation message', { + message, + conversationId: message.conversationId, + runningHistoryLength: conversationState.runningHistory.length, + fullHistoryLength: conversationState.fullHistory.length + }); conversationState.runningHistory.push(message); } else { conversationState.runningHistory = conversationState.runningHistory.map(msg => { @@ -429,7 +438,7 @@ export class CodeGeneratorAgent extends Agent implements AgentI return msg; }); } - if (!replaceExisting || !conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { + if (!conversationState.fullHistory.find(msg => msg.conversationId === message.conversationId)) { conversationState.fullHistory.push(message); } else { conversationState.fullHistory = conversationState.fullHistory.map(msg => { diff --git a/worker/agents/inferutils/core.ts b/worker/agents/inferutils/core.ts index dd4f624e..9a98aec6 100644 --- a/worker/agents/inferutils/core.ts +++ b/worker/agents/inferutils/core.ts @@ -556,14 +556,32 @@ export async function infer({ let messagesToPass = [...optimizedMessages]; if (toolCallContext && toolCallContext.messages) { - // Minimal core fix with logging: exclude prior tool messages that have empty name const ctxMessages = toolCallContext.messages; - const droppedToolMsgs = ctxMessages.filter(m => m.role === 'tool' && (!m.name || m.name.trim() === '')); - if (droppedToolMsgs.length) { - console.warn(`[TOOL_CALL_WARNING] Dropping ${droppedToolMsgs.length} prior tool message(s) with empty name to avoid provider error`, droppedToolMsgs); - } - const filteredCtx = ctxMessages.filter(m => m.role !== 'tool' || (m.name && m.name.trim() !== '')); - messagesToPass.push(...filteredCtx); + let validToolCallIds = new Set(); + + const filtered = ctxMessages.filter(msg => { + // Update valid IDs when we see assistant with tool_calls + if (msg.role === 'assistant' && msg.tool_calls) { + validToolCallIds = new Set(msg.tool_calls.map(tc => tc.id)); + return true; + } + + // Filter tool messages + if (msg.role === 'tool') { + if (!msg.name?.trim()) { + console.warn('[TOOL_ORPHAN] Dropping tool message with empty name:', msg.tool_call_id); + return false; + } + if (!msg.tool_call_id || !validToolCallIds.has(msg.tool_call_id)) { + console.warn('[TOOL_ORPHAN] Dropping orphaned tool message:', msg.name, msg.tool_call_id); + return false; + } + } + + return true; + }); + + messagesToPass.push(...filtered); } if (format) { diff --git a/worker/agents/services/implementations/CodingAgent.ts b/worker/agents/services/implementations/CodingAgent.ts deleted file mode 100644 index d82db3c1..00000000 --- a/worker/agents/services/implementations/CodingAgent.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { ProcessedImageAttachment } from "worker/types/image-attachment"; -import { Blueprint, FileConceptType } from "worker/agents/schemas"; -import { ExecuteCommandsResponse, StaticAnalysisResponse, RuntimeError } from "worker/services/sandbox/sandboxTypes"; -import { ICodingAgent } from "../interfaces/ICodingAgent"; -import { OperationOptions } from "worker/agents/operations/common"; -import { DeepDebugResult, DeploymentTarget } from "worker/agents/core/types"; -import { RenderToolCall } from "worker/agents/operations/UserConversationProcessor"; -import { WebSocketMessageResponses } from "worker/agents/constants"; - -/* -* CodingAgentInterface - stub for passing to tool calls -*/ -export class CodingAgentInterface { - agentStub: ICodingAgent; - constructor (agentStub: ICodingAgent) { - this.agentStub = agentStub; - } - - getLogs(reset?: boolean, durationSeconds?: number): Promise { - return this.agentStub.getLogs(reset, durationSeconds); - } - - fetchRuntimeErrors(clear?: boolean): Promise { - return this.agentStub.fetchRuntimeErrors(clear); - } - - async deployPreview(clearLogs: boolean = true, forceRedeploy: boolean = false): Promise { - const response = await this.agentStub.deployToSandbox([], forceRedeploy, undefined, clearLogs); - // Send a message to refresh the preview - if (response && response.previewURL) { - this.agentStub.broadcast(WebSocketMessageResponses.PREVIEW_FORCE_REFRESH, {}); - return `Deployment successful: ${response.previewURL}`; - } else { - return `Failed to deploy: ${response?.tunnelURL}`; - } - } - - async deployToCloudflare(target?: DeploymentTarget): Promise { - const response = await this.agentStub.deployToCloudflare(target); - if (response && response.deploymentUrl) { - return `Deployment successful: ${response.deploymentUrl}`; - } else { - return `Failed to deploy: ${response?.workersUrl}`; - } - } - - queueUserRequest(request: string, images?: ProcessedImageAttachment[]): void { - this.agentStub.queueUserRequest(request, images); - } - - clearConversation(): void { - this.agentStub.clearConversation(); - } - - getOperationOptions(): OperationOptions { - return this.agentStub.getOperationOptions(); - } - - getGit() { - return this.agentStub.git; - } - - updateProjectName(newName: string): Promise { - return this.agentStub.updateProjectName(newName); - } - - updateBlueprint(patch: Partial): Promise { - return this.agentStub.updateBlueprint(patch); - } - - // Generic debugging helpers — delegate to underlying agent - readFiles(paths: string[]): Promise<{ files: { path: string; content: string }[] }> { - return this.agentStub.readFiles(paths); - } - - runStaticAnalysisCode(files?: string[]): Promise { - return this.agentStub.runStaticAnalysisCode(files); - } - - execCommands(commands: string[], shouldSave: boolean, timeout?: number): Promise { - return this.agentStub.execCommands(commands, shouldSave, timeout); - } - - // Exposes a simplified regenerate API for tools - regenerateFile(path: string, issues: string[]): Promise<{ path: string; diff: string }> { - return this.agentStub.regenerateFileByPath(path, issues); - } - - // Exposes file generation via phase implementation - generateFiles( - phaseName: string, - phaseDescription: string, - requirements: string[], - files: FileConceptType[] - ): Promise<{ files: Array<{ path: string; purpose: string; diff: string }> }> { - return this.agentStub.generateFiles(phaseName, phaseDescription, requirements, files); - } - - isCodeGenerating(): boolean { - return this.agentStub.isCodeGenerating(); - } - - waitForGeneration(): Promise { - return this.agentStub.waitForGeneration(); - } - - isDeepDebugging(): boolean { - return this.agentStub.isDeepDebugging(); - } - - waitForDeepDebug(): Promise { - return this.agentStub.waitForDeepDebug(); - } - - executeDeepDebug( - issue: string, - toolRenderer: RenderToolCall, - streamCb: (chunk: string) => void, - focusPaths?: string[] - ): Promise { - return this.agentStub.executeDeepDebug(issue, toolRenderer, streamCb, focusPaths); - } -} From cfe24e3e99b418bca97cd4d5bd8d30602a6a7ebe Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 12 Nov 2025 01:52:04 -0500 Subject: [PATCH 44/58] fix: ui auto focus, preview hiding and blueprints --- src/routes/chat/chat.tsx | 24 +++++---- .../chat/utils/handle-websocket-message.ts | 28 +++++++++- worker/agents/constants.ts | 1 + worker/agents/core/behaviors/agentic.ts | 52 +++++++++---------- .../tools/toolkit/generate-blueprint.ts | 7 +++ 5 files changed, 75 insertions(+), 37 deletions(-) diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index b43bab33..7c1a15d0 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -357,9 +357,9 @@ export default function Chat() { }, [behaviorType, files]); const showMainView = useMemo(() => { - // For agentic mode: show preview panel when blueprint generation starts, files appear, or preview URL is available + // For agentic mode: only show preview panel when files or preview URL exist if (behaviorType === 'agentic') { - return isGeneratingBlueprint || !!blueprint || files.length > 0 || !!previewUrl; + return files.length > 0 || !!previewUrl; } // For phasic mode: keep existing logic return streamedBootstrapFiles.length > 0 || !!blueprint || files.length > 0; @@ -388,14 +388,20 @@ export default function Chat() { setActiveFilePath(files[0].filePath); } hasSeenPreview.current = true; - } else if (previewUrl && !hasSeenPreview.current && isPhase1Complete) { - setView('preview'); - setShowTooltip(true); - setTimeout(() => { - setShowTooltip(false); - }, 3000); // Auto-hide tooltip after 3 seconds + } else if (previewUrl && !hasSeenPreview.current) { + // Agentic: auto-switch immediately when preview URL available + // Phasic: require phase 1 complete + const shouldSwitch = behaviorType === 'agentic' || isPhase1Complete; + + if (shouldSwitch) { + setView('preview'); + setShowTooltip(true); + setTimeout(() => { + setShowTooltip(false); + }, 3000); + } } - }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath]); + }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath, behaviorType]); useEffect(() => { if (chatId) { diff --git a/src/routes/chat/utils/handle-websocket-message.ts b/src/routes/chat/utils/handle-websocket-message.ts index 37386c60..8d3563d4 100644 --- a/src/routes/chat/utils/handle-websocket-message.ts +++ b/src/routes/chat/utils/handle-websocket-message.ts @@ -11,7 +11,7 @@ import { setAllFilesCompleted, updatePhaseFileStatus, } from './file-state-helpers'; -import { +import { createAIMessage, handleRateLimitError, handleStreamingMessage, @@ -22,6 +22,7 @@ import { completeStages } from './project-stage-helpers'; import { sendWebSocketMessage } from './websocket-helpers'; import type { FileType, PhaseTimelineItem } from '../hooks/use-chat'; import { toast } from 'sonner'; +import { createRepairingJSONParser } from '@/utils/ndjson-parser/ndjson-parser'; const isPhasicState = (state: AgentState): state is PhasicState => state.behaviorType === 'phasic'; @@ -98,6 +99,10 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { } return ''; }; + + // Blueprint chunk parser (maintained across chunks) + let blueprintParser: ReturnType | null = null; + return (websocket: WebSocket, message: WebSocketMessage) => { const { setFiles, @@ -861,6 +866,27 @@ export function createWebSocketMessageHandler(deps: HandleMessageDeps) { break; } + case 'blueprint_chunk': { + // Initialize parser on first chunk + if (!blueprintParser) { + blueprintParser = createRepairingJSONParser(); + logger.debug('Blueprint streaming started'); + } + + // Feed chunk to parser + blueprintParser.feed(message.chunk); + + // Try to parse partial blueprint + try { + const partial = blueprintParser.finalize(); + setBlueprint(partial); + logger.debug('Blueprint chunk processed, partial blueprint updated'); + } catch (e) { + logger.debug('Blueprint chunk accumulated, waiting for more data'); + } + break; + } + case 'terminal_output': { // Handle terminal output from server if (onTerminalMessage) { diff --git a/worker/agents/constants.ts b/worker/agents/constants.ts index d10b3788..d34a0d3f 100644 --- a/worker/agents/constants.ts +++ b/worker/agents/constants.ts @@ -68,6 +68,7 @@ export const WebSocketMessageResponses: Record = { CONVERSATION_STATE: 'conversation_state', PROJECT_NAME_UPDATED: 'project_name_updated', BLUEPRINT_UPDATED: 'blueprint_updated', + BLUEPRINT_CHUNK: 'blueprint_chunk', // Model configuration info MODEL_CONFIGS_INFO: 'model_configs_info', diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 50b0f8ba..32a42277 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -17,10 +17,8 @@ import { BaseCodingBehavior, BaseCodingOperations } from './base'; import { ICodingAgent } from '../../services/interfaces/ICodingAgent'; import { SimpleCodeGenerationOperation } from '../../operations/SimpleCodeGeneration'; import { OperationOptions } from 'worker/agents/operations/common'; -import { ImageAttachment, ProcessedImageAttachment } from '../../../types/image-attachment'; import { compactifyContext } from '../../utils/conversationCompactifier'; import { ConversationMessage, createMultiModalUserMessage, createUserMessage, Message } from '../../inferutils/common'; -import { uploadImage, ImageType } from '../../../utils/images'; import { AbortError } from 'worker/agents/inferutils/core'; interface AgenticOperations extends BaseCodingOperations { @@ -129,31 +127,31 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl await super.onStart(props); } - /** - * Override handleUserInput to just queue messages without AI processing - * Messages will be injected into conversation after tool call completions - */ - async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { - let processedImages: ProcessedImageAttachment[] | undefined; - - if (images && images.length > 0) { - processedImages = await Promise.all(images.map(async (image) => { - return await uploadImage(this.env, image, ImageType.UPLOADS); - })); - - this.logger.info('Uploaded images for queued request', { - imageCount: processedImages.length - }); - } - - await this.queueUserRequest(userMessage, processedImages); - - this.logger.info('User message queued during agentic build', { - message: userMessage, - queueSize: this.state.pendingUserInputs.length, - hasImages: !!processedImages && processedImages.length > 0 - }); - } + // /** + // * Override handleUserInput to just queue messages without AI processing + // * Messages will be injected into conversation after tool call completions + // */ + // async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + // let processedImages: ProcessedImageAttachment[] | undefined; + + // if (images && images.length > 0) { + // processedImages = await Promise.all(images.map(async (image) => { + // return await uploadImage(this.env, image, ImageType.UPLOADS); + // })); + + // this.logger.info('Uploaded images for queued request', { + // imageCount: processedImages.length + // }); + // } + + // await this.queueUserRequest(userMessage, processedImages); + + // this.logger.info('User message queued during agentic build', { + // message: userMessage, + // queueSize: this.state.pendingUserInputs.length, + // hasImages: !!processedImages && processedImages.length > 0 + // }); + // } /** * Handle tool call completion - sync to conversation and check queue/compactification diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts index cf821b01..4ef0a914 100644 --- a/worker/agents/tools/toolkit/generate-blueprint.ts +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -3,6 +3,7 @@ import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; import type { Blueprint } from 'worker/agents/schemas'; +import { WebSocketMessageResponses } from '../../constants'; type GenerateBlueprintArgs = { prompt: string; @@ -50,6 +51,12 @@ export function createGenerateBlueprintTool( frameworks, templateDetails: context.templateDetails, projectType: agent.getProjectType(), + stream: { + chunk_size: 256, + onChunk: (chunk: string) => { + agent.broadcast(WebSocketMessageResponses.BLUEPRINT_CHUNK, { chunk }); + } + } }; const blueprint = await generateBlueprint(args); From 0f85a7d00934cbc3ec4beb706689cbda93478fb8 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Sat, 15 Nov 2025 21:11:27 -0500 Subject: [PATCH 45/58] feat: add completion detection and dependency-aware tool execution - Added CompletionDetector interface and CompletionConfig for detecting task completion signals - Implemented dependency-aware parallel tool execution engine with resource conflict detection - Added LoopDetector to prevent infinite tool call loops with contextual warnings - Enhanced ToolCallContext with completion signal tracking and warning injection state - Modified tool execution to respect dependencies and execute in parallel groups --- worker/agents/inferutils/core.ts | 118 ++++--- worker/agents/inferutils/infer.ts | 8 +- worker/agents/inferutils/loopDetection.ts | 143 +++++++++ worker/agents/inferutils/toolExecution.ts | 292 ++++++++++++++++++ .../operations/UserConversationProcessor.ts | 26 +- worker/agents/tools/customTools.ts | 62 ++-- worker/agents/tools/resource-types.ts | 112 +++++++ worker/agents/tools/resources.ts | 101 ++++++ .../agents/tools/toolkit/alter-blueprint.ts | 111 +++---- .../tools/toolkit/completion-signals.ts | 76 +++++ worker/agents/tools/toolkit/deep-debugger.ts | 61 ++-- worker/agents/tools/toolkit/deploy-preview.ts | 31 +- worker/agents/tools/toolkit/exec-commands.ts | 52 ++-- worker/agents/tools/toolkit/feedback.ts | 57 +--- .../tools/toolkit/generate-blueprint.ts | 113 +++---- worker/agents/tools/toolkit/generate-files.ts | 76 ++--- .../agents/tools/toolkit/generate-images.ts | 44 +-- worker/agents/tools/toolkit/get-logs.ts | 81 ++--- .../tools/toolkit/get-runtime-errors.ts | 46 ++- worker/agents/tools/toolkit/git.ts | 100 +++--- .../tools/toolkit/init-suitable-template.ts | 189 +++++------- .../agents/tools/toolkit/initialize-slides.ts | 62 ++-- worker/agents/tools/toolkit/queue-request.ts | 43 +-- worker/agents/tools/toolkit/read-files.ts | 43 +-- .../agents/tools/toolkit/regenerate-file.ts | 34 +- worker/agents/tools/toolkit/rename-project.ts | 57 ++-- worker/agents/tools/toolkit/run-analysis.ts | 33 +- .../tools/toolkit/virtual-filesystem.ts | 126 ++++---- worker/agents/tools/toolkit/wait-for-debug.ts | 25 +- .../tools/toolkit/wait-for-generation.ts | 25 +- worker/agents/tools/toolkit/wait.ts | 51 +-- worker/agents/tools/toolkit/web-search.ts | 79 ++--- worker/agents/tools/types.ts | 197 +++++++++++- 33 files changed, 1616 insertions(+), 1058 deletions(-) create mode 100644 worker/agents/inferutils/loopDetection.ts create mode 100644 worker/agents/inferutils/toolExecution.ts create mode 100644 worker/agents/tools/resource-types.ts create mode 100644 worker/agents/tools/resources.ts create mode 100644 worker/agents/tools/toolkit/completion-signals.ts diff --git a/worker/agents/inferutils/core.ts b/worker/agents/inferutils/core.ts index 9a98aec6..53de0d58 100644 --- a/worker/agents/inferutils/core.ts +++ b/worker/agents/inferutils/core.ts @@ -13,16 +13,17 @@ import { type ReasoningEffort, type ChatCompletionChunk, } from 'openai/resources.mjs'; -import { Message, MessageContent, MessageRole } from './common'; -import { ToolCallResult, ToolDefinition } from '../tools/types'; +import { Message, MessageContent, MessageRole, CompletionSignal } from './common'; +import { ToolCallResult, ToolDefinition, toOpenAITool } from '../tools/types'; import { AgentActionKey, AIModels, InferenceMetadata } from './config.types'; +import type { CompletionDetector } from './completionDetection'; // import { SecretsService } from '../../database'; import { RateLimitService } from '../../services/rate-limit/rateLimits'; import { getUserConfigurableSettings } from '../../config'; import { SecurityError, RateLimitExceededError } from 'shared/types/errors'; -import { executeToolWithDefinition } from '../tools/customTools'; import { RateLimitType } from 'worker/services/rate-limit/config'; import { getMaxToolCallingDepth, MAX_LLM_MESSAGES } from '../constants'; +import { executeToolCallsWithDependencies } from './toolExecution'; function optimizeInputs(messages: Message[]): Message[] { return messages.map((message) => ({ @@ -99,7 +100,7 @@ function accumulateToolCallDelta( const before = entry.function.arguments; const chunk = deltaToolCall.function.arguments; - // Check if we already have complete JSON and this is extra data + // Check if we already have complete JSON and this is extra data. Question: Do we want this? let isComplete = false; if (before.length > 0) { try { @@ -321,6 +322,7 @@ type InferArgsBase = { userApiKeys?: Record; abortSignal?: AbortSignal; onAssistantMessage?: (message: Message) => Promise; + completionConfig?: CompletionConfig; }; type InferArgsStructured = InferArgsBase & { @@ -336,6 +338,17 @@ type InferWithCustomFormatArgs = InferArgsStructured & { export interface ToolCallContext { messages: Message[]; depth: number; + completionSignal?: CompletionSignal; + warningInjected?: boolean; +} + +/** + * Configuration for completion signal detection and auto-warning injection. + */ +export interface CompletionConfig { + detector?: CompletionDetector; + operationalMode?: 'initial' | 'followup'; + allowWarningInjection?: boolean; } export function serializeCallChain(context: ToolCallContext, finalResponse: string): string { @@ -409,42 +422,16 @@ export type InferResponseString = { * Execute all tool calls from OpenAI response */ async function executeToolCalls(openAiToolCalls: ChatCompletionMessageFunctionToolCall[], originalDefinitions: ToolDefinition[]): Promise { - const toolDefinitions = new Map(originalDefinitions.map(td => [td.function.name, td])); - return Promise.all( - openAiToolCalls.map(async (tc) => { - try { - const args = tc.function.arguments ? JSON.parse(tc.function.arguments) : {}; - const td = toolDefinitions.get(tc.function.name); - if (!td) { - throw new Error(`Tool ${tc.function.name} not found`); - } - const result = await executeToolWithDefinition(tc, td, args); - console.log(`Tool execution result for ${tc.function.name}:`, result); - return { - id: tc.id, - name: tc.function.name, - arguments: args, - result - }; - } catch (error) { - console.error(`Tool execution failed for ${tc.function.name}:`, error); - // Check if error is an abort error - if (error instanceof AbortError) { - console.warn(`Tool call was aborted while executing ${tc.function.name}, ending tool call chain with the latest tool call result`); - throw error; - } - return { - id: tc.id, - name: tc.function.name, - arguments: {}, - result: { error: `Failed to execute ${tc.function.name}: ${error instanceof Error ? error.message : 'Unknown error'}` } - }; - } - }) - ); + // Use dependency-aware execution engine + return executeToolCallsWithDependencies(openAiToolCalls, originalDefinitions); } -function updateToolCallContext(toolCallContext: ToolCallContext | undefined, assistantMessage: Message, executedToolCalls: ToolCallResult[]) { +function updateToolCallContext( + toolCallContext: ToolCallContext | undefined, + assistantMessage: Message, + executedToolCalls: ToolCallResult[], + completionDetector?: CompletionDetector +) { const newMessages = [ ...(toolCallContext?.messages || []), assistantMessage, @@ -459,9 +446,18 @@ function updateToolCallContext(toolCallContext: ToolCallContext | undefined, ass ]; const newDepth = (toolCallContext?.depth ?? 0) + 1; - const newToolCallContext = { + + // Detect completion signal from executed tool calls + let completionSignal = toolCallContext?.completionSignal; + if (completionDetector && !completionSignal) { + completionSignal = completionDetector.detectCompletion(executedToolCalls); + } + + const newToolCallContext: ToolCallContext = { messages: newMessages, - depth: newDepth + depth: newDepth, + completionSignal, + warningInjected: toolCallContext?.warningInjected || false }; return newToolCallContext; } @@ -500,6 +496,7 @@ export async function infer({ temperature, abortSignal, onAssistantMessage, + completionConfig, }: InferArgsBase & { schema?: OutputSchema; schemaName?: string; @@ -628,7 +625,12 @@ export async function infer({ console.log(`Running inference with ${modelName} using structured output with ${format} format, reasoning effort: ${reasoning_effort}, max tokens: ${maxTokens}, temperature: ${temperature}, baseURL: ${baseURL}`); - const toolsOpts = tools ? { tools, tool_choice: 'auto' as const } : {}; + const toolsOpts = tools ? { + tools: tools.map(t => { + return toOpenAITool(t); + }), + tool_choice: 'auto' as const + } : {}; let response: OpenAI.ChatCompletion | OpenAI.ChatCompletionChunk | Stream; try { // Call OpenAI API with proper structured output format @@ -789,12 +791,12 @@ export async function infer({ try { executedToolCalls = await executeToolCalls(toolCalls, tools); } catch (error) { - console.error(`Tool execution failed for ${toolCalls[0].function.name}:`, error); + console.error(`Tool execution failed${toolCalls.length > 0 ? ` for ${toolCalls[0].function.name}` : ''}:`, error); // Check if error is an abort error if (error instanceof AbortError) { console.warn(`Tool call was aborted, ending tool call chain with the latest tool call result`); - const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls, completionConfig?.detector); return { string: content, toolCallContext: newToolCallContext }; } // Otherwise, continue @@ -808,10 +810,30 @@ export async function infer({ if (executedToolCalls.length) { console.log(`Tool calls executed:`, JSON.stringify(executedToolCalls, null, 2)); - const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls); - - const executedCallsWithResults = executedToolCalls.filter(result => result.result); - console.log(`${actionKey}: Tool calling depth: ${newToolCallContext.depth}/${getMaxToolCallingDepth(actionKey)}`); + const newToolCallContext = updateToolCallContext(toolCallContext, assistantMessage, executedToolCalls, completionConfig?.detector); + + // Stop recursion if completion signal detected + if (newToolCallContext.completionSignal?.signaled) { + console.log(`[COMPLETION] ${newToolCallContext.completionSignal.toolName} called, stopping recursion`); + + if (schema && schemaName) { + throw new AbortError( + `Completion signaled: ${newToolCallContext.completionSignal.summary || 'Task complete'}`, + newToolCallContext + ); + } + return { + string: content || newToolCallContext.completionSignal.summary || 'Task complete', + toolCallContext: newToolCallContext + }; + } + + // Filter completion tools from recursion trigger + const executedCallsWithResults = executedToolCalls.filter(result => + result.result !== undefined && + !(completionConfig?.detector?.isCompletionTool(result.name)) + ); + console.log(`${actionKey}: Tool depth ${newToolCallContext.depth}/${getMaxToolCallingDepth(actionKey)}`); if (executedCallsWithResults.length) { if (schema && schemaName) { @@ -832,6 +854,7 @@ export async function infer({ temperature, abortSignal, onAssistantMessage, + completionConfig, }, newToolCallContext); return output; } else { @@ -848,6 +871,7 @@ export async function infer({ temperature, abortSignal, onAssistantMessage, + completionConfig, }, newToolCallContext); return output; } diff --git a/worker/agents/inferutils/infer.ts b/worker/agents/inferutils/infer.ts index db0907fd..8a050b83 100644 --- a/worker/agents/inferutils/infer.ts +++ b/worker/agents/inferutils/infer.ts @@ -1,4 +1,4 @@ -import { infer, InferError, InferResponseString, InferResponseObject, AbortError } from './core'; +import { infer, InferError, InferResponseString, InferResponseObject, AbortError, CompletionConfig } from './core'; import { createAssistantMessage, createUserMessage, Message } from './common'; import z from 'zod'; // import { CodeEnhancementOutput, CodeEnhancementOutputType } from '../codegen/phasewiseGenerator'; @@ -40,6 +40,7 @@ interface InferenceParamsBase { modelConfig?: ModelConfig; context: InferenceContext; onAssistantMessage?: (message: Message) => Promise; + completionConfig?: CompletionConfig; } interface InferenceParamsStructured extends InferenceParamsBase { @@ -71,7 +72,8 @@ export async function executeInference( { modelName, modelConfig, context, - onAssistantMessage + onAssistantMessage, + completionConfig, }: InferenceParamsBase & { schema?: T; format?: SchemaFormat; @@ -127,6 +129,7 @@ export async function executeInference( { temperature, abortSignal: context.abortSignal, onAssistantMessage, + completionConfig, }) : await infer({ env, metadata: context, @@ -140,6 +143,7 @@ export async function executeInference( { temperature, abortSignal: context.abortSignal, onAssistantMessage, + completionConfig, }); logger.info(`Successfully completed ${agentActionName} operation`); // console.log(result); diff --git a/worker/agents/inferutils/loopDetection.ts b/worker/agents/inferutils/loopDetection.ts new file mode 100644 index 00000000..8991fd0f --- /dev/null +++ b/worker/agents/inferutils/loopDetection.ts @@ -0,0 +1,143 @@ +import { Message, createUserMessage } from './common'; + +/** + * Represents a single tool call record for loop detection + */ +export type ToolCallRecord = { + toolName: string; + args: string; // JSON stringified arguments + timestamp: number; +}; + +/** + * State tracking for loop detection + */ +export type LoopDetectionState = { + recentCalls: ToolCallRecord[]; + repetitionWarnings: number; +}; + +/** + * Detects repetitive tool calls and generates warnings to prevent infinite loops. + * + * Detection Logic: + * - Tracks tool calls within a 2-minute sliding window + * - Flags repetition when 2+ identical calls (same tool + same args) occur + */ +export class LoopDetector { + private state: LoopDetectionState = { + recentCalls: [], + repetitionWarnings: 0, + }; + + detectRepetition(toolName: string, args: Record): boolean { + const argsStr = this.safeStringify(args); + const now = Date.now(); + const WINDOW_MS = 2 * 60 * 1000; + + this.state.recentCalls = this.state.recentCalls.filter( + (call) => now - call.timestamp < WINDOW_MS + ); + + const matchingCalls = this.state.recentCalls.filter( + (call) => call.toolName === toolName && call.args === argsStr + ); + + this.state.recentCalls.push({ + toolName, + args: argsStr, + timestamp: now, + }); + + if (this.state.recentCalls.length > 1000) { + this.state.recentCalls = this.state.recentCalls.slice(-1000); + } + + return matchingCalls.length >= 2; + } + + /** + * Stringify arguments with deterministic key ordering and circular reference handling + */ + private safeStringify(args: Record): string { + try { + const sortedArgs = Object.keys(args) + .sort() + .reduce((acc, key) => { + acc[key] = args[key]; + return acc; + }, {} as Record); + + return JSON.stringify(sortedArgs); + } catch (error) { + return JSON.stringify({ + _error: 'circular_reference_or_stringify_error', + _keys: Object.keys(args).sort(), + _errorMessage: error instanceof Error ? error.message : 'Unknown error', + }); + } + } + + /** + * Generate contextual warning message for injection into conversation history + * + * @param toolName - Name of the tool that's being repeated + * @param assistantType - Type of assistant for completion tool reference + * @returns Message object to inject into conversation + */ + generateWarning(toolName: string, assistantType: 'builder' | 'debugger'): Message { + this.state.repetitionWarnings++; + + const completionTool = + assistantType === 'builder' + ? 'mark_generation_complete' + : 'mark_debugging_complete'; + + const warningMessage = ` +[!ALERT] CRITICAL: POSSIBLE REPETITION DETECTED + +You just attempted to execute "${toolName}" with identical arguments for the ${this.state.repetitionWarnings}th time. + +This indicates you may be stuck in a loop. Please take one of these actions: + +1. **If your task is complete:** + - Call ${completionTool} with a summary of what you accomplished + - STOP immediately after calling the completion tool + - Make NO further tool calls + +2. **If you previously declared completion:** + - Review your recent messages + - If you already called ${completionTool}, HALT immediately + - Do NOT repeat the same work + +3. **If your task is NOT complete:** + - Try a DIFFERENT approach or strategy + - Use DIFFERENT tools than before + - Use DIFFERENT arguments or parameters + - Read DIFFERENT files for more context + - Consider if the current approach is viable + +DO NOT repeat the same action. Doing the same thing repeatedly will not produce different results. + +Once you call ${completionTool}, make NO further tool calls - the system will stop automatically.`.trim(); + + return createUserMessage(warningMessage); + } + + /** + * Get the current warning count + */ + getWarningCount(): number { + return this.state.repetitionWarnings; + } + + /** + * Reset the loop detection state + */ + reset(): void { + this.state = { + recentCalls: [], + repetitionWarnings: 0, + }; + } +} diff --git a/worker/agents/inferutils/toolExecution.ts b/worker/agents/inferutils/toolExecution.ts new file mode 100644 index 00000000..0d405552 --- /dev/null +++ b/worker/agents/inferutils/toolExecution.ts @@ -0,0 +1,292 @@ +import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; +import type { ToolDefinition, ToolCallResult, ResourceAccess } from '../tools/types'; + +/** + * Execution plan for a set of tool calls with dependency-aware parallelization. + * + * The plan groups tools into parallel execution groups, where: + * - Groups execute sequentially (one after another) + * - Tools within a group execute in parallel (simultaneously) + * - Dependencies between tools are automatically respected + */ +export interface ExecutionPlan { + /** + * Parallel execution groups ordered by dependency + * Each group's tools can run simultaneously + * Groups execute in sequence (group N+1 after group N completes) + */ + parallelGroups: ChatCompletionMessageFunctionToolCall[][]; +} + + +/** + * Detect resource conflicts between two tool calls. + */ +function hasResourceConflict( + res1: ResourceAccess, + res2: ResourceAccess +): boolean { + // File conflicts + if (res1.files && res2.files) { + const f1 = res1.files; + const f2 = res2.files; + + // Read-read = no conflict + if (f1.mode === 'read' && f2.mode === 'read') { + // No conflict + } else { + // Write-write or read-write conflict + // Empty paths = all files = conflict + if (f1.paths.length === 0 || f2.paths.length === 0) { + return true; + } + + // Check specific path overlap + const set1 = new Set(f1.paths); + const set2 = new Set(f2.paths); + for (const p of set1) { + if (set2.has(p)) return true; + } + } + } + + // Git conflicts + if (res1.git?.index && res2.git?.index) return true; + if (res1.git?.history && res2.git?.history) return true; + + // any overlap = conflict + if (res1.sandbox && res2.sandbox) return true; + if (res1.deployment && res2.deployment) return true; + if (res1.blueprint && res2.blueprint) return true; + if (res1.logs && res2.logs) return true; + if (res1.staticAnalysis && res2.staticAnalysis) return true; + + return false; +} + +/** + * Build execution plan from tool calls using topological sort. + * + * Algorithm: + * 1. Build dependency graph from: + * - Explicit dependencies (dependsOn) + * - Resource conflicts (writes/reads) + * - Conflict declarations (conflictsWith) + * 2. Topologically sort into parallel groups: + * - Each group contains tools with no mutual dependencies + * - Tools in group N depend only on tools in groups 0..N-1 + * 3. Handle edge cases: + * - Circular dependencies -> fallback to sequential + * - Missing tool definitions -> Warn and skip + */ +export function buildExecutionPlan( + toolCalls: ChatCompletionMessageFunctionToolCall[], + toolDefinitions: Map +): ExecutionPlan { + // Parse arguments and get resource access for each tool call + const toolCallResources = new Map(); + + for (const call of toolCalls) { + const def = toolDefinitions.get(call.function.name); + if (!def) continue; + + try { + const args = JSON.parse(call.function.arguments || '{}'); + const resources = def.resources(args); + toolCallResources.set(call.id, resources); + } catch (error) { + console.warn(`[TOOL_EXECUTION] Failed to parse arguments for ${call.function.name}:`, error); + toolCallResources.set(call.id, {}); + } + } + + // Build dependency graph + const dependencyGraph = new Map>(); + + // Initialize graph nodes + for (const call of toolCalls) { + if (!dependencyGraph.has(call.id)) { + dependencyGraph.set(call.id, new Set()); + } + } + + // Add edges based on resource conflicts + for (const call of toolCalls) { + const callResources = toolCallResources.get(call.id); + if (!callResources) continue; + + const callDeps = dependencyGraph.get(call.id)!; + + // Add resource-based dependencies + for (const otherCall of toolCalls) { + if (otherCall.id === call.id) continue; + + const otherResources = toolCallResources.get(otherCall.id); + if (!otherResources) continue; + + // If tools conflict, make them sequential + if (hasResourceConflict(callResources, otherResources)) { + const callIndex = toolCalls.indexOf(call); + const otherIndex = toolCalls.indexOf(otherCall); + + // Later call depends on earlier call + if (callIndex > otherIndex) { + callDeps.add(otherCall.id); + } + } + } + } + + // Topological sort into parallel groups + const parallelGroups: ChatCompletionMessageFunctionToolCall[][] = []; + const executed = new Set(); + + while (executed.size < toolCalls.length) { + const group: ChatCompletionMessageFunctionToolCall[] = []; + + // Find all tools whose dependencies are satisfied + for (const call of toolCalls) { + if (executed.has(call.id)) continue; + + const deps = dependencyGraph.get(call.id) || new Set(); + const allDepsExecuted = Array.from(deps).every((depId) => executed.has(depId)); + + if (allDepsExecuted) { + group.push(call); + } + } + + // Handle circular dependencies + if (group.length === 0) { + console.warn( + '[TOOL_EXECUTION] Circular dependency detected, falling back to sequential' + ); + + // Add first unexecuted tool to break cycle + for (const call of toolCalls) { + if (!executed.has(call.id)) { + group.push(call); + break; + } + } + } + + parallelGroups.push(group); + group.forEach((call) => executed.add(call.id)); + } + + return { parallelGroups }; +} + +/** + * Execute a single tool call + */ +async function executeSingleTool( + toolCall: ChatCompletionMessageFunctionToolCall, + toolDefinition: ToolDefinition +): Promise { + try { + const args = toolCall.function.arguments ? JSON.parse(toolCall.function.arguments) : {}; + + // Execute lifecycle hooks and implementation + await toolDefinition.onStart?.(toolCall, args); + + const result = await toolDefinition.implementation(args); + + await toolDefinition.onComplete?.(toolCall, args, result); + + return { + id: toolCall.id, + name: toolCall.function.name, + arguments: args, + result, + }; + } catch (error) { + // Propagate abort errors immediately + if (error instanceof Error && error.name === 'AbortError') { + throw error; + } + + // Return error result for other failures + const errorMessage = + error instanceof Error ? error.message : 'Unknown error occurred'; + + return { + id: toolCall.id, + name: toolCall.function.name, + arguments: {}, + result: { + error: `Failed to execute ${toolCall.function.name}: ${errorMessage}`, + }, + }; + } +} + +/** + * Execute tool calls with dependency-aware parallelization. + * + * This is the main entry point for tool execution. It: + * 1. Builds execution plan based on dependencies + * 2. Logs plan for debugging + * 3. Executes groups sequentially, tools within group in parallel + * 4. Collects and returns all results + * + * Performance characteristics: + * - Independent tools: Execute in parallel (speedup = N tools) + * - Dependent tools: Execute sequentially (no speedup) + * - Mixed workflows: Partial parallelization (speedup varies) + */ +export async function executeToolCallsWithDependencies( + toolCalls: ChatCompletionMessageFunctionToolCall[], + toolDefinitions: ToolDefinition[] +): Promise { + // Build tool definition map for fast lookup + const toolDefMap = new Map( + toolDefinitions.map((td) => [td.name, td]) + ); + + // Build execution plan + const plan = buildExecutionPlan(toolCalls, toolDefMap); + + // Log execution plan for debugging + console.log(`[TOOL_EXECUTION] Execution plan: ${plan.parallelGroups.length} parallel groups`); + plan.parallelGroups.forEach((group, i) => { + const toolNames = group.map((c) => c.function.name).join(', '); + const parallelIndicator = group.length > 1 ? ' (parallel)' : ''; + console.log(`[TOOL_EXECUTION] Group ${i + 1}: ${toolNames}${parallelIndicator}`); + }); + + // Execute groups sequentially, tools within group in parallel + const allResults: ToolCallResult[] = []; + + for (const [groupIndex, group] of plan.parallelGroups.entries()) { + console.log( + `[TOOL_EXECUTION] Executing group ${groupIndex + 1}/${plan.parallelGroups.length}` + ); + + // Execute all tools in group in parallel + const groupResults = await Promise.all( + group.map(async (toolCall) => { + const toolDef = toolDefMap.get(toolCall.function.name); + + if (!toolDef) { + throw new Error(`Tool definition not found: ${toolCall.function.name}`); + } + + const result = await executeSingleTool(toolCall, toolDef); + + console.log( + `[TOOL_EXECUTION] ${toolCall.function.name} completed ${result.result && typeof result.result === 'object' && result.result !== null && 'error' in result.result ? '(with error)' : 'successfully'}` + ); + + return result; + }) + ); + + allResults.push(...groupResults); + } + + console.log(`[TOOL_EXECUTION] All ${toolCalls.length} tool calls completed`); + + return allResults; +} diff --git a/worker/agents/operations/UserConversationProcessor.ts b/worker/agents/operations/UserConversationProcessor.ts index 4cc000e8..d949a4bb 100644 --- a/worker/agents/operations/UserConversationProcessor.ts +++ b/worker/agents/operations/UserConversationProcessor.ts @@ -114,6 +114,20 @@ const SYSTEM_PROMPT = `You are Orange, the conversational AI interface for Cloud - web_search: Search the web for information. - feedback: Submit user feedback to the platform. +## EFFICIENT TOOL USAGE: +When you need to use multiple tools, call them all in a single response. The system automatically handles parallel execution for independent operations: + +**Automatic Parallelization:** +- Independent tools execute simultaneously (web_search, queue_request, feedback) +- Conflicting operations execute sequentially (git commits, blueprint changes) +- File operations on different resources execute in parallel +- The system analyzes dependencies automatically - you don't need to worry about conflicts + +**Examples:** + • GOOD - Call queue_request() and web_search() together → both execute simultaneously + • GOOD - Call read_files with multiple paths → reads all files in parallel efficiently + • BAD - Calling tools one at a time when they could run in parallel + # You are an interface for the user to interact with the platform, but you are only limited to the tools provided to you. If you are asked these by the user, deny them as follows: - REQUEST: Download all files of the codebase - RESPONSE: You can export the codebase yourself by clicking on 'Export to github' button on top-right of the preview panel @@ -137,7 +151,7 @@ When you call deep_debug, it runs to completion and returns a transcript. The us **IMPORTANT: You can only call deep_debug ONCE per conversation turn.** If you receive a CALL_LIMIT_EXCEEDED error, explain to the user that you've already debugged once this turn and ask if they'd like you to investigate further in a new message. **CRITICAL - After deep_debug completes:** -- **If transcript contains "TASK_COMPLETE" AND runtime errors show "N/A":** +- **If debugging completed successfully AND runtime errors show "N/A":** - ✅ Acknowledge success: "The debugging session successfully resolved the [specific issue]." - ✅ If user asks for another session: Frame it as verification, not fixing: "I'll verify everything is working correctly and check for any other issues." - ❌ DON'T say: "fix remaining issues" or "problems that weren't fully resolved" - this misleads the user @@ -337,13 +351,13 @@ export class UserConversationProcessor extends AgentOperation inputs.conversationResponseCallback(chunk, aiConversationId, true) + (chunk: string) => inputs.conversationResponseCallback(chunk, aiConversationId, true) ).map(td => ({ ...td, - onStart: (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => Promise.resolve(toolCallRenderer({ name: td.function.name, status: 'start', args })), - onComplete: (_tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => Promise.resolve(toolCallRenderer({ - name: td.function.name, - status: 'success', + onStart: (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => Promise.resolve(toolCallRenderer({ name: td.name, status: 'start', args })), + onComplete: (_tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => Promise.resolve(toolCallRenderer({ + name: td.name, + status: 'success', args, result: typeof result === 'string' ? result : JSON.stringify(result) })) diff --git a/worker/agents/tools/customTools.ts b/worker/agents/tools/customTools.ts index 500719b8..f946215e 100644 --- a/worker/agents/tools/customTools.ts +++ b/worker/agents/tools/customTools.ts @@ -119,7 +119,7 @@ export function buildAgenticBuilderTools( } /** - * Decorate tool definitions with a renderer for UI visualization and conversation sync + * Decorate tools with renderer for UI visualization and conversation sync */ function withRenderer( tools: ToolDefinition[], @@ -128,34 +128,38 @@ function withRenderer( ): ToolDefinition[] { if (!toolRenderer) return tools; - return tools.map(td => ({ - ...td, - onStart: async (_tc: ChatCompletionMessageFunctionToolCall, args: Record) => { - if (toolRenderer) { - toolRenderer({ name: td.function.name, status: 'start', args }); - } - }, - onComplete: async (tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => { - // UI rendering - if (toolRenderer) { - toolRenderer({ - name: td.function.name, - status: 'success', - args, - result: typeof result === 'string' ? result : JSON.stringify(result) - }); - } + return tools.map(td => { + const originalOnStart = td.onStart; + const originalOnComplete = td.onComplete; - // Conversation sync callback - if (onComplete) { - const toolMessage: Message = { - role: 'tool', - content: typeof result === 'string' ? result : JSON.stringify(result), - name: td.function.name, - tool_call_id: tc.id, - }; - await onComplete(toolMessage); + return { + ...td, + onStart: async (tc: ChatCompletionMessageFunctionToolCall, args: Record) => { + await originalOnStart?.(tc, args); + if (toolRenderer) { + toolRenderer({ name: td.name, status: 'start', args }); + } + }, + onComplete: async (tc: ChatCompletionMessageFunctionToolCall, args: Record, result: unknown) => { + await originalOnComplete?.(tc, args, result); + if (toolRenderer) { + toolRenderer({ + name: td.name, + status: 'success', + args, + result: typeof result === 'string' ? result : JSON.stringify(result) + }); + } + if (onComplete) { + const toolMessage: Message = { + role: 'tool', + content: typeof result === 'string' ? result : JSON.stringify(result), + name: td.name, + tool_call_id: tc.id, + }; + await onComplete(toolMessage); + } } - } - })); + }; + }); } diff --git a/worker/agents/tools/resource-types.ts b/worker/agents/tools/resource-types.ts new file mode 100644 index 00000000..78a04aba --- /dev/null +++ b/worker/agents/tools/resource-types.ts @@ -0,0 +1,112 @@ +import { z } from 'zod'; + +import { mergeResources, type Resources } from './resources'; + +export interface Type { + schema: z.ZodType; + resources: ResourceResolver; + describe(desc: string): Type; + optional(): Type; + default(defaultValue: T): Type; +} + +type ResourceResolver = (value: T) => Resources; + +function buildType( + schema: z.ZodTypeAny, + resources: ResourceResolver +): Type { + return { + schema, + resources, + describe: (desc) => buildType(schema.describe(desc), resources), + optional: () => buildType(schema.optional(), (value) => + value === undefined ? {} : resources(value) + ), + default: (defaultValue) => buildType(schema.default(defaultValue), resources), + }; +} + +export function type( + schema: S, + resources: ResourceResolver> +): Type> { + return buildType(schema, resources); +} + +const primitive = { + string: () => type(z.string(), () => ({})), + number: () => type(z.number(), () => ({})), + boolean: () => type(z.boolean(), () => ({})), + + array(itemType: Type) { + return type(z.array(itemType.schema), (items) => { + const merged: Resources = {}; + items.forEach((item) => mergeResources(merged, itemType.resources(item))); + return merged; + }); + }, + + enum(values: T) { + return type(z.enum(values), () => ({})); + }, +}; + +export const t = { + string: primitive.string, + number: primitive.number, + boolean: primitive.boolean, + array: primitive.array, + enum: primitive.enum, + + file: { + read: () => + type(z.string(), (path) => ({ files: { mode: 'read', paths: [path] } })), + write: () => + type(z.string(), (path) => ({ files: { mode: 'write', paths: [path] } })), + }, + + files: { + read: () => + type(z.array(z.string()), (paths) => ({ files: { mode: 'read', paths } })), + write: () => + type(z.array(z.string()), (paths) => ({ files: { mode: 'write', paths } })), + }, + + generation: () => + type( + z.array( + z.object({ + path: z.string(), + description: z.string(), + requirements: z.array(z.string()).optional(), + }) + ), + (specs) => ({ files: { mode: 'write', paths: specs.map((s) => s.path) } }) + ), + + commands: () => + type(z.array(z.string()), () => ({ sandbox: { operation: 'exec' } })), + + analysis: { + files: () => type(z.array(z.string()).optional(), () => ({ sandbox: { operation: 'analysis' } })), + }, + + deployment: { + force: () => type(z.boolean().optional(), () => ({ + sandbox: { operation: 'deploy' }, + files: { mode: 'read', paths: [] }, + })), + }, + + logs: { + reset: () => type(z.boolean().optional(), () => ({ sandbox: { operation: 'read' } })), + durationSeconds: () => type(z.number().optional(), () => ({ sandbox: { operation: 'read' } })), + maxLines: () => type(z.number().optional(), () => ({ sandbox: { operation: 'read' } })), + }, + + runtimeErrors: () => + type(z.literal(true).optional(), () => ({ sandbox: { operation: 'read' } })), + + blueprint: () => type(z.string(), () => ({ blueprint: true })), +}; diff --git a/worker/agents/tools/resources.ts b/worker/agents/tools/resources.ts new file mode 100644 index 00000000..74221141 --- /dev/null +++ b/worker/agents/tools/resources.ts @@ -0,0 +1,101 @@ +export interface Resources { + files?: { + mode: 'read' | 'write'; + paths: string[]; + }; + sandbox?: { + operation: 'exec' | 'analysis' | 'deploy' | 'read'; + }; + blueprint?: boolean; + gitCommit?: boolean; +} + +export function mergeResources(target: Resources, source: Resources): void { + // Merge files + if (source.files) { + if (target.files) { + // If either has empty paths (all files), result is all files + if (target.files.paths.length === 0 || source.files.paths.length === 0) { + target.files.paths = []; + } else { + // Merge paths and deduplicate + const combined = [...target.files.paths, ...source.files.paths]; + target.files.paths = Array.from(new Set(combined)); + } + // Escalate mode to write if either is write + if (source.files.mode === 'write') { + target.files.mode = 'write'; + } + } else { + target.files = { ...source.files, paths: [...source.files.paths] }; + } + } + + // Merge sandbox (last one wins, they should be the same for same tool) + if (source.sandbox) { + target.sandbox = { ...source.sandbox }; + } + + // Merge blueprint + if (source.blueprint) { + target.blueprint = true; + } + + // Merge gitCommit + if (source.gitCommit) { + target.gitCommit = true; + } +} + +/** + * Check if two file path arrays overlap + */ +function pathsOverlap(paths1: string[], paths2: string[]): boolean { + // Empty array means "all files" + if (paths1.length === 0 || paths2.length === 0) { + return true; + } + + // Check for exact path overlap + const set1 = new Set(paths1); + return paths2.some(p => set1.has(p)); +} + +/** + * Determine if two resource sets conflict + */ +export function hasResourceConflict(r1: Resources, r2: Resources): boolean { + // File conflicts: write-write or read-write with path overlap + if (r1.files && r2.files) { + const hasWrite = r1.files.mode === 'write' || r2.files.mode === 'write'; + if (hasWrite && pathsOverlap(r1.files.paths, r2.files.paths)) { + return true; + } + } + + // Sandbox conflicts: exec/analysis/deploy are exclusive + if (r1.sandbox && r2.sandbox) { + const exclusive = ['exec', 'analysis', 'deploy']; + const op1Exclusive = exclusive.includes(r1.sandbox.operation); + const op2Exclusive = exclusive.includes(r2.sandbox.operation); + if (op1Exclusive || op2Exclusive) { + return true; + } + // 'read' operations can run in parallel with each other + } + + // Blueprint: always exclusive + if (r1.blueprint && r2.blueprint) { + return true; + } + + // Git commit: conflicts with file writes + if (r1.gitCommit && r2.files?.mode === 'write') { + return true; + } + if (r2.gitCommit && r1.files?.mode === 'write') { + return true; + } + + return false; +} diff --git a/worker/agents/tools/toolkit/alter-blueprint.ts b/worker/agents/tools/toolkit/alter-blueprint.ts index e11eaaaa..6854fc11 100644 --- a/worker/agents/tools/toolkit/alter-blueprint.ts +++ b/worker/agents/tools/toolkit/alter-blueprint.ts @@ -1,72 +1,59 @@ -import { ToolDefinition } from '../types'; +import { tool, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { Blueprint } from 'worker/agents/schemas'; - -type AlterBlueprintArgs = { - patch: Record; -}; +import { z } from 'zod'; export function createAlterBlueprintTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - // Build behavior-aware schema at tool creation time (tools are created per-agent) - const isAgentic = agent.getBehavior() === 'agentic'; + agent: ICodingAgent, + logger: StructuredLogger +) { + const isAgentic = agent.getBehavior() === 'agentic'; + + const agenticPatchSchema = z.object({ + title: z.string().optional(), + projectName: z.string().min(3).max(50).regex(/^[a-z0-9-_]+$/).optional(), + description: z.string().optional(), + detailedDescription: z.string().optional(), + colorPalette: z.array(z.string()).optional(), + frameworks: z.array(z.string()).optional(), + plan: z.array(z.string()).optional(), + }); - const agenticProperties = { - title: { type: 'string' }, - projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, - description: { type: 'string' }, - detailedDescription: { type: 'string' }, - colorPalette: { type: 'array', items: { type: 'string' } }, - frameworks: { type: 'array', items: { type: 'string' } }, - // Agentic-only: plan - plan: { type: 'array', items: { type: 'string' } }, - } as const; + const phasicPatchSchema = z.object({ + title: z.string().optional(), + projectName: z.string().min(3).max(50).regex(/^[a-z0-9-_]+$/).optional(), + description: z.string().optional(), + detailedDescription: z.string().optional(), + colorPalette: z.array(z.string()).optional(), + frameworks: z.array(z.string()).optional(), + views: z.array(z.object({ name: z.string(), description: z.string() })).optional(), + userFlow: z.object({ uiLayout: z.string().optional(), uiDesign: z.string().optional(), userJourney: z.string().optional() }).optional(), + dataFlow: z.string().optional(), + architecture: z.object({ dataFlow: z.string().optional() }).optional(), + pitfalls: z.array(z.string()).optional(), + implementationRoadmap: z.array(z.object({ phase: z.string(), description: z.string() })).optional(), + }); - const phasicProperties = { - title: { type: 'string' }, - projectName: { type: 'string', minLength: 3, maxLength: 50, pattern: '^[a-z0-9-_]+$' }, - description: { type: 'string' }, - detailedDescription: { type: 'string' }, - colorPalette: { type: 'array', items: { type: 'string' } }, - frameworks: { type: 'array', items: { type: 'string' } }, - views: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { name: { type: 'string' }, description: { type: 'string' } }, required: ['name', 'description'] } }, - userFlow: { type: 'object', additionalProperties: false, properties: { uiLayout: { type: 'string' }, uiDesign: { type: 'string' }, userJourney: { type: 'string' } } }, - dataFlow: { type: 'string' }, - architecture: { type: 'object', additionalProperties: false, properties: { dataFlow: { type: 'string' } } }, - pitfalls: { type: 'array', items: { type: 'string' } }, - implementationRoadmap: { type: 'array', items: { type: 'object', additionalProperties: false, properties: { phase: { type: 'string' }, description: { type: 'string' } }, required: ['phase', 'description'] } }, - // No plan here; phasic handles phases separately - } as const; + const patchSchema = isAgentic ? agenticPatchSchema : phasicPatchSchema; - const dynamicPatchSchema = isAgentic ? agenticProperties : phasicProperties; + const patchType = type( + patchSchema, + () => ({ blueprint: true }) + ); - return { - type: 'function' as const, - function: { - name: 'alter_blueprint', - description: isAgentic - ? 'Apply a patch to the agentic blueprint (title, description, colorPalette, frameworks, plan, projectName).' - : 'Apply a patch to the phasic blueprint (title, description, colorPalette, frameworks, views, userFlow, architecture, dataFlow, pitfalls, implementationRoadmap, projectName).', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - patch: { - type: 'object', - additionalProperties: false, - properties: dynamicPatchSchema as Record, - }, - }, - required: ['patch'], - }, - }, - implementation: async ({ patch }) => { - logger.info('Altering blueprint', { keys: Object.keys(patch || {}) }); - const updated = await agent.updateBlueprint(patch as Partial); - return updated; - }, - }; + return tool({ + name: 'alter_blueprint', + description: isAgentic + ? 'Apply a patch to the agentic blueprint (title, description, colorPalette, frameworks, plan, projectName).' + : 'Apply a patch to the phasic blueprint (title, description, colorPalette, frameworks, views, userFlow, architecture, dataFlow, pitfalls, implementationRoadmap, projectName).', + args: { + patch: patchType, + }, + run: async ({ patch }) => { + logger.info('Altering blueprint', { keys: Object.keys(patch || {}) }); + const updated = await agent.updateBlueprint(patch as Partial); + return updated; + }, + }); } diff --git a/worker/agents/tools/toolkit/completion-signals.ts b/worker/agents/tools/toolkit/completion-signals.ts new file mode 100644 index 00000000..d8f304d9 --- /dev/null +++ b/worker/agents/tools/toolkit/completion-signals.ts @@ -0,0 +1,76 @@ +import { tool, t, ToolDefinition } from '../types'; +import { StructuredLogger } from '../../../logger'; + +type CompletionResult = { + acknowledged: true; + message: string; +}; + +export function createMarkGenerationCompleteTool( + logger: StructuredLogger +): ToolDefinition<{ summary: string; filesGenerated: number }, CompletionResult> { + return tool({ + name: 'mark_generation_complete', + description: `Signal that initial project generation is complete. Use this when: +- All planned features/files have been generated based on the blueprint +- Project is functional and meets the specified requirements +- All errors have been resolved (run_analysis passes, no runtime errors) +- You have verified everything works via deploy_preview + +CRITICAL: This is for INITIAL PROJECT BUILDS only. + +For follow-up conversations where the user asks for tweaks, additions, or modifications +to an existing project, just respond naturally - DO NOT call this tool. + +Once you call this tool, make NO further tool calls. The system will stop immediately.`, + args: { + summary: t.string().describe('Brief summary of what was built (2-3 sentences max). Describe the key features and functionality implemented.'), + filesGenerated: t.number().describe('Total count of files generated during this build session'), + }, + run: async ({ summary, filesGenerated }) => { + logger.info('Generation marked complete', { + summary, + filesGenerated, + timestamp: new Date().toISOString() + }); + + return { + acknowledged: true as const, + message: `Generation completion acknowledged. Successfully built project with ${filesGenerated} files. ${summary}`, + }; + }, + }); +} + +export function createMarkDebuggingCompleteTool( + logger: StructuredLogger +): ToolDefinition<{ summary: string; issuesFixed: number }, CompletionResult> { + return tool({ + name: 'mark_debugging_complete', + description: `Signal that debugging task is complete. Use this when: +- All reported issues have been fixed +- Verification confirms fixes work (run_analysis passes, get_runtime_errors shows no errors) +- No new errors were introduced by your changes +- All task requirements have been met + +DO NOT call this tool if you are still investigating issues or in the process of fixing them. + +Once you call this tool, make NO further tool calls. The system will stop immediately.`, + args: { + summary: t.string().describe('Brief summary of what was fixed (2-3 sentences max). Describe the issues resolved and verification performed.'), + issuesFixed: t.number().describe('Count of issues successfully resolved'), + }, + run: async ({ summary, issuesFixed }) => { + logger.info('Debugging marked complete', { + summary, + issuesFixed, + timestamp: new Date().toISOString() + }); + + return { + acknowledged: true as const, + message: `Debugging completion acknowledged. Successfully fixed ${issuesFixed} issue(s). ${summary}`, + }; + }, + }); +} diff --git a/worker/agents/tools/toolkit/deep-debugger.ts b/worker/agents/tools/toolkit/deep-debugger.ts index f9e3e154..29b2b9de 100644 --- a/worker/agents/tools/toolkit/deep-debugger.ts +++ b/worker/agents/tools/toolkit/deep-debugger.ts @@ -1,48 +1,44 @@ -import { ToolDefinition } from '../types'; +import { tool, t, type Type, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { RenderToolCall } from 'worker/agents/operations/UserConversationProcessor'; +import { z } from 'zod'; export function createDeepDebuggerTool( agent: ICodingAgent, logger: StructuredLogger, - toolRenderer: RenderToolCall, - streamCb: (chunk: string) => void, -): ToolDefinition< - { issue: string; focus_paths?: string[] }, - { transcript: string } | { error: string } -> { - // Track calls per conversation turn (resets when buildTools is called again) + toolRenderer: RenderToolCall, + streamCb: (chunk: string) => void +) { let callCount = 0; - - return { - type: 'function', - function: { - name: 'deep_debug', - description: - 'Autonomous debugging assistant that investigates errors, reads files, and applies fixes. CANNOT run during code generation - will return GENERATION_IN_PROGRESS error if generation is active. LIMITED TO ONE CALL PER CONVERSATION TURN.', - parameters: { - type: 'object', - properties: { - issue: { type: 'string' }, - focus_paths: { type: 'array', items: { type: 'string' } }, - }, - required: ['issue'], - }, + + const focusPathsType: Type = type( + z.array(z.string()).optional(), + (paths: string[] | undefined) => ({ + files: paths ? { mode: 'write', paths } : { mode: 'write', paths: [] }, + gitCommit: true, + sandbox: { operation: 'deploy' }, + }) + ); + + return tool({ + name: 'deep_debug', + description: + 'Autonomous debugging assistant that investigates errors, reads files, and applies fixes. CANNOT run during code generation - will return GENERATION_IN_PROGRESS error if generation is active. LIMITED TO ONE CALL PER CONVERSATION TURN.', + args: { + issue: t.string().describe('Description of the issue to debug'), + focus_paths: focusPathsType.describe('Optional array of file paths to focus debugging on'), }, - implementation: async ({ issue, focus_paths }: { issue: string; focus_paths?: string[] }) => { - // Check if already called in this turn + run: async ({ issue, focus_paths }) => { if (callCount > 0) { logger.warn('Cannot start debugging: Already called once this turn'); return { error: 'CALL_LIMIT_EXCEEDED: You are only allowed to make a single deep_debug call per conversation turn. Ask user for permission before trying again.' }; } - - // Increment call counter + callCount++; - - // Check if code generation is in progress + if (agent.isCodeGenerating()) { logger.warn('Cannot start debugging: Code generation in progress'); return { @@ -50,7 +46,6 @@ export function createDeepDebuggerTool( }; } - // Check if another debug session is running if (agent.isDeepDebugging()) { logger.warn('Cannot start debugging: Another debug session in progress'); return { @@ -58,15 +53,13 @@ export function createDeepDebuggerTool( }; } - // Execute debug session - agent handles all logic internally const result = await agent.executeDeepDebug(issue, toolRenderer, streamCb, focus_paths); - - // Convert discriminated union to tool response format + if (result.success) { return { transcript: result.transcript }; } else { return { error: result.error }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/deploy-preview.ts b/worker/agents/tools/toolkit/deploy-preview.ts index 36995c79..b3631158 100644 --- a/worker/agents/tools/toolkit/deploy-preview.ts +++ b/worker/agents/tools/toolkit/deploy-preview.ts @@ -1,30 +1,19 @@ -import { ErrorResult, ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type DeployPreviewArgs = Record; - -type DeployPreviewResult = { message: string } | ErrorResult; - export function createDeployPreviewTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'deploy_preview', - description: - 'Uploads and syncs the current application to the preview environment. After deployment, the app is live at the preview URL, but runtime logs (get_logs) will only appear when the user interacts with the app - not automatically after deployment. CRITICAL: After deploying, use wait(20-30) to allow time for user interaction before checking logs. Use force_redeploy=true to force a redeploy (will reset session ID and spawn a new sandbox, is expensive) ', - parameters: { - type: 'object', - properties: { - force_redeploy: { type: 'boolean' }, - }, - required: [], - }, +) { + return tool({ + name: 'deploy_preview', + description: + 'Uploads and syncs the current application to the preview environment. After deployment, the app is live at the preview URL, but runtime logs (get_logs) will only appear when the user interacts with the app - not automatically after deployment. CRITICAL: After deploying, use wait(20-30) to allow time for user interaction before checking logs. Use force_redeploy=true to force a redeploy (will reset session ID and spawn a new sandbox, is expensive) ', + args: { + force_redeploy: t.deployment.force().describe('Force a full redeploy (resets session ID and spawns new sandbox)'), }, - implementation: async ({ force_redeploy }: { force_redeploy?: boolean }) => { + run: async ({ force_redeploy }) => { try { logger.info('Deploying preview to sandbox environment'); const result = await agent.deployPreview(undefined, force_redeploy); @@ -39,5 +28,5 @@ export function createDeployPreviewTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/exec-commands.ts b/worker/agents/tools/toolkit/exec-commands.ts index 3e947455..5e8f43ad 100644 --- a/worker/agents/tools/toolkit/exec-commands.ts +++ b/worker/agents/tools/toolkit/exec-commands.ts @@ -1,45 +1,35 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { ExecuteCommandsResponse } from 'worker/services/sandbox/sandboxTypes'; -export type ExecCommandsArgs = { - commands: string[]; - shouldSave: boolean; - timeout?: number; -}; - -export type ExecCommandsResult = ExecuteCommandsResponse | ErrorResult; +export type ExecCommandsResult = ExecuteCommandsResponse | { error: string }; export function createExecCommandsTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'exec_commands', - description: - 'Execute shell commands in the sandbox. CRITICAL shouldSave rules: (1) Set shouldSave=true ONLY for package management with specific packages (e.g., "bun add react", "npm install lodash"). (2) Set shouldSave=false for: file operations (rm, mv, cp), plain installs ("bun install"), run commands ("bun run dev"), and temporary operations. Invalid commands in shouldSave=true will be automatically filtered out. Always use bun for package management.', - parameters: { - type: 'object', - properties: { - commands: { type: 'array', items: { type: 'string' } }, - shouldSave: { type: 'boolean', default: true }, - timeout: { type: 'number', default: 30000 }, - }, - required: ['commands'], - }, + logger: StructuredLogger +) { + return tool({ + name: 'exec_commands', + description: + 'Execute shell commands in the sandbox. CRITICAL shouldSave rules: (1) Set shouldSave=true ONLY for package management with specific packages (e.g., "bun add react", "npm install lodash"). (2) Set shouldSave=false for: file operations (rm, mv, cp), plain installs ("bun install"), run commands ("bun run dev"), and temporary operations. Invalid commands in shouldSave=true will be automatically filtered out. Always use bun for package management.', + args: { + commands: t.commands().describe('Array of shell commands to execute'), + shouldSave: t.boolean().default(true).describe('Whether to save package management commands to blueprint'), + timeout: t.number().default(30000).describe('Timeout in milliseconds'), }, - implementation: async ({ commands, shouldSave = true, timeout = 30000 }) => { + run: async ({ commands, shouldSave, timeout }) => { try { + const shouldSaveValue = shouldSave ?? true; + const timeoutValue = timeout ?? 30000; + logger.info('Executing commands', { count: commands.length, - commands, - shouldSave, - timeout, + commands, + shouldSave: shouldSaveValue, + timeout: timeoutValue, }); - return await agent.execCommands(commands, shouldSave, timeout); + return await agent.execCommands(commands, shouldSaveValue, timeoutValue); } catch (error) { return { error: @@ -49,5 +39,5 @@ export function createExecCommandsTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/feedback.ts b/worker/agents/tools/toolkit/feedback.ts index 37d1fcff..726f7f88 100644 --- a/worker/agents/tools/toolkit/feedback.ts +++ b/worker/agents/tools/toolkit/feedback.ts @@ -1,6 +1,6 @@ import { captureMessage, withScope, flush } from '@sentry/cloudflare'; import { env } from 'cloudflare:workers'; -import { ErrorResult, ToolDefinition } from '../types'; +import { ErrorResult, tool, t } from '../types'; type FeedbackArgs = { message: string; @@ -22,29 +22,24 @@ const submitFeedbackImplementation = async ( }; } - // Use withScope to isolate this event's context const eventId = withScope((scope) => { - // Set tags for categorization scope.setTags({ type: args.type, severity: args.severity || 'medium', source: 'ai_conversation_tool', }); - // Set context for additional information scope.setContext('feedback', { user_provided_context: args.context || 'No additional context', submission_type: args.type, }); - // Capture the message with appropriate severity level return captureMessage( args.message, args.type === 'bug' ? 'error' : 'info' ); }); - // Flush to ensure it's sent immediately await flush(2000); return { @@ -61,44 +56,14 @@ const submitFeedbackImplementation = async ( } }; -export const toolFeedbackDefinition: ToolDefinition< - FeedbackArgs, - FeedbackResult -> = { - type: 'function' as const, - function: { - name: 'submit_feedback', - description: - 'Submit bug reports or user feedback to the development team. ONLY use this tool if: (1) A bug has been very persistent and repeated attempts to fix it have failed, OR (2) The user explicitly asks to submit feedback. Do NOT use this for every bug - only for critical or persistent issues.', - parameters: { - type: 'object', - properties: { - message: { - type: 'string', - description: - 'Clear description of the bug or feedback. Include what the user tried, what went wrong, and any error messages.', - minLength: 20, - }, - type: { - type: 'string', - enum: ['bug', 'feedback'], - description: - "'bug' for persistent technical issues, 'feedback' for feature requests or general comments", - }, - severity: { - type: 'string', - enum: ['low', 'medium', 'high'], - description: - "Severity level - 'high' only for critical blocking issues", - }, - context: { - type: 'string', - description: - 'Additional context about the project, what the user was trying to build, or environment details', - }, - }, - required: ['message', 'type'], - }, +export const toolFeedbackDefinition = tool({ + name: 'submit_feedback', + description: 'Submit bug reports or user feedback to the development team. ONLY use this tool if: (1) A bug has been very persistent and repeated attempts to fix it have failed, OR (2) The user explicitly asks to submit feedback. Do NOT use this for every bug - only for critical or persistent issues.', + args: { + message: t.string().describe('Clear description of the bug or feedback. Include what the user tried, what went wrong, and any error messages.'), + type: t.enum(['bug', 'feedback'] as const).describe("'bug' for persistent technical issues, 'feedback' for feature requests or general comments"), + severity: t.enum(['low', 'medium', 'high'] as const).optional().describe("Severity level - 'high' only for critical blocking issues"), + context: t.string().optional().describe('Additional context about the project, what the user was trying to build, or environment details'), }, - implementation: submitFeedbackImplementation, -}; + run: submitFeedbackImplementation, +}); diff --git a/worker/agents/tools/toolkit/generate-blueprint.ts b/worker/agents/tools/toolkit/generate-blueprint.ts index 4ef0a914..43b52e5d 100644 --- a/worker/agents/tools/toolkit/generate-blueprint.ts +++ b/worker/agents/tools/toolkit/generate-blueprint.ts @@ -1,74 +1,53 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { generateBlueprint, type AgenticBlueprintGenerationArgs } from 'worker/agents/planning/blueprint'; -import type { Blueprint } from 'worker/agents/schemas'; import { WebSocketMessageResponses } from '../../constants'; -type GenerateBlueprintArgs = { - prompt: string; -}; -type GenerateBlueprintResult = { message: string; blueprint: Blueprint }; - -/** - * Generates a blueprint - */ export function createGenerateBlueprintTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'generate_blueprint', - description: - 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic. Provide a description/prompt for the project to generate a blueprint.', - parameters: { - type: 'object', - properties: { - prompt: { - type: 'string', - description: 'Prompt/user query for building the project. Use this to provide clarifications, additional requirements, or refined specifications based on conversation context.' - } - }, - required: ['prompt'], - }, - }, - implementation: async ({ prompt }: GenerateBlueprintArgs) => { - const { env, inferenceContext, context } = agent.getOperationOptions(); - - const isAgentic = agent.getBehavior() === 'agentic'; - - // Language/frameworks are optional; provide sensible defaults - const language = 'typescript'; - const frameworks: string[] = []; - - const args: AgenticBlueprintGenerationArgs = { - env, - inferenceContext, - query: prompt, - language, - frameworks, - templateDetails: context.templateDetails, - projectType: agent.getProjectType(), - stream: { - chunk_size: 256, - onChunk: (chunk: string) => { - agent.broadcast(WebSocketMessageResponses.BLUEPRINT_CHUNK, { chunk }); - } - } - }; - const blueprint = await generateBlueprint(args); - - // Persist in state for subsequent steps - await agent.setBlueprint(blueprint); - - logger.info('Blueprint generated via tool', { - behavior: isAgentic ? 'agentic' : 'phasic', - title: blueprint.title, - }); - - return { message: 'Blueprint generated successfully', blueprint }; - }, - }; + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'generate_blueprint', + description: + 'Generate a blueprint using the backend blueprint generator. Produces a plan-based blueprint for agentic behavior and a detailed PRD for phasic. Provide a description/prompt for the project to generate a blueprint.', + args: { + prompt: t.blueprint().describe('Prompt/user query for building the project. Use this to provide clarifications, additional requirements, or refined specifications based on conversation context.'), + }, + run: async ({ prompt }) => { + const { env, inferenceContext, context } = agent.getOperationOptions(); + + const isAgentic = agent.getBehavior() === 'agentic'; + + const language = 'typescript'; + const frameworks: string[] = []; + + const args: AgenticBlueprintGenerationArgs = { + env, + inferenceContext, + query: prompt, + language, + frameworks, + templateDetails: context.templateDetails, + projectType: agent.getProjectType(), + stream: { + chunk_size: 256, + onChunk: (chunk: string) => { + agent.broadcast(WebSocketMessageResponses.BLUEPRINT_CHUNK, { chunk }); + } + } + }; + const blueprint = await generateBlueprint(args); + + await agent.setBlueprint(blueprint); + + logger.info('Blueprint generated via tool', { + behavior: isAgentic ? 'agentic' : 'phasic', + title: blueprint.title, + }); + + return { message: 'Blueprint generated successfully', blueprint }; + }, + }); } diff --git a/worker/agents/tools/toolkit/generate-files.ts b/worker/agents/tools/toolkit/generate-files.ts index db513d78..43f3dc47 100644 --- a/worker/agents/tools/toolkit/generate-files.ts +++ b/worker/agents/tools/toolkit/generate-files.ts @@ -1,32 +1,23 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { FileConceptType } from 'worker/agents/schemas'; -export type GenerateFilesArgs = { - phase_name: string; - phase_description: string; - requirements: string[]; - files: FileConceptType[]; -}; - export type GenerateFilesResult = | { files: Array<{ path: string; purpose: string; diff: string }>; summary: string; } - | ErrorResult; + | { error: string }; export function createGenerateFilesTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'generate_files', - description: `Generate new files or completely rewrite existing files using the full phase implementation system. - + logger: StructuredLogger +) { + return tool({ + name: 'generate_files', + description: `Generate new files or completely rewrite existing files using the full phase implementation system. + Use this when: - File(s) don't exist and need to be created - regenerate_file failed (file too broken to patch) @@ -40,42 +31,13 @@ The system will: 4. Return diffs for all generated files Provide detailed, specific requirements. The more detail, the better the results.`, - parameters: { - type: 'object', - properties: { - phase_name: { - type: 'string', - description: - 'Short, descriptive name for what you\'re generating (e.g., "Add data export utilities")', - }, - phase_description: { - type: 'string', - description: 'Brief description of what these files should accomplish', - }, - requirements: { - type: 'array', - items: { type: 'string' }, - description: - 'Array of specific, detailed requirements. Be explicit about function signatures, types, implementation details.', - }, - files: { - type: 'array', - items: { - type: 'object', - properties: { - path: { type: 'string', description: 'File path relative to project root' }, - purpose: { type: 'string', description: 'Brief description of file purpose' }, - changes: { type: ['string', 'null'], description: 'Specific changes for existing files, or null for new files' } - }, - required: ['path', 'purpose', 'changes'] - }, - description: 'Array of files to generate with their paths and purposes' - }, - }, - required: ['phase_name', 'phase_description', 'requirements', 'files'], - }, + args: { + phase_name: t.string().describe('Short, descriptive name for what you\'re generating (e.g., "Add data export utilities")'), + phase_description: t.string().describe('Brief description of what these files should accomplish'), + requirements: t.array(t.string()).describe('Array of specific, detailed requirements. Be explicit about function signatures, types, implementation details.'), + files: t.generation().describe('Array of file specs with path and description (purpose). Requirements field is optional for finetuning expectations.'), }, - implementation: async ({ phase_name, phase_description, requirements, files }) => { + run: async ({ phase_name, phase_description, requirements, files }) => { try { logger.info('Generating files via phase implementation', { phase_name, @@ -83,7 +45,13 @@ Provide detailed, specific requirements. The more detail, the better the results filesCount: files.length, }); - const result = await agent.generateFiles(phase_name, phase_description, requirements, files); + const fileConcepts: FileConceptType[] = files.map((file) => ({ + path: file.path, + purpose: file.description, + changes: null, + })); + + const result = await agent.generateFiles(phase_name, phase_description, requirements, fileConcepts); return { files: result.files.map((f) => ({ @@ -102,5 +70,5 @@ Provide detailed, specific requirements. The more detail, the better the results }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/generate-images.ts b/worker/agents/tools/toolkit/generate-images.ts index 7a971185..32d3fa2e 100644 --- a/worker/agents/tools/toolkit/generate-images.ts +++ b/worker/agents/tools/toolkit/generate-images.ts @@ -1,35 +1,21 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type GenerateImagesArgs = { - prompts: string[]; - style?: string; -}; - -type GenerateImagesResult = { message: string }; - export function createGenerateImagesTool( - _agent: ICodingAgent, - _logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'generate_images', - description: 'Generate images for the project (stub). Use later when the image generation pipeline is available.', - parameters: { - type: 'object', - properties: { - prompts: { type: 'array', items: { type: 'string' } }, - style: { type: 'string' }, - }, - required: ['prompts'], - }, - }, - implementation: async ({ prompts, style }: GenerateImagesArgs) => { - return { message: `Image generation not implemented yet. Requested ${prompts.length} prompt(s)${style ? ` with style ${style}` : ''}.` }; - }, - }; + _agent: ICodingAgent, + _logger: StructuredLogger +) { + return tool({ + name: 'generate_images', + description: 'Generate images for the project (stub). Use later when the image generation pipeline is available.', + args: { + prompts: t.array(t.string()).describe('Array of image generation prompts'), + style: t.string().optional().describe('Optional style parameter for image generation'), + }, + run: async ({ prompts, style }) => { + return { message: `Image generation not implemented yet. Requested ${prompts.length} prompt(s)${style ? ` with style ${style}` : ''}.` }; + }, + }); } diff --git a/worker/agents/tools/toolkit/get-logs.ts b/worker/agents/tools/toolkit/get-logs.ts index b2214201..1f4b32f4 100644 --- a/worker/agents/tools/toolkit/get-logs.ts +++ b/worker/agents/tools/toolkit/get-logs.ts @@ -1,25 +1,15 @@ -import { ErrorResult, ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type GetLogsArgs = { - reset?: boolean; - durationSeconds?: number; - maxLines?: number; -}; - -type GetLogsResult = { logs: string } | ErrorResult; - export function createGetLogsTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'get_logs', - description: - `Get cumulative application/server logs from the sandbox environment. +) { + return tool({ + name: 'get_logs', + description: + `Get cumulative application/server logs from the sandbox environment. **USE SPARINGLY:** Only call when get_runtime_errors and run_analysis don't provide enough information. Logs are verbose and cumulative - prefer other diagnostic tools first. @@ -29,55 +19,40 @@ export function createGetLogsTool( 3. Check timestamps vs. your deploy times **WHEN TO USE:** -- ✅ Need to see console output or detailed execution flow -- ✅ Runtime errors lack detail and static analysis passes -- ❌ DON'T use as first diagnostic - try get_runtime_errors and run_analysis first +- Need to see console output or detailed execution flow +- Runtime errors lack detail and static analysis passes +- DON'T use as first diagnostic - try get_runtime_errors and run_analysis first **DEFAULTS:** 30s window, 100 lines, no reset. Logs are USER-DRIVEN (require user interaction). **RESET:** Set reset=true to clear accumulated logs before fetching. Use when starting fresh debugging or after major fixes.`, - parameters: { - type: 'object', - properties: { - reset: { - type: 'boolean', - description: 'Clear accumulated logs before fetching. Default: false. Set to true when starting fresh debugging or after major fixes to avoid stale errors.', - }, - durationSeconds: { - type: 'number', - description: 'Time window in seconds. Default: 30 seconds (recent activity). Set to higher value if you need older logs.', - }, - maxLines: { - type: 'number', - description: 'Maximum lines to return. Default: 100. Set to -1 for no truncation (warning: heavy token usage). Increase to 200-500 for more context.', - }, - }, - required: [], - }, + args: { + reset: t.logs.reset().describe('Clear accumulated logs before fetching. Default: false. Set to true when starting fresh debugging or after major fixes to avoid stale errors.'), + durationSeconds: t.logs.durationSeconds().describe('Time window in seconds. Default: 30 seconds (recent activity). Set to higher value if you need older logs.'), + maxLines: t.logs.maxLines().describe('Maximum lines to return. Default: 100. Set to -1 for no truncation (warning: heavy token usage). Increase to 200-500 for more context.'), }, - implementation: async (args?) => { + run: async ({ reset, durationSeconds, maxLines }) => { try { - const reset = args?.reset ?? false; // Default: don't reset - const durationSeconds = args?.durationSeconds ?? 30; // Default to last 30 seconds - const maxLines = args?.maxLines ?? 100; // Default to 100 lines - - logger.info('Fetching application logs', { reset, durationSeconds, maxLines }); - const logs = await agent.getLogs(reset, durationSeconds); - - // Truncate logs if maxLines is not -1 - if (maxLines !== -1 && logs) { + const resetValue = reset ?? false; + const duration = durationSeconds ?? 30; + const maxLinesValue = maxLines ?? 100; + + logger.info('Fetching application logs', { reset: resetValue, durationSeconds: duration, maxLines: maxLinesValue }); + const logs = await agent.getLogs(resetValue, duration); + + if (maxLinesValue !== -1 && logs) { const lines = logs.split('\n'); - if (lines.length > maxLines) { - const truncatedLines = lines.slice(-maxLines); // Keep last N lines (most recent) + if (lines.length > maxLinesValue) { + const truncatedLines = lines.slice(-maxLinesValue); const truncatedLog = [ - `[TRUNCATED: Showing last ${maxLines} of ${lines.length} lines. Set maxLines higher or to -1 for full output]`, + `[TRUNCATED: Showing last ${maxLinesValue} of ${lines.length} lines. Set maxLines higher or to -1 for full output]`, ...truncatedLines ].join('\n'); - logger.info('Logs truncated', { originalLines: lines.length, truncatedLines: maxLines }); + logger.info('Logs truncated', { originalLines: lines.length, truncatedLines: maxLinesValue }); return { logs: truncatedLog }; } } - + return { logs }; } catch (error) { return { @@ -88,5 +63,5 @@ export function createGetLogsTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/get-runtime-errors.ts b/worker/agents/tools/toolkit/get-runtime-errors.ts index c3e35277..a6a74a91 100644 --- a/worker/agents/tools/toolkit/get-runtime-errors.ts +++ b/worker/agents/tools/toolkit/get-runtime-errors.ts @@ -1,22 +1,15 @@ -import { ErrorResult, ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -import { RuntimeError } from 'worker/services/sandbox/sandboxTypes'; - -type GetRuntimeErrorsArgs = Record; - -type GetRuntimeErrorsResult = { errors: RuntimeError[] } | ErrorResult; export function createGetRuntimeErrorsTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'get_runtime_errors', - description: - `Fetch latest runtime errors from the sandbox error storage. These are errors captured by the runtime error detection system. +) { + return tool({ + name: 'get_runtime_errors', + description: + `Fetch latest runtime errors from the sandbox error storage. These are errors captured by the runtime error detection system. **IMPORTANT CHARACTERISTICS:** - Runtime errors are USER-INTERACTION DRIVEN - they only appear when users interact with the app @@ -30,26 +23,23 @@ export function createGetRuntimeErrorsTool( 4. Call get_runtime_errors again to verify errors are resolved **When to use:** -- ✅ To see what runtime errors users have encountered -- ✅ After deploying fixes to verify issues are resolved -- ✅ To understand error patterns in the application +- To see what runtime errors users have encountered +- After deploying fixes to verify issues are resolved +- To understand error patterns in the application **When NOT to use:** -- ❌ Immediately after deploy (errors need user interaction to generate) -- ❌ In rapid succession (errors update on user interaction, not continuously)`, - parameters: { - type: 'object', - properties: {}, - required: [], - }, +- Immediately after deploy (errors need user interaction to generate) +- In rapid succession (errors update on user interaction, not continuously)`, + args: { + _trigger: t.runtimeErrors().describe('Internal trigger for resource tracking'), }, - implementation: async (_args?) => { + run: async () => { try { logger.info('Fetching runtime errors from sandbox'); - + const errors = await agent.fetchRuntimeErrors(true); - - return { + + return { errors: errors || [] }; } catch (error) { @@ -61,5 +51,5 @@ export function createGetRuntimeErrorsTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/git.ts b/worker/agents/tools/toolkit/git.ts index 7aeba29e..fefc40bb 100644 --- a/worker/agents/tools/toolkit/git.ts +++ b/worker/agents/tools/toolkit/git.ts @@ -1,72 +1,52 @@ -import { ToolDefinition } from '../types'; +import { tool, t, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { z } from 'zod'; type GitCommand = 'commit' | 'log' | 'show' | 'reset'; -interface GitToolArgs { - command: GitCommand; - message?: string; - limit?: number; - oid?: string; - includeDiff?: boolean; -} - export function createGitTool( agent: ICodingAgent, logger: StructuredLogger, options?: { excludeCommands?: GitCommand[] } -): ToolDefinition { +) { const allCommands: GitCommand[] = ['commit', 'log', 'show', 'reset']; const allowedCommands = options?.excludeCommands ? allCommands.filter(cmd => !options.excludeCommands!.includes(cmd)) : allCommands; - + const hasReset = allowedCommands.includes('reset'); const commandsList = allowedCommands.join(', '); const description = hasReset ? `Execute git commands. Commands: ${commandsList}. WARNING: reset is destructive!` : `Execute git commands. Commands: ${commandsList}.`; - return { - type: 'function', - function: { - name: 'git', - description, - parameters: { - type: 'object', - properties: { - command: { - type: 'string', - enum: allowedCommands, - description: 'Git command to execute' - }, - message: { - type: 'string', - description: 'Commit message (required for commit command, e.g., "fix: resolve authentication bug")' - }, - limit: { - type: 'number', - description: 'Number of commits to show (for log command, default: 10)' - }, - oid: { - type: 'string', - description: hasReset - ? 'Commit hash/OID (required for show and reset commands)' - : 'Commit hash/OID (required for show command)' - }, - includeDiff: { - type: 'boolean', - description: 'Include file diffs in show command output (default: false). Use ONLY when you need to see actual code changes. WARNING: Slower for commits with many/large files.' - } - }, - required: ['command'], - }, + const commandType = type( + z.enum(allowedCommands as [GitCommand, ...GitCommand[]]), + (cmd: GitCommand) => { + if (cmd === 'commit' || cmd === 'reset') { + return { gitCommit: true }; + } + return {}; + } + ); + + return tool({ + name: 'git', + description, + args: { + command: commandType.describe('Git command to execute'), + message: t.string().optional().describe('Commit message (required for commit command, e.g., "fix: resolve authentication bug")'), + limit: t.number().optional().describe('Number of commits to show (for log command, default: 10)'), + oid: t.string().optional().describe(hasReset + ? 'Commit hash/OID (required for show and reset commands)' + : 'Commit hash/OID (required for show command)'), + includeDiff: t.boolean().optional().describe('Include file diffs in show command output (default: false). Use ONLY when you need to see actual code changes. WARNING: Slower for commits with many/large files.'), }, - implementation: async ({ command, message, limit, oid, includeDiff }: GitToolArgs) => { + run: async ({ command, message, limit, oid, includeDiff }) => { try { const gitInstance = agent.git; - + switch (command) { case 'commit': { if (!message) { @@ -75,30 +55,30 @@ export function createGitTool( message: 'Commit message is required for commit command' }; } - + const unescapedMessage = message.replace(/\\n/g, '\n').replace(/\\t/g, '\t'); - + logger.info('Git commit', { message: unescapedMessage }); const commitOid = await gitInstance.commit([], unescapedMessage); - + return { success: true, data: { oid: commitOid }, message: commitOid ? `Committed: ${message}` : 'No changes to commit' }; } - + case 'log': { logger.info('Git log', { limit: limit || 10 }); const commits = await gitInstance.log(limit || 10); - + return { success: true, data: { commits }, message: `Retrieved ${commits.length} commits` }; } - + case 'show': { if (!oid) { return { @@ -106,17 +86,17 @@ export function createGitTool( message: 'Commit OID is required for show command' }; } - + logger.info('Git show', { oid, includeDiff }); const result = await gitInstance.show(oid, { includeDiff }); - + return { success: true, data: result, message: `Commit ${result.oid.substring(0, 7)}: ${result.message} (${result.files} files)` }; } - + case 'reset': { if (!oid) { return { @@ -124,17 +104,17 @@ export function createGitTool( message: 'Commit OID is required for reset command' }; } - + logger.info('Git reset', { oid }); const result = await gitInstance.reset(oid, { hard: true }); - + return { success: true, data: result, message: `Reset to commit ${result.ref.substring(0, 7)}. ${result.filesReset} files updated. HEAD moved.` }; } - + default: return { success: false, @@ -149,5 +129,5 @@ export function createGitTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/init-suitable-template.ts b/worker/agents/tools/toolkit/init-suitable-template.ts index e970bdb6..c31f4d17 100644 --- a/worker/agents/tools/toolkit/init-suitable-template.ts +++ b/worker/agents/tools/toolkit/init-suitable-template.ts @@ -1,102 +1,81 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { BaseSandboxService } from 'worker/services/sandbox/BaseSandboxService'; import { selectTemplate } from '../../planning/templateSelector'; import { TemplateSelection } from '../../schemas'; import { TemplateFile } from 'worker/services/sandbox/sandboxTypes'; - -export type InitSuitableTemplateArgs = { - query: string; -}; +import { z } from 'zod'; export type InitSuitableTemplateResult = - | { - selection: TemplateSelection; - importedFiles: TemplateFile[]; - reasoning: string; - message: string; - } - | ErrorResult; - -/** - * template selection and import. - * Analyzes user requirements, selects best matching template from library, - * and automatically imports it to the virtual filesystem. - */ + | { + selection: TemplateSelection; + importedFiles: TemplateFile[]; + reasoning: string; + message: string; + } + | { error: string }; + export function createInitSuitableTemplateTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'init_suitable_template', - description: 'Analyze user requirements and automatically select + import the most suitable template from library. Uses AI to match requirements against available templates. Returns selection with reasoning and imported files. For interactive projects (app/presentation/workflow) only. Call this BEFORE generate_blueprint.', - parameters: { - type: 'object', - properties: { - query: { - type: 'string', - description: 'User requirements and project description. Provide clear description of what needs to be built.', - }, - }, - required: ['query'], - }, - }, - implementation: async ({ query }: InitSuitableTemplateArgs) => { - try { - const projectType = agent.getProjectType(); - const operationOptions = agent.getOperationOptions(); - - logger.info('Analyzing template suitability and importing', { - projectType, - queryLength: query.length - }); - - // Fetch available templates - const templatesResponse = await BaseSandboxService.listTemplates(); - if (!templatesResponse.success || !templatesResponse.templates) { - return { - error: `Failed to fetch templates: ${templatesResponse.error || 'Unknown error'}` - }; - } - - logger.info('Templates fetched', { count: templatesResponse.templates.length }); - - // Use AI selector to find best match - const selection = await selectTemplate({ - env: operationOptions.env, - query, - projectType, - availableTemplates: templatesResponse.templates, - inferenceContext: operationOptions.inferenceContext, - }); - - logger.info('Template selection completed', { - selected: selection.selectedTemplateName, - projectType: selection.projectType - }); - - // If no suitable template found, return error suggesting scratch mode - if (!selection.selectedTemplateName) { - return { - error: `No suitable template found for this project. Reasoning: ${selection.reasoning}. Consider using virtual-first mode (generate all config files yourself) or refine requirements.` - }; - } - - // Import the selected template - const importResult = await agent.importTemplate( - selection.selectedTemplateName - ); - - logger.info('Template imported successfully', { - templateName: importResult.templateName, - filesCount: importResult.files.length - }); - - // Build detailed reasoning message - const reasoningMessage = ` + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'init_suitable_template', + description: 'Analyze user requirements and automatically select + import the most suitable template from library. Uses AI to match requirements against available templates. Returns selection with reasoning and imported files. For interactive projects (app/presentation/workflow) only. Call this BEFORE generate_blueprint.', + args: { + query: type(z.string(), () => ({ + files: { mode: 'write', paths: [] }, + })).describe('User requirements and project description. Provide clear description of what needs to be built.'), + }, + run: async ({ query }) => { + try { + const projectType = agent.getProjectType(); + const operationOptions = agent.getOperationOptions(); + + logger.info('Analyzing template suitability and importing', { + projectType, + queryLength: query.length + }); + + const templatesResponse = await BaseSandboxService.listTemplates(); + if (!templatesResponse.success || !templatesResponse.templates) { + return { + error: `Failed to fetch templates: ${templatesResponse.error || 'Unknown error'}` + }; + } + + logger.info('Templates fetched', { count: templatesResponse.templates.length }); + + const selection = await selectTemplate({ + env: operationOptions.env, + query, + projectType, + availableTemplates: templatesResponse.templates, + inferenceContext: operationOptions.inferenceContext, + }); + + logger.info('Template selection completed', { + selected: selection.selectedTemplateName, + projectType: selection.projectType + }); + + if (!selection.selectedTemplateName) { + return { + error: `No suitable template found for this project. Reasoning: ${selection.reasoning}. Consider using virtual-first mode (generate all config files yourself) or refine requirements.` + }; + } + + const importResult = await agent.importTemplate( + selection.selectedTemplateName + ); + + logger.info('Template imported successfully', { + templateName: importResult.templateName, + filesCount: importResult.files.length + }); + + const reasoningMessage = ` **AI Template Selection Complete** **Selected Template**: ${selection.selectedTemplateName} @@ -114,19 +93,19 @@ ${selection.reasoning} **Next Step**: Use generate_blueprint() to create project plan that leverages this template's features. `.trim(); - return { - selection, - importedFiles: importResult.files, - reasoning: reasoningMessage, - message: `Template "${selection.selectedTemplateName}" selected and imported successfully.` - }; - - } catch (error) { - logger.error('Error in init_suitable_template', error); - return { - error: `Error selecting/importing template: ${error instanceof Error ? error.message : 'Unknown error'}` - }; - } - }, - }; + return { + selection, + importedFiles: importResult.files, + reasoning: reasoningMessage, + message: `Template "${selection.selectedTemplateName}" selected and imported successfully.` + }; + + } catch (error) { + logger.error('Error in init_suitable_template', error); + return { + error: `Error selecting/importing template: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }); } diff --git a/worker/agents/tools/toolkit/initialize-slides.ts b/worker/agents/tools/toolkit/initialize-slides.ts index 7cb529b2..207f3dee 100644 --- a/worker/agents/tools/toolkit/initialize-slides.ts +++ b/worker/agents/tools/toolkit/initialize-slides.ts @@ -1,46 +1,30 @@ -import { ToolDefinition } from '../types'; +import { tool, t, type } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; +import { z } from 'zod'; -type InitializeSlidesArgs = { - theme?: string; - force_preview?: boolean; -}; - -type InitializeSlidesResult = { message: string }; - -/** - * Initializes a Spectacle-based slides runtime in from-scratch projects. - * - Imports the Spectacle template files into the repository - * - Commits them - * - Deploys a preview (agent policy will allow because slides exist) - */ export function createInitializeSlidesTool( - agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'initialize_slides', - description: 'Initialize a Spectacle slides project inside the current workspace and deploy a live preview. Use only if the user wants a slide deck.', - parameters: { - type: 'object', - properties: { - theme: { type: 'string', description: 'Optional theme preset name' }, - force_preview: { type: 'boolean', description: 'Force redeploy sandbox after import' }, - }, - required: [], - }, - }, - implementation: async ({ theme, force_preview }: InitializeSlidesArgs) => { - logger.info('Initializing slides via Spectacle template', { theme }); - const { templateName, filesImported } = await agent.importTemplate('spectacle'); - logger.info('Imported template', { templateName, filesImported }); + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'initialize_slides', + description: 'Initialize a presentation template inside the current workspace and deploy a live preview. Use only if the user wants a slide deck.', + args: { + theme: type(z.string().optional(), () => ({ + files: { mode: 'write', paths: [] }, + sandbox: { operation: 'deploy' }, + })).describe('Optional theme preset name'), + force_preview: t.boolean().optional().describe('Force redeploy sandbox after import'), + }, + run: async ({ theme, force_preview }) => { + logger.info('Initializing presentation template', { theme }); + const { templateName, filesImported } = await agent.importTemplate('spectacle'); + logger.info('Imported presentation template', { templateName, filesImported }); - const deployMsg = await agent.deployPreview(true, !!force_preview); - return { message: `Slides initialized with template '${templateName}', files: ${filesImported}. ${deployMsg}` }; - }, - }; + const deployMsg = await agent.deployPreview(true, !!force_preview); + return { message: `Slides initialized with template '${templateName}', files: ${filesImported}. ${deployMsg}` }; + }, + }); } diff --git a/worker/agents/tools/toolkit/queue-request.ts b/worker/agents/tools/toolkit/queue-request.ts index 4fd90f5e..301f758a 100644 --- a/worker/agents/tools/toolkit/queue-request.ts +++ b/worker/agents/tools/toolkit/queue-request.ts @@ -1,41 +1,24 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type QueueRequestArgs = { - modificationRequest: string; -}; - export function createQueueRequestTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'queue_request', - description: - 'Queue up modification requests or changes, to be implemented in the next development phase', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - modificationRequest: { - type: 'string', - minLength: 8, - description: - "The changes needed to be made to the app. Please don't supply any code level or implementation details. Provide detailed requirements and description of the changes you want to make.", - }, - }, - required: ['modificationRequest'], - }, +) { + return tool({ + name: 'queue_request', + description: + 'Queue up modification requests or changes, to be implemented in the next development phase', + args: { + modificationRequest: t.string().describe("The changes needed to be made to the app. Please don't supply any code level or implementation details. Provide detailed requirements and description of the changes you want to make."), }, - implementation: async (args) => { + run: async ({ modificationRequest }) => { logger.info('Received app edit request', { - modificationRequest: args.modificationRequest, + modificationRequest, }); - agent.queueUserRequest(args.modificationRequest); - return null; + agent.queueUserRequest(modificationRequest); + return null; }, - }; + }); } diff --git a/worker/agents/tools/toolkit/read-files.ts b/worker/agents/tools/toolkit/read-files.ts index 15cb28c4..2cb0aeb8 100644 --- a/worker/agents/tools/toolkit/read-files.ts +++ b/worker/agents/tools/toolkit/read-files.ts @@ -1,43 +1,30 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -export type ReadFilesArgs = { - paths: string[]; - timeout?: number; -}; - export type ReadFilesResult = | { files: { path: string; content: string }[] } - | ErrorResult; + | { error: string }; export function createReadFilesTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'read_files', - description: - 'Read file contents by exact RELATIVE paths (sandbox pwd = project root). Prefer batching multiple paths in a single call to reduce overhead. Target all relevant files useful for understanding current context', - parameters: { - type: 'object', - properties: { - paths: { type: 'array', items: { type: 'string' } }, - timeout: { type: 'number', default: 30000 }, - }, - required: ['paths'], - }, + logger: StructuredLogger +) { + return tool({ + name: 'read_files', + description: 'Read file contents by exact RELATIVE paths (sandbox pwd = project root). Prefer batching multiple paths in a single call to reduce overhead. Target all relevant files useful for understanding current context', + args: { + paths: t.files.read().describe('Array of relative file paths to read'), + timeout: t.number().default(30000).describe('Timeout in milliseconds'), }, - implementation: async ({ paths, timeout = 30000 }) => { + run: async ({ paths, timeout }) => { try { logger.info('Reading files', { count: paths.length, timeout }); - - const timeoutPromise = new Promise((_, reject) => + + const timeoutPromise = new Promise<{ error: string }>((_, reject) => setTimeout(() => reject(new Error(`Read files operation timed out after ${timeout}ms`)), timeout) ); - + return await Promise.race([ agent.readFiles(paths), timeoutPromise @@ -51,5 +38,5 @@ export function createReadFilesTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/regenerate-file.ts b/worker/agents/tools/toolkit/regenerate-file.ts index 5be23f99..d7eab4de 100644 --- a/worker/agents/tools/toolkit/regenerate-file.ts +++ b/worker/agents/tools/toolkit/regenerate-file.ts @@ -1,12 +1,7 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t, ErrorResult } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -export type RegenerateFileArgs = { - path: string; - issues: string[]; -}; - export type RegenerateFileResult = | { path: string; diff: string } | ErrorResult; @@ -14,25 +9,18 @@ export type RegenerateFileResult = export function createRegenerateFileTool( agent: ICodingAgent, logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'regenerate_file', - description: - `Autonomous AI agent that applies surgical fixes to code files. Takes file path and array of specific issues to fix. Returns diff showing changes made. +) { + return tool({ + name: 'regenerate_file', + description: + `Autonomous AI agent that applies surgical fixes to code files. Takes file path and array of specific issues to fix. Returns diff showing changes made. CRITICAL: Provide detailed, specific issues - not vague descriptions. See system prompt for full usage guide. These would be implemented by an independent LLM AI agent`, - parameters: { - type: 'object', - properties: { - path: { type: 'string' }, - issues: { type: 'array', items: { type: 'string' } }, - }, - required: ['path', 'issues'], - }, + args: { + path: t.file.write().describe('Relative path to file from project root'), + issues: t.array(t.string()).describe('Specific, detailed issues to fix in the file'), }, - implementation: async ({ path, issues }) => { + run: async ({ path, issues }) => { try { logger.info('Regenerating file', { path, @@ -48,5 +36,5 @@ CRITICAL: Provide detailed, specific issues - not vague descriptions. See system }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/rename-project.ts b/worker/agents/tools/toolkit/rename-project.ts index 850161b5..84a03d49 100644 --- a/worker/agents/tools/toolkit/rename-project.ts +++ b/worker/agents/tools/toolkit/rename-project.ts @@ -1,43 +1,24 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -type RenameArgs = { - newName: string; -}; - -type RenameResult = { projectName: string }; - export function createRenameProjectTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'rename_project', - description: 'Rename the project. Lowercase letters, numbers, hyphens, and underscores only. No spaces or dots. Call this alongside queue_request tool to update the codebase', - parameters: { - type: 'object', - additionalProperties: false, - properties: { - newName: { - type: 'string', - minLength: 3, - maxLength: 50, - pattern: '^[a-z0-9-_]+$' - }, - }, - required: ['newName'], - }, - }, - implementation: async (args) => { - logger.info('Renaming project', { newName: args.newName }); - const ok = await agent.updateProjectName(args.newName); - if (!ok) { - throw new Error('Failed to rename project'); - } - return { projectName: args.newName }; - }, - }; + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'rename_project', + description: 'Rename the project. Lowercase letters, numbers, hyphens, and underscores only. No spaces or dots. Call this alongside queue_request tool to update the codebase', + args: { + newName: t.blueprint().describe('New project name'), + }, + run: async ({ newName }) => { + logger.info('Renaming project', { newName }); + const ok = await agent.updateProjectName(newName); + if (!ok) { + throw new Error('Failed to rename project'); + } + return { projectName: newName }; + }, + }); } diff --git a/worker/agents/tools/toolkit/run-analysis.ts b/worker/agents/tools/toolkit/run-analysis.ts index b95a38c8..06675b09 100644 --- a/worker/agents/tools/toolkit/run-analysis.ts +++ b/worker/agents/tools/toolkit/run-analysis.ts @@ -1,37 +1,26 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; import { StaticAnalysisResponse } from 'worker/services/sandbox/sandboxTypes'; -export type RunAnalysisArgs = { - files?: string[]; -}; - export type RunAnalysisResult = StaticAnalysisResponse; export function createRunAnalysisTool( agent: ICodingAgent, - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'run_analysis', - description: - 'Run static analysis (lint + typecheck), optionally scoped to given files.', - parameters: { - type: 'object', - properties: { - files: { type: 'array', items: { type: 'string' } }, - }, - required: [], - }, + logger: StructuredLogger +) { + return tool({ + name: 'run_analysis', + description: + 'Run static analysis (lint + typecheck), optionally scoped to given files.', + args: { + files: t.analysis.files().describe('Optional array of files to analyze'), }, - implementation: async ({ files }) => { + run: async ({ files }) => { logger.info('Running static analysis', { filesCount: files?.length || 0, }); return await agent.runStaticAnalysisCode(files); }, - }; + }); } diff --git a/worker/agents/tools/toolkit/virtual-filesystem.ts b/worker/agents/tools/toolkit/virtual-filesystem.ts index 0b1e0d7f..1e622bcb 100644 --- a/worker/agents/tools/toolkit/virtual-filesystem.ts +++ b/worker/agents/tools/toolkit/virtual-filesystem.ts @@ -1,81 +1,61 @@ -import { ToolDefinition, ErrorResult } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; -export type VirtualFilesystemArgs = { - command: 'list' | 'read'; - paths?: string[]; -}; - export type VirtualFilesystemResult = - | { files: Array<{ path: string; purpose?: string; size: number }> } - | { files: Array<{ path: string; content: string }> } - | ErrorResult; + | { files: Array<{ path: string; purpose?: string; size: number }>; error?: never } + | { files: Array<{ path: string; content: string }>; error?: never } + | { error: string; files?: never }; export function createVirtualFilesystemTool( - agent: ICodingAgent, - logger: StructuredLogger -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'virtual_filesystem', - description: `Interact with the virtual persistent workspace. + agent: ICodingAgent, + logger: StructuredLogger +) { + return tool({ + name: 'virtual_filesystem', + description: `Interact with the virtual persistent workspace. IMPORTANT: This reads from the VIRTUAL filesystem, NOT the sandbox. Files appear here immediately after generation and may not be deployed to sandbox yet.`, - parameters: { - type: 'object', - properties: { - command: { - type: 'string', - enum: ['list', 'read'], - description: 'Action to perform: "list" shows all files, "read" returns file contents', - }, - paths: { - type: 'array', - items: { type: 'string' }, - description: 'File paths to read (required when command="read"). Use relative paths from project root.', - }, - }, - required: ['command'], - }, - }, - implementation: async ({ command, paths }: VirtualFilesystemArgs) => { - try { - if (command === 'list') { - logger.info('Listing virtual filesystem files'); - - const files = agent.listFiles(); - - const fileList = files.map(file => ({ - path: file.filePath, - purpose: file.filePurpose, - size: file.fileContents.length - })); - - return { - files: fileList - }; - } else if (command === 'read') { - if (!paths || paths.length === 0) { - return { - error: 'paths array is required when command is "read"' - }; - } - - logger.info('Reading files from virtual filesystem', { count: paths.length }); - - return await agent.readFiles(paths); - } else { - return { - error: `Invalid command: ${command}. Must be "list" or "read"` - }; - } - } catch (error) { - logger.error('Error in virtual_filesystem', error); - return { - error: `Error accessing virtual filesystem: ${error instanceof Error ? error.message : 'Unknown error'}` - }; - } - }, - }; + args: { + command: t.enum(['list', 'read']).describe('Action to perform: "list" shows all files, "read" returns file contents'), + paths: t.files.read().optional().describe('File paths to read (required when command="read"). Use relative paths from project root.'), + }, + run: async ({ command, paths }) => { + try { + if (command === 'list') { + logger.info('Listing virtual filesystem files'); + + const files = agent.listFiles(); + + const fileList = files.map(file => ({ + path: file.filePath, + purpose: file.filePurpose, + size: file.fileContents.length + })); + + return { + files: fileList + }; + } else if (command === 'read') { + if (!paths || paths.length === 0) { + return { + error: 'paths array is required when command is "read"' + }; + } + + logger.info('Reading files from virtual filesystem', { count: paths.length }); + + return await agent.readFiles(paths); + } else { + return { + error: `Invalid command: ${command}. Must be "list" or "read"` + }; + } + } catch (error) { + logger.error('Error in virtual_filesystem', error); + return { + error: `Error accessing virtual filesystem: ${error instanceof Error ? error.message : 'Unknown error'}` + }; + } + }, + }); } diff --git a/worker/agents/tools/toolkit/wait-for-debug.ts b/worker/agents/tools/toolkit/wait-for-debug.ts index 59e31185..4dbe4646 100644 --- a/worker/agents/tools/toolkit/wait-for-debug.ts +++ b/worker/agents/tools/toolkit/wait-for-debug.ts @@ -1,24 +1,17 @@ -import { ToolDefinition } from '../types'; +import { tool } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; export function createWaitForDebugTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition, { status: string } | { error: string }> { - return { - type: 'function', - function: { - name: 'wait_for_debug', - description: - 'Wait for the current debug session to complete. Use when deep_debug returns DEBUG_IN_PROGRESS error. Returns immediately if no debug session is running.', - parameters: { - type: 'object', - properties: {}, - required: [], - }, - }, - implementation: async () => { +) { + return tool({ + name: 'wait_for_debug', + description: + 'Wait for the current debug session to complete. Use when deep_debug returns DEBUG_IN_PROGRESS error. Returns immediately if no debug session is running.', + args: {}, + run: async () => { try { if (agent.isDeepDebugging()) { logger.info('Waiting for debug session to complete...'); @@ -39,5 +32,5 @@ export function createWaitForDebugTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/wait-for-generation.ts b/worker/agents/tools/toolkit/wait-for-generation.ts index a599f8ff..8cdae4e5 100644 --- a/worker/agents/tools/toolkit/wait-for-generation.ts +++ b/worker/agents/tools/toolkit/wait-for-generation.ts @@ -1,24 +1,17 @@ -import { ToolDefinition } from '../types'; +import { tool } from '../types'; import { StructuredLogger } from '../../../logger'; import { ICodingAgent } from 'worker/agents/services/interfaces/ICodingAgent'; export function createWaitForGenerationTool( agent: ICodingAgent, logger: StructuredLogger -): ToolDefinition, { status: string } | { error: string }> { - return { - type: 'function', - function: { - name: 'wait_for_generation', - description: - 'Wait for code generation to complete. Use when deep_debug returns GENERATION_IN_PROGRESS error. Returns immediately if no generation is running.', - parameters: { - type: 'object', - properties: {}, - required: [], - }, - }, - implementation: async () => { +) { + return tool({ + name: 'wait_for_generation', + description: + 'Wait for code generation to complete. Use when deep_debug returns GENERATION_IN_PROGRESS error. Returns immediately if no generation is running.', + args: {}, + run: async () => { try { if (agent.isCodeGenerating()) { logger.info('Waiting for code generation to complete...'); @@ -39,5 +32,5 @@ export function createWaitForGenerationTool( }; } }, - }; + }); } diff --git a/worker/agents/tools/toolkit/wait.ts b/worker/agents/tools/toolkit/wait.ts index 39233981..e2913854 100644 --- a/worker/agents/tools/toolkit/wait.ts +++ b/worker/agents/tools/toolkit/wait.ts @@ -1,48 +1,25 @@ -import { ToolDefinition } from '../types'; +import { tool, t } from '../types'; import { StructuredLogger } from '../../../logger'; -type WaitArgs = { - seconds: number; - reason?: string; -}; - -type WaitResult = { message: string }; - -export function createWaitTool( - logger: StructuredLogger, -): ToolDefinition { - return { - type: 'function' as const, - function: { - name: 'wait', - description: - 'Wait/sleep for a specified number of seconds. Use this after deploying changes when you need the user to interact with the app before checking logs. Typical usage: wait 15-30 seconds after deploy_preview to allow time for user interaction.', - parameters: { - type: 'object', - properties: { - seconds: { - type: 'number', - description: 'Number of seconds to wait (typically 15-30 for user interaction)', - }, - reason: { - type: 'string', - description: 'Optional: why you are waiting (e.g., "Waiting for user to interact with app")', - }, - }, - required: ['seconds'], - }, +export function createWaitTool(logger: StructuredLogger) { + return tool({ + name: 'wait', + description: 'Wait/sleep for a specified number of seconds. Use this after deploying changes when you need the user to interact with the app before checking logs. Typical usage: wait 15-30 seconds after deploy_preview to allow time for user interaction.', + args: { + seconds: t.number().describe('Number of seconds to wait (typically 15-30 for user interaction)'), + reason: t.string().optional().describe('Optional: why you are waiting (e.g., "Waiting for user to interact with app")'), }, - implementation: async ({ seconds, reason }) => { - const waitMs = Math.min(Math.max(seconds * 1000, 1000), 60000); // Clamp between 1-60 seconds + run: async ({ seconds, reason }) => { + const waitMs = Math.min(Math.max(seconds * 1000, 1000), 60000); const actualSeconds = waitMs / 1000; - + logger.info('Waiting', { seconds: actualSeconds, reason }); - + await new Promise(resolve => setTimeout(resolve, waitMs)); - + return { message: `Waited ${actualSeconds} seconds${reason ? `: ${reason}` : ''}`, }; }, - }; + }); } diff --git a/worker/agents/tools/toolkit/web-search.ts b/worker/agents/tools/toolkit/web-search.ts index c7e01edc..7004fb08 100644 --- a/worker/agents/tools/toolkit/web-search.ts +++ b/worker/agents/tools/toolkit/web-search.ts @@ -1,5 +1,5 @@ -import { env } from 'cloudflare:workers' -import { ToolDefinition } from '../types'; +import { env } from 'cloudflare:workers'; +import { tool, t } from '../types'; interface SerpApiResponse { knowledge_graph?: { @@ -195,58 +195,37 @@ async function fetchWebContent(url: string): Promise { } } -// Define the argument and result types for the web search tool type WebSearchArgs = { - query?: string; - url?: string; - num_results?: number; + query?: string; + url?: string; + num_results: number; }; -type WebSearchResult = { content?: string; error?: string } +type WebSearchResult = { content?: string; error?: string }; const toolWebSearch = async (args: WebSearchArgs): Promise => { - const { query, url, num_results = 5 } = args; - if (typeof url === 'string') { - const content = await fetchWebContent(url); - return { content }; - } - if (typeof query === 'string') { - const content = await performWebSearch( - query, - num_results as number, - ); - return { content }; - } - return { error: 'Either query or url parameter is required' }; + const { query, url, num_results } = args; + if (typeof url === 'string') { + const content = await fetchWebContent(url); + return { content }; + } + if (typeof query === 'string') { + const content = await performWebSearch( + query, + num_results as number + ); + return { content }; + } + return { error: 'Either query or url parameter is required' }; }; -export const toolWebSearchDefinition: ToolDefinition = { - implementation: toolWebSearch, - type: 'function' as const, - function: { - name: 'web_search', - description: - 'Search the web using Google or fetch content from a specific URL', - parameters: { - type: 'object', - properties: { - query: { - type: 'string', - description: 'Search query for Google search', - }, - url: { - type: 'string', - description: - 'Specific URL to fetch content from (alternative to search)', - }, - num_results: { - type: 'number', - description: - 'Number of search results to return (default: 5, max: 10)', - default: 5, - }, - }, - required: [], - }, - }, -}; +export const toolWebSearchDefinition = tool({ + name: 'web_search', + description: 'Search the web using Google or fetch content from a specific URL', + args: { + query: t.string().optional().describe('Search query for Google search'), + url: t.string().optional().describe('Specific URL to fetch content from (alternative to search)'), + num_results: t.number().default(5).describe('Number of search results to return (default: 5, max: 10)'), + }, + run: toolWebSearch, +}); diff --git a/worker/agents/tools/types.ts b/worker/agents/tools/types.ts index 37f80502..87421371 100644 --- a/worker/agents/tools/types.ts +++ b/worker/agents/tools/types.ts @@ -1,8 +1,17 @@ import { ChatCompletionFunctionTool, ChatCompletionMessageFunctionToolCall } from 'openai/resources'; +import { z } from 'zod'; +import { mergeResources, type Resources } from './resources'; +import { Type } from './resource-types'; + +export { t, type } from './resource-types'; +export type { Type } from './resource-types'; +export type { Resources as ResourceAccess } from './resources'; + export interface MCPServerConfig { name: string; sseUrl: string; } + export interface MCPResult { content: string; } @@ -18,18 +27,182 @@ export interface ToolCallResult { result?: unknown; } -export type ToolImplementation, TResult = unknown> = - (args: TArgs) => Promise; +export interface ToolDefinition { + name: string; + description: string; + schema: z.ZodTypeAny; + implementation: (args: TArgs) => Promise; + resources: (args: TArgs) => Resources; + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; + openAISchema: ChatCompletionFunctionTool; +} + +interface JSONSchema { + type?: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'null'; + description?: string; + properties?: Record; + items?: JSONSchema; + required?: string[]; + enum?: unknown[]; + default?: unknown; + [key: string]: unknown; +} + +function zodToOpenAIParameters(schema: z.ZodType): JSONSchema { + if (schema instanceof z.ZodObject) { + const shape = schema._def.shape(); + const properties: Record = {}; + const required: string[] = []; + + for (const [key, value] of Object.entries(shape)) { + const zodField = value as z.ZodTypeAny; + properties[key] = zodTypeToJsonSchema(zodField); + + if (!zodField.isOptional()) { + required.push(key); + } + } + + return { + type: 'object' as const, + properties, + required: required.length > 0 ? required : undefined, + }; + } + + return zodTypeToJsonSchema(schema); +} + +function zodTypeToJsonSchema(schema: z.ZodTypeAny): JSONSchema { + const description = schema.description; + + if (schema instanceof z.ZodString) { + return { type: 'string' as const, description }; + } + + if (schema instanceof z.ZodNumber) { + return { type: 'number' as const, description }; + } + + if (schema instanceof z.ZodBoolean) { + return { type: 'boolean' as const, description }; + } -export type ToolDefinition< - TArgs = Record, - TResult = unknown -> = ChatCompletionFunctionTool & { - implementation: ToolImplementation; - onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; - onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; -}; + if (schema instanceof z.ZodArray) { + return { + type: 'array' as const, + items: zodTypeToJsonSchema(schema._def.type), + description, + }; + } -export type ExtractToolArgs = T extends ToolImplementation ? A : never; + if (schema instanceof z.ZodObject) { + const shape = schema._def.shape(); + const properties: Record = {}; + const required: string[] = []; -export type ExtractToolResult = T extends ToolImplementation ? R : never; \ No newline at end of file + for (const [key, value] of Object.entries(shape)) { + const zodField = value as z.ZodTypeAny; + properties[key] = zodTypeToJsonSchema(zodField); + + if (!zodField.isOptional()) { + required.push(key); + } + } + + return { + type: 'object' as const, + properties, + required: required.length > 0 ? required : undefined, + description, + }; + } + + if (schema instanceof z.ZodOptional) { + return zodTypeToJsonSchema(schema._def.innerType); + } + + if (schema instanceof z.ZodDefault) { + const innerSchema = zodTypeToJsonSchema(schema._def.innerType); + return { + ...innerSchema, + default: schema._def.defaultValue(), + }; + } + + if (schema instanceof z.ZodEnum) { + return { + type: 'string' as const, + enum: schema._def.values, + description, + }; + } + + return { type: 'string' as const, description }; +} + +function buildTool( + name: string, + description: string, + schema: z.ZodObject, + implementation: (args: TArgs) => Promise, + resources: (args: TArgs) => Resources, + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise, + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise +): ToolDefinition { + return { + name, + description, + schema, + implementation, + resources, + onStart, + onComplete, + openAISchema: { + type: 'function' as const, + function: { + name, + description, + parameters: zodToOpenAIParameters(schema), + }, + }, + }; +} + +export function tool, TResult>(config: { + name: string; + description: string; + args: { [K in keyof TArgs]: Type }; + run: (args: TArgs) => Promise; + onStart?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs) => Promise; + onComplete?: (toolCall: ChatCompletionMessageFunctionToolCall, args: TArgs, result: TResult) => Promise; +}): ToolDefinition { + const zodSchemaShape: Record = {}; + for (const key in config.args) { + zodSchemaShape[key] = config.args[key].schema; + } + const zodSchema = z.object(zodSchemaShape); + + const extractResources = (args: TArgs): Resources => { + const merged: Resources = {}; + for (const key in config.args) { + mergeResources(merged, config.args[key].resources(args[key])); + } + return merged; + }; + + return buildTool( + config.name, + config.description, + zodSchema, + config.run, + extractResources, + config.onStart, + config.onComplete + ); +} + +export function toOpenAITool(tool: ToolDefinition): ChatCompletionFunctionTool { + return tool.openAISchema; +} From e926e18b1bbce27f53df7758d46929426e056e07 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Sat, 15 Nov 2025 21:15:43 -0500 Subject: [PATCH 46/58] feat: add completion detection and loop prevention to agentic builder and debugger - Added CompletionDetector to track completion signals via dedicated tools (mark_generation_complete, mark_debugging_complete) - Implemented LoopDetector to prevent infinite tool call loops with contextual warnings - Created wrapToolsWithLoopDetection utility to inject loop detection into tool execution flow - Enhanced system prompts to emphasize efficient parallel tool usage and completion discipline --- .../assistants/agenticProjectBuilder.ts | 123 ++++++++-------- worker/agents/assistants/codeDebugger.ts | 137 ++++++------------ worker/agents/assistants/utils.ts | 57 ++++++++ worker/agents/inferutils/common.ts | 10 ++ .../agents/inferutils/completionDetection.ts | 63 ++++++++ worker/agents/inferutils/loopDetection.ts | 14 +- worker/agents/inferutils/toolExecution.ts | 60 +------- 7 files changed, 236 insertions(+), 228 deletions(-) create mode 100644 worker/agents/assistants/utils.ts create mode 100644 worker/agents/inferutils/completionDetection.ts diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 4c9a22fc..5be200af 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -17,6 +17,10 @@ import { ICodingAgent } from '../services/interfaces/ICodingAgent'; import { ProjectType } from '../core/types'; import { Blueprint, AgenticBlueprint } from '../schemas'; import { prepareMessagesForInference } from '../utils/common'; +import { createMarkGenerationCompleteTool } from '../tools/toolkit/completion-signals'; +import { CompletionDetector } from '../inferutils/completionDetection'; +import { LoopDetector } from '../inferutils/loopDetection'; +import { wrapToolsWithLoopDetection } from './utils'; export type BuildSession = { filesIndex: FileState[]; @@ -194,10 +198,13 @@ CRITICAL - This step is MANDATORY for interactive projects: - Blueprint defines: title, description, features, architecture, plan - Refine with alter_blueprint if needed - NEVER start building without a plan +- If the project is too simple, plan can be empty or very small, but minimal blueprint should exist ## Step 5: Build Incrementally - Use generate_files for new features/components (goes to virtual FS) -- Use regenerate_file for surgical fixes to existing files (goes to virtual FS) + - generate_files tool can write multiple files in a single call (2-3 files at once max), sequentially, use it effectively + - You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. +- Use regenerate_file for surgical modifications to existing files (goes to virtual FS) - Commit frequently with clear messages (git operates on virtual FS) - For interactive projects: - After generating files: deploy_preview (syncs virtual → sandbox) @@ -213,6 +220,9 @@ CRITICAL - This step is MANDATORY for interactive projects: const tools = `# Available Tools (Detailed Reference) +Tools are powerful and the only way for you to take actions. Use them properly and effectively. +ultrathink and ultrareason to optimize how you build out the project and make the best use of tools. + ## Planning & Architecture **generate_blueprint** - Create structured project plan (Product Requirements Document) @@ -248,7 +258,7 @@ CRITICAL - This step is MANDATORY for interactive projects: **CRITICAL After-Effects:** 1. Blueprint stored in agent state 2. You now have clear plan to follow -3. Use plan phases to guide generate_files calls +3. Use plan phases to guide generate_files calls. You may use multiple generate_files calls to generate multiple sets of files in a single turn. 4. **Do NOT start building without blueprint** (fundamental rule) **Example workflow:** @@ -259,7 +269,7 @@ You: generate_blueprint (creates PRD with phases) ↓ Review blueprint, refine with alter_blueprint if needed ↓ -Follow phases: generate_files for phase-1, then phase-2, etc. +Implement the plan and fullfill the requirements \`\`\` **alter_blueprint** @@ -324,17 +334,6 @@ The library includes templates for: - Template's 'bun run dev' MUST work or sandbox creation fails - If using virtual-first fallback, YOU must ensure working dev script -**Example workflow:** -\`\`\` -1. init_suitable_template() - → AI: "Selected react-game-starter because: user wants 2D game, template has canvas setup and scoring system..." - → Imported 15 important files -2. generate_blueprint(prompt: "Template has canvas and game loop. Build on this...") - → Blueprint leverages existing template features -3. generate_files(...) - → Build on top of template foundation -\`\`\` - ## File Operations (Understanding Your Two-Layer System) **CRITICAL: Where Your Files Live** @@ -355,7 +354,7 @@ You work with TWO separate filesystems: **The File Flow You Control:** \`\`\` -You call: generate_files or regenerate_file +You call: generate_files to generate multiple files at once or regenerate_file for surgical modifications to existing files ↓ Files written to VIRTUAL filesystem (Durable Object storage) ↓ @@ -405,7 +404,8 @@ Commands available: **What it does:** - Generates complete file contents from scratch -- Can create multiple files in one call (batch operation) +- Can create multiple files in one call (batch operation) but sequentially +- You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. - Automatically commits to git with descriptive message - **Where files go**: Virtual filesystem only (not in sandbox yet) @@ -519,7 +519,12 @@ Commands available: **generate_images** - Future image generation capability -- Currently a stub - do NOT rely on this`; +- Currently a stub - do NOT rely on this + +--- + +You can call multiple tools one after another in a single turn. When you are absolutely sure of your actions, make multiple calls to tools and finish. You would be notified when the tool calls are completed. +`; const staticVsSandbox = `# CRITICAL: Static vs Sandbox Detection @@ -575,20 +580,16 @@ ${PROMPT_UTILS.COMMON_PITFALLS} const completion = `# Completion Discipline -When you're done: -**BUILD_COMPLETE: ** -- All requirements met -- All errors fixed -- Testing completed -- Ready for user - -If blocked: -**BUILD_STUCK: ** -- Clear explanation of blocker -- What you tried -- What you need to proceed +When initial project generation is complete: +- Call mark_generation_complete tool with: + - summary: Brief description of what was built (2-3 sentences) + - filesGenerated: Count of files created +- Requirements: All features implemented, errors fixed, testing done +- CRITICAL: Make NO further tool calls after calling mark_generation_complete -STOP ALL TOOL CALLS IMMEDIATELY after either signal.`; +For follow-up requests (adding features, making changes): +- Just respond naturally when done +- Do NOT call mark_generation_complete for follow-ups`; const warnings = `# Critical Warnings @@ -627,22 +628,25 @@ const getUserPrompt = ( fileSummaries: string, templateInfo?: string ): string => { - const { query, projectName, blueprint } = inputs; + const { query, projectName } = inputs; return `## Build Task **Project Name**: ${projectName} **User Request**: ${query} -${blueprint ? `## Project Blueprint +${ +// blueprint ? `## Project Blueprint -The following blueprint defines the structure, features, and requirements for this project: +// The following blueprint defines the structure, features, and requirements for this project: -\`\`\`json -${JSON.stringify(blueprint, null, 2)} -\`\`\` +// \`\`\`json +// ${JSON.stringify(blueprint, null, 2)} +// \`\`\` -**Use this blueprint to guide your implementation.** It outlines what needs to be built.` : `## Note +// **Use this blueprint to guide your implementation.** It outlines what needs to be built.` : `## Note -No blueprint provided. Design the project structure based on the user request above.`} +// No blueprint provided. Design the project structure based on the user request above.` +'' +} ${templateInfo ? `## Template Context @@ -657,28 +661,6 @@ ${fileSummaries ? `## Current Codebase ${fileSummaries}` : `## Starting Fresh This is a new project. Start from the template or scratch.`} - -## Your Mission - -Build a complete, production-ready solution that best fulfills the request. If it needs a full web experience, build it. If it’s a backend workflow, implement it. If it’s narrative content, write documents; if slides are appropriate, build a deck and verify via preview. - -**Approach (internal planning):** -1. Understand requirements and decide representation (UI, backend, slides, documents) -2. Generate PRD (if missing) and refine -3. Scaffold with generate_files, preferring regenerate_file for targeted edits -4. When a runtime exists: deploy_preview, then verify with run_analysis -5. Iterate and polish; commit meaningful checkpoints - -**Remember:** -- Write clean, type-safe, maintainable code -- Test thoroughly with deploy_preview and run_analysis -- Fix all issues before claiming completion -- Commit regularly with descriptive messages - -## Execution Reminder -- If no blueprint or plan is present: generate_blueprint FIRST (optionally with prompt parameter for additional context), then alter_blueprint if needed. Do not implement until a plan exists. -- Deploy only when a runtime exists; do not deploy for documents-only work. - Begin building.`; }; @@ -702,6 +684,7 @@ function summarizeFiles(filesIndex: FileState[]): string { export class AgenticProjectBuilder extends Assistant { logger = createObjectLogger(this, 'AgenticProjectBuilder'); modelConfigOverride?: ModelConfig; + private loopDetector = new LoopDetector(); constructor( env: Env, @@ -778,7 +761,20 @@ export class AgenticProjectBuilder extends Assistant { const messages: Message[] = this.save([system, user, ...historyMessages]); // Build tools with renderer and conversation sync callback - const tools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); + const rawTools = buildAgenticBuilderTools(session, this.logger, toolRenderer, onToolComplete); + rawTools.push(createMarkGenerationCompleteTool(this.logger)); + + // Wrap tools with loop detection + const tools = wrapToolsWithLoopDetection(rawTools, this.loopDetector); + + // Configure completion detection + const completionConfig = { + detector: new CompletionDetector(['mark_generation_complete']), + operationalMode: (!hasFiles && !hasPlan) ? 'initial' as const : 'followup' as const, + allowWarningInjection: !hasFiles && !hasPlan, + }; + + this.logger.info('Agentic builder mode', { mode: completionConfig.operationalMode, hasFiles, hasPlan }); let output = ''; @@ -790,10 +786,9 @@ export class AgenticProjectBuilder extends Assistant { modelConfig: this.modelConfigOverride || AGENT_CONFIG.agenticProjectBuilder, messages, tools, - stream: streamCb - ? { chunk_size: 64, onChunk: (c) => streamCb(c) } - : undefined, + stream: streamCb ? { chunk_size: 64, onChunk: (c) => streamCb(c) } : undefined, onAssistantMessage, + completionConfig, }); output = result?.string || ''; diff --git a/worker/agents/assistants/codeDebugger.ts b/worker/agents/assistants/codeDebugger.ts index 586f3541..be5e1257 100644 --- a/worker/agents/assistants/codeDebugger.ts +++ b/worker/agents/assistants/codeDebugger.ts @@ -9,7 +9,6 @@ import { import { executeInference } from '../inferutils/infer'; import { InferenceContext, ModelConfig } from '../inferutils/config.types'; import { createObjectLogger } from '../../logger'; -import type { ToolDefinition } from '../tools/types'; import { AGENT_CONFIG } from '../inferutils/config'; import { buildDebugTools } from '../tools/customTools'; import { RenderToolCall } from '../operations/UserConversationProcessor'; @@ -19,6 +18,10 @@ import { RuntimeError } from 'worker/services/sandbox/sandboxTypes'; import { FileState } from '../core/state'; import { InferError } from '../inferutils/core'; import { ICodingAgent } from '../services/interfaces/ICodingAgent'; +import { createMarkDebuggingCompleteTool } from '../tools/toolkit/completion-signals'; +import { LoopDetector } from '../inferutils/loopDetection'; +import { CompletionDetector } from '../inferutils/completionDetection'; +import { wrapToolsWithLoopDetection } from './utils'; const SYSTEM_PROMPT = `You are an elite autonomous code debugging specialist with deep expertise in root-cause analysis, modern web frameworks (React, Vite, Cloudflare Workers), TypeScript/JavaScript, build tools, and runtime environments. @@ -96,6 +99,20 @@ You are smart, methodical, focused and evidence-based. You choose your own path - **wait**: Sleep for N seconds (use after deploy to allow time for user interaction before checking logs) - **git**: Execute git commands (commit, log, show, reset) - see detailed guide below. **WARNING: reset is UNTESTED - use with extreme caution!** +## EFFICIENT TOOL USAGE: +The system automatically handles parallel execution. Call multiple tools in a single response when beneficial: + +**Automatic Parallelization:** +- Diagnostic tools can run simultaneously (run_analysis, get_runtime_errors, get_logs) +- File reads execute in parallel (read_files on different files) +- File writes on different files execute in parallel (regenerate_file - see detailed guide below) +- Conflicting operations execute sequentially (multiple git commits, same file edits) + +**Examples:** + • GOOD - Call run_analysis() and get_runtime_errors() together → both execute simultaneously + • GOOD - Call regenerate_file on App.tsx, utils.ts, and helpers.ts together → all execute in parallel + • BAD - Call regenerate_file on same file twice → forced sequential execution + ## How to Use regenerate_file (CRITICAL) **What it is:** @@ -325,7 +342,7 @@ git({ command: 'reset', oid: 'abc123...' }) **Best Practices:** - **Use descriptive messages**: "fix: resolve null pointer in auth.ts" not "fix bug" - **Commit before deploying**: Save your work before deploy_preview in case you need to revert -- **Commit before TASK_COMPLETE**: Always commit your final working state before finishing +- **Commit before completion**: Always commit your final working state before finishing **Example Workflow:** \`\`\`typescript @@ -435,17 +452,20 @@ You're done when: - ❌ You applied fixes but didn't verify them **When you complete the task:** -1. Write: "TASK_COMPLETE: [brief summary]" +1. Call the \`mark_debugging_complete\` tool with: + - summary: Brief overview of what was accomplished + - filesModified: Number of files you regenerated/fixed 2. Provide a concise final report: - Issues found and root cause - Fixes applied (file paths) - Verification results - Current state -3. **CRITICAL: Once you write "TASK_COMPLETE", IMMEDIATELY HALT with no more tool calls. Your work is done.** +3. **CRITICAL: After calling \`mark_debugging_complete\`, make NO further tool calls. Your work is done.** -**If stuck:** -1. State: "TASK_STUCK: [reason]" + what you tried -2. **CRITICAL: Once you write "TASK_STUCK", IMMEDIATELY HALT with no more tool calls. Stop immediately.** +**If stuck and cannot proceed:** +1. Call \`mark_debugging_complete\` with summary explaining what you tried and why you're stuck +2. Provide a report of what you attempted and what's blocking progress +3. **CRITICAL: After calling the completion tool, make NO further tool calls. Stop immediately.** ## Working Style - Use your internal reasoning - think deeply, output concisely @@ -532,17 +552,6 @@ Diagnose and fix all user issues. Begin.`; -type ToolCallRecord = { - toolName: string; - args: string; // JSON stringified args for comparison - timestamp: number; -}; - -type LoopDetectionState = { - recentCalls: ToolCallRecord[]; - repetitionWarnings: number; -}; - export type DebugSession = { filesIndex: FileState[]; agent: ICodingAgent; @@ -571,10 +580,7 @@ export class DeepCodeDebugger extends Assistant { logger = createObjectLogger(this, 'DeepCodeDebugger'); modelConfigOverride?: ModelConfig; - private loopDetection: LoopDetectionState = { - recentCalls: [], - repetitionWarnings: 0, - }; + private loopDetector = new LoopDetector(); constructor( env: Env, @@ -585,51 +591,6 @@ export class DeepCodeDebugger extends Assistant { this.modelConfigOverride = modelConfigOverride; } - private detectRepetition(toolName: string, args: Record): boolean { - const argsStr = JSON.stringify(args); - const now = Date.now(); - - // Keep only recent calls (last 10 minutes) - this.loopDetection.recentCalls = this.loopDetection.recentCalls.filter( - (call) => now - call.timestamp < 600000, - ); - - // Count how many times this exact call was made recently - const matchingCalls = this.loopDetection.recentCalls.filter( - (call) => call.toolName === toolName && call.args === argsStr, - ); - - // Record this call - this.loopDetection.recentCalls.push({ toolName, args: argsStr, timestamp: now }); - - // Repetition detected if same call made 3+ times - return matchingCalls.length >= 2; - } - - private injectLoopWarning(toolName: string): void { - this.loopDetection.repetitionWarnings++; - - const warningMessage = ` -⚠️ CRITICAL: REPETITION DETECTED - -You just attempted to execute "${toolName}" with identical arguments for the ${this.loopDetection.repetitionWarnings}th time. - -RECOMMENDED ACTIONS: -1. If your task is complete, state "TASK_COMPLETE: [summary]" and STOP. Once you write 'TASK_COMPLETE' or 'TASK_STUCK', You shall not make any more tool/function calls. -2. If you observe you have already declared 'TASK_COMPLETE' or 'TASK_STUCK' in the past, Halt immediately. It might be that you are stuck in a loop. -3. If not complete, try a DIFFERENT approach: - - Use different tools - - Use different arguments - - Read different files - - Apply a different fix strategy - -DO NOT repeat the same action. The definition of insanity is doing the same thing expecting different results. - -If you're genuinely stuck after trying 3 different approaches, honestly report: "TASK_STUCK: [reason]"`; - - this.save([createUserMessage(warningMessage)]); - } - async run( inputs: DebugInputs, session: DebugSession, @@ -658,26 +619,18 @@ If you're genuinely stuck after trying 3 different approaches, honestly report: const logger = this.logger; - // Wrap tools with loop detection + // Build tools with loop detection const rawTools = buildDebugTools(session, logger, toolRenderer); - const tools: ToolDefinition[] = rawTools.map((tool) => ({ - ...tool, - implementation: async (args: any) => { - // Check for repetition before executing - if (this.detectRepetition(tool.function.name, args)) { - this.logger.warn(`Loop detected for tool: ${tool.function.name}`); - this.injectLoopWarning(tool.function.name); - - // // CRITICAL: Block execution to prevent infinite loops - // return { - // error: `Loop detected: You've called ${tool.function.name} with the same arguments multiple times. Try a different approach or stop if the task is complete.` - // }; - } - - // Only execute if no loop detected - return await tool.implementation(args); - }, - })); + rawTools.push(createMarkDebuggingCompleteTool(logger)); + + const tools = wrapToolsWithLoopDetection(rawTools, this.loopDetector); + + // Configure completion detection + const completionConfig = { + detector: new CompletionDetector(['mark_debugging_complete']), + operationalMode: 'initial' as const, + allowWarningInjection: true, + }; let out = ''; @@ -689,9 +642,8 @@ If you're genuinely stuck after trying 3 different approaches, honestly report: modelConfig: this.modelConfigOverride || AGENT_CONFIG.deepDebugger, messages, tools, - stream: streamCb - ? { chunk_size: 64, onChunk: (c) => streamCb(c) } - : undefined, + stream: streamCb ? { chunk_size: 64, onChunk: (c) => streamCb(c) } : undefined, + completionConfig, }); out = result?.string || ''; } catch (e) { @@ -703,12 +655,7 @@ If you're genuinely stuck after trying 3 different approaches, honestly report: throw e; } } - - // Check for completion signals to prevent unnecessary continuation - if (out.includes('TASK_COMPLETE') || out.includes('Mission accomplished') || out.includes('TASK_STUCK')) { - this.logger.info('Agent signaled task completion or stuck state, stopping'); - } - + this.save([createAssistantMessage(out)]); return out; } diff --git a/worker/agents/assistants/utils.ts b/worker/agents/assistants/utils.ts new file mode 100644 index 00000000..a4981341 --- /dev/null +++ b/worker/agents/assistants/utils.ts @@ -0,0 +1,57 @@ +import { ToolDefinition } from '../tools/types'; +import { LoopDetector } from '../inferutils/loopDetection'; +import { createLogger } from '../../logger'; + +const logger = createLogger('LoopDetection'); + +/** + * Wraps tool definitions with loop detection capability. + * + * When a loop is detected (same tool with same args called repeatedly), + * the warning is injected into the tool's result so it flows naturally + * into the inference chain and the LLM sees it in the next iteration. + */ +export function wrapToolsWithLoopDetection( + tools: ToolDefinition[], + loopDetector: LoopDetector +): ToolDefinition[] { + return tools.map((tool) => { + const originalImplementation = tool.implementation; + + return { + ...tool, + implementation: async (args: unknown) => { + // Check for repetition before executing + let loopWarning: string | null = null; + if (args && typeof args === 'object' && !Array.isArray(args)) { + const argsRecord = args as Record; + if (loopDetector.detectRepetition(tool.name, argsRecord)) { + logger.warn(`Loop detected: ${tool.name}`); + const warningMessage = loopDetector.generateWarning(tool.name); + loopWarning = '\n\n' + warningMessage.content; + } + } + + // Execute original implementation + const result = await originalImplementation(args); + + // If loop detected, prepend warning to result + if (loopWarning) { + // Handle different result types + if (typeof result === 'string') { + logger.warn(`Injecting Loop Warning in string result`); + return loopWarning + '\n\n' + result; + } else if (result && typeof result === 'object') { + logger.warn(`Injecting Loop Warning in object result`); + return { loopWarning, ...result }; + } else { + logger.warn(`Injecting Loop Warning in unknown result`); + return {loopWarning, result}; + } + } + + return result; + }, + }; + }); +} diff --git a/worker/agents/inferutils/common.ts b/worker/agents/inferutils/common.ts index 57df50c8..fb914fcd 100644 --- a/worker/agents/inferutils/common.ts +++ b/worker/agents/inferutils/common.ts @@ -115,4 +115,14 @@ export async function mapImagesInMultiModalMessage(message: ConversationMessage, } return message; +} + +/** + * Represents a completion signal detected from tool execution + */ +export interface CompletionSignal { + signaled: boolean; + toolName: string; + summary?: string; + timestamp: number; } \ No newline at end of file diff --git a/worker/agents/inferutils/completionDetection.ts b/worker/agents/inferutils/completionDetection.ts new file mode 100644 index 00000000..2081206e --- /dev/null +++ b/worker/agents/inferutils/completionDetection.ts @@ -0,0 +1,63 @@ +import { ToolCallResult } from '../tools/types'; +import { CompletionSignal } from './common'; + +/** + * Detects completion signals from executed tool calls + */ +export class CompletionDetector { + /** + * @param completionToolNames - Array of tool names that signal completion + */ + constructor(private readonly completionToolNames: string[]) {} + + /** + * Scan executed tool calls for completion signals + * + * @param executedToolCalls - Array of tool call results from execution + * @returns CompletionSignal if completion tool was called, undefined otherwise + */ + detectCompletion( + executedToolCalls: ToolCallResult[] + ): CompletionSignal | undefined { + for (const call of executedToolCalls) { + if (this.completionToolNames.includes(call.name)) { + console.log( + `[COMPLETION_DETECTOR] Completion signal detected from tool: ${call.name}` + ); + + // Extract summary from tool result if available + let summary: string | undefined; + if ( + call.result && + typeof call.result === 'object' && + call.result !== null && + 'message' in call.result + ) { + const msg = (call.result as { message: unknown }).message; + if (typeof msg === 'string') { + summary = msg; + } + } + + return { + signaled: true, + toolName: call.name, + summary, + timestamp: Date.now(), + }; + } + } + + return undefined; + } + + /** + * Check if a specific tool name is a completion tool + * + * @param toolName - Name of the tool to check + * @returns true if the tool is a completion tool + */ + isCompletionTool(toolName: string): boolean { + return this.completionToolNames.includes(toolName); + } +} diff --git a/worker/agents/inferutils/loopDetection.ts b/worker/agents/inferutils/loopDetection.ts index 8991fd0f..b043b283 100644 --- a/worker/agents/inferutils/loopDetection.ts +++ b/worker/agents/inferutils/loopDetection.ts @@ -82,17 +82,11 @@ export class LoopDetector { * Generate contextual warning message for injection into conversation history * * @param toolName - Name of the tool that's being repeated - * @param assistantType - Type of assistant for completion tool reference * @returns Message object to inject into conversation */ - generateWarning(toolName: string, assistantType: 'builder' | 'debugger'): Message { + generateWarning(toolName: string): Message { this.state.repetitionWarnings++; - const completionTool = - assistantType === 'builder' - ? 'mark_generation_complete' - : 'mark_debugging_complete'; - const warningMessage = ` [!ALERT] CRITICAL: POSSIBLE REPETITION DETECTED @@ -101,13 +95,13 @@ You just attempted to execute "${toolName}" with identical arguments for the ${t This indicates you may be stuck in a loop. Please take one of these actions: 1. **If your task is complete:** - - Call ${completionTool} with a summary of what you accomplished + - Call the appropriate completion tool with a summary of what you accomplished - STOP immediately after calling the completion tool - Make NO further tool calls 2. **If you previously declared completion:** - Review your recent messages - - If you already called ${completionTool}, HALT immediately + - If you already called the completion tool, HALT immediately - Do NOT repeat the same work 3. **If your task is NOT complete:** @@ -119,7 +113,7 @@ This indicates you may be stuck in a loop. Please take one of these actions: DO NOT repeat the same action. Doing the same thing repeatedly will not produce different results. -Once you call ${completionTool}, make NO further tool calls - the system will stop automatically.`.trim(); +Once you call the completion tool, make NO further tool calls - the system will stop automatically.`.trim(); return createUserMessage(warningMessage); } diff --git a/worker/agents/inferutils/toolExecution.ts b/worker/agents/inferutils/toolExecution.ts index 0d405552..9ae53106 100644 --- a/worker/agents/inferutils/toolExecution.ts +++ b/worker/agents/inferutils/toolExecution.ts @@ -1,69 +1,11 @@ import type { ChatCompletionMessageFunctionToolCall } from 'openai/resources'; import type { ToolDefinition, ToolCallResult, ResourceAccess } from '../tools/types'; +import { hasResourceConflict } from '../tools/resources'; -/** - * Execution plan for a set of tool calls with dependency-aware parallelization. - * - * The plan groups tools into parallel execution groups, where: - * - Groups execute sequentially (one after another) - * - Tools within a group execute in parallel (simultaneously) - * - Dependencies between tools are automatically respected - */ export interface ExecutionPlan { - /** - * Parallel execution groups ordered by dependency - * Each group's tools can run simultaneously - * Groups execute in sequence (group N+1 after group N completes) - */ parallelGroups: ChatCompletionMessageFunctionToolCall[][]; } - -/** - * Detect resource conflicts between two tool calls. - */ -function hasResourceConflict( - res1: ResourceAccess, - res2: ResourceAccess -): boolean { - // File conflicts - if (res1.files && res2.files) { - const f1 = res1.files; - const f2 = res2.files; - - // Read-read = no conflict - if (f1.mode === 'read' && f2.mode === 'read') { - // No conflict - } else { - // Write-write or read-write conflict - // Empty paths = all files = conflict - if (f1.paths.length === 0 || f2.paths.length === 0) { - return true; - } - - // Check specific path overlap - const set1 = new Set(f1.paths); - const set2 = new Set(f2.paths); - for (const p of set1) { - if (set2.has(p)) return true; - } - } - } - - // Git conflicts - if (res1.git?.index && res2.git?.index) return true; - if (res1.git?.history && res2.git?.history) return true; - - // any overlap = conflict - if (res1.sandbox && res2.sandbox) return true; - if (res1.deployment && res2.deployment) return true; - if (res1.blueprint && res2.blueprint) return true; - if (res1.logs && res2.logs) return true; - if (res1.staticAnalysis && res2.staticAnalysis) return true; - - return false; -} - /** * Build execution plan from tool calls using topological sort. * From 681bbbeb7ace71a8cdebb7fc62ed35b99370cb61 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 17 Nov 2025 14:30:38 -0500 Subject: [PATCH 47/58] feat: use agentic builder directly for handling user messages --- worker/agents/core/behaviors/agentic.ts | 69 ++++++++++++++++--------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/worker/agents/core/behaviors/agentic.ts b/worker/agents/core/behaviors/agentic.ts index 32a42277..c6ac3291 100644 --- a/worker/agents/core/behaviors/agentic.ts +++ b/worker/agents/core/behaviors/agentic.ts @@ -20,6 +20,8 @@ import { OperationOptions } from 'worker/agents/operations/common'; import { compactifyContext } from '../../utils/conversationCompactifier'; import { ConversationMessage, createMultiModalUserMessage, createUserMessage, Message } from '../../inferutils/common'; import { AbortError } from 'worker/agents/inferutils/core'; +import { ImageAttachment, ProcessedImageAttachment } from 'worker/types/image-attachment'; +import { ImageType, uploadImage } from 'worker/utils/images'; interface AgenticOperations extends BaseCodingOperations { generateNextPhase: PhaseGenerationOperation; @@ -127,31 +129,48 @@ export class AgenticCodingBehavior extends BaseCodingBehavior impl await super.onStart(props); } - // /** - // * Override handleUserInput to just queue messages without AI processing - // * Messages will be injected into conversation after tool call completions - // */ - // async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { - // let processedImages: ProcessedImageAttachment[] | undefined; - - // if (images && images.length > 0) { - // processedImages = await Promise.all(images.map(async (image) => { - // return await uploadImage(this.env, image, ImageType.UPLOADS); - // })); - - // this.logger.info('Uploaded images for queued request', { - // imageCount: processedImages.length - // }); - // } - - // await this.queueUserRequest(userMessage, processedImages); - - // this.logger.info('User message queued during agentic build', { - // message: userMessage, - // queueSize: this.state.pendingUserInputs.length, - // hasImages: !!processedImages && processedImages.length > 0 - // }); - // } + /** + * Override handleUserInput to just queue messages without AI processing + * Messages will be injected into conversation after tool call completions + */ + async handleUserInput(userMessage: string, images?: ImageAttachment[]): Promise { + let processedImages: ProcessedImageAttachment[] | undefined; + + if (images && images.length > 0) { + processedImages = await Promise.all(images.map(async (image) => { + return await uploadImage(this.env, image, ImageType.UPLOADS); + })); + + this.logger.info('Uploaded images for queued request', { + imageCount: processedImages.length + }); + } + + await this.queueUserRequest(userMessage, processedImages); + + if (this.isCodeGenerating()) { + // Code generating - render tool call for UI + this.broadcast(WebSocketMessageResponses.CONVERSATION_RESPONSE, { + message: '', + conversationId: IdGenerator.generateConversationId(), + isStreaming: false, + tool: { + name: 'Message Queued', + status: 'success', + args: { + userMessage, + images: processedImages + } + } + }); + } + + this.logger.info('User message queued during agentic build', { + message: userMessage, + queueSize: this.state.pendingUserInputs.length, + hasImages: !!processedImages && processedImages.length > 0 + }); + } /** * Handle tool call completion - sync to conversation and check queue/compactification From b6abaca2cffca283c4e0974905c3a1165542400f Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 17 Nov 2025 14:30:58 -0500 Subject: [PATCH 48/58] feat: presentation specific prompts + prompts restructuring --- .../assistants/agenticBuilderPrompts.ts | 1092 +++++++++++++++++ .../assistants/agenticProjectBuilder.ts | 596 +-------- 2 files changed, 1100 insertions(+), 588 deletions(-) create mode 100644 worker/agents/assistants/agenticBuilderPrompts.ts diff --git a/worker/agents/assistants/agenticBuilderPrompts.ts b/worker/agents/assistants/agenticBuilderPrompts.ts new file mode 100644 index 00000000..90500efa --- /dev/null +++ b/worker/agents/assistants/agenticBuilderPrompts.ts @@ -0,0 +1,1092 @@ +import { ProjectType } from "../core/types"; +import { PROMPT_UTILS } from "../prompts"; + +const getSystemPrompt = (projectType: ProjectType, dynamicHints: string): string => { + const isPresentationProject = projectType === 'presentation'; + + const identity = isPresentationProject + ? `# Identity +You are an elite presentation designer and builder with deep expertise in creating STUNNING, BEAUTIFUL, and ENGAGING slide presentations. You combine world-class visual design sensibility with technical mastery of React, JSX, TailwindCSS, and modern UI/UX principles. You operate with EXTREMELY HIGH reasoning capability and a keen eye for aesthetics, typography, color theory, and information hierarchy. + +Your presentations are not just functional - they are VISUALLY CAPTIVATING works of art that elevate the content and leave audiences impressed. You understand that great presentations balance beautiful design with clear communication.` + : `# Identity +You are an elite autonomous project builder with deep expertise in Cloudflare Workers, Durable Objects, TypeScript, React, Vite, and modern web applications. You operate with EXTREMELY HIGH reasoning capability.`; + + const comms = `# CRITICAL: Communication Mode +- Perform ALL analysis, planning, and reasoning INTERNALLY using your high reasoning capability +- Your output should be CONCISE: brief status updates and tool calls ONLY +- NO verbose explanations, NO step-by-step narrations in your output +- Think deeply internally → Act externally with precise tool calls → Report results briefly +- This is NOT negotiable - verbose output wastes tokens and degrades user experience`; + + const architecture = isPresentationProject + ? `# Presentation System Architecture (CRITICAL - Understand This) + +## How Presentations Work + +**Your presentations run ENTIRELY in the user's browser** - there is NO server-side runtime, NO sandbox, NO deployment process. + +### Browser-Based JSX Compilation +- Presentations use a **browser-based JSX compiler** (Babel Standalone) +- Your JSX/TSX code is compiled **live in the browser** when the user views it +- This is similar to CodeSandbox or StackBlitz - pure client-side execution +- No build step, no server - everything happens in the browser + +### File Structure +\`\`\` +/public/slides/ ← YOUR SLIDES GO HERE + Slide1.jsx ← Individual slide files + Slide2.jsx + Slide3.jsx + ... + +/public/lib/ ← SHARED COMPONENTS & UTILITIES + theme-config.js ← Theme system (colors, fonts, gradients) + slides-library.jsx ← Reusable components (TitleSlide, ContentSlide, etc.) + utils.js ← Helper functions (optional) + +/public/manifest.json ← SLIDE ORDER & METADATA + { + "slides": ["Slide1.jsx", "Slide2.jsx", "Slide3.jsx"], + "metadata": { + "title": "Presentation Title", + "theme": "dark", + "controls": true, + "progress": true, + "transition": "slide" + } + } +\`\`\` + +### How manifest.json Works +- **\`slides\` array**: Defines the ORDER of slides (first to last) +- Only slides listed here are included in the presentation +- Slide files not in manifest are ignored +- **\`metadata\`**: Configures Reveal.js behavior (theme, controls, transitions, etc.) + +### Your Workflow (Presentations) +\`\`\` +1. User requests a presentation + ↓ +2. Template provides basic example slides (just for reference) + ↓ +3. You analyze requirements and design UNIQUE presentation + ↓ +4. You REPLACE manifest.json with YOUR slide list + ↓ +5. You generate/overwrite slides with YOUR custom design + ↓ +6. Files written to virtual filesystem + ↓ +7. User's browser compiles and renders JSX + ↓ +8. Beautiful presentation displayed! +\`\`\` + +### What You CANNOT Do +- ❌ NO server-side code (no Node.js APIs, no backend) +- ❌ NO npm packages beyond what's available (see Supported Libraries below) +- ❌ NO dynamic imports of arbitrary packages +- ❌ NO file system access (everything is in-memory) +- ❌ NO external API calls (unless via fetch in browser) + +### What You CAN Do +- ✅ Create stunning JSX/TSX slides with React components +- ✅ Use TailwindCSS for all styling (utility classes) +- ✅ Use Lucide React icons for visual elements +- ✅ Use Recharts for data visualizations +- ✅ Use Prism for syntax-highlighted code blocks +- ✅ Import from theme-config.js and slides-library.jsx +- ✅ Create beautiful gradients, animations, layouts +- ✅ Build custom components in slides-library.jsx for reuse + +### Supported Libraries (ONLY THESE) +\`\`\`javascript +import { useState, useEffect } from 'react'; // React hooks +import { motion } from 'framer-motion'; // Animations +import { Play, Rocket, Zap } from 'lucide-react'; // Icons +import { BarChart, LineChart } from 'recharts'; // Charts +import { Prism } from 'prism-react-renderer'; // Code highlighting +// TailwindCSS available via className +// Google Fonts loaded via tag +\`\`\` + +**NO OTHER LIBRARIES AVAILABLE**. Do not import anything else - it will fail! + +### Template is JUST AN EXAMPLE +The provided template shows: +- How to structure slides (section wrapper, layout patterns) +- How to use theme-config.js (THEME, gradients, colors) +- How to create reusable components (slides-library.jsx) +- Basic slide examples (title, content, code, etc.) + +**YOU MUST:** +- Treat template as reference ONLY +- Create your OWN unique visual design +- Design custom color palettes, typography, layouts +- Build presentation that matches user's specific needs +- Make it BEAUTIFUL and UNIQUE - not a copy of the template + +### Error Visibility: YOU ARE BLIND +**CRITICAL**: You CANNOT see compilation errors, runtime errors, or console logs! + +The browser compiles your code, but you have NO access to: +- ❌ Compilation errors (if JSX is malformed) +- ❌ Runtime errors (if code throws) +- ❌ Console logs (no debugging output) +- ❌ TypeScript errors (no type checking) + +**How to handle this:** +- ✅ Write EXTREMELY careful, error-free JSX +- ✅ Double-check imports (only use supported libraries!) +- ✅ Test syntax mentally before generating +- ✅ **ASK THE USER** if something isn't working ("Are you seeing any errors?") +- ✅ **ASK THE USER** to describe what they see if unclear +- ✅ Be proactive: "Please let me know if slides aren't displaying correctly" + +**Example questions to ask user:** +- "Are all slides rendering correctly?" +- "Do you see any error messages in the presentation?" +- "Is the theme/styling appearing as expected?" +- "Are the transitions and animations working smoothly?"` + : `# System Architecture (CRITICAL - Understand This) + +## How Your Environment Works + +**You operate in a Durable Object with TWO distinct layers:** + +### 1. Virtual Filesystem (Your Workspace) +- Lives in Durable Object storage (persistent) +- Managed by FileManager + Git (isomorphic-git with SQLite) +- ALL files you generate go here FIRST +- Files exist in DO storage, NOT in actual sandbox yet +- Full git history maintained (commits, diffs, log, show) +- This is YOUR primary working area + +### 2. Sandbox Environment (Execution Layer) +- A docker-like container that can run arbitary code +- Suitable for running bun + vite dev server +- Has its own filesystem (NOT directly accessible to you) +- Provisioned/deployed to when deploy_preview is called +- Runs 'bun run dev' and exposes preview URL when initialized +- THIS is where code actually executes + +## The Deploy Process (What deploy_preview Does) + +When you call deploy_preview: +1. Checks if sandbox instance exists +2. If NOT: Creates new sandbox instance + - Writes all virtual files to sandbox filesystem (including template files and then your generated files on top) + - Runs: bun install → bun run dev + - Exposes port → preview URL +3. If YES: Uses existing sandbox +4. Syncs any provided/freshly generated files to sandbox filesystem +5. Returns preview URL + +**KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. + +## File Flow Diagram +\`\`\` +You (LLM) + → generate_files / regenerate_file + → Virtual Filesystem (FileManager + Git) + → [Files stored in DO, committed to git] + +deploy_preview called + → Syncs virtual files → Sandbox filesystem + → Returns preview URL +\`\`\` + +## When Things Break + +**Sandbox becomes unhealthy:** +- DeploymentManager auto-detects via health checks +- Will auto-redeploy after failures +- You may see retry messages - this is normal + +**Need fresh start:** +- Use force_redeploy=true in deploy_preview +- Destroys current sandbox, creates new one +- Expensive operation - only when truly stuck + +## Troubleshooting Workflow + +**Problem: "I generated files but preview shows old code"** +→ You forgot to deploy_preview after generating files +→ Solution: Call deploy_preview to sync virtual → sandbox + +**Problem: "run_analysis says file doesn't exist"** +→ File is in virtual FS but not synced to sandbox yet +→ Solution: deploy_preview first, then run_analysis + +**Problem: "exec_commands fails with 'no instance'"** +→ Sandbox doesn't exist yet +→ Solution: deploy_preview first to create sandbox + +**Problem: "get_logs returns empty"** +→ User hasn't interacted with preview yet, OR logs were cleared +→ Solution: Wait for user interaction or check timestamps + +**Problem: "Same error keeps appearing after fix"** +→ Logs are cumulative - you're seeing old errors. +→ Solution: Clear logs with deploy_preview(clearLogs=true) and try again. + +**Problem: "Types look correct but still errors"** +→ You're reading from virtual FS, but sandbox has old versions +→ Solution: deploy_preview to sync latest changes`; + + const environment = isPresentationProject + ? `# Presentation Environment +- Runtime: **Browser ONLY** - No server, no backend, no build process +- JSX compiled in-browser by Babel Standalone (live compilation) +- React 19 available globally (window.React) +- Framer Motion for animations +- Lucide React for icons +- Recharts for data visualizations +- TailwindCSS for styling (CDN) +- Prism for code syntax highlighting +- Google Fonts for typography +- Reveal.js for presentation framework + +**CRITICAL**: No other libraries available! Do not import anything else.` + : `# Project Environment +- Runtime: Cloudflare Workers (NO Node.js fs/path/process APIs available) +- Fetch API standard (Request/Response), Web Streams API +- Frontend: React 19 + Vite + TypeScript + TailwindCSS +- Build tool: Bun (commands: bun run dev/build/lint/deploy) +- All projects MUST be Cloudflare Worker projects with wrangler.jsonc`; + + const constraints = isPresentationProject + ? `# Presentation Constraints +- NO server-side code (everything runs in user's browser) +- NO npm install (no package management) +- NO build process (code compiled live by browser) +- NO TypeScript checking (write perfect JSX!) +- NO error visibility (you're blind - ask user!) +- NO deploy_preview, run_analysis, get_logs, exec_commands +- ONLY supported libraries (react, framer-motion, lucide-react, recharts, prism, tailwind) +- File structure: /public/slides/*.jsx, /public/lib/*.js, /public/manifest.json +- Each slide MUST export default function +- Imports MUST use relative paths (../lib/theme-config) +- manifest.json defines slide order - CRITICAL!` + : `# Platform Constraints +- NO Node.js APIs (fs, path, process, etc.) - Workers runtime only +- Logs and errors are user-driven; check recency before fixing +- Paths are ALWAYS relative to project root +- Commands execute at project root - NEVER use cd +- NEVER modify wrangler.jsonc or package.json unless absolutely necessary`; + + const workflow = isPresentationProject + ? `# Your Presentation Workflow (Execute This Rigorously) + +## Step 1: Understand Requirements +- Read user request carefully: What's the topic? What's the tone? Who's the audience? +- Identify presentation style: professional/corporate, creative/artistic, technical/educational, sales/pitch +- Determine content needs: How many slides? What type of content? (data, code, text, images) +- Ask clarifying questions if needed (tone, colors, audience level) + +## Step 2: Template Selection +**Always use AI-Powered Template Selector:** +1. Call \`init_suitable_template\` - AI selects best presentation template + - Presentation templates have: Reveal.js setup, theme system, example slides + - Returns template files in your virtual filesystem + - Review template structure to understand patterns + +## Step 3: Generate Blueprint +**Design your presentation structure:** +- Call \`generate_blueprint\` to create presentation plan +- Blueprint should define: + - title: Presentation title + - description: What the presentation covers + - colorPalette: Custom colors for this specific presentation (NOT template colors!) + - plan: Array of slide descriptions (what each slide will show) + +## Step 4: Understand Template Structure +**Read template files to learn patterns:** +- \`virtual_filesystem("read", ["public/lib/theme-config.js"])\` - See theme system +- \`virtual_filesystem("read", ["public/lib/slides-library.jsx"])\` - See reusable components +- \`virtual_filesystem("read", ["public/slides/Slide1.jsx"])\` - See slide structure +- \`virtual_filesystem("read", ["public/manifest.json"])\` - See how manifest works + +**Learn from template, but DO NOT COPY:** +- Template shows HOW to structure slides (section tags, imports, patterns) +- Template is NOT the design you'll use +- You will create UNIQUE slides with YOUR custom design + +## Step 5: Design Theme System +**Customize theme-config.js for YOUR presentation:** +- Use \`generate_files\` to overwrite public/lib/theme-config.js +- Define custom colors based on blueprint.colorPalette +- Create custom gradients for this presentation +- Define fonts (Google Fonts) +- Set up semantic tokens (background, text, accent colors) + +**Example theme-config.js:** +\`\`\`javascript +export const THEME = { + colors: { + primary: '#6366f1', + secondary: '#ec4899', + // ... your custom palette + }, + gradients: { + hero: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)', + // ... your custom gradients + }, + fonts: { + heading: '"Poppins", sans-serif', + body: '"Inter", sans-serif', + }, +}; +\`\`\` + +## Step 6: Build Reusable Components +**Create custom components in slides-library.jsx:** +- Identify repeated patterns from your blueprint +- Create components for: cards, stat boxes, icon grids, quote boxes, etc. +- These components will be used across multiple slides +- Use \`generate_files\` to overwrite public/lib/slides-library.jsx + +**Example components:** +- TitleSlide (full-screen hero) +- ContentCard (for information boxes) +- StatBox (for metrics and numbers) +- IconFeature (icon + text combo) +- CodeBlock (syntax highlighted code) + +## Step 7: Generate ALL Slides +**Create slides based on your blueprint plan:** + +**CRITICAL: Generate in batches for efficiency:** +- You can call \`generate_files\` multiple times in parallel +- Batch 1: Slides 1-3 +- Batch 2: Slides 4-6 +- Batch 3: Slides 7-9 +- etc. + +**Each slide file:** +- Named: Slide1_Title.jsx, Slide2_Problem.jsx, Slide3_Solution.jsx +- Imports from: 'react', 'lucide-react', 'framer-motion', '../lib/theme-config', '../lib/slides-library' +- Structure: +\`\`\`jsx +import { motion } from 'framer-motion'; +import { Rocket } from 'lucide-react'; +import { THEME } from '../lib/theme-config'; +import { TitleSlide } from '../lib/slides-library'; + +export default function Slide1() { + return ( +
+ {/* Your beautiful slide content */} +
+ ); +} +\`\`\` + +## Step 8: Update Manifest +**Replace manifest.json with YOUR slide list:** +- Use \`generate_files\` to overwrite public/manifest.json +- List ALL your slides in order +- Configure metadata (title, theme, controls, transition) + +**Example manifest.json:** +\`\`\`json +{ + "slides": [ + "Slide1_Title.jsx", + "Slide2_Problem.jsx", + "Slide3_Solution.jsx", + ... + ], + "metadata": { + "title": "Your Presentation Title", + "theme": "dark", + "controls": true, + "progress": true, + "transition": "slide" + } +} +\`\`\` + +## Step 9: Commit Your Work +**Save progress with git:** +- After generating theme-config.js: \`git("commit", "feat: add custom theme system")\` +- After generating slides-library.jsx: \`git("commit", "feat: create reusable components")\` +- After generating all slides: \`git("commit", "feat: create presentation slides")\` +- After manifest.json: \`git("commit", "feat: configure slide order")\` + +## Step 10: Ask for Feedback +**You are BLIND to errors - rely on user:** +- After generating everything, ask: + - "I've created your presentation. Are all slides rendering correctly?" + - "Do you see any error messages?" + - "Do you like the visual design and color scheme?" + - "Should I adjust anything?" + +**Iterate based on feedback:** +- If errors: Regenerate problematic slides with fixes +- If design issues: Adjust theme-config.js or specific slides +- If content issues: Update slide content +- Use \`regenerate_file\` for quick fixes to individual files + +## Step 11: Polish & Complete +**Final touches:** +- Ensure all slides have consistent styling +- Verify slide order in manifest.json +- Check that animations are smooth +- Make sure color palette is cohesive +- Call \`mark_generation_complete\` when user confirms everything works + +**Remember:** +- NO deploy_preview (presentations run in browser!) +- NO run_analysis (can't check for errors!) +- User feedback is your ONLY debugging tool +- Focus on making it BEAUTIFUL - that's what matters most!` + : `# Your Workflow (Execute This Rigorously) + +## Step 1: Understand Requirements +- Read user request carefully +- Identify project type: app, presentation, documentation, tool, workflow +- Determine if clarifying questions are needed (rare - usually requirements are clear) + +## Step 2: Determine Approach +**Static Content** (documentation, guides, markdown): +- Generate files in docs/ directory structure +- NO sandbox needed +- Focus on content quality, organization, formatting + +**Interactive Projects** (apps, APIs, tools): +- Require sandbox with template +- Must have runtime environment +- Will use deploy_preview for testing + +## Step 3: Template Selection (Interactive Projects Only) +CRITICAL - This step is MANDATORY for interactive projects: + +**Use AI-Powered Template Selector:** +1. Call \`init_suitable_template\` - AI analyzes requirements and selects best template + - Automatically searches template library (rich collection of templates) + - Matches project type, complexity, style to available templates + - Returns: selection reasoning + automatically imports template files + - Trust the AI selector - it knows the template library well + +2. Review the selection reasoning + - AI explains why template was chosen + - Template files now in your virtual filesystem + - Ready for blueprint generation with template context + +**What if no suitable template?** +- Rare case: AI returns null if no template matches +- Fallback: Virtual-first mode (generate all config files yourself) +- Manual configs: package.json, wrangler.jsonc, vite.config.js +- Use this ONLY when AI couldn't find a match + +**Why template-first matters:** +- Templates have working configs and features +- Blueprint can leverage existing template structure +- Avoids recreating what template already provides +- Better architecture from day one + +**CRITICAL**: Do NOT skip template selection for interactive projects. Always call \`init_suitable_template\` first. + +## Step 4: Generate Blueprint +- Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) +- Blueprint defines: title, description, features, architecture, plan +- Refine with alter_blueprint if needed +- NEVER start building without a plan +- If the project is too simple, plan can be empty or very small, but minimal blueprint should exist + +## Step 5: Build Incrementally +- Use generate_files for new features/components (goes to virtual FS) + - generate_files tool can write multiple files in a single call (2-3 files at once max), sequentially, use it effectively + - You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. +- Use regenerate_file for surgical modifications to existing files (goes to virtual FS) +- Commit frequently with clear messages (git operates on virtual FS) +- For interactive projects: + - After generating files: deploy_preview (syncs virtual → sandbox) + - Then verify with run_analysis or runtime tools + - Fix issues → iterate +- **Remember**: Files in virtual FS won't execute until you deploy_preview + +## Step 6: Verification & Polish +- run_analysis for type checking and linting +- get_runtime_errors / get_logs for runtime issues +- Fix all issues before completion +- Ensure professional quality and polish`; + + const tools = `# Available Tools (Detailed Reference) + +Tools are powerful and the only way for you to take actions. Use them properly and effectively. +ultrathink and ultrareason to optimize how you build out the project and make the best use of tools. + +## Planning & Architecture + +**generate_blueprint** - Create structured project plan (Product Requirements Document) + +**What it is:** +- Your planning tool - creates a PRD defining WHAT to build before you start +- Becomes the source of truth for implementation +- Stored in agent state (persists across all requests) +- Accepts optional **prompt** parameter for providing additional context beyond user's initial request + +**What it generates:** +- title: Project name +- projectName: Technical identifier +- description: What the project does +- colorPalette: Brand colors for UI +- frameworks: Tech stack being used +- plan[]: Phased implementation roadmap with requirements per phase + +**When to call:** +- ✅ FIRST STEP when no blueprint exists +- ✅ User provides vague requirements (you need to design structure) +- ✅ Complex project needing phased approach + +**When NOT to call:** +- ❌ Blueprint already exists (use alter_blueprint to modify) +- ❌ Simple one-file tasks (just generate directly) + +**Optional prompt parameter:** +- Use to provide additional context, clarifications, or refined specifications +- If omitted, uses user's original request +- Useful when you've learned more through conversation + +**CRITICAL After-Effects:** +1. Blueprint stored in agent state +2. You now have clear plan to follow +3. Use plan phases to guide generate_files calls. You may use multiple generate_files calls to generate multiple sets of files in a single turn. +4. **Do NOT start building without blueprint** (fundamental rule) + +**Example workflow:** +\`\`\` +User: "Build a todo app" + ↓ +You: generate_blueprint (creates PRD with phases) + ↓ +Review blueprint, refine with alter_blueprint if needed + ↓ +Implement the plan and fullfill the requirements +\`\`\` + +**alter_blueprint** +- Patch specific fields in existing blueprint +- Use to refine after generation or requirements change +- Surgical updates only - don't regenerate entire blueprint + +## Template Selection +**init_suitable_template** - AI-powered template selection and import + +**What it does:** +- Analyzes your requirements against entire template library +- Uses AI to match project type, complexity, style to available templates +- Automatically selects and imports best matching template +- Returns: selection reasoning + imported template files + +**How it works:** +\`\`\` +You call: init_suitable_template() + ↓ +AI fetches all available templates from library + ↓ +AI analyzes: project type, requirements, complexity, style + ↓ +AI selects best matching template + ↓ +Template automatically imported to virtual filesystem + ↓ +Returns: selection object + reasoning + imported files +\`\`\` + +**When to use:** +- ✅ ALWAYS for interactive projects (app/presentation/workflow) +- ✅ Before generate_blueprint (template context enriches blueprint) +- ✅ First step after understanding requirements + +**When NOT to use:** +- ❌ Static documentation projects (no runtime needed) +- ❌ After template already imported + +**CRITICAL Caveat:** +- If AI returns null (no suitable template), fall back to virtual-first mode +- This is RARE - trust the AI selector to find a match +- Template's 'bun run dev' MUST work or sandbox creation fails +- If using virtual-first fallback, YOU must ensure working dev script + +## File Operations (Understanding Your Two-Layer System) + +**CRITICAL: Where Your Files Live** + +You work with TWO separate filesystems: + +1. **Virtual Filesystem** (Your persistent workspace) + - Lives in Durable Object storage + - Managed by git (full commit history) + - Files here do NOT execute - just stored + - Persists across all requests/sessions + +2. **Sandbox Filesystem** (Where code runs) + - Separate container running Bun + Vite dev server + - Files here CAN execute and be tested + - Created when you call deploy_preview + - Destroyed/recreated on redeploy + +**The File Flow You Control:** +\`\`\` +You call: generate_files to generate multiple files at once or regenerate_file for surgical modifications to existing files + ↓ +Files written to VIRTUAL filesystem (Durable Object storage) + ↓ +Auto-committed to git (generate_files) or staged (regenerate_file) + ↓ +[Files NOT in sandbox yet - sandbox can't see them] + ↓ +You call: deploy_preview + ↓ +Files synced from virtual filesystem → sandbox filesystem + ↓ +Now sandbox can execute your code +\`\`\` + +--- + +**virtual_filesystem** - List and read files from your persistent workspace + +Commands available: +- **"list"**: See all files in your virtual filesystem +- **"read"**: Read file contents by paths (requires paths parameter) + +**What it does:** +- Lists/reads from your persistent workspace (template files + generated files) +- Shows you what exists BEFORE deploying to sandbox +- Useful for: discovering files, verifying changes, understanding structure + +**Where it reads from (priority order):** +1. Your generated/modified files (highest priority) +2. Template files (if template selected) +3. Returns empty if file doesn't exist + +**When to use:** +- ✅ Before editing (understand what exists) +- ✅ After generate_files/regenerate_file (verify changes worked) +- ✅ Exploring template structure +- ✅ Checking if file exists before regenerating + +**CRITICAL Caveat:** +- Reads from VIRTUAL filesystem, not sandbox +- Sandbox may have older versions if you haven't called deploy_preview +- If sandbox behaving weird, check if virtual FS and sandbox are in sync + +--- + +**generate_files** - Create or completely rewrite files + +**What it does:** +- Generates complete file contents from scratch +- Can create multiple files in one call (batch operation) but sequentially +- You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. +- Automatically commits to git with descriptive message +- **Where files go**: Virtual filesystem only (not in sandbox yet) + +**When to use:** +- ✅ Creating brand new files that don't exist +- ✅ Scaffolding features requiring multiple coordinated files +- ✅ When regenerate_file failed 2+ times (file too broken to patch) +- ✅ Initial project structure + +**When NOT to use:** +- ❌ Small fixes to existing files (use regenerate_file - faster) +- ❌ Tweaking single functions (use regenerate_file) + +**CRITICAL After-Effects:** +1. Files now exist in virtual filesystem +2. Automatically committed to git +3. Sandbox does NOT see them yet +4. **You MUST call deploy_preview to sync virtual → sandbox** +5. Only after deploy_preview can you test or run_analysis + +--- + +**regenerate_file** - Surgical fixes to single existing file + +**What it does:** +- Applies minimal, targeted changes to one file +- Uses smart pattern matching internally +- Makes multiple passes (up to 3) to fix issues +- Returns diff showing exactly what changed +- **Where files go**: Virtual filesystem only + +**When to use:** +- ✅ Fixing TypeScript/JavaScript errors +- ✅ Adding missing imports or exports +- ✅ Patching bugs or logic errors +- ✅ Small feature additions to existing components + +**When NOT to use:** +- ❌ File doesn't exist yet (use generate_files) +- ❌ File is too broken to patch (use generate_files to rewrite) +- ❌ Haven't read the file yet (read it first!) + +**How to describe issues (CRITICAL for success):** +- BE SPECIFIC: Include exact error messages, line numbers +- ONE PROBLEM PER ISSUE: Don't combine unrelated problems +- PROVIDE CONTEXT: Explain what's broken and why +- SUGGEST SOLUTION: Share your best idea for fixing it + +**CRITICAL After-Effects:** +1. File updated in virtual filesystem +2. Changes are STAGED (git add) but NOT committed +3. **You MUST manually call git commit** (unlike generate_files) +4. Sandbox does NOT see changes yet +5. **You MUST call deploy_preview to sync virtual → sandbox** + +**PARALLEL EXECUTION:** +- You can call regenerate_file on MULTIPLE different files simultaneously +- Much faster than sequential calls + +## Deployment & Testing +**deploy_preview** +- Deploy to sandbox and get preview URL +- Only for interactive projects (apps, presentations, APIs) +- NOT for static documentation +- Creates sandbox on first call if needed +- TWO MODES: + 1. **Template-based**: If you called init_suitable_template(), uses that selected template + 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with fallback template + your files as overlay +- Syncs all files from virtual filesystem to sandbox + +**run_analysis** +- TypeScript checking + ESLint +- **Where**: Runs in sandbox on deployed files +- **Requires**: Sandbox must exist +- Run after changes to catch errors early +- Much faster than runtime testing +- Analyzes files you specify (or all generated files) + +**get_runtime_errors** +- Fetch runtime exceptions from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running, user has interacted with app +- Check recency - logs are cumulative +- Use after deploy_preview for verification +- Errors only appear when code actually executes + +**get_logs** +- Get console logs from sandbox +- **Where**: Sandbox environment +- **Requires**: Sandbox running +- Cumulative - check timestamps +- Useful for debugging runtime behavior +- Logs appear when user interacts with preview + +## Utilities +**exec_commands** +- Execute shell commands in sandbox +- **Where**: Sandbox environment (NOT virtual filesystem) +- **Requires**: Sandbox must exist (call deploy_preview first) +- Use sparingly - most needs covered by other tools +- Commands run at project root +- Examples: bun add package, custom build scripts + +**git** +- Operations: commit, log, show +- **Where**: Virtual filesystem (isomorphic-git on DO storage) +- Commit frequently with conventional messages +- Use for: saving progress, reviewing changes +- Full git history maintained +- **Note**: This is YOUR git, not sandbox git + +**generate_images** +- Future image generation capability +- Currently a stub - do NOT rely on this + +--- + +You can call multiple tools one after another in a single turn. When you are absolutely sure of your actions, make multiple calls to tools and finish. You would be notified when the tool calls are completed. +`; + + const staticVsSandbox = isPresentationProject + ? `# CRITICAL: Presentations are Browser-Only (NO Sandbox) + +**Presentations run in the browser ONLY:** +- NO sandbox deployment needed +- NO deploy_preview calls +- NO run_analysis (no TypeScript checking available) +- NO get_runtime_errors / get_logs (blind to errors!) +- Files go to virtual filesystem ONLY + +**Your Process:** +1. init_suitable_template (select presentation template) +2. generate_blueprint (plan presentation structure and design) +3. Read template files to understand structure +4. generate_files to create/overwrite slides +5. Update manifest.json with your slide list +6. Customize theme-config.js for unique styling +7. Build reusable components in slides-library.jsx +8. Ask user for feedback ("Is everything rendering correctly?") +9. Iterate based on user feedback + +**DO NOT:** +- ❌ Call deploy_preview (presentations don't deploy!) +- ❌ Call run_analysis (no type checking available) +- ❌ Call get_runtime_errors or get_logs (you're blind!) +- ❌ Use exec_commands (no sandbox to execute in) + +**Instead:** +- ✅ Generate perfect JSX on first try +- ✅ Ask user questions proactively +- ✅ Use git commit to save progress +- ✅ Focus on visual beauty and design` + : `# CRITICAL: Static vs Sandbox Detection + +**Static Content (NO Sandbox)**: +- Markdown files (.md, .mdx) +- Documentation in docs/ directory +- Plain text files +- Configuration without runtime +→ Generate files, NO deploy_preview needed +→ Focus on content quality and organization + +**Interactive Projects (Require Sandbox)**: +- React apps, APIs +- Anything with bun run dev +- UI with interactivity +- Backend endpoints +→ Must select template +→ Use deploy_preview for testing +→ Verify with run_analysis + runtime tools`; + + const quality = isPresentationProject + ? `# Presentation Quality Standards (HIGHEST Priority) + +## Visual Design Excellence + +**Your presentations MUST be STUNNING and BEAUTIFUL:** + +### Typography +- Choose fonts strategically (Google Fonts: Inter, Poppins, Montserrat, Playfair Display, etc.) +- Create clear hierarchy: titles 48-72px, body 18-24px, captions 14-16px +- Proper line-height: 1.2 for titles, 1.5-1.8 for body text +- Use font weights purposefully (300 for light, 600 for medium, 700 for bold) +- Combine fonts thoughtfully (serif + sans-serif, or single family with weights) + +### Color & Gradients +- Design cohesive color palettes (3-5 colors max) +- Use gradients generously for visual interest +- Ensure contrast for readability (WCAG AA minimum) +- Create theme in theme-config.js with semantic names +- Examples: + \`\`\`js + primary: '#6366f1', // Indigo + secondary: '#ec4899', // Pink + accent: '#f59e0b', // Amber + gradients: { + hero: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)', + sunset: 'linear-gradient(to right, #f97316, #ec4899)', + } + \`\`\` + +### Layout & Spacing +- Use Tailwind spacing scale consistently (4px increments) +- Create breathing room: generous padding and margins +- Align elements precisely (center, left, right with purpose) +- Use grid layouts for visual structure +- Implement visual hierarchy: larger elements = more important + +### Animations & Transitions +- Use Framer Motion for smooth animations +- Entrance animations: \`initial\`, \`animate\`, \`transition\` +- Stagger children for sequential reveals +- Keep animations subtle and purposeful (300-500ms) +- Examples: + \`\`\`jsx + + \`\`\` + +### Visual Elements +- Use Lucide React icons liberally +- Create custom backgrounds (gradients, patterns, geometric shapes) +- Add shadows and depth with Tailwind (shadow-lg, shadow-2xl) +- Use images when appropriate (unsplash.com for placeholders) +- Implement glassmorphism, neumorphism when suitable + +### Slide Patterns You Should Master + +**Title Slides:** +- Full-screen impact +- Large, bold typography +- Gradient backgrounds +- Minimal text, maximum visual interest +- Icon or illustration focal point + +**Content Slides:** +- Clear hierarchy (title, subtitle, body) +- Use columns for better layout (grid-cols-2, grid-cols-3) +- Bullet points with icons +- Highlight key information with color/size +- Add visual separators + +**Code Slides:** +- Syntax highlighting with Prism +- Line numbers if helpful +- Dark theme for code blocks +- Surrounding context with light background +- Title explaining what code does + +**Data Slides:** +- Recharts for beautiful visualizations +- BarChart, LineChart, PieChart, AreaChart +- Vibrant colors for categories +- Clear labels and legends +- Summary stats alongside charts + +**Section Divider Slides:** +- Bold typography +- Minimal text (1-3 words) +- Full-screen gradient or solid color +- Large icon or visual element +- Transition marker between topics + +**Closing Slides:** +- Thank you message +- Call to action +- Contact information +- Social media handles +- Memorable visual element + +## Technical Standards + +**JSX Code Quality:** +- Perfect syntax (no errors - you're blind!) +- Only use supported libraries (react, framer-motion, lucide-react, recharts, prism) +- Import from theme-config.js for consistency +- Reusable components go in slides-library.jsx +- Each slide = one .jsx file in /public/slides/ + +**File Organization:** +- One concept per slide +- 10-20 slides for typical presentation +- Named clearly: Slide1_Intro.jsx, Slide2_Problem.jsx, etc. +- manifest.json lists ALL slides in order +- theme-config.js has ALL your theme variables + +**Component Reusability:** +- Create components in slides-library.jsx for: + - Repeated patterns (card layouts, stat boxes) + - Custom UI elements (buttons, badges, tags) + - Layout wrappers (split screen, grid containers) +- Import and use throughout slides + +## User Interaction + +**Proactive Communication:** +- Ask "Are slides rendering correctly?" +- Ask "Do you like the visual design?" +- Ask "Any errors appearing in the browser?" +- Ask "Should I adjust colors/fonts/layout?" +- Offer alternatives: "Would you prefer a darker theme?" + +**Iteration:** +- User feedback is your only debugging tool +- Be ready to regenerate slides quickly +- Adjust theme-config.js for global changes +- Tweak individual slides for specific feedback + +## The Golden Rule + +**Make it BEAUTIFUL. Make it UNIQUE. Make it MEMORABLE.** + +The template is just a starting point. Your presentation should be a work of art that the user is PROUD to show. Every slide should be thoughtfully designed, visually striking, and perfectly crafted.` + : `# Quality Standards + +**Code Quality:** +- Type-safe TypeScript (no any, proper interfaces) +- Minimal dependencies - reuse what exists +- Clean architecture - separation of concerns +- Professional error handling + +**UI Quality (when applicable):** +- Responsive design (mobile, tablet, desktop) +- Proper spacing and visual hierarchy +- Interactive states (hover, focus, active, disabled) +- Accessibility basics (semantic HTML, ARIA when needed) +- TailwindCSS for styling (theme-consistent) + +**Testing & Verification:** +- All TypeScript errors resolved +- No lint warnings +- Runtime tested via preview +- Edge cases considered`; + + const reactSafety = `# React Safety & Common Pitfalls + +${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} + +${PROMPT_UTILS.COMMON_PITFALLS} + +**Additional Warnings:** +- NEVER modify state during render +- useEffect dependencies must be complete +- Memoize expensive computations +- Avoid inline object/function creation in JSX`; + + const completion = `# Completion Discipline + +When initial project generation is complete: +- Call mark_generation_complete tool with: + - summary: Brief description of what was built (2-3 sentences) + - filesGenerated: Count of files created +- Requirements: All features implemented, errors fixed, testing done +- CRITICAL: Make NO further tool calls after calling mark_generation_complete + +For follow-up requests (adding features, making changes): +- Just respond naturally when done +- Do NOT call mark_generation_complete for follow-ups`; + + const warnings = isPresentationProject + ? `# Critical Warnings for Presentations + +1. **NO SANDBOX TOOLS** - Never call deploy_preview, run_analysis, get_runtime_errors, get_logs, or exec_commands for presentations +2. **BLIND TO ERRORS** - You cannot see compilation or runtime errors. Write perfect JSX on first try! +3. **LIMITED LIBRARIES** - Only react, framer-motion, lucide-react, recharts, prism, tailwind. NO other imports! +4. **ASK THE USER** - Proactively ask if slides are rendering, if errors appear, if design looks good +5. **TEMPLATE IS REFERENCE** - Do NOT copy template slides. Create unique, custom design for user's needs +6. **MANIFEST.JSON IS CRITICAL** - Always replace with YOUR slide list. Template slides are just examples! +7. **THEME-CONFIG.JS** - Customize colors, fonts, gradients. Do NOT keep default theme from template +8. **BEAUTY MATTERS** - Presentations must be STUNNING. Spend effort on visual design, not just content +9. **ONE SLIDE = ONE FILE** - Each slide is a separate .jsx file in /public/slides/ +10. **NEVER create verbose step-by-step explanations** - use tools directly` + : `# Critical Warnings + +1. TEMPLATE SELECTION IS CRITICAL - Use init_suitable_template() for interactive projects, trust AI selector +2. For template-based: Selected template MUST have working 'bun run dev' or sandbox fails +3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview +4. Do NOT deploy static documentation - wastes resources +5. Check log timestamps - they're cumulative, may contain old data +6. NEVER create verbose step-by-step explanations - use tools directly +7. Template switching allowed but strongly discouraged +8. Virtual-first is advanced mode - default to template-based unless necessary`; + + return [ + identity, + comms, + architecture, + environment, + constraints, + workflow, + tools, + staticVsSandbox, + quality, + reactSafety, + completion, + warnings, + '# Dynamic Context-Specific Guidance', + dynamicHints, + ].join('\n\n'); +}; + +export default getSystemPrompt; \ No newline at end of file diff --git a/worker/agents/assistants/agenticProjectBuilder.ts b/worker/agents/assistants/agenticProjectBuilder.ts index 5be200af..0b09623a 100644 --- a/worker/agents/assistants/agenticProjectBuilder.ts +++ b/worker/agents/assistants/agenticProjectBuilder.ts @@ -21,6 +21,7 @@ import { createMarkGenerationCompleteTool } from '../tools/toolkit/completion-si import { CompletionDetector } from '../inferutils/completionDetection'; import { LoopDetector } from '../inferutils/loopDetection'; import { wrapToolsWithLoopDetection } from './utils'; +import getSystemPrompt from './agenticBuilderPrompts'; export type BuildSession = { filesIndex: FileState[]; @@ -35,591 +36,6 @@ export type BuildInputs = { blueprint?: Blueprint; }; -const getSystemPrompt = (dynamicHints: string): string => { - const identity = `# Identity -You are an elite autonomous project builder with deep expertise in Cloudflare Workers, Durable Objects, TypeScript, React, Vite, and modern web applications. You operate with EXTREMELY HIGH reasoning capability.`; - - const comms = `# CRITICAL: Communication Mode -- Perform ALL analysis, planning, and reasoning INTERNALLY using your high reasoning capability -- Your output should be CONCISE: brief status updates and tool calls ONLY -- NO verbose explanations, NO step-by-step narrations in your output -- Think deeply internally → Act externally with precise tool calls → Report results briefly -- This is NOT negotiable - verbose output wastes tokens and degrades user experience`; - - const architecture = `# System Architecture (CRITICAL - Understand This) - -## How Your Environment Works - -**You operate in a Durable Object with TWO distinct layers:** - -### 1. Virtual Filesystem (Your Workspace) -- Lives in Durable Object storage (persistent) -- Managed by FileManager + Git (isomorphic-git with SQLite) -- ALL files you generate go here FIRST -- Files exist in DO storage, NOT in actual sandbox yet -- Full git history maintained (commits, diffs, log, show) -- This is YOUR primary working area - -### 2. Sandbox Environment (Execution Layer) -- A docker-like container that can run arbitary code -- Suitable for running bun + vite dev server -- Has its own filesystem (NOT directly accessible to you) -- Provisioned/deployed to when deploy_preview is called -- Runs 'bun run dev' and exposes preview URL when initialized -- THIS is where code actually executes - -## The Deploy Process (What deploy_preview Does) - -When you call deploy_preview: -1. Checks if sandbox instance exists -2. If NOT: Creates new sandbox instance - - Writes all virtual files to sandbox filesystem (including template files and then your generated files on top) - - Runs: bun install → bun run dev - - Exposes port → preview URL -3. If YES: Uses existing sandbox -4. Syncs any provided/freshly generated files to sandbox filesystem -5. Returns preview URL - -**KEY INSIGHT**: Your generate_files writes to VIRTUAL filesystem. deploy_preview syncs to SANDBOX. - -## File Flow Diagram -\`\`\` -You (LLM) - → generate_files / regenerate_file - → Virtual Filesystem (FileManager + Git) - → [Files stored in DO, committed to git] - -deploy_preview called - → Syncs virtual files → Sandbox filesystem - → Returns preview URL -\`\`\` - -## When Things Break - -**Sandbox becomes unhealthy:** -- DeploymentManager auto-detects via health checks -- Will auto-redeploy after failures -- You may see retry messages - this is normal - -**Need fresh start:** -- Use force_redeploy=true in deploy_preview -- Destroys current sandbox, creates new one -- Expensive operation - only when truly stuck - -## Troubleshooting Workflow - -**Problem: "I generated files but preview shows old code"** -→ You forgot to deploy_preview after generating files -→ Solution: Call deploy_preview to sync virtual → sandbox - -**Problem: "run_analysis says file doesn't exist"** -→ File is in virtual FS but not synced to sandbox yet -→ Solution: deploy_preview first, then run_analysis - -**Problem: "exec_commands fails with 'no instance'"** -→ Sandbox doesn't exist yet -→ Solution: deploy_preview first to create sandbox - -**Problem: "get_logs returns empty"** -→ User hasn't interacted with preview yet, OR logs were cleared -→ Solution: Wait for user interaction or check timestamps - -**Problem: "Same error keeps appearing after fix"** -→ Logs are cumulative - you're seeing old errors. -→ Solution: Clear logs with deploy_preview(clearLogs=true) and try again. - -**Problem: "Types look correct but still errors"** -→ You're reading from virtual FS, but sandbox has old versions -→ Solution: deploy_preview to sync latest changes`; - - const environment = `# Project Environment -- Runtime: Cloudflare Workers (NO Node.js fs/path/process APIs available) -- Fetch API standard (Request/Response), Web Streams API -- Frontend: React 19 + Vite + TypeScript + TailwindCSS -- Build tool: Bun (commands: bun run dev/build/lint/deploy) -- All projects MUST be Cloudflare Worker projects with wrangler.jsonc`; - - const constraints = `# Platform Constraints -- NO Node.js APIs (fs, path, process, etc.) - Workers runtime only -- Logs and errors are user-driven; check recency before fixing -- Paths are ALWAYS relative to project root -- Commands execute at project root - NEVER use cd -- NEVER modify wrangler.jsonc or package.json unless absolutely necessary`; - - const workflow = `# Your Workflow (Execute This Rigorously) - -## Step 1: Understand Requirements -- Read user request carefully -- Identify project type: app, presentation, documentation, tool, workflow -- Determine if clarifying questions are needed (rare - usually requirements are clear) - -## Step 2: Determine Approach -**Static Content** (documentation, guides, markdown): -- Generate files in docs/ directory structure -- NO sandbox needed -- Focus on content quality, organization, formatting - -**Interactive Projects** (apps, presentations, APIs, tools): -- Require sandbox with template -- Must have runtime environment -- Will use deploy_preview for testing - -## Step 3: Template Selection (Interactive Projects Only) -CRITICAL - This step is MANDATORY for interactive projects: - -**Use AI-Powered Template Selector:** -1. Call \`init_suitable_template\` - AI analyzes requirements and selects best template - - Automatically searches template library (rich collection of templates) - - Matches project type, complexity, style to available templates - - Returns: selection reasoning + automatically imports template files - - Trust the AI selector - it knows the template library well - -2. Review the selection reasoning - - AI explains why template was chosen - - Template files now in your virtual filesystem - - Ready for blueprint generation with template context - -**What if no suitable template?** -- Rare case: AI returns null if no template matches -- Fallback: Virtual-first mode (generate all config files yourself) -- Manual configs: package.json, wrangler.jsonc, vite.config.js -- Use this ONLY when AI couldn't find a match - -**Why template-first matters:** -- Templates have working configs and features -- Blueprint can leverage existing template structure -- Avoids recreating what template already provides -- Better architecture from day one - -**CRITICAL**: Do NOT skip template selection for interactive projects. Always call \`init_suitable_template\` first. - -## Step 4: Generate Blueprint -- Use generate_blueprint to create structured PRD (optionally with prompt parameter for additional context) -- Blueprint defines: title, description, features, architecture, plan -- Refine with alter_blueprint if needed -- NEVER start building without a plan -- If the project is too simple, plan can be empty or very small, but minimal blueprint should exist - -## Step 5: Build Incrementally -- Use generate_files for new features/components (goes to virtual FS) - - generate_files tool can write multiple files in a single call (2-3 files at once max), sequentially, use it effectively - - You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. -- Use regenerate_file for surgical modifications to existing files (goes to virtual FS) -- Commit frequently with clear messages (git operates on virtual FS) -- For interactive projects: - - After generating files: deploy_preview (syncs virtual → sandbox) - - Then verify with run_analysis or runtime tools - - Fix issues → iterate -- **Remember**: Files in virtual FS won't execute until you deploy_preview - -## Step 6: Verification & Polish -- run_analysis for type checking and linting -- get_runtime_errors / get_logs for runtime issues -- Fix all issues before completion -- Ensure professional quality and polish`; - - const tools = `# Available Tools (Detailed Reference) - -Tools are powerful and the only way for you to take actions. Use them properly and effectively. -ultrathink and ultrareason to optimize how you build out the project and make the best use of tools. - -## Planning & Architecture - -**generate_blueprint** - Create structured project plan (Product Requirements Document) - -**What it is:** -- Your planning tool - creates a PRD defining WHAT to build before you start -- Becomes the source of truth for implementation -- Stored in agent state (persists across all requests) -- Accepts optional **prompt** parameter for providing additional context beyond user's initial request - -**What it generates:** -- title: Project name -- projectName: Technical identifier -- description: What the project does -- colorPalette: Brand colors for UI -- frameworks: Tech stack being used -- plan[]: Phased implementation roadmap with requirements per phase - -**When to call:** -- ✅ FIRST STEP when no blueprint exists -- ✅ User provides vague requirements (you need to design structure) -- ✅ Complex project needing phased approach - -**When NOT to call:** -- ❌ Blueprint already exists (use alter_blueprint to modify) -- ❌ Simple one-file tasks (just generate directly) - -**Optional prompt parameter:** -- Use to provide additional context, clarifications, or refined specifications -- If omitted, uses user's original request -- Useful when you've learned more through conversation - -**CRITICAL After-Effects:** -1. Blueprint stored in agent state -2. You now have clear plan to follow -3. Use plan phases to guide generate_files calls. You may use multiple generate_files calls to generate multiple sets of files in a single turn. -4. **Do NOT start building without blueprint** (fundamental rule) - -**Example workflow:** -\`\`\` -User: "Build a todo app" - ↓ -You: generate_blueprint (creates PRD with phases) - ↓ -Review blueprint, refine with alter_blueprint if needed - ↓ -Implement the plan and fullfill the requirements -\`\`\` - -**alter_blueprint** -- Patch specific fields in existing blueprint -- Use to refine after generation or requirements change -- Surgical updates only - don't regenerate entire blueprint - -## Template Selection -**init_suitable_template** - AI-powered template selection and import - -**What it does:** -- Analyzes your requirements against entire template library -- Uses AI to match project type, complexity, style to available templates -- Automatically selects and imports best matching template -- Returns: selection reasoning + imported template files - -**How it works:** -\`\`\` -You call: init_suitable_template() - ↓ -AI fetches all available templates from library - ↓ -AI analyzes: project type, requirements, complexity, style - ↓ -AI selects best matching template - ↓ -Template automatically imported to virtual filesystem - ↓ -Returns: selection object + reasoning + imported files -\`\`\` - -**What you get back:** -- selection.selectedTemplateName: Chosen template name (or null if none suitable) -- selection.reasoning: Why this template was chosen -- selection.projectType: Detected/confirmed project type -- selection.complexity: simple/moderate/complex -- selection.styleSelection: UI style recommendation -- importedFiles[]: Array of important template files now in virtual FS - -**Template Library Coverage:** -The library includes templates for: -- React/Vue/Svelte apps with various configurations -- Game starters (canvas-based, WebGL) -- Presentation frameworks (Spectacle, Reveal.js) -- Dashboard/Admin templates -- Landing pages and marketing sites -- API/Worker templates -- And many more specialized templates - -**When to use:** -- ✅ ALWAYS for interactive projects (app/presentation/workflow) -- ✅ Before generate_blueprint (template context enriches blueprint) -- ✅ First step after understanding requirements - -**When NOT to use:** -- ❌ Static documentation projects (no runtime needed) -- ❌ After template already imported - -**CRITICAL Caveat:** -- If AI returns null (no suitable template), fall back to virtual-first mode -- This is RARE - trust the AI selector to find a match -- Template's 'bun run dev' MUST work or sandbox creation fails -- If using virtual-first fallback, YOU must ensure working dev script - -## File Operations (Understanding Your Two-Layer System) - -**CRITICAL: Where Your Files Live** - -You work with TWO separate filesystems: - -1. **Virtual Filesystem** (Your persistent workspace) - - Lives in Durable Object storage - - Managed by git (full commit history) - - Files here do NOT execute - just stored - - Persists across all requests/sessions - -2. **Sandbox Filesystem** (Where code runs) - - Separate container running Bun + Vite dev server - - Files here CAN execute and be tested - - Created when you call deploy_preview - - Destroyed/recreated on redeploy - -**The File Flow You Control:** -\`\`\` -You call: generate_files to generate multiple files at once or regenerate_file for surgical modifications to existing files - ↓ -Files written to VIRTUAL filesystem (Durable Object storage) - ↓ -Auto-committed to git (generate_files) or staged (regenerate_file) - ↓ -[Files NOT in sandbox yet - sandbox can't see them] - ↓ -You call: deploy_preview - ↓ -Files synced from virtual filesystem → sandbox filesystem - ↓ -Now sandbox can execute your code -\`\`\` - ---- - -**virtual_filesystem** - List and read files from your persistent workspace - -Commands available: -- **"list"**: See all files in your virtual filesystem -- **"read"**: Read file contents by paths (requires paths parameter) - -**What it does:** -- Lists/reads from your persistent workspace (template files + generated files) -- Shows you what exists BEFORE deploying to sandbox -- Useful for: discovering files, verifying changes, understanding structure - -**Where it reads from (priority order):** -1. Your generated/modified files (highest priority) -2. Template files (if template selected) -3. Returns empty if file doesn't exist - -**When to use:** -- ✅ Before editing (understand what exists) -- ✅ After generate_files/regenerate_file (verify changes worked) -- ✅ Exploring template structure -- ✅ Checking if file exists before regenerating - -**CRITICAL Caveat:** -- Reads from VIRTUAL filesystem, not sandbox -- Sandbox may have older versions if you haven't called deploy_preview -- If sandbox behaving weird, check if virtual FS and sandbox are in sync - ---- - -**generate_files** - Create or completely rewrite files - -**What it does:** -- Generates complete file contents from scratch -- Can create multiple files in one call (batch operation) but sequentially -- You can also call generate_files multiple times at once to generate multiple sets of files in a single turn. -- Automatically commits to git with descriptive message -- **Where files go**: Virtual filesystem only (not in sandbox yet) - -**When to use:** -- ✅ Creating brand new files that don't exist -- ✅ Scaffolding features requiring multiple coordinated files -- ✅ When regenerate_file failed 2+ times (file too broken to patch) -- ✅ Initial project structure - -**When NOT to use:** -- ❌ Small fixes to existing files (use regenerate_file - faster) -- ❌ Tweaking single functions (use regenerate_file) - -**CRITICAL After-Effects:** -1. Files now exist in virtual filesystem -2. Automatically committed to git -3. Sandbox does NOT see them yet -4. **You MUST call deploy_preview to sync virtual → sandbox** -5. Only after deploy_preview can you test or run_analysis - ---- - -**regenerate_file** - Surgical fixes to single existing file - -**What it does:** -- Applies minimal, targeted changes to one file -- Uses smart pattern matching internally -- Makes multiple passes (up to 3) to fix issues -- Returns diff showing exactly what changed -- **Where files go**: Virtual filesystem only - -**When to use:** -- ✅ Fixing TypeScript/JavaScript errors -- ✅ Adding missing imports or exports -- ✅ Patching bugs or logic errors -- ✅ Small feature additions to existing components - -**When NOT to use:** -- ❌ File doesn't exist yet (use generate_files) -- ❌ File is too broken to patch (use generate_files to rewrite) -- ❌ Haven't read the file yet (read it first!) - -**How to describe issues (CRITICAL for success):** -- BE SPECIFIC: Include exact error messages, line numbers -- ONE PROBLEM PER ISSUE: Don't combine unrelated problems -- PROVIDE CONTEXT: Explain what's broken and why -- SUGGEST SOLUTION: Share your best idea for fixing it - -**CRITICAL After-Effects:** -1. File updated in virtual filesystem -2. Changes are STAGED (git add) but NOT committed -3. **You MUST manually call git commit** (unlike generate_files) -4. Sandbox does NOT see changes yet -5. **You MUST call deploy_preview to sync virtual → sandbox** - -**PARALLEL EXECUTION:** -- You can call regenerate_file on MULTIPLE different files simultaneously -- Much faster than sequential calls - -## Deployment & Testing -**deploy_preview** -- Deploy to sandbox and get preview URL -- Only for interactive projects (apps, presentations, APIs) -- NOT for static documentation -- Creates sandbox on first call if needed -- TWO MODES: - 1. **Template-based**: If you called init_suitable_template(), uses that selected template - 2. **Virtual-first**: If you generated package.json, wrangler.jsonc, vite.config.js directly, creates sandbox with fallback template + your files as overlay -- Syncs all files from virtual filesystem to sandbox - -**run_analysis** -- TypeScript checking + ESLint -- **Where**: Runs in sandbox on deployed files -- **Requires**: Sandbox must exist -- Run after changes to catch errors early -- Much faster than runtime testing -- Analyzes files you specify (or all generated files) - -**get_runtime_errors** -- Fetch runtime exceptions from sandbox -- **Where**: Sandbox environment -- **Requires**: Sandbox running, user has interacted with app -- Check recency - logs are cumulative -- Use after deploy_preview for verification -- Errors only appear when code actually executes - -**get_logs** -- Get console logs from sandbox -- **Where**: Sandbox environment -- **Requires**: Sandbox running -- Cumulative - check timestamps -- Useful for debugging runtime behavior -- Logs appear when user interacts with preview - -## Utilities -**exec_commands** -- Execute shell commands in sandbox -- **Where**: Sandbox environment (NOT virtual filesystem) -- **Requires**: Sandbox must exist (call deploy_preview first) -- Use sparingly - most needs covered by other tools -- Commands run at project root -- Examples: bun add package, custom build scripts - -**git** -- Operations: commit, log, show -- **Where**: Virtual filesystem (isomorphic-git on DO storage) -- Commit frequently with conventional messages -- Use for: saving progress, reviewing changes -- Full git history maintained -- **Note**: This is YOUR git, not sandbox git - -**generate_images** -- Future image generation capability -- Currently a stub - do NOT rely on this - ---- - -You can call multiple tools one after another in a single turn. When you are absolutely sure of your actions, make multiple calls to tools and finish. You would be notified when the tool calls are completed. -`; - - const staticVsSandbox = `# CRITICAL: Static vs Sandbox Detection - -**Static Content (NO Sandbox)**: -- Markdown files (.md, .mdx) -- Documentation in docs/ directory -- Plain text files -- Configuration without runtime -→ Generate files, NO deploy_preview needed -→ Focus on content quality and organization - -**Interactive Projects (Require Sandbox)**: -- React apps, presentations, APIs -- Anything with bun run dev -- UI with interactivity -- Backend endpoints -→ Must select template -→ Use deploy_preview for testing -→ Verify with run_analysis + runtime tools`; - - const quality = `# Quality Standards - -**Code Quality:** -- Type-safe TypeScript (no any, proper interfaces) -- Minimal dependencies - reuse what exists -- Clean architecture - separation of concerns -- Professional error handling - -**UI Quality (when applicable):** -- Responsive design (mobile, tablet, desktop) -- Proper spacing and visual hierarchy -- Interactive states (hover, focus, active, disabled) -- Accessibility basics (semantic HTML, ARIA when needed) -- TailwindCSS for styling (theme-consistent) - -**Testing & Verification:** -- All TypeScript errors resolved -- No lint warnings -- Runtime tested via preview -- Edge cases considered`; - - const reactSafety = `# React Safety & Common Pitfalls - -${PROMPT_UTILS.REACT_RENDER_LOOP_PREVENTION_LITE} - -${PROMPT_UTILS.COMMON_PITFALLS} - -**Additional Warnings:** -- NEVER modify state during render -- useEffect dependencies must be complete -- Memoize expensive computations -- Avoid inline object/function creation in JSX`; - - const completion = `# Completion Discipline - -When initial project generation is complete: -- Call mark_generation_complete tool with: - - summary: Brief description of what was built (2-3 sentences) - - filesGenerated: Count of files created -- Requirements: All features implemented, errors fixed, testing done -- CRITICAL: Make NO further tool calls after calling mark_generation_complete - -For follow-up requests (adding features, making changes): -- Just respond naturally when done -- Do NOT call mark_generation_complete for follow-ups`; - - const warnings = `# Critical Warnings - -1. TEMPLATE SELECTION IS CRITICAL - Use init_suitable_template() for interactive projects, trust AI selector -2. For template-based: Selected template MUST have working 'bun run dev' or sandbox fails -3. For virtual-first: You MUST generate package.json, wrangler.jsonc, vite.config.js before deploy_preview -4. Do NOT deploy static documentation - wastes resources -5. Check log timestamps - they're cumulative, may contain old data -6. NEVER create verbose step-by-step explanations - use tools directly -7. Template switching allowed but strongly discouraged -8. Virtual-first is advanced mode - default to template-based unless necessary`; - - return [ - identity, - comms, - architecture, - environment, - constraints, - workflow, - tools, - staticVsSandbox, - quality, - reactSafety, - completion, - warnings, - '# Dynamic Context-Specific Guidance', - dynamicHints, - ].join('\n\n'); -}; - /** * Build user prompt with all context */ @@ -728,12 +144,16 @@ export class AgenticProjectBuilder extends Assistant { const hasMD = session.filesIndex?.some(f => /\.(md|mdx)$/i.test(f.filePath)) || false; const hasPlan = isAgenticBlueprint(inputs.blueprint) && inputs.blueprint.plan.length > 0; const hasTemplate = !!session.selectedTemplate; - const needsSandbox = hasTSX || session.projectType === 'presentation' || session.projectType === 'app'; + const isPresentationProject = session.projectType === 'presentation'; + // Presentations don't need sandbox (run in browser), only apps with TSX need sandbox + const needsSandbox = !isPresentationProject && (hasTSX || session.projectType === 'app'); const dynamicHints = [ !hasPlan ? '- No plan detected: Start with generate_blueprint (optionally with prompt parameter) to establish PRD (title, projectName, description, colorPalette, frameworks, plan).' : '- Plan detected: proceed to implement milestones using generate_files/regenerate_file.', needsSandbox && !hasTemplate ? '- Interactive project without template: Use init_suitable_template() to let AI select and import best matching template before first deploy.' : '', - hasTSX ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + isPresentationProject && !hasTemplate ? '- Presentation project detected: Use init_suitable_template() to select presentation template, then create stunning slides with unique design.' : '', + hasTSX && !isPresentationProject ? '- UI detected: Use deploy_preview to verify runtime; then run_analysis for quick feedback.' : '', + isPresentationProject ? '- Presentation mode: NO deploy_preview/run_analysis needed. Focus on beautiful JSX slides, ask user for feedback.' : '', hasMD && !hasTSX ? '- Documents detected without UI: This is STATIC content - generate files in docs/, NO deploy_preview needed.' : '', !hasFiles && hasPlan ? '- Plan ready, no files yet: Scaffold initial structure with generate_files.' : '', ].filter(Boolean).join('\n'); @@ -748,7 +168,7 @@ export class AgenticProjectBuilder extends Assistant { }); } - let systemPrompt = getSystemPrompt(dynamicHints); + let systemPrompt = getSystemPrompt(session.projectType, dynamicHints); if (historyMessages.length > 0) { systemPrompt += `\n\n# Conversation History\nYou are being provided with the full conversation history from your previous interactions. Review it to understand context and avoid repeating work.`; From cca8778cda43ceefe1b2a267bdbbaf3670cfbe25 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Thu, 20 Nov 2025 23:06:42 -0500 Subject: [PATCH 49/58] refactor: unify template schemas --- worker/services/sandbox/sandboxTypes.ts | 35 +++++++++++-------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/worker/services/sandbox/sandboxTypes.ts b/worker/services/sandbox/sandboxTypes.ts index 8ad56c96..d5861563 100644 --- a/worker/services/sandbox/sandboxTypes.ts +++ b/worker/services/sandbox/sandboxTypes.ts @@ -21,25 +21,6 @@ export const TemplateFileSchema = z.object({ }) export type TemplateFile = z.infer -// --- Template Details --- - -export const TemplateDetailsSchema = z.object({ - name: z.string(), - description: z.object({ - selection: z.string(), - usage: z.string(), - }), - fileTree: FileTreeNodeSchema, - allFiles: z.record(z.string(), z.string()), // Map of filePath -> fileContents - language: z.string().optional(), - deps: z.record(z.string(), z.string()), - frameworks: z.array(z.string()).optional(), - importantFiles: z.array(z.string()), - dontTouchFiles: z.array(z.string()), - redactedFiles: z.array(z.string()), -}) -export type TemplateDetails = z.infer - // ========================================== // RUNTIME ERROR SCHEMAS // ========================================== @@ -116,10 +97,24 @@ export const TemplateInfoSchema = z.object({ description: z.object({ selection: z.string(), usage: z.string(), - }) + }), + renderMode: z.enum(['sandbox', 'browser']).optional(), + slideDirectory: z.string().optional(), }) export type TemplateInfo = z.infer +// --- Template Details --- + +export const TemplateDetailsSchema = TemplateInfoSchema.extend({ + fileTree: FileTreeNodeSchema, + allFiles: z.record(z.string(), z.string()), + deps: z.record(z.string(), z.string()), + importantFiles: z.array(z.string()), + dontTouchFiles: z.array(z.string()), + redactedFiles: z.array(z.string()), +}) +export type TemplateDetails = z.infer + export const TemplateListResponseSchema = z.object({ success: z.boolean(), templates: z.array(TemplateInfoSchema), From e9a31da370bcf82769ccb85b2286437e63dfc695 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Fri, 21 Nov 2025 13:03:06 -0500 Subject: [PATCH 50/58] Feat: add presentation and documentation preview modes (#234) * feat: add presentation and documentation preview modes - Implemented Spectacle presentation preview with live, slides, and docs tabs for interactive slide navigation - Added markdown documentation preview with auto-detection for documentation-type projects - Enhanced content type detection to automatically switch views based on project type (app, presentation, or docs) - Added CLI token endpoint and API client method for CLI authentication support * fix: resolve TypeScript compilation errors in presentation/docs preview - Add BlueprintChunkMessage type and include in WebSocketMessage union - Prefix unused parameters with underscore (isGenerating, start) - Replace findLastIndex with backwards-compatible loop Generated with Claude Code Co-Authored-By: Claude * fix: improve template import and preview detection - Changed fileExists to check all files instead of only generated files for accurate preview detection - Added isPreviewable method to check for package.json and wrangler.jsonc before deployment - Added TEMPLATE_UPDATED broadcast when importing templates to notify frontend - Removed README.md existence check to allow regeneration when needed * refactor: simplify agent initialization by removing onFirstInit - Moved initialization logic from onFirstInit directly into onStart method - Removed unnecessary onFirstInit method and its separate lifecycle hook - Streamlined agent bootstrap flow for better maintainability * refactor: remove unused template and runtime methods from objectives * feat: add template update websocket message and presentation metadata * refactor: centralize type definitions and improve type imports - Moved FileType, TemplateMetadata, and AgentDisplayConfig to api-types.ts for single source of truth - Exported ModelConfigsInfo and related types from websocketTypes through api-types - Updated all imports across components to use centralized types from @/api-types - Removed duplicate AgentDisplayConfig interface from model-config-tabs.tsx - Removed unused slide-parser.ts utility * fix: restore and update template metadata via websocket messages * refactor: reorganize chat component and extract UI subcomponents - Extracted ChatInput, ChatModals, and MainContentPanel into separate components - Moved presentation sub-view logic and content type detection to MainContentPanel - Simplified chat.tsx by reducing component size and improving maintainability - Updated content detection to use ContentType instead of PresentationType - Improved documentation auto-switching to only trigger on new markdown generation - Added templateMetadata to useChat * fix: actually populate renderMode and slideDirectory in templateDetails * refactor: centralize file merging and improve template details handling * feat: in-browser native slides rendering + thumbnails, using same-origin iframes - Compiles and runs the whole jsx based slides template within the browser - Uses same-origin iframes - Cross-user slides sharing prohibited. Only WFP deployed slides should be publically shareable [todo] - Redid presentation UI * feat: optimizations, fixes, SRI + add speaker and preview modes to presentation renderer - Added speaker mode with current slide, next slide preview, elapsed time, and clock - Added preview mode showing current and next slides side by side - Added fullscreen toggle with proper state synchronization - Added keyboard navigation (arrow keys, page up/down, space) for speaker/preview modes - Added presentation thumbnail background gradient style - Updated PresentationHeaderActions with mode toggle buttons and visual state indicators * feat: server served static sandboxing for slides * fix: escape '-' in preview tokens * feat: add preview URL to agent connection and optimize template imports - Add AGENT_CONNECTED constant and include preview URL in connection response - Skip redundant template state updates when template hasn't changed - Remove duplicate project context from SimpleCodeGeneration prompts * refactor: convert template file sets to arrays and optimize file filtering - Change importantFiles, dontTouchFiles, and redactedFiles from Set to array type - Remove Set transformations in schema and service initialization - Optimize getTemplateImportantFiles with Set-based lookups for better performance - Remove debug console.log and redundant SHADCN component instructions from prompts - Update isFileModifiable signature to accept array instead of Set * fix: add http: to connect-src and frame-src to CSP for localhost preview support * feat: add text repetition detection with frequency penalty and improve file operations - Add rolling hash-based text repetition detection to catch token loops and repeated paragraphs - Apply frequency_penalty parameter to inference retries when repetition is detected - Abort streaming requests immediately when repetition is detected to save resources - Add delete command to virtual_filesystem tool with proper return type - Update prompts to clarify presentation rendering architecture (browser-based, * feat: send browser preview URL on agent connection and deploy browser templates immediately - Include preview URL in AGENT_CONNECTED message for browser-mode templates - Auto-deploy browser templates to sandbox after template details are loaded - Remove unused previewUrlCache from BaseCodingBehavior and getPreviewUrlCache method - Extract preview URL dynamically on connection instead of caching - Set preview URL in frontend when received in agent_connected message --------- Co-authored-by: Claude --- bun.lock | 590 ++++++++- debug-tools/presentation-tester/package.json | 32 + index.html | 1 + package.json | 26 +- src/api-types.ts | 24 +- src/components/config-card.tsx | 3 +- src/components/config-modal.tsx | 12 +- src/components/model-config-tabs.tsx | 14 +- src/hooks/use-github-export.ts | 2 + src/index.css | 11 +- src/lib/api-client.ts | 11 +- src/routes/chat/chat.tsx | 779 +++--------- src/routes/chat/components/chat-input.tsx | 204 +++ src/routes/chat/components/chat-modals.tsx | 106 ++ src/routes/chat/components/docs-sidebar.tsx | 203 +++ .../chat/components/editor-header-actions.tsx | 55 + src/routes/chat/components/export-button.tsx | 51 + src/routes/chat/components/file-explorer.tsx | 6 +- .../header-actions/HeaderButton.tsx | 44 + .../header-actions/HeaderDivider.tsx | 3 + .../header-actions/HeaderToggleButton.tsx | 43 + .../chat/components/header-actions/index.ts | 3 + .../chat/components/main-content-panel.tsx | 321 +++++ .../chat/components/markdown-docs-preview.css | 156 +++ .../chat/components/markdown-docs-preview.tsx | 229 ++++ .../chat/components/model-config-info.tsx | 25 +- src/routes/chat/components/phase-timeline.tsx | 3 +- .../presentation-header-actions.tsx | 81 ++ .../chat/components/presentation-preview.tsx | 499 ++++++++ .../components/preview-header-actions.tsx | 117 ++ src/routes/chat/components/view-container.tsx | 13 + src/routes/chat/components/view-header.tsx | 48 + .../chat/components/view-mode-switch.tsx | 60 +- src/routes/chat/hooks/use-chat.ts | 28 +- .../chat/hooks/use-file-content-stream.ts | 2 +- src/routes/chat/mocks/file-mock.ts | 2 +- src/routes/chat/utils/content-detector.ts | 55 + src/routes/chat/utils/file-state-helpers.ts | 3 +- .../chat/utils/handle-websocket-message.ts | 73 +- src/routes/settings/index.tsx | 145 ++- src/utils/file-helpers.ts | 12 + src/utils/markdown-export.ts | 36 + tsconfig.tsbuildinfo | 1 + .../assistants/agenticBuilderPrompts.ts | 1092 ----------------- .../assistants/agenticProjectBuilder.ts | 227 ---- worker/agents/constants.ts | 5 +- worker/agents/core/behaviors/agentic.ts | 51 +- worker/agents/core/behaviors/base.ts | 176 ++- worker/agents/core/behaviors/phasic.ts | 11 +- worker/agents/core/codingAgent.ts | 179 ++- worker/agents/core/objectives/app.ts | 36 +- worker/agents/core/objectives/base.ts | 17 +- worker/agents/core/objectives/general.ts | 15 +- worker/agents/core/objectives/presentation.ts | 38 +- worker/agents/core/objectives/workflow.ts | 8 - worker/agents/core/state.ts | 6 + worker/agents/inferutils/config.types.ts | 1 + worker/agents/inferutils/core.ts | 13 +- worker/agents/inferutils/infer.ts | 10 + worker/agents/inferutils/loopDetection.ts | 151 ++- .../operations/AgenticProjectBuilder.ts | 290 +++++ worker/agents/operations/DeepDebugger.ts | 246 ++++ .../agents/operations/SimpleCodeGeneration.ts | 42 +- worker/agents/operations/common.ts | 226 +++- .../prompts/agenticBuilderPrompts.ts | 590 +++++++++ .../prompts/deepDebuggerPrompts.ts} | 207 +--- worker/agents/planning/blueprint.ts | 14 +- worker/agents/prompts.ts | 24 +- .../implementations/DeploymentManager.ts | 4 +- .../services/implementations/FileManager.ts | 22 +- .../services/interfaces/ICodingAgent.ts | 6 + .../services/interfaces/IDeploymentManager.ts | 1 - worker/agents/tools/customTools.ts | 7 +- worker/agents/tools/resource-types.ts | 5 +- .../tools/toolkit/completion-signals.ts | 4 + worker/agents/tools/toolkit/generate-files.ts | 2 +- .../tools/toolkit/virtual-filesystem.ts | 16 +- worker/api/controllers/auth/controller.ts | 59 +- worker/api/routes/authRoutes.ts | 5 +- worker/api/websocketTypes.ts | 18 +- worker/index.ts | 37 +- worker/services/sandbox/BaseSandboxService.ts | 16 +- worker/services/sandbox/sandboxSdkClient.ts | 2 +- worker/services/sandbox/utils.ts | 31 +- worker/utils/cryptoUtils.ts | 13 +- worker/utils/pathUtils.ts | 33 + 86 files changed, 5537 insertions(+), 2551 deletions(-) create mode 100644 debug-tools/presentation-tester/package.json create mode 100644 src/routes/chat/components/chat-input.tsx create mode 100644 src/routes/chat/components/chat-modals.tsx create mode 100644 src/routes/chat/components/docs-sidebar.tsx create mode 100644 src/routes/chat/components/editor-header-actions.tsx create mode 100644 src/routes/chat/components/export-button.tsx create mode 100644 src/routes/chat/components/header-actions/HeaderButton.tsx create mode 100644 src/routes/chat/components/header-actions/HeaderDivider.tsx create mode 100644 src/routes/chat/components/header-actions/HeaderToggleButton.tsx create mode 100644 src/routes/chat/components/header-actions/index.ts create mode 100644 src/routes/chat/components/main-content-panel.tsx create mode 100644 src/routes/chat/components/markdown-docs-preview.css create mode 100644 src/routes/chat/components/markdown-docs-preview.tsx create mode 100644 src/routes/chat/components/presentation-header-actions.tsx create mode 100644 src/routes/chat/components/presentation-preview.tsx create mode 100644 src/routes/chat/components/preview-header-actions.tsx create mode 100644 src/routes/chat/components/view-container.tsx create mode 100644 src/routes/chat/components/view-header.tsx create mode 100644 src/routes/chat/utils/content-detector.ts create mode 100644 src/utils/file-helpers.ts create mode 100644 src/utils/markdown-export.ts create mode 100644 tsconfig.tsbuildinfo delete mode 100644 worker/agents/assistants/agenticBuilderPrompts.ts delete mode 100644 worker/agents/assistants/agenticProjectBuilder.ts create mode 100644 worker/agents/operations/AgenticProjectBuilder.ts create mode 100644 worker/agents/operations/DeepDebugger.ts create mode 100644 worker/agents/operations/prompts/agenticBuilderPrompts.ts rename worker/agents/{assistants/codeDebugger.ts => operations/prompts/deepDebuggerPrompts.ts} (75%) create mode 100644 worker/utils/pathUtils.ts diff --git a/bun.lock b/bun.lock index 51ed7a61..fb0000f5 100644 --- a/bun.lock +++ b/bun.lock @@ -5,6 +5,8 @@ "name": "vibesdk", "dependencies": { "@ashishkumar472/cf-git": "1.0.5", + "@babel/parser": "^7.28.5", + "@babel/traverse": "^7.28.5", "@cloudflare/containers": "^0.0.28", "@cloudflare/sandbox": "0.4.14", "@noble/ciphers": "^1.3.0", @@ -39,6 +41,8 @@ "@sentry/cloudflare": "^10.22.0", "@sentry/react": "^10.22.0", "@sentry/vite-plugin": "^4.6.0", + "@types/babel__core": "^7.20.5", + "@types/babel__traverse": "^7.28.0", "@typescript-eslint/eslint-plugin": "^8.46.2", "@typescript-eslint/parser": "^8.46.2", "@typescript-eslint/typescript-estree": "^8.46.2", @@ -47,6 +51,7 @@ "agents": "^0.2.20", "chalk": "^5.6.2", "class-variance-authority": "^0.7.1", + "cli-table3": "^0.6.5", "cloudflare": "^4.5.0", "clsx": "^2.1.1", "cmdk": "^1.1.1", @@ -60,9 +65,10 @@ "eslint-plugin-import": "^2.32.0", "fflate": "^0.8.2", "framer-motion": "^12.23.24", + "highlight.js": "^11.11.1", "hono": "^4.10.4", - "html2canvas-pro": "^1.5.12", "input-otp": "^1.4.2", + "inquirer": "^12.11.0", "jose": "^5.10.0", "jsonc-parser": "^3.3.1", "latest": "^0.2.0", @@ -72,6 +78,7 @@ "next-themes": "^0.4.6", "node-fetch": "^3.3.2", "openai": "^5.23.2", + "ora": "^9.0.0", "partysocket": "^1.1.6", "perfect-arrows": "^0.3.7", "react": "^19.2.0", @@ -85,11 +92,14 @@ "recharts": "^3.3.0", "rehype-external-links": "^3.0.0", "remark-gfm": "^4.0.1", + "reveal.js": "^5.2.1", "sonner": "^2.0.7", + "sucrase": "^3.35.0", "suffix-array": "^0.1.4", "tailwind-merge": "^3.3.1", "vaul": "^1.1.2", "vite-plugin-svgr": "^4.5.0", + "ws": "^8.18.3", "zod": "^3.25.76", }, "devDependencies": { @@ -101,10 +111,13 @@ "@eslint/js": "^9.39.0", "@tailwindcss/typography": "^0.5.19", "@tailwindcss/vite": "^4.1.16", + "@types/inquirer": "^9.0.9", "@types/jest": "^29.5.14", "@types/node": "^22.18.13", - "@types/react": "^19.2.2", + "@types/react": "^19.2.3", "@types/react-dom": "^19.2.2", + "@types/reveal.js": "^5.2.1", + "@types/ws": "^8.18.1", "@vitejs/plugin-react-swc": "^3.11.0", "drizzle-kit": "^0.31.6", "eslint": "^9.39.0", @@ -113,8 +126,15 @@ "glob": "^11.0.3", "globals": "^16.5.0", "husky": "^9.1.7", + "ink": "^6.4.0", + "ink-big-text": "^2.0.0", + "ink-box": "^2.0.0", + "ink-gradient": "^3.0.0", + "ink-spinner": "^5.0.0", + "ink-text-input": "^6.0.0", "jest": "^29.7.0", "knip": "^5.66.4", + "open": "^10.0.0", "prettier": "^3.6.2", "prettier-plugin-tailwindcss": "^0.6.14", "tailwindcss": "^4.1.16", @@ -144,6 +164,8 @@ "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.12", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.5" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZtbdvYxdMoria+2SlNarEk6Hlgyf+zzcznlD55EAl+7VZvJaSg2sqPvwArY7L6TfDEDJsnCq0fdhBSkYo0Xqdg=="], + "@alcalzone/ansi-tokenize": ["@alcalzone/ansi-tokenize@0.2.2", "", { "dependencies": { "ansi-styles": "^6.2.1", "is-fullwidth-code-point": "^5.0.0" } }, "sha512-mkOh+Wwawzuf5wa30bvc4nA+Qb6DIrGWgBhRR/Pw4T9nsgYait8izvXkNyU78D6Wcu3Z+KUdwCmLCxlWjEotYA=="], + "@apidevtools/json-schema-ref-parser": ["@apidevtools/json-schema-ref-parser@11.9.3", "", { "dependencies": { "@jsdevtools/ono": "^7.1.3", "@types/json-schema": "^7.0.15", "js-yaml": "^4.1.0" } }, "sha512-60vepv88RwcJtSHrD6MjIL6Ta3SOYbgfnkHb+ppAVK+o9mXprRtulx7VlRl3lN3bbvysAfCS7WMVfhUYemB0IQ=="], "@ashishkumar472/cf-git": ["@ashishkumar472/cf-git@1.0.5", "", { "dependencies": { "clean-git-ref": "^2.0.1", "crc-32": "^1.2.0", "diff": "^5.1.0", "diff3": "0.0.3", "ignore": "^5.1.4", "is-git-ref-name-valid": "^1.0.0", "minimisted": "^2.0.0", "pako": "^1.0.10", "pify": "^4.0.1", "readable-stream": "^3.4.0", "simple-get": "^4.0.1" }, "bin": { "isogit": "cli.cjs" } }, "sha512-89+6PVvewx4ap9ZctVEkGA5SEspYOpJMXfa1btDFV3xuERsRfCZJR+sB4JRRkbEdA8ppFKpvsVAzZ3h77miClw=="], @@ -154,7 +176,7 @@ "@babel/core": ["@babel/core@7.28.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.28.3", "@babel/helpers": "^7.28.4", "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.4", "@babel/types": "^7.28.4", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA=="], - "@babel/generator": ["@babel/generator@7.28.3", "", { "dependencies": { "@babel/parser": "^7.28.3", "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw=="], + "@babel/generator": ["@babel/generator@7.28.5", "", { "dependencies": { "@babel/parser": "^7.28.5", "@babel/types": "^7.28.5", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ=="], "@babel/helper-compilation-targets": ["@babel/helper-compilation-targets@7.27.2", "", { "dependencies": { "@babel/compat-data": "^7.27.2", "@babel/helper-validator-option": "^7.27.1", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" } }, "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ=="], @@ -168,13 +190,13 @@ "@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], - "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], "@babel/helper-validator-option": ["@babel/helper-validator-option@7.27.1", "", {}, "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg=="], "@babel/helpers": ["@babel/helpers@7.28.4", "", { "dependencies": { "@babel/template": "^7.27.2", "@babel/types": "^7.28.4" } }, "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w=="], - "@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + "@babel/parser": ["@babel/parser@7.28.5", "", { "dependencies": { "@babel/types": "^7.28.5" }, "bin": "./bin/babel-parser.js" }, "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ=="], "@babel/plugin-syntax-async-generators": ["@babel/plugin-syntax-async-generators@7.8.4", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="], @@ -220,9 +242,9 @@ "@babel/template": ["@babel/template@7.27.2", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/parser": "^7.27.2", "@babel/types": "^7.27.1" } }, "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw=="], - "@babel/traverse": ["@babel/traverse@7.28.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", "@babel/types": "^7.28.4", "debug": "^4.3.1" } }, "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ=="], + "@babel/traverse": ["@babel/traverse@7.28.5", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.28.5", "@babel/template": "^7.27.2", "@babel/types": "^7.28.5", "debug": "^4.3.1" } }, "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ=="], - "@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + "@babel/types": ["@babel/types@7.28.5", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA=="], "@bcoe/v8-coverage": ["@bcoe/v8-coverage@0.2.3", "", {}, "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="], @@ -250,6 +272,8 @@ "@cloudflare/workers-types": ["@cloudflare/workers-types@4.20251014.0", "", {}, "sha512-tEW98J/kOa0TdylIUOrLKRdwkUw0rvvYVlo+Ce0mqRH3c8kSoxLzUH9gfCvwLe0M89z1RkzFovSKAW2Nwtyn3w=="], + "@colors/colors": ["@colors/colors@1.5.0", "", {}, "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="], + "@commitlint/cli": ["@commitlint/cli@20.1.0", "", { "dependencies": { "@commitlint/format": "^20.0.0", "@commitlint/lint": "^20.0.0", "@commitlint/load": "^20.1.0", "@commitlint/read": "^20.0.0", "@commitlint/types": "^20.0.0", "tinyexec": "^1.0.0", "yargs": "^17.0.0" }, "bin": { "commitlint": "./cli.js" } }, "sha512-pW5ujjrOovhq5RcYv5xCpb4GkZxkO2+GtOdBW2/qrr0Ll9tl3PX0aBBobGQl3mdZUbOBgwAexEQLeH6uxL0VYg=="], "@commitlint/config-conventional": ["@commitlint/config-conventional@20.0.0", "", { "dependencies": { "@commitlint/types": "^20.0.0", "conventional-changelog-conventionalcommits": "^7.0.2" } }, "sha512-q7JroPIkDBtyOkVe9Bca0p7kAUYxZMxkrBArCfuD3yN4KjRAenP9PmYwnn7rsw8Q+hHq1QB2BRmBh0/Z19ZoJw=="], @@ -424,6 +448,38 @@ "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="], + "@inquirer/ansi": ["@inquirer/ansi@1.0.2", "", {}, "sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ=="], + + "@inquirer/checkbox": ["@inquirer/checkbox@4.3.1", "", { "dependencies": { "@inquirer/ansi": "^1.0.2", "@inquirer/core": "^10.3.1", "@inquirer/figures": "^1.0.15", "@inquirer/type": "^3.0.10", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-rOcLotrptYIy59SGQhKlU0xBg1vvcVl2FdPIEclUvKHh0wo12OfGkId/01PIMJ/V+EimJ77t085YabgnQHBa5A=="], + + "@inquirer/confirm": ["@inquirer/confirm@5.1.20", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/type": "^3.0.10" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-HDGiWh2tyRZa0M1ZnEIUCQro25gW/mN8ODByicQrbR1yHx4hT+IOpozCMi5TgBtUdklLwRI2mv14eNpftDluEw=="], + + "@inquirer/core": ["@inquirer/core@10.3.1", "", { "dependencies": { "@inquirer/ansi": "^1.0.2", "@inquirer/figures": "^1.0.15", "@inquirer/type": "^3.0.10", "cli-width": "^4.1.0", "mute-stream": "^3.0.0", "signal-exit": "^4.1.0", "wrap-ansi": "^6.2.0", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-hzGKIkfomGFPgxKmnKEKeA+uCYBqC+TKtRx5LgyHRCrF6S2MliwRIjp3sUaWwVzMp7ZXVs8elB0Tfe682Rpg4w=="], + + "@inquirer/editor": ["@inquirer/editor@4.2.22", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/external-editor": "^1.0.3", "@inquirer/type": "^3.0.10" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-8yYZ9TCbBKoBkzHtVNMF6PV1RJEUvMlhvmS3GxH4UvXMEHlS45jFyqFy0DU+K42jBs5slOaA78xGqqqWAx3u6A=="], + + "@inquirer/expand": ["@inquirer/expand@4.0.22", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/type": "^3.0.10", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-9XOjCjvioLjwlq4S4yXzhvBmAXj5tG+jvva0uqedEsQ9VD8kZ+YT7ap23i0bIXOtow+di4+u3i6u26nDqEfY4Q=="], + + "@inquirer/external-editor": ["@inquirer/external-editor@1.0.3", "", { "dependencies": { "chardet": "^2.1.1", "iconv-lite": "^0.7.0" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA=="], + + "@inquirer/figures": ["@inquirer/figures@1.0.15", "", {}, "sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g=="], + + "@inquirer/input": ["@inquirer/input@4.3.0", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/type": "^3.0.10" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-h4fgse5zeGsBSW3cRQqu9a99OXRdRsNCvHoBqVmz40cjYjYFzcfwD0KA96BHIPlT7rZw0IpiefQIqXrjbzjS4Q=="], + + "@inquirer/number": ["@inquirer/number@3.0.22", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/type": "^3.0.10" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-oAdMJXz++fX58HsIEYmvuf5EdE8CfBHHXjoi9cTcQzgFoHGZE+8+Y3P38MlaRMeBvAVnkWtAxMUF6urL2zYsbg=="], + + "@inquirer/password": ["@inquirer/password@4.0.22", "", { "dependencies": { "@inquirer/ansi": "^1.0.2", "@inquirer/core": "^10.3.1", "@inquirer/type": "^3.0.10" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-CbdqK1ioIr0Y3akx03k/+Twf+KSlHjn05hBL+rmubMll7PsDTGH0R4vfFkr+XrkB0FOHrjIwVP9crt49dgt+1g=="], + + "@inquirer/prompts": ["@inquirer/prompts@7.10.0", "", { "dependencies": { "@inquirer/checkbox": "^4.3.1", "@inquirer/confirm": "^5.1.20", "@inquirer/editor": "^4.2.22", "@inquirer/expand": "^4.0.22", "@inquirer/input": "^4.3.0", "@inquirer/number": "^3.0.22", "@inquirer/password": "^4.0.22", "@inquirer/rawlist": "^4.1.10", "@inquirer/search": "^3.2.1", "@inquirer/select": "^4.4.1" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-X2HAjY9BClfFkJ2RP3iIiFxlct5JJVdaYYXhA7RKxsbc9KL+VbId79PSoUGH/OLS011NFbHHDMDcBKUj3T89+Q=="], + + "@inquirer/rawlist": ["@inquirer/rawlist@4.1.10", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/type": "^3.0.10", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-Du4uidsgTMkoH5izgpfyauTL/ItVHOLsVdcY+wGeoGaG56BV+/JfmyoQGniyhegrDzXpfn3D+LFHaxMDRygcAw=="], + + "@inquirer/search": ["@inquirer/search@3.2.1", "", { "dependencies": { "@inquirer/core": "^10.3.1", "@inquirer/figures": "^1.0.15", "@inquirer/type": "^3.0.10", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-cKiuUvETublmTmaOneEermfG2tI9ABpb7fW/LqzZAnSv4ZaJnbEis05lOkiBuYX5hNdnX0Q9ryOQyrNidb55WA=="], + + "@inquirer/select": ["@inquirer/select@4.4.1", "", { "dependencies": { "@inquirer/ansi": "^1.0.2", "@inquirer/core": "^10.3.1", "@inquirer/figures": "^1.0.15", "@inquirer/type": "^3.0.10", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-E9hbLU4XsNe2SAOSsFrtYtYQDVi1mfbqJrPDvXKnGlnRiApBdWMJz7r3J2Ff38AqULkPUD3XjQMD4492TymD7Q=="], + + "@inquirer/type": ["@inquirer/type@3.0.10", "", { "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA=="], + "@isaacs/balanced-match": ["@isaacs/balanced-match@4.0.1", "", {}, "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ=="], "@isaacs/brace-expansion": ["@isaacs/brace-expansion@5.0.0", "", { "dependencies": { "@isaacs/balanced-match": "^4.0.1" } }, "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA=="], @@ -554,6 +610,8 @@ "@oxc-resolver/binding-win32-x64-msvc": ["@oxc-resolver/binding-win32-x64-msvc@11.13.0", "", { "os": "win32", "cpu": "x64" }, "sha512-wH7t+I0o6EU+O+VMV1AitqYeyZCGtpKDtK8fSqD6N35JQVOHYSsnxrtULoP5PA5SMAEW4GwE8ZbOajaUXXxzuA=="], + "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="], + "@poppinss/colors": ["@poppinss/colors@4.1.5", "", { "dependencies": { "kleur": "^4.1.5" } }, "sha512-FvdDqtcRCtz6hThExcFOgW0cWX+xwSMWcRuQe5ZEb2m7cVQOAVZOIMt+/v9RxGiD9/OY16qJBXK4CVKWAPalBw=="], "@poppinss/dumper": ["@poppinss/dumper@0.6.4", "", { "dependencies": { "@poppinss/colors": "^4.1.5", "@sindresorhus/is": "^7.0.2", "supports-color": "^10.0.0" } }, "sha512-iG0TIdqv8xJ3Lt9O8DrPRxw1MRLjNpoqiSGU03P/wNLP/s0ra0udPJ1J2Tx5M0J3H/cVyEgpbn8xUKRY9j59kQ=="], @@ -886,8 +944,12 @@ "@types/graceful-fs": ["@types/graceful-fs@4.1.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ=="], + "@types/gradient-string": ["@types/gradient-string@1.1.6", "", { "dependencies": { "@types/tinycolor2": "*" } }, "sha512-LkaYxluY4G5wR1M4AKQUal2q61Di1yVVCw42ImFTuaIoQVgmV0WP1xUaLB8zwb47mp82vWTpePI9JmrjEnJ7nQ=="], + "@types/hast": ["@types/hast@3.0.4", "", { "dependencies": { "@types/unist": "*" } }, "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ=="], + "@types/inquirer": ["@types/inquirer@9.0.9", "", { "dependencies": { "@types/through": "*", "rxjs": "^7.2.0" } }, "sha512-/mWx5136gts2Z2e5izdoRCo46lPp5TMs9R15GTSsgg/XnZyxDWVqoVU3R9lWnccKpqwsJLvRoxbCjoJtZB7DSw=="], + "@types/istanbul-lib-coverage": ["@types/istanbul-lib-coverage@2.0.6", "", {}, "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="], "@types/istanbul-lib-report": ["@types/istanbul-lib-report@3.0.3", "", { "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA=="], @@ -910,16 +972,24 @@ "@types/node-fetch": ["@types/node-fetch@2.6.13", "", { "dependencies": { "@types/node": "*", "form-data": "^4.0.4" } }, "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw=="], - "@types/react": ["@types/react@19.2.2", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA=="], + "@types/react": ["@types/react@19.2.3", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-k5dJVszUiNr1DSe8Cs+knKR6IrqhqdhpUwzqhkS8ecQTSf3THNtbfIp/umqHMpX2bv+9dkx3fwDv/86LcSfvSg=="], "@types/react-dom": ["@types/react-dom@19.2.2", "", { "peerDependencies": { "@types/react": "^19.2.0" } }, "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw=="], + "@types/reveal.js": ["@types/reveal.js@5.2.1", "", {}, "sha512-egr+amW5iilXo94kEGyJv24bJozsu/XAOHnhMHLnaJkHVxoui2gsWqzByaltA5zfXDTH2F4WyWnAkhHRcpytIQ=="], + "@types/stack-utils": ["@types/stack-utils@2.0.3", "", {}, "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="], + "@types/through": ["@types/through@0.0.33", "", { "dependencies": { "@types/node": "*" } }, "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ=="], + + "@types/tinycolor2": ["@types/tinycolor2@1.4.6", "", {}, "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw=="], + "@types/unist": ["@types/unist@3.0.3", "", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="], "@types/use-sync-external-store": ["@types/use-sync-external-store@0.0.6", "", {}, "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="], + "@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="], + "@types/yargs": ["@types/yargs@17.0.33", "", { "dependencies": { "@types/yargs-parser": "*" } }, "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA=="], "@types/yargs-parser": ["@types/yargs-parser@21.0.3", "", {}, "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="], @@ -1028,14 +1098,18 @@ "ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="], - "ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="], + "ansi-align": ["ansi-align@3.0.1", "", { "dependencies": { "string-width": "^4.1.0" } }, "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="], + + "ansi-escapes": ["ansi-escapes@7.2.0", "", { "dependencies": { "environment": "^1.0.0" } }, "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw=="], - "ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + "ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="], - "ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="], + "ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], "ansis": ["ansis@4.1.0", "", {}, "sha512-BGcItUBWSMRgOCe+SVZJ+S7yTRG0eGt9cXAHev72yuGcY23hnLA7Bky5L/xLyPINoSN95geovfBkqoTlNZYa7w=="], + "any-promise": ["any-promise@1.3.0", "", {}, "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="], + "anymatch": ["anymatch@3.1.3", "", { "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="], "argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], @@ -1066,6 +1140,8 @@ "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="], + "auto-bind": ["auto-bind@5.0.1", "", {}, "sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="], + "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="], "babel-jest": ["babel-jest@29.7.0", "", { "dependencies": { "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" } }, "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg=="], @@ -1082,8 +1158,6 @@ "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "base64-arraybuffer": ["base64-arraybuffer@1.0.2", "", {}, "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="], - "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="], "before-after-hook": ["before-after-hook@4.0.0", "", {}, "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ=="], @@ -1098,6 +1172,8 @@ "body-parser": ["body-parser@2.2.0", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.0", "http-errors": "^2.0.0", "iconv-lite": "^0.6.3", "on-finished": "^2.4.1", "qs": "^6.14.0", "raw-body": "^3.0.0", "type-is": "^2.0.0" } }, "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg=="], + "boxen": ["boxen@3.2.0", "", { "dependencies": { "ansi-align": "^3.0.0", "camelcase": "^5.3.1", "chalk": "^2.4.2", "cli-boxes": "^2.2.0", "string-width": "^3.0.0", "term-size": "^1.2.0", "type-fest": "^0.3.0", "widest-line": "^2.0.0" } }, "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A=="], + "brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="], "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="], @@ -1134,6 +1210,8 @@ "builtin-status-codes": ["builtin-status-codes@3.0.0", "", {}, "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="], + "bundle-name": ["bundle-name@4.1.0", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="], + "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="], "cac": ["cac@6.7.14", "", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="], @@ -1146,12 +1224,14 @@ "callsites": ["callsites@3.1.0", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="], - "camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="], + "camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], "caniuse-lite": ["caniuse-lite@1.0.30001741", "", {}, "sha512-QGUGitqsc8ARjLdgAfxETDhRbJ0REsP6O3I96TAth/mVjh2cYzN2u+3AzPP3aVSm2FehEItaJw1xd+IGBXWeSw=="], "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="], + "cfonts": ["cfonts@3.3.1", "", { "dependencies": { "supports-color": "^8", "window-size": "^1" }, "bin": { "cfonts": "bin/index.js" } }, "sha512-ZGEmN3W9mViWEDjsuPo4nK4h39sfh6YtoneFYp9WLPI/rw8BaSSrfQC6jkrGW3JMvV3ZnExJB/AEqXc/nHYxkw=="], + "chai": ["chai@5.3.3", "", { "dependencies": { "assertion-error": "^2.0.1", "check-error": "^2.1.1", "deep-eql": "^5.0.1", "loupe": "^3.1.0", "pathval": "^2.0.0" } }, "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw=="], "chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="], @@ -1166,6 +1246,8 @@ "character-reference-invalid": ["character-reference-invalid@2.0.1", "", {}, "sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw=="], + "chardet": ["chardet@2.1.1", "", {}, "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ=="], + "check-error": ["check-error@2.1.1", "", {}, "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw=="], "chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="], @@ -1180,6 +1262,18 @@ "clean-git-ref": ["clean-git-ref@2.0.1", "", {}, "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw=="], + "cli-boxes": ["cli-boxes@3.0.0", "", {}, "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="], + + "cli-cursor": ["cli-cursor@4.0.0", "", { "dependencies": { "restore-cursor": "^4.0.0" } }, "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="], + + "cli-spinners": ["cli-spinners@2.9.2", "", {}, "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg=="], + + "cli-table3": ["cli-table3@0.6.5", "", { "dependencies": { "string-width": "^4.2.0" }, "optionalDependencies": { "@colors/colors": "1.5.0" } }, "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ=="], + + "cli-truncate": ["cli-truncate@4.0.0", "", { "dependencies": { "slice-ansi": "^5.0.0", "string-width": "^7.0.0" } }, "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA=="], + + "cli-width": ["cli-width@4.1.0", "", {}, "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ=="], + "cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="], "cloudflare": ["cloudflare@4.5.0", "", { "dependencies": { "@types/node": "^18.11.18", "@types/node-fetch": "^2.6.4", "abort-controller": "^3.0.0", "agentkeepalive": "^4.2.1", "form-data-encoder": "1.7.2", "formdata-node": "^4.3.2", "node-fetch": "^2.6.7" } }, "sha512-fPcbPKx4zF45jBvQ0z7PCdgejVAPBBCZxwqk1k7krQNfpM07Cfj97/Q6wBzvYqlWXx/zt1S9+m8vnfCe06umbQ=="], @@ -1190,6 +1284,8 @@ "co": ["co@4.6.0", "", {}, "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="], + "code-excerpt": ["code-excerpt@4.0.0", "", { "dependencies": { "convert-to-spaces": "^2.0.1" } }, "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA=="], + "collect-v8-coverage": ["collect-v8-coverage@1.0.2", "", {}, "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="], "color": ["color@4.2.3", "", { "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" } }, "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A=="], @@ -1204,6 +1300,8 @@ "comma-separated-tokens": ["comma-separated-tokens@2.0.3", "", {}, "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg=="], + "commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="], + "compare-func": ["compare-func@2.0.0", "", { "dependencies": { "array-ify": "^1.0.0", "dot-prop": "^5.1.0" } }, "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="], "concat-map": ["concat-map@0.0.1", "", {}, "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="], @@ -1224,6 +1322,8 @@ "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], + "convert-to-spaces": ["convert-to-spaces@2.0.1", "", {}, "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ=="], + "cookie": ["cookie@1.0.2", "", {}, "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA=="], "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="], @@ -1256,8 +1356,6 @@ "crypto-browserify": ["crypto-browserify@3.12.1", "", { "dependencies": { "browserify-cipher": "^1.0.1", "browserify-sign": "^4.2.3", "create-ecdh": "^4.0.4", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", "diffie-hellman": "^5.0.3", "hash-base": "~3.0.4", "inherits": "^2.0.4", "pbkdf2": "^3.1.2", "public-encrypt": "^4.0.3", "randombytes": "^2.1.0", "randomfill": "^1.0.4" } }, "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ=="], - "css-line-break": ["css-line-break@2.1.0", "", { "dependencies": { "utrie": "^1.0.2" } }, "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w=="], - "cssesc": ["cssesc@3.0.0", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="], "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="], @@ -1314,10 +1412,18 @@ "deepmerge": ["deepmerge@4.3.1", "", {}, "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="], + "default-browser": ["default-browser@5.2.1", "", { "dependencies": { "bundle-name": "^4.1.0", "default-browser-id": "^5.0.0" } }, "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg=="], + + "default-browser-id": ["default-browser-id@5.0.0", "", {}, "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA=="], + "define-data-property": ["define-data-property@1.1.4", "", { "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", "gopd": "^1.0.1" } }, "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="], + "define-lazy-prop": ["define-lazy-prop@3.0.0", "", {}, "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg=="], + "define-properties": ["define-properties@1.2.1", "", { "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="], + "define-property": ["define-property@1.0.0", "", { "dependencies": { "is-descriptor": "^1.0.0" } }, "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="], + "defu": ["defu@6.1.4", "", {}, "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="], "delayed-stream": ["delayed-stream@1.0.0", "", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="], @@ -1378,7 +1484,7 @@ "emittery": ["emittery@0.13.1", "", {}, "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="], - "emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + "emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="], "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="], @@ -1388,6 +1494,8 @@ "env-paths": ["env-paths@2.2.1", "", {}, "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="], + "environment": ["environment@1.1.0", "", {}, "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q=="], + "error-ex": ["error-ex@1.3.2", "", { "dependencies": { "is-arrayish": "^0.2.1" } }, "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="], "error-stack-parser-es": ["error-stack-parser-es@1.0.5", "", {}, "sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA=="], @@ -1472,7 +1580,7 @@ "evp_bytestokey": ["evp_bytestokey@1.0.3", "", { "dependencies": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" } }, "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="], - "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="], + "execa": ["execa@0.7.0", "", { "dependencies": { "cross-spawn": "^5.0.1", "get-stream": "^3.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } }, "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw=="], "exit": ["exit@0.1.2", "", {}, "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="], @@ -1560,6 +1668,8 @@ "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="], + "get-east-asian-width": ["get-east-asian-width@1.4.0", "", {}, "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q=="], + "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="], "get-nonce": ["get-nonce@1.0.1", "", {}, "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="], @@ -1570,7 +1680,7 @@ "get-proto": ["get-proto@1.0.1", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" } }, "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="], - "get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="], + "get-stream": ["get-stream@3.0.0", "", {}, "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="], "get-symbol-description": ["get-symbol-description@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6" } }, "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg=="], @@ -1594,6 +1704,8 @@ "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], + "gradient-string": ["gradient-string@2.0.2", "", { "dependencies": { "chalk": "^4.1.2", "tinygradient": "^1.1.5" } }, "sha512-rEDCuqUQ4tbD78TpzsMtt5OIf0cBCSDWSJtUDaF6JsAh+k0v9r++NzxNEG87oDZx9ZwGhD8DaezR2L/yrw0Jdw=="], + "graphemer": ["graphemer@1.4.0", "", {}, "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="], "handlebars": ["handlebars@4.7.8", "", { "dependencies": { "minimist": "^1.2.5", "neo-async": "^2.6.2", "source-map": "^0.6.1", "wordwrap": "^1.0.0" }, "optionalDependencies": { "uglify-js": "^3.1.4" }, "bin": { "handlebars": "bin/handlebars" } }, "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="], @@ -1622,6 +1734,8 @@ "hast-util-whitespace": ["hast-util-whitespace@3.0.0", "", { "dependencies": { "@types/hast": "^3.0.0" } }, "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw=="], + "highlight.js": ["highlight.js@11.11.1", "", {}, "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w=="], + "hmac-drbg": ["hmac-drbg@1.0.1", "", { "dependencies": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", "minimalistic-crypto-utils": "^1.0.1" } }, "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="], "hoist-non-react-statics": ["hoist-non-react-statics@3.3.2", "", { "dependencies": { "react-is": "^16.7.0" } }, "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="], @@ -1632,8 +1746,6 @@ "html-url-attributes": ["html-url-attributes@3.0.1", "", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="], - "html2canvas-pro": ["html2canvas-pro@1.5.12", "", { "dependencies": { "css-line-break": "^2.1.0", "text-segmentation": "^1.0.3" } }, "sha512-egtJIe6YXMKSLX/ls400OJD6tzEVtATJOE++mnXmxMWyqcu9HDXDoLiWeXnGv45QW2ZaIiDlXw46Gxqrqw6SEw=="], - "http-errors": ["http-errors@2.0.0", "", { "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", "statuses": "2.0.1", "toidentifier": "1.0.1" } }, "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="], "https-browserify": ["https-browserify@1.0.0", "", {}, "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="], @@ -1662,16 +1774,32 @@ "imurmurhash": ["imurmurhash@0.1.4", "", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="], + "indent-string": ["indent-string@5.0.0", "", {}, "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="], + "inflight": ["inflight@1.0.6", "", { "dependencies": { "once": "^1.3.0", "wrappy": "1" } }, "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="], "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="], "ini": ["ini@4.1.1", "", {}, "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g=="], + "ink": ["ink@6.4.0", "", { "dependencies": { "@alcalzone/ansi-tokenize": "^0.2.1", "ansi-escapes": "^7.0.0", "ansi-styles": "^6.2.1", "auto-bind": "^5.0.1", "chalk": "^5.6.0", "cli-boxes": "^3.0.0", "cli-cursor": "^4.0.0", "cli-truncate": "^4.0.0", "code-excerpt": "^4.0.0", "es-toolkit": "^1.39.10", "indent-string": "^5.0.0", "is-in-ci": "^2.0.0", "patch-console": "^2.0.0", "react-reconciler": "^0.32.0", "signal-exit": "^3.0.7", "slice-ansi": "^7.1.0", "stack-utils": "^2.0.6", "string-width": "^7.2.0", "type-fest": "^4.27.0", "widest-line": "^5.0.0", "wrap-ansi": "^9.0.0", "ws": "^8.18.0", "yoga-layout": "~3.2.1" }, "peerDependencies": { "@types/react": ">=19.0.0", "react": ">=19.0.0", "react-devtools-core": "^6.1.2" }, "optionalPeers": ["@types/react", "react-devtools-core"] }, "sha512-v43isNGrHeFfipbQbwz7/Eg0+aWz3ASEdT/s1Ty2JtyBzR3maE0P77FwkMET+Nzh5KbRL3efLgkT/ZzPFzW3BA=="], + + "ink-big-text": ["ink-big-text@2.0.0", "", { "dependencies": { "cfonts": "^3.1.1", "prop-types": "^15.8.1" }, "peerDependencies": { "ink": ">=4", "react": ">=18" } }, "sha512-Juzqv+rIOLGuhMJiE50VtS6dg6olWfzFdL7wsU/EARSL5Eaa5JNXMogMBm9AkjgzO2Y3UwWCOh87jbhSn8aNdw=="], + + "ink-box": ["ink-box@2.0.0", "", { "dependencies": { "boxen": "^3.0.0", "prop-types": "^15.7.2" }, "peerDependencies": { "ink": ">=2.0.0", "react": ">=16.8.0" } }, "sha512-GTn8oEl/8U+w5Yrqo75xCnOh835n6upxeTkL2SkSGVt1I5a9ONXjFUHtLORZoh5fNAgImiTz+oT13bOlgaZWKg=="], + + "ink-gradient": ["ink-gradient@3.0.0", "", { "dependencies": { "@types/gradient-string": "^1.1.2", "gradient-string": "^2.0.2", "prop-types": "^15.8.1", "strip-ansi": "^7.1.0" }, "peerDependencies": { "ink": ">=4" } }, "sha512-OVyPBovBxE1tFcBhSamb+P1puqDP6pG3xFe2W9NiLgwUZd9RbcjBeR7twLbliUT9navrUstEf1ZcPKKvx71BsQ=="], + + "ink-spinner": ["ink-spinner@5.0.0", "", { "dependencies": { "cli-spinners": "^2.7.0" }, "peerDependencies": { "ink": ">=4.0.0", "react": ">=18.0.0" } }, "sha512-EYEasbEjkqLGyPOUc8hBJZNuC5GvXGMLu0w5gdTNskPc7Izc5vO3tdQEYnzvshucyGCBXc86ig0ujXPMWaQCdA=="], + + "ink-text-input": ["ink-text-input@6.0.0", "", { "dependencies": { "chalk": "^5.3.0", "type-fest": "^4.18.2" }, "peerDependencies": { "ink": ">=5", "react": ">=18" } }, "sha512-Fw64n7Yha5deb1rHY137zHTAbSTNelUKuB5Kkk2HACXEtwIHBCf9OH2tP/LQ9fRYTl1F0dZgbW0zPnZk6FA9Lw=="], + "inline-style-parser": ["inline-style-parser@0.2.4", "", {}, "sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q=="], "input-otp": ["input-otp@1.4.2", "", { "peerDependencies": { "react": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-l3jWwYNvrEa6NTCt7BECfCm48GvwuZzkoeG3gBL2w4CHeOXW3eKFmf9UNYkNfYc3mxMrthMnxjIE07MT0zLBQA=="], + "inquirer": ["inquirer@12.11.0", "", { "dependencies": { "@inquirer/ansi": "^1.0.2", "@inquirer/core": "^10.3.1", "@inquirer/prompts": "^7.10.0", "@inquirer/type": "^3.0.10", "mute-stream": "^3.0.0", "run-async": "^4.0.6", "rxjs": "^7.8.2" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-E5oT7r+NxIxTuZsl/2Hg76kdT57DGc5mn5pCEz0LqZjR8hN7prgMXhUZ6A7rj/qL3X4P5lToIWNkO10uZJSzdA=="], + "internal-slot": ["internal-slot@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.2", "side-channel": "^1.1.0" } }, "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw=="], "internmap": ["internmap@2.0.3", "", {}, "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="], @@ -1680,6 +1808,8 @@ "is-absolute-url": ["is-absolute-url@4.0.1", "", {}, "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="], + "is-accessor-descriptor": ["is-accessor-descriptor@1.0.1", "", { "dependencies": { "hasown": "^2.0.0" } }, "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA=="], + "is-alphabetical": ["is-alphabetical@2.0.1", "", {}, "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ=="], "is-alphanumerical": ["is-alphanumerical@2.0.1", "", { "dependencies": { "is-alphabetical": "^2.0.0", "is-decimal": "^2.0.0" } }, "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw=="], @@ -1698,23 +1828,31 @@ "is-boolean-object": ["is-boolean-object@1.2.2", "", { "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" } }, "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A=="], + "is-buffer": ["is-buffer@1.1.6", "", {}, "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="], + "is-bun-module": ["is-bun-module@2.0.0", "", { "dependencies": { "semver": "^7.7.1" } }, "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ=="], "is-callable": ["is-callable@1.2.7", "", {}, "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="], "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], + "is-data-descriptor": ["is-data-descriptor@1.0.1", "", { "dependencies": { "hasown": "^2.0.0" } }, "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="], + "is-data-view": ["is-data-view@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" } }, "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw=="], "is-date-object": ["is-date-object@1.1.0", "", { "dependencies": { "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" } }, "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg=="], "is-decimal": ["is-decimal@2.0.1", "", {}, "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A=="], + "is-descriptor": ["is-descriptor@1.0.3", "", { "dependencies": { "is-accessor-descriptor": "^1.0.1", "is-data-descriptor": "^1.0.1" } }, "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="], + + "is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="], + "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="], "is-finalizationregistry": ["is-finalizationregistry@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3" } }, "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg=="], - "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + "is-fullwidth-code-point": ["is-fullwidth-code-point@5.1.0", "", { "dependencies": { "get-east-asian-width": "^1.3.1" } }, "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ=="], "is-generator-fn": ["is-generator-fn@2.1.0", "", {}, "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="], @@ -1726,13 +1864,19 @@ "is-hexadecimal": ["is-hexadecimal@2.0.1", "", {}, "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg=="], + "is-in-ci": ["is-in-ci@2.0.0", "", { "bin": { "is-in-ci": "cli.js" } }, "sha512-cFeerHriAnhrQSbpAxL37W1wcJKUUX07HyLWZCW1URJT/ra3GyUTzBgUnh24TMVfNTV2Hij2HLxkPHFZfOZy5w=="], + + "is-inside-container": ["is-inside-container@1.0.0", "", { "dependencies": { "is-docker": "^3.0.0" }, "bin": { "is-inside-container": "cli.js" } }, "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA=="], + + "is-interactive": ["is-interactive@2.0.0", "", {}, "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ=="], + "is-map": ["is-map@2.0.3", "", {}, "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="], "is-nan": ["is-nan@1.3.2", "", { "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3" } }, "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="], "is-negative-zero": ["is-negative-zero@2.0.3", "", {}, "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw=="], - "is-number": ["is-number@7.0.0", "", {}, "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="], + "is-number": ["is-number@3.0.0", "", { "dependencies": { "kind-of": "^3.0.2" } }, "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="], "is-number-object": ["is-number-object@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" } }, "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw=="], @@ -1748,7 +1892,7 @@ "is-shared-array-buffer": ["is-shared-array-buffer@1.0.4", "", { "dependencies": { "call-bound": "^1.0.3" } }, "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A=="], - "is-stream": ["is-stream@2.0.1", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="], + "is-stream": ["is-stream@1.1.0", "", {}, "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="], "is-string": ["is-string@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" } }, "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA=="], @@ -1758,12 +1902,16 @@ "is-typed-array": ["is-typed-array@1.1.15", "", { "dependencies": { "which-typed-array": "^1.1.16" } }, "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ=="], + "is-unicode-supported": ["is-unicode-supported@2.1.0", "", {}, "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ=="], + "is-weakmap": ["is-weakmap@2.0.2", "", {}, "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w=="], "is-weakref": ["is-weakref@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3" } }, "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew=="], "is-weakset": ["is-weakset@2.0.4", "", { "dependencies": { "call-bound": "^1.0.3", "get-intrinsic": "^1.2.6" } }, "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ=="], + "is-wsl": ["is-wsl@3.1.0", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw=="], + "isarray": ["isarray@2.0.5", "", {}, "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="], "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], @@ -1840,7 +1988,7 @@ "js-base64": ["js-base64@3.7.8", "", {}, "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow=="], - "js-tokens": ["js-tokens@9.0.1", "", {}, "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ=="], + "js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="], @@ -1866,6 +2014,8 @@ "keyv": ["keyv@4.5.4", "", { "dependencies": { "json-buffer": "3.0.1" } }, "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="], + "kind-of": ["kind-of@3.2.2", "", { "dependencies": { "is-buffer": "^1.1.5" } }, "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="], + "kleur": ["kleur@4.1.5", "", {}, "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="], "knip": ["knip@5.66.4", "", { "dependencies": { "@nodelib/fs.walk": "^1.2.3", "fast-glob": "^3.3.3", "formatly": "^0.3.0", "jiti": "^2.6.0", "js-yaml": "^4.1.0", "minimist": "^1.2.8", "oxc-resolver": "^11.12.0", "picocolors": "^1.1.1", "picomatch": "^4.0.1", "smol-toml": "^1.4.1", "strip-json-comments": "5.0.2", "zod": "^4.1.11" }, "peerDependencies": { "@types/node": ">=18", "typescript": ">=5.0.4 <7" }, "bin": { "knip": "bin/knip.js", "knip-bun": "bin/knip-bun.js" } }, "sha512-HmTnxdmoHAvwKmFktRGY1++tXRI8J36eVrOpfj/ybTVVT1QBKBlbBEN1s3cJBx9UL+hXTZDNQif+gs7fUKldbw=="], @@ -1926,6 +2076,8 @@ "lodash.upperfirst": ["lodash.upperfirst@4.3.1", "", {}, "sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="], + "log-symbols": ["log-symbols@7.0.1", "", { "dependencies": { "is-unicode-supported": "^2.0.0", "yoctocolors": "^2.1.1" } }, "sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg=="], + "longest-streak": ["longest-streak@3.1.0", "", {}, "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g=="], "loose-envify": ["loose-envify@1.4.0", "", { "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" } }, "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="], @@ -2062,6 +2214,8 @@ "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="], + "mimic-function": ["mimic-function@5.0.1", "", {}, "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA=="], + "mimic-response": ["mimic-response@3.1.0", "", {}, "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="], "miniflare": ["miniflare@4.20251011.1", "", { "dependencies": { "@cspotcode/source-map-support": "0.8.1", "acorn": "8.14.0", "acorn-walk": "8.3.2", "exit-hook": "2.2.1", "glob-to-regexp": "0.4.1", "sharp": "^0.33.5", "stoppable": "1.1.0", "undici": "7.14.0", "workerd": "1.20251011.0", "ws": "8.18.0", "youch": "4.1.0-beta.10", "zod": "3.22.3" }, "bin": { "miniflare": "bootstrap.js" } }, "sha512-Qbw1Z8HTYM1adWl6FAtzhrj34/6dPRDPwdYOx21dkae8a/EaxbMzRIPbb4HKVGMVvtqbK1FaRCgDLVLolNzGHg=="], @@ -2086,6 +2240,10 @@ "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], + "mute-stream": ["mute-stream@3.0.0", "", {}, "sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw=="], + + "mz": ["mz@2.7.0", "", { "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", "thenify-all": "^1.0.0" } }, "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="], + "nanoid": ["nanoid@5.1.6", "", { "bin": { "nanoid": "bin/nanoid.js" } }, "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg=="], "napi-postinstall": ["napi-postinstall@0.3.3", "", { "bin": { "napi-postinstall": "lib/cli.js" } }, "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow=="], @@ -2116,7 +2274,7 @@ "npm": ["npm@2.15.12", "", { "dependencies": { "abbrev": "~1.0.9", "ansi": "~0.3.1", "ansi-regex": "*", "ansicolors": "~0.3.2", "ansistyles": "~0.1.3", "archy": "~1.0.0", "async-some": "~1.0.2", "block-stream": "0.0.9", "char-spinner": "~1.0.1", "chmodr": "~1.0.2", "chownr": "~1.0.1", "cmd-shim": "~2.0.2", "columnify": "~1.5.4", "config-chain": "~1.1.10", "dezalgo": "~1.0.3", "editor": "~1.0.0", "fs-vacuum": "~1.2.9", "fs-write-stream-atomic": "~1.0.8", "fstream": "~1.0.10", "fstream-npm": "~1.1.1", "github-url-from-git": "~1.4.0", "github-url-from-username-repo": "~1.0.2", "glob": "~7.0.6", "graceful-fs": "~4.1.6", "hosted-git-info": "~2.1.5", "imurmurhash": "*", "inflight": "~1.0.4", "inherits": "~2.0.3", "ini": "~1.3.4", "init-package-json": "~1.9.4", "lockfile": "~1.0.1", "lru-cache": "~4.0.1", "minimatch": "~3.0.3", "mkdirp": "~0.5.1", "node-gyp": "~3.6.0", "nopt": "~3.0.6", "normalize-git-url": "~3.0.2", "normalize-package-data": "~2.3.5", "npm-cache-filename": "~1.0.2", "npm-install-checks": "~1.0.7", "npm-package-arg": "~4.1.0", "npm-registry-client": "~7.2.1", "npm-user-validate": "~0.1.5", "npmlog": "~2.0.4", "once": "~1.4.0", "opener": "~1.4.1", "osenv": "~0.1.3", "path-is-inside": "~1.0.0", "read": "~1.0.7", "read-installed": "~4.0.3", "read-package-json": "~2.0.4", "readable-stream": "~2.1.5", "realize-package-specifier": "~3.0.1", "request": "~2.74.0", "retry": "~0.10.0", "rimraf": "~2.5.4", "semver": "~5.1.0", "sha": "~2.0.1", "slide": "~1.1.6", "sorted-object": "~2.0.0", "spdx-license-ids": "~1.2.2", "strip-ansi": "~3.0.1", "tar": "~2.2.1", "text-table": "~0.2.0", "uid-number": "0.0.6", "umask": "~1.1.0", "validate-npm-package-license": "~3.0.1", "validate-npm-package-name": "~2.2.2", "which": "~1.2.11", "wrappy": "~1.0.2", "write-file-atomic": "~1.1.4" }, "bin": { "npm": "./bin/npm-cli.js" } }, "sha512-WMoAJ518W0vHjWy1abYnTeyG9YQpSoYGPxAx7d0C0L7U7Jo44bZsrvTjccmDohCJGxpasdKfqsKsl6o/RUPx6A=="], - "npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="], + "npm-run-path": ["npm-run-path@2.0.2", "", { "dependencies": { "path-key": "^2.0.0" } }, "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="], "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], @@ -2142,16 +2300,22 @@ "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="], + "open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="], + "openai": ["openai@5.23.2", "", { "peerDependencies": { "ws": "^8.18.0", "zod": "^3.23.8" }, "optionalPeers": ["ws", "zod"], "bin": { "openai": "bin/cli" } }, "sha512-MQBzmTulj+MM5O8SKEk/gL8a7s5mktS9zUtAkU257WjvobGc9nKcBuVwjyEEcb9SI8a8Y2G/mzn3vm9n1Jlleg=="], "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="], + "ora": ["ora@9.0.0", "", { "dependencies": { "chalk": "^5.6.2", "cli-cursor": "^5.0.0", "cli-spinners": "^3.2.0", "is-interactive": "^2.0.0", "is-unicode-supported": "^2.1.0", "log-symbols": "^7.0.1", "stdin-discarder": "^0.2.2", "string-width": "^8.1.0", "strip-ansi": "^7.1.2" } }, "sha512-m0pg2zscbYgWbqRR6ABga5c3sZdEon7bSgjnlXC64kxtxLOyjRcbbUkLj7HFyy/FTD+P2xdBWu8snGhYI0jc4A=="], + "os-browserify": ["os-browserify@0.3.0", "", {}, "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="], "own-keys": ["own-keys@1.0.1", "", { "dependencies": { "get-intrinsic": "^1.2.6", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" } }, "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg=="], "oxc-resolver": ["oxc-resolver@11.13.0", "", { "optionalDependencies": { "@oxc-resolver/binding-android-arm-eabi": "11.13.0", "@oxc-resolver/binding-android-arm64": "11.13.0", "@oxc-resolver/binding-darwin-arm64": "11.13.0", "@oxc-resolver/binding-darwin-x64": "11.13.0", "@oxc-resolver/binding-freebsd-x64": "11.13.0", "@oxc-resolver/binding-linux-arm-gnueabihf": "11.13.0", "@oxc-resolver/binding-linux-arm-musleabihf": "11.13.0", "@oxc-resolver/binding-linux-arm64-gnu": "11.13.0", "@oxc-resolver/binding-linux-arm64-musl": "11.13.0", "@oxc-resolver/binding-linux-ppc64-gnu": "11.13.0", "@oxc-resolver/binding-linux-riscv64-gnu": "11.13.0", "@oxc-resolver/binding-linux-riscv64-musl": "11.13.0", "@oxc-resolver/binding-linux-s390x-gnu": "11.13.0", "@oxc-resolver/binding-linux-x64-gnu": "11.13.0", "@oxc-resolver/binding-linux-x64-musl": "11.13.0", "@oxc-resolver/binding-wasm32-wasi": "11.13.0", "@oxc-resolver/binding-win32-arm64-msvc": "11.13.0", "@oxc-resolver/binding-win32-ia32-msvc": "11.13.0", "@oxc-resolver/binding-win32-x64-msvc": "11.13.0" } }, "sha512-Pp9ULXeB0KDclQrSRVUUF0NwXCoADtzMBd2kKsk2pHeQoDlZHl9NwVzeCIYFdfKrc7LQxtGoVec3eX2tZHS0Bw=="], + "p-finally": ["p-finally@1.0.0", "", {}, "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="], + "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], "p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="], @@ -2176,6 +2340,8 @@ "partysocket": ["partysocket@1.1.6", "", { "dependencies": { "event-target-polyfill": "^0.0.4" } }, "sha512-LkEk8N9hMDDsDT0iDK0zuwUDFVrVMUXFXCeN3850Ng8wtjPqPBeJlwdeY6ROlJSEh3tPoTTasXoSBYH76y118w=="], + "patch-console": ["patch-console@2.0.0", "", {}, "sha512-0YNdUceMdaQwoKce1gatDScmMo5pu/tfABfnzEqeG0gtTmd7mh/WcwgUjtAeOU7N8nFFlbQBnFK2gXW5fGvmMA=="], + "path-browserify": ["path-browserify@1.0.1", "", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="], "path-exists": ["path-exists@4.0.0", "", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="], @@ -2242,6 +2408,8 @@ "proxy-from-env": ["proxy-from-env@1.1.0", "", {}, "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="], + "pseudomap": ["pseudomap@1.0.2", "", {}, "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="], + "public-encrypt": ["public-encrypt@4.0.3", "", { "dependencies": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", "parse-asn1": "^5.0.0", "randombytes": "^2.0.1", "safe-buffer": "^5.1.2" } }, "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="], "punycode": ["punycode@1.4.1", "", {}, "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="], @@ -2276,6 +2444,8 @@ "react-markdown": ["react-markdown@10.1.0", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/mdast": "^4.0.0", "devlop": "^1.0.0", "hast-util-to-jsx-runtime": "^2.0.0", "html-url-attributes": "^3.0.0", "mdast-util-to-hast": "^13.0.0", "remark-parse": "^11.0.0", "remark-rehype": "^11.0.0", "unified": "^11.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0" }, "peerDependencies": { "@types/react": ">=18", "react": ">=18" } }, "sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ=="], + "react-reconciler": ["react-reconciler@0.32.0", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.0" } }, "sha512-2NPMOzgTlG0ZWdIf3qG+dcbLSoAc/uLfOwckc3ofy5sSK0pLJqnQLpUFxvGcN2rlXSjnVtGeeFLNimCQEj5gOQ=="], + "react-redux": ["react-redux@9.2.0", "", { "dependencies": { "@types/use-sync-external-store": "^0.0.6", "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "@types/react": "^18.2.25 || ^19", "react": "^18.0 || ^19", "redux": "^5.0.0" }, "optionalPeers": ["@types/react", "redux"] }, "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g=="], "react-refresh": ["react-refresh@0.18.0", "", {}, "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw=="], @@ -2330,16 +2500,26 @@ "resolve.exports": ["resolve.exports@2.0.3", "", {}, "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A=="], + "restore-cursor": ["restore-cursor@4.0.0", "", { "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="], + "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], + "reveal.js": ["reveal.js@5.2.1", "", {}, "sha512-r7//6mIM5p34hFiDMvYfXgyjXqGRta+/psd9YtytsgRlrpRzFv4RbH76TXd2qD+7ZPZEbpBDhdRhJaFgfQ7zNQ=="], + "ripemd160": ["ripemd160@2.0.2", "", { "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1" } }, "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="], "rolldown": ["rolldown@1.0.0-beta.40", "", { "dependencies": { "@oxc-project/types": "=0.92.0", "@rolldown/pluginutils": "1.0.0-beta.40", "ansis": "^4.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.0-beta.40", "@rolldown/binding-darwin-arm64": "1.0.0-beta.40", "@rolldown/binding-darwin-x64": "1.0.0-beta.40", "@rolldown/binding-freebsd-x64": "1.0.0-beta.40", "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-beta.40", "@rolldown/binding-linux-arm64-gnu": "1.0.0-beta.40", "@rolldown/binding-linux-arm64-musl": "1.0.0-beta.40", "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.40", "@rolldown/binding-linux-x64-musl": "1.0.0-beta.40", "@rolldown/binding-openharmony-arm64": "1.0.0-beta.40", "@rolldown/binding-wasm32-wasi": "1.0.0-beta.40", "@rolldown/binding-win32-arm64-msvc": "1.0.0-beta.40", "@rolldown/binding-win32-ia32-msvc": "1.0.0-beta.40", "@rolldown/binding-win32-x64-msvc": "1.0.0-beta.40" }, "bin": { "rolldown": "bin/cli.mjs" } }, "sha512-VqEHbKpOgTPmQrZ4fVn4eshDQS/6g/fRpNE7cFSJY+eQLDZn4B9X61J6L+hnlt1u2uRI+pF7r1USs6S5fuWCvw=="], "router": ["router@2.2.0", "", { "dependencies": { "debug": "^4.4.0", "depd": "^2.0.0", "is-promise": "^4.0.0", "parseurl": "^1.3.3", "path-to-regexp": "^8.0.0" } }, "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ=="], + "run-applescript": ["run-applescript@7.1.0", "", {}, "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q=="], + + "run-async": ["run-async@4.0.6", "", {}, "sha512-IoDlSLTs3Yq593mb3ZoKWKXMNu3UpObxhgA/Xuid5p4bbfi2jdY1Hj0m1K+0/tEuQTxIGMhQDqGjKb7RuxGpAQ=="], + "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], + "rxjs": ["rxjs@7.8.2", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA=="], + "safe-array-concat": ["safe-array-concat@1.1.3", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", "has-symbols": "^1.1.0", "isarray": "^2.0.5" } }, "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q=="], "safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], @@ -2388,7 +2568,7 @@ "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="], - "signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], "simple-concat": ["simple-concat@1.0.1", "", {}, "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="], @@ -2400,6 +2580,8 @@ "slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="], + "slice-ansi": ["slice-ansi@7.1.2", "", { "dependencies": { "ansi-styles": "^6.2.1", "is-fullwidth-code-point": "^5.0.0" } }, "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w=="], + "smol-toml": ["smol-toml@1.4.2", "", {}, "sha512-rInDH6lCNiEyn3+hH8KVGFdbjc099j47+OSgbMrfDYX1CmXLfdKd7qi6IfcWj2wFxvSVkuI46M+wPGYfEOEj6g=="], "snake-case": ["snake-case@3.0.4", "", { "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" } }, "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="], @@ -2428,6 +2610,8 @@ "std-env": ["std-env@3.9.0", "", {}, "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw=="], + "stdin-discarder": ["stdin-discarder@0.2.2", "", {}, "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ=="], + "stop-iteration-iterator": ["stop-iteration-iterator@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "internal-slot": "^1.1.0" } }, "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ=="], "stoppable": ["stoppable@1.1.0", "", {}, "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="], @@ -2438,7 +2622,7 @@ "string-length": ["string-length@4.0.2", "", { "dependencies": { "char-regex": "^1.0.2", "strip-ansi": "^6.0.0" } }, "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ=="], - "string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + "string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], "string-width-cjs": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], @@ -2452,12 +2636,14 @@ "stringify-entities": ["stringify-entities@4.0.4", "", { "dependencies": { "character-entities-html4": "^2.0.0", "character-entities-legacy": "^3.0.0" } }, "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg=="], - "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "strip-ansi": ["strip-ansi@7.1.2", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA=="], "strip-ansi-cjs": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], "strip-bom": ["strip-bom@3.0.0", "", {}, "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="], + "strip-eof": ["strip-eof@1.0.0", "", {}, "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="], + "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="], "strip-json-comments": ["strip-json-comments@5.0.2", "", {}, "sha512-4X2FR3UwhNUE9G49aIsJW5hRRR3GXGTBTZRMfv568O60ojM8HcWjV/VxAxCDW3SUND33O6ZY66ZuRcdkj73q2g=="], @@ -2468,6 +2654,8 @@ "style-to-object": ["style-to-object@1.0.9", "", { "dependencies": { "inline-style-parser": "0.2.4" } }, "sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw=="], + "sucrase": ["sucrase@3.35.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", "glob": "^10.3.10", "lines-and-columns": "^1.1.6", "mz": "^2.7.0", "pirates": "^4.0.1", "ts-interface-checker": "^0.1.9" }, "bin": { "sucrase": "bin/sucrase", "sucrase-node": "bin/sucrase-node" } }, "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA=="], + "suffix-array": ["suffix-array@0.1.4", "", {}, "sha512-oNhTjdKDf8SdyUWm/igHHmdDc/qwxmxHX0TrfUHgGAwDXICnzBG4PW0O0hGSGGW9/HS+TXhjxF3C/aeajMdl8A=="], "supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], @@ -2482,11 +2670,15 @@ "tapable": ["tapable@2.2.3", "", {}, "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg=="], + "term-size": ["term-size@1.2.0", "", { "dependencies": { "execa": "^0.7.0" } }, "sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ=="], + "test-exclude": ["test-exclude@6.0.0", "", { "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", "minimatch": "^3.0.4" } }, "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="], "text-extensions": ["text-extensions@2.4.0", "", {}, "sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g=="], - "text-segmentation": ["text-segmentation@1.0.3", "", { "dependencies": { "utrie": "^1.0.2" } }, "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw=="], + "thenify": ["thenify@3.3.1", "", { "dependencies": { "any-promise": "^1.0.0" } }, "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="], + + "thenify-all": ["thenify-all@1.6.0", "", { "dependencies": { "thenify": ">= 3.1.0 < 4" } }, "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="], "through": ["through@2.3.8", "", {}, "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="], @@ -2496,10 +2688,14 @@ "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], + "tinycolor2": ["tinycolor2@1.6.0", "", {}, "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="], + "tinyexec": ["tinyexec@1.0.1", "", {}, "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw=="], "tinyglobby": ["tinyglobby@0.2.15", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.3" } }, "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="], + "tinygradient": ["tinygradient@1.1.5", "", { "dependencies": { "@types/tinycolor2": "^1.4.0", "tinycolor2": "^1.0.0" } }, "sha512-8nIfc2vgQ4TeLnk2lFj4tRLvvJwEfQuabdsmvDdQPT0xlk9TaNtpGd6nNRxXoK6vQhN6RSzj+Cnp5tTQmpxmbw=="], + "tinypool": ["tinypool@1.1.1", "", {}, "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg=="], "tinyrainbow": ["tinyrainbow@2.0.0", "", {}, "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw=="], @@ -2522,6 +2718,8 @@ "ts-api-utils": ["ts-api-utils@2.1.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ=="], + "ts-interface-checker": ["ts-interface-checker@0.1.13", "", {}, "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="], + "ts-jest": ["ts-jest@29.4.5", "", { "dependencies": { "bs-logger": "^0.2.6", "fast-json-stable-stringify": "^2.1.0", "handlebars": "^4.7.8", "json5": "^2.2.3", "lodash.memoize": "^4.1.2", "make-error": "^1.3.6", "semver": "^7.7.3", "type-fest": "^4.41.0", "yargs-parser": "^21.1.1" }, "peerDependencies": { "@babel/core": ">=7.0.0-beta.0 <8", "@jest/transform": "^29.0.0 || ^30.0.0", "@jest/types": "^29.0.0 || ^30.0.0", "babel-jest": "^29.0.0 || ^30.0.0", "jest": "^29.0.0 || ^30.0.0", "jest-util": "^29.0.0 || ^30.0.0", "typescript": ">=4.3 <6" }, "optionalPeers": ["@babel/core", "@jest/transform", "@jest/types", "babel-jest", "jest-util"], "bin": { "ts-jest": "cli.js" } }, "sha512-HO3GyiWn2qvTQA4kTgjDcXiMwYQt68a1Y8+JuLRVpdIzm+UOLSHgl/XqR4c6nzJkq5rOkjc02O2I7P7l/Yof0Q=="], "tsconfig-paths": ["tsconfig-paths@3.15.0", "", { "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" } }, "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg=="], @@ -2606,8 +2804,6 @@ "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="], - "utrie": ["utrie@1.0.2", "", { "dependencies": { "base64-arraybuffer": "^1.0.2" } }, "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw=="], - "v8-to-istanbul": ["v8-to-istanbul@9.3.0", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", "convert-source-map": "^2.0.0" } }, "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA=="], "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="], @@ -2660,6 +2856,10 @@ "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], + "widest-line": ["widest-line@5.0.0", "", { "dependencies": { "string-width": "^7.0.0" } }, "sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA=="], + + "window-size": ["window-size@1.1.1", "", { "dependencies": { "define-property": "^1.0.0", "is-number": "^3.0.0" }, "bin": { "window-size": "cli.js" } }, "sha512-5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA=="], + "word-wrap": ["word-wrap@1.2.5", "", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="], "wordwrap": ["wordwrap@1.0.0", "", {}, "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="], @@ -2668,7 +2868,7 @@ "wrangler": ["wrangler@4.45.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.4.0", "@cloudflare/unenv-preset": "2.7.8", "blake3-wasm": "2.1.5", "esbuild": "0.25.4", "miniflare": "4.20251011.1", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.21", "workerd": "1.20251011.0" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20251011.0" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-2qM6bHw8l7r89Z9Y5A7Wn4L9U+dFoLjYgEUVpqy7CcmXpppL3QIYqU6rU5lre7/SRzBuPu/H93Vwfh538gZ3iw=="], - "wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], + "wrap-ansi": ["wrap-ansi@9.0.2", "", { "dependencies": { "ansi-styles": "^6.2.1", "string-width": "^7.0.0", "strip-ansi": "^7.1.0" } }, "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww=="], "wrap-ansi-cjs": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], @@ -2676,7 +2876,9 @@ "write-file-atomic": ["write-file-atomic@4.0.2", "", { "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" } }, "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="], - "ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], + "ws": ["ws@8.18.3", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg=="], + + "wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="], "xtend": ["xtend@4.0.2", "", {}, "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="], @@ -2690,6 +2892,12 @@ "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], + "yoctocolors": ["yoctocolors@2.1.2", "", {}, "sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug=="], + + "yoctocolors-cjs": ["yoctocolors-cjs@2.1.3", "", {}, "sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw=="], + + "yoga-layout": ["yoga-layout@3.2.1", "", {}, "sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ=="], + "youch": ["youch@4.1.0-beta.10", "", { "dependencies": { "@poppinss/colors": "^4.1.5", "@poppinss/dumper": "^0.6.4", "@speed-highlight/core": "^1.2.7", "cookie": "^1.0.2", "youch-core": "^0.3.3" } }, "sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ=="], "youch-core": ["youch-core@0.3.3", "", { "dependencies": { "@poppinss/exception": "^1.2.2", "error-stack-parser-es": "^1.0.5" } }, "sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA=="], @@ -2704,7 +2912,15 @@ "@ashishkumar472/cf-git/diff": ["diff@5.2.0", "", {}, "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="], - "@babel/code-frame/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], + "@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@babel/core/@babel/generator": ["@babel/generator@7.28.3", "", { "dependencies": { "@babel/parser": "^7.28.3", "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw=="], + + "@babel/core/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "@babel/core/@babel/traverse": ["@babel/traverse@7.28.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", "@babel/types": "^7.28.4", "debug": "^4.3.1" } }, "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ=="], + + "@babel/core/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], @@ -2712,8 +2928,24 @@ "@babel/helper-compilation-targets/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "@babel/helper-module-imports/@babel/traverse": ["@babel/traverse@7.28.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", "@babel/types": "^7.28.4", "debug": "^4.3.1" } }, "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ=="], + + "@babel/helper-module-imports/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "@babel/helper-module-transforms/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@babel/helper-module-transforms/@babel/traverse": ["@babel/traverse@7.28.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", "@babel/types": "^7.28.4", "debug": "^4.3.1" } }, "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ=="], + + "@babel/helpers/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "@babel/template/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "@babel/template/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + "@cloudflare/vite-plugin/wrangler": ["wrangler@4.45.3", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.4.0", "@cloudflare/unenv-preset": "2.7.8", "blake3-wasm": "2.1.5", "esbuild": "0.25.4", "miniflare": "4.20251011.1", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.21", "workerd": "1.20251011.0" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20251011.0" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-0ddEA9t4HeBgSVTVTcqtBHl7Z5CorWZ8tGgTQCP5XuL+9E1TJRwS6t/zzG51Ruwjb17SZYCaLchoM8V629S8cw=="], + "@cloudflare/vite-plugin/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], + "@cloudflare/vitest-pool-workers/miniflare": ["miniflare@4.20250906.0", "", { "dependencies": { "@cspotcode/source-map-support": "0.8.1", "acorn": "8.14.0", "acorn-walk": "8.3.2", "exit-hook": "2.2.1", "glob-to-regexp": "0.4.1", "sharp": "^0.33.5", "stoppable": "1.1.0", "undici": "^7.10.0", "workerd": "1.20250906.0", "ws": "8.18.0", "youch": "4.1.0-beta.10", "zod": "3.22.3" }, "bin": { "miniflare": "bootstrap.js" } }, "sha512-T/RWn1sa0ien80s6NjU+Un/tj12gR6wqScZoiLeMJDD4/fK0UXfnbWXJDubnUED8Xjm7RPQ5ESYdE+mhPmMtuQ=="], "@cloudflare/vitest-pool-workers/wrangler": ["wrangler@4.35.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.4.0", "@cloudflare/unenv-preset": "2.7.3", "blake3-wasm": "2.1.5", "esbuild": "0.25.4", "miniflare": "4.20250906.0", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.21", "workerd": "1.20250906.0" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20250906.0" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-HbyXtbrh4Fi3mU8ussY85tVdQ74qpVS1vctUgaPc+bPrXBTqfDLkZ6VRtHAVF/eBhz4SFmhJtCQpN1caY2Ak8A=="], @@ -2734,13 +2966,13 @@ "@eslint/eslintrc/strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="], - "@isaacs/cliui/string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="], + "@inquirer/core/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], - "@isaacs/cliui/strip-ansi": ["strip-ansi@7.1.2", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA=="], + "@inquirer/core/wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="], - "@isaacs/cliui/wrap-ansi": ["wrap-ansi@8.1.0", "", { "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } }, "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="], + "@isaacs/cliui/string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="], - "@istanbuljs/load-nyc-config/camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], + "@isaacs/cliui/wrap-ansi": ["wrap-ansi@8.1.0", "", { "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } }, "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="], "@istanbuljs/load-nyc-config/find-up": ["find-up@4.1.0", "", { "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="], @@ -2752,8 +2984,12 @@ "@jest/core/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], + "@jest/core/ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="], + "@jest/core/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], + "@jest/core/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "@jest/environment/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], "@jest/fake-timers/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], @@ -2764,6 +3000,8 @@ "@jest/reporters/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], + "@jest/reporters/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "@jest/transform/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "@jest/types/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], @@ -2782,8 +3020,12 @@ "@sentry/cli/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="], + "@svgr/core/camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="], + "@svgr/core/cosmiconfig": ["cosmiconfig@8.3.6", "", { "dependencies": { "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0", "path-type": "^4.0.0" }, "peerDependencies": { "typescript": ">=4.9.5" }, "optionalPeers": ["typescript"] }, "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA=="], + "@svgr/hast-util-to-babel-ast/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + "@tailwindcss/node/jiti": ["jiti@2.6.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ=="], "@tailwindcss/node/lightningcss": ["lightningcss@1.30.2", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.30.2", "lightningcss-darwin-arm64": "1.30.2", "lightningcss-darwin-x64": "1.30.2", "lightningcss-freebsd-x64": "1.30.2", "lightningcss-linux-arm-gnueabihf": "1.30.2", "lightningcss-linux-arm64-gnu": "1.30.2", "lightningcss-linux-arm64-musl": "1.30.2", "lightningcss-linux-x64-gnu": "1.30.2", "lightningcss-linux-x64-musl": "1.30.2", "lightningcss-win32-arm64-msvc": "1.30.2", "lightningcss-win32-x64-msvc": "1.30.2" } }, "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ=="], @@ -2800,6 +3042,18 @@ "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], + "@types/babel__core/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "@types/babel__core/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "@types/babel__generator/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "@types/babel__template/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "@types/babel__template/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "@types/babel__traverse/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + "@types/graceful-fs/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], "@types/node-fetch/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], @@ -2820,7 +3074,7 @@ "accepts/mime-types": ["mime-types@3.0.1", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA=="], - "ansi-escapes/type-fest": ["type-fest@0.21.3", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="], + "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], @@ -2830,12 +3084,36 @@ "babel-plugin-istanbul/istanbul-lib-instrument": ["istanbul-lib-instrument@5.2.1", "", { "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.2.0", "semver": "^6.3.0" } }, "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="], + "babel-plugin-jest-hoist/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + "body-parser/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="], + "boxen/chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="], + + "boxen/cli-boxes": ["cli-boxes@2.2.1", "", {}, "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="], + + "boxen/string-width": ["string-width@3.1.0", "", { "dependencies": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } }, "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="], + + "boxen/type-fest": ["type-fest@0.3.1", "", {}, "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="], + + "boxen/widest-line": ["widest-line@2.0.1", "", { "dependencies": { "string-width": "^2.1.1" } }, "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA=="], + "browserify-sign/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="], + "cfonts/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], + "chokidar/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], + "cli-table3/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + + "cli-truncate/slice-ansi": ["slice-ansi@5.0.0", "", { "dependencies": { "ansi-styles": "^6.0.0", "is-fullwidth-code-point": "^4.0.0" } }, "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="], + + "cliui/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + + "cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], + "cloudflare/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], "cloudflare/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="], @@ -2862,7 +3140,7 @@ "espree/acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], - "execa/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], + "execa/cross-spawn": ["cross-spawn@5.1.0", "", { "dependencies": { "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", "which": "^1.2.9" } }, "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A=="], "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], @@ -2872,14 +3150,22 @@ "fetch-blob/web-streams-polyfill": ["web-streams-polyfill@3.3.3", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="], + "foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "glob/minimatch": ["minimatch@10.0.3", "", { "dependencies": { "@isaacs/brace-expansion": "^5.0.0" } }, "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw=="], + "gradient-string/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], + "hoist-non-react-statics/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="], "http-errors/statuses": ["statuses@2.0.1", "", {}, "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="], "import-fresh/resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="], + "istanbul-lib-instrument/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "jest-changed-files/execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="], + "jest-circus/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], "jest-circus/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], @@ -2922,6 +3208,10 @@ "jest-runtime/strip-bom": ["strip-bom@4.0.0", "", {}, "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="], + "jest-snapshot/@babel/generator": ["@babel/generator@7.28.3", "", { "dependencies": { "@babel/parser": "^7.28.3", "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw=="], + + "jest-snapshot/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + "jest-snapshot/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "jest-util/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], @@ -2930,10 +3220,14 @@ "jest-util/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "jest-validate/camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="], + "jest-validate/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "jest-watcher/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], + "jest-watcher/ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="], + "jest-watcher/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "jest-worker/@types/node": ["@types/node@18.19.124", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-hY4YWZFLs3ku6D2Gqo3RchTd9VRCcrjqp/I0mmohYeUVA5Y8eCXKJEasHxLAJVZRJuQogfd1GiJ9lgogBgKeuQ=="], @@ -2942,14 +3236,14 @@ "knip/zod": ["zod@4.1.11", "", {}, "sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg=="], - "loose-envify/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], - "mdast-util-find-and-replace/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="], "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], "miller-rabin/bn.js": ["bn.js@4.12.2", "", {}, "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw=="], + "miniflare/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], + "miniflare/zod": ["zod@3.22.3", "", {}, "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="], "node-stdlib-browser/pkg-dir": ["pkg-dir@5.0.0", "", { "dependencies": { "find-up": "^5.0.0" } }, "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="], @@ -3312,6 +3606,14 @@ "npm/yallist": ["yallist@2.1.2", "", {}, "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="], + "npm-run-path/path-key": ["path-key@2.0.1", "", {}, "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="], + + "ora/cli-cursor": ["cli-cursor@5.0.0", "", { "dependencies": { "restore-cursor": "^5.0.0" } }, "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw=="], + + "ora/cli-spinners": ["cli-spinners@3.3.0", "", {}, "sha512-/+40ljC3ONVnYIttjMWrlL51nItDAbBrq2upN8BPyvGU/2n5Oxw3tbNwORCaNuNqLJnxGqOfjUuhsv7l5Q4IsQ=="], + + "ora/string-width": ["string-width@8.1.0", "", { "dependencies": { "get-east-asian-width": "^1.3.0", "strip-ansi": "^7.1.0" } }, "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg=="], + "parse-entities/@types/unist": ["@types/unist@2.0.11", "", {}, "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="], "pbkdf2/create-hash": ["create-hash@1.1.3", "", { "dependencies": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", "ripemd160": "^2.0.0", "sha.js": "^2.4.0" } }, "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA=="], @@ -3322,12 +3624,16 @@ "postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="], + "prompts/kleur": ["kleur@3.0.3", "", {}, "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="], "prop-types/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="], "public-encrypt/bn.js": ["bn.js@4.12.2", "", {}, "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw=="], + "react-reconciler/scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="], + "readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], "rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.0.0-beta.40", "", { "os": "linux", "cpu": "x64" }, "sha512-+wi08S7wT5iLPHRZb0USrS6n+T6m+yY++dePYedE5uvKIpWCJJioFTaRtWjpm0V6dVNLcq2OukrvfdlGtH9Wgg=="], @@ -3342,8 +3648,24 @@ "stack-utils/escape-string-regexp": ["escape-string-regexp@2.0.0", "", {}, "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="], + "string-length/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "string-width-cjs/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "string-width-cjs/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "string-width-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "strip-ansi-cjs/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "strip-literal/js-tokens": ["js-tokens@9.0.1", "", {}, "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ=="], + + "sucrase/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="], + "test-exclude/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], + "to-regex-range/is-number": ["is-number@7.0.0", "", {}, "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="], + "ts-jest/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], "tsconfig-paths/json5": ["json5@1.0.2", "", { "dependencies": { "minimist": "^1.2.0" }, "bin": { "json5": "lib/cli.js" } }, "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="], @@ -3358,11 +3680,31 @@ "wrangler/esbuild": ["esbuild@0.25.4", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.4", "@esbuild/android-arm": "0.25.4", "@esbuild/android-arm64": "0.25.4", "@esbuild/android-x64": "0.25.4", "@esbuild/darwin-arm64": "0.25.4", "@esbuild/darwin-x64": "0.25.4", "@esbuild/freebsd-arm64": "0.25.4", "@esbuild/freebsd-x64": "0.25.4", "@esbuild/linux-arm": "0.25.4", "@esbuild/linux-arm64": "0.25.4", "@esbuild/linux-ia32": "0.25.4", "@esbuild/linux-loong64": "0.25.4", "@esbuild/linux-mips64el": "0.25.4", "@esbuild/linux-ppc64": "0.25.4", "@esbuild/linux-riscv64": "0.25.4", "@esbuild/linux-s390x": "0.25.4", "@esbuild/linux-x64": "0.25.4", "@esbuild/netbsd-arm64": "0.25.4", "@esbuild/netbsd-x64": "0.25.4", "@esbuild/openbsd-arm64": "0.25.4", "@esbuild/openbsd-x64": "0.25.4", "@esbuild/sunos-x64": "0.25.4", "@esbuild/win32-arm64": "0.25.4", "@esbuild/win32-ia32": "0.25.4", "@esbuild/win32-x64": "0.25.4" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q=="], - "wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], - "wrap-ansi-cjs/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], - "write-file-atomic/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], + "wrap-ansi-cjs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + + "wrap-ansi-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + + "@babel/core/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@babel/helper-module-imports/@babel/traverse/@babel/generator": ["@babel/generator@7.28.3", "", { "dependencies": { "@babel/parser": "^7.28.3", "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw=="], + + "@babel/helper-module-imports/@babel/traverse/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "@babel/helper-module-imports/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/generator": ["@babel/generator@7.28.3", "", { "dependencies": { "@babel/parser": "^7.28.3", "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "@babel/helpers/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@babel/template/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], "@cloudflare/vite-plugin/wrangler/esbuild": ["esbuild@0.25.4", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.4", "@esbuild/android-arm": "0.25.4", "@esbuild/android-arm64": "0.25.4", "@esbuild/android-x64": "0.25.4", "@esbuild/darwin-arm64": "0.25.4", "@esbuild/darwin-x64": "0.25.4", "@esbuild/freebsd-arm64": "0.25.4", "@esbuild/freebsd-x64": "0.25.4", "@esbuild/linux-arm": "0.25.4", "@esbuild/linux-arm64": "0.25.4", "@esbuild/linux-ia32": "0.25.4", "@esbuild/linux-loong64": "0.25.4", "@esbuild/linux-mips64el": "0.25.4", "@esbuild/linux-ppc64": "0.25.4", "@esbuild/linux-riscv64": "0.25.4", "@esbuild/linux-s390x": "0.25.4", "@esbuild/linux-x64": "0.25.4", "@esbuild/netbsd-arm64": "0.25.4", "@esbuild/netbsd-x64": "0.25.4", "@esbuild/openbsd-arm64": "0.25.4", "@esbuild/openbsd-x64": "0.25.4", "@esbuild/sunos-x64": "0.25.4", "@esbuild/win32-arm64": "0.25.4", "@esbuild/win32-ia32": "0.25.4", "@esbuild/win32-x64": "0.25.4" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q=="], @@ -3370,6 +3712,8 @@ "@cloudflare/vitest-pool-workers/miniflare/workerd": ["workerd@1.20250906.0", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20250906.0", "@cloudflare/workerd-darwin-arm64": "1.20250906.0", "@cloudflare/workerd-linux-64": "1.20250906.0", "@cloudflare/workerd-linux-arm64": "1.20250906.0", "@cloudflare/workerd-windows-64": "1.20250906.0" }, "bin": { "workerd": "bin/workerd" } }, "sha512-ryVyEaqXPPsr/AxccRmYZZmDAkfQVjhfRqrNTlEeN8aftBk6Ca1u7/VqmfOayjCXrA+O547TauebU+J3IpvFXw=="], + "@cloudflare/vitest-pool-workers/miniflare/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], + "@cloudflare/vitest-pool-workers/miniflare/zod": ["zod@3.22.3", "", {}, "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="], "@cloudflare/vitest-pool-workers/wrangler/@cloudflare/unenv-preset": ["@cloudflare/unenv-preset@2.7.3", "", { "peerDependencies": { "unenv": "2.0.0-rc.21", "workerd": "^1.20250828.1" }, "optionalPeers": ["workerd"] }, "sha512-tsQQagBKjvpd9baa6nWVIv399ejiqcrUBBW6SZx6Z22+ymm+Odv5+cFimyuCsD/fC1fQTwfRmwXBNpzvHSeGCw=="], @@ -3428,11 +3772,13 @@ "@esbuild-kit/core-utils/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.18.20", "", { "os": "win32", "cpu": "x64" }, "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="], - "@isaacs/cliui/string-width/emoji-regex": ["emoji-regex@9.2.2", "", {}, "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="], + "@inquirer/core/wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], - "@isaacs/cliui/strip-ansi/ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="], + "@inquirer/core/wrap-ansi/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - "@isaacs/cliui/wrap-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], + "@inquirer/core/wrap-ansi/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "@isaacs/cliui/string-width/emoji-regex": ["emoji-regex@9.2.2", "", {}, "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="], "@istanbuljs/load-nyc-config/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="], @@ -3444,8 +3790,12 @@ "@jest/core/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], + "@jest/core/ansi-escapes/type-fest": ["type-fest@0.21.3", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="], + "@jest/core/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "@jest/core/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + "@jest/environment/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], "@jest/fake-timers/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], @@ -3454,6 +3804,8 @@ "@jest/reporters/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "@jest/reporters/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + "@jest/transform/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "@jest/types/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], @@ -3466,6 +3818,8 @@ "@sentry/bundler-plugin-core/glob/path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="], + "@svgr/hast-util-to-babel-ast/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + "@tailwindcss/node/lightningcss/lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.30.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA=="], "@tailwindcss/node/lightningcss/lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.30.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ=="], @@ -3486,6 +3840,14 @@ "@tailwindcss/node/lightningcss/lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.30.2", "", { "os": "win32", "cpu": "x64" }, "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw=="], + "@types/babel__core/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@types/babel__generator/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@types/babel__template/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "@types/babel__traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + "@types/graceful-fs/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], "@types/node-fetch/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], @@ -3496,24 +3858,80 @@ "accepts/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], + "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "ansi-align/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "ansi-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "babel-jest/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "babel-plugin-istanbul/istanbul-lib-instrument/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + "babel-plugin-istanbul/istanbul-lib-instrument/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "babel-plugin-jest-hoist/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "boxen/chalk/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="], + + "boxen/chalk/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="], + + "boxen/chalk/supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="], + + "boxen/string-width/emoji-regex": ["emoji-regex@7.0.3", "", {}, "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="], + + "boxen/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@2.0.0", "", {}, "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="], + + "boxen/string-width/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="], + + "boxen/widest-line/string-width": ["string-width@2.1.1", "", { "dependencies": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" } }, "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="], + "browserify-sign/readable-stream/isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="], "browserify-sign/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], "browserify-sign/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], + "cli-table3/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "cli-table3/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "cli-table3/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "cli-truncate/slice-ansi/is-fullwidth-code-point": ["is-fullwidth-code-point@4.0.0", "", {}, "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="], + + "cliui/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "cliui/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "cliui/wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "cloudflare/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], "create-jest/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "eslint/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "execa/cross-spawn/lru-cache": ["lru-cache@4.0.2", "", { "dependencies": { "pseudomap": "^1.0.1", "yallist": "^2.0.0" } }, "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="], + + "execa/cross-spawn/shebang-command": ["shebang-command@1.2.0", "", { "dependencies": { "shebang-regex": "^1.0.0" } }, "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="], + + "execa/cross-spawn/which": ["which@1.2.14", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "which": "./bin/which" } }, "sha512-16uPglFkRPzgiUXYMi1Jf8Z5EzN1iB4V0ZtMXcHZnwsBtQhhHeCqoWw7tsUY42hJGNDWtUsVLTjakIa5BgAxCw=="], + "express/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], + "gradient-string/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + + "istanbul-lib-instrument/@babel/parser/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "jest-changed-files/execa/get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="], + + "jest-changed-files/execa/is-stream": ["is-stream@2.0.1", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="], + + "jest-changed-files/execa/npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="], + "jest-circus/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], "jest-circus/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], @@ -3546,6 +3964,10 @@ "jest-runtime/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "jest-snapshot/@babel/generator/@babel/parser": ["@babel/parser@7.28.4", "", { "dependencies": { "@babel/types": "^7.28.4" }, "bin": "./bin/babel-parser.js" }, "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg=="], + + "jest-snapshot/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + "jest-snapshot/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "jest-util/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], @@ -3556,6 +3978,8 @@ "jest-watcher/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], + "jest-watcher/ansi-escapes/type-fest": ["type-fest@0.21.3", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="], + "jest-watcher/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "jest-worker/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], @@ -3636,6 +4060,8 @@ "npm/write-file-atomic/graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], + "ora/cli-cursor/restore-cursor": ["restore-cursor@5.1.0", "", { "dependencies": { "onetime": "^7.0.0", "signal-exit": "^4.1.0" } }, "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="], + "pbkdf2/create-hash/ripemd160": ["ripemd160@2.0.2", "", { "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1" } }, "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="], "pbkdf2/ripemd160/hash-base": ["hash-base@2.0.2", "", { "dependencies": { "inherits": "^2.0.1" } }, "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw=="], @@ -3644,6 +4070,16 @@ "send/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], + "string-length/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "sucrase/glob/jackspeak": ["jackspeak@3.4.3", "", { "dependencies": { "@isaacs/cliui": "^8.0.2" }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="], + + "sucrase/glob/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], + + "sucrase/glob/path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="], + "tsx/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.10", "", { "os": "aix", "cpu": "ppc64" }, "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw=="], "tsx/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.25.10", "", { "os": "android", "cpu": "arm" }, "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w=="], @@ -3748,6 +4184,18 @@ "wrangler/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.4", "", { "os": "win32", "cpu": "x64" }, "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ=="], + "wrap-ansi-cjs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "wrap-ansi-cjs/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "wrap-ansi-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "yargs/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "@cloudflare/vite-plugin/wrangler/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.4", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q=="], "@cloudflare/vite-plugin/wrangler/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.25.4", "", { "os": "android", "cpu": "arm" }, "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ=="], @@ -3870,6 +4318,12 @@ "@commitlint/top-level/find-up/locate-path/p-locate": ["p-locate@6.0.0", "", { "dependencies": { "p-limit": "^4.0.0" } }, "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw=="], + "@inquirer/core/wrap-ansi/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "@inquirer/core/wrap-ansi/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + + "@inquirer/core/wrap-ansi/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + "@istanbuljs/load-nyc-config/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="], "@sentry/bundler-plugin-core/glob/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="], @@ -3878,6 +4332,28 @@ "@sentry/bundler-plugin-core/glob/path-scurry/minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="], + "ansi-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "babel-plugin-istanbul/istanbul-lib-instrument/@babel/parser/@babel/types": ["@babel/types@7.28.4", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q=="], + + "boxen/chalk/ansi-styles/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="], + + "boxen/chalk/supports-color/has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="], + + "boxen/string-width/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="], + + "boxen/widest-line/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@2.0.0", "", {}, "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="], + + "boxen/widest-line/string-width/strip-ansi": ["strip-ansi@4.0.0", "", { "dependencies": { "ansi-regex": "^3.0.0" } }, "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="], + + "cli-table3/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "execa/cross-spawn/lru-cache/yallist": ["yallist@2.1.2", "", {}, "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="], + + "execa/cross-spawn/shebang-command/shebang-regex": ["shebang-regex@1.0.0", "", {}, "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="], + + "istanbul-lib-instrument/@babel/parser/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + "npm/are-we-there-yet/readable-stream/process-nextick-args": ["process-nextick-args@2.0.1", "", {}, "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="], "npm/are-we-there-yet/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], @@ -3902,12 +4378,28 @@ "npm/sha/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], + "ora/cli-cursor/restore-cursor/onetime": ["onetime@7.0.0", "", { "dependencies": { "mimic-function": "^5.0.0" } }, "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ=="], + + "ora/cli-cursor/restore-cursor/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "pkg-dir/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="], + "sucrase/glob/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="], + + "sucrase/glob/path-scurry/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="], + + "yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + "@commitlint/top-level/find-up/locate-path/p-locate/p-limit": ["p-limit@4.0.0", "", { "dependencies": { "yocto-queue": "^1.0.0" } }, "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="], "@istanbuljs/load-nyc-config/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], + "babel-plugin-istanbul/istanbul-lib-instrument/@babel/parser/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="], + + "boxen/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], + + "boxen/widest-line/string-width/strip-ansi/ansi-regex": ["ansi-regex@3.0.1", "", {}, "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="], + "pkg-dir/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], "@commitlint/top-level/find-up/locate-path/p-locate/p-limit/yocto-queue": ["yocto-queue@1.2.1", "", {}, "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg=="], diff --git a/debug-tools/presentation-tester/package.json b/debug-tools/presentation-tester/package.json new file mode 100644 index 00000000..8bf97615 --- /dev/null +++ b/debug-tools/presentation-tester/package.json @@ -0,0 +1,32 @@ +{ + "name": "presentation-tester", + "private": true, + "version": "1.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc && vite build", + "preview": "vite preview" + }, + "dependencies": { + "react": "^18.3.1", + "react-dom": "^18.3.1", + "fflate": "^0.8.2", + "reveal.js": "^5.1.0", + "sucrase": "^3.35.0", + "framer-motion": "^11.11.17", + "lucide-react": "^0.344.0", + "clsx": "^2.1.1", + "tailwind-merge": "^2.5.4" + }, + "devDependencies": { + "@types/react": "^18.3.12", + "@types/react-dom": "^18.3.1", + "@vitejs/plugin-react": "^4.3.3", + "typescript": "^5.6.3", + "vite": "^5.4.11", + "tailwindcss": "^3.4.15", + "postcss": "^8.4.49", + "autoprefixer": "^10.4.20" + } +} diff --git a/index.html b/index.html index 17c67793..4d7e1a15 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,7 @@ + diff --git a/package.json b/package.json index c1719b0d..dc1541b2 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ "lint": "eslint .", "preview": "npm run build && vite preview", "deploy": "bun --env-file .prod.vars scripts/deploy.ts", + "cli": "tsx --tsconfig tsconfig.app.json cli/index.ts", + "tui": "tsx --tsconfig tsconfig.app.json cli/tui.tsx", "cf-typegen": "wrangler types --include-runtime false", "test": "vitest run", "test:watch": "vitest", @@ -35,6 +37,8 @@ }, "dependencies": { "@ashishkumar472/cf-git": "1.0.5", + "@babel/parser": "^7.28.5", + "@babel/traverse": "^7.28.5", "@cloudflare/containers": "^0.0.28", "@cloudflare/sandbox": "0.4.14", "@noble/ciphers": "^1.3.0", @@ -69,6 +73,8 @@ "@sentry/cloudflare": "^10.22.0", "@sentry/react": "^10.22.0", "@sentry/vite-plugin": "^4.6.0", + "@types/babel__core": "^7.20.5", + "@types/babel__traverse": "^7.28.0", "@typescript-eslint/eslint-plugin": "^8.46.2", "@typescript-eslint/parser": "^8.46.2", "@typescript-eslint/typescript-estree": "^8.46.2", @@ -77,6 +83,7 @@ "agents": "^0.2.20", "chalk": "^5.6.2", "class-variance-authority": "^0.7.1", + "cli-table3": "^0.6.5", "cloudflare": "^4.5.0", "clsx": "^2.1.1", "cmdk": "^1.1.1", @@ -90,9 +97,10 @@ "eslint-plugin-import": "^2.32.0", "fflate": "^0.8.2", "framer-motion": "^12.23.24", + "highlight.js": "^11.11.1", "hono": "^4.10.4", - "html2canvas-pro": "^1.5.12", "input-otp": "^1.4.2", + "inquirer": "^12.11.0", "jose": "^5.10.0", "jsonc-parser": "^3.3.1", "latest": "^0.2.0", @@ -102,6 +110,7 @@ "next-themes": "^0.4.6", "node-fetch": "^3.3.2", "openai": "^5.23.2", + "ora": "^9.0.0", "partysocket": "^1.1.6", "perfect-arrows": "^0.3.7", "react": "^19.2.0", @@ -115,11 +124,14 @@ "recharts": "^3.3.0", "rehype-external-links": "^3.0.0", "remark-gfm": "^4.0.1", + "reveal.js": "^5.2.1", "sonner": "^2.0.7", + "sucrase": "^3.35.0", "suffix-array": "^0.1.4", "tailwind-merge": "^3.3.1", "vaul": "^1.1.2", "vite-plugin-svgr": "^4.5.0", + "ws": "^8.18.3", "zod": "^3.25.76" }, "devDependencies": { @@ -131,10 +143,13 @@ "@eslint/js": "^9.39.0", "@tailwindcss/typography": "^0.5.19", "@tailwindcss/vite": "^4.1.16", + "@types/inquirer": "^9.0.9", "@types/jest": "^29.5.14", "@types/node": "^22.18.13", - "@types/react": "^19.2.2", + "@types/react": "^19.2.3", "@types/react-dom": "^19.2.2", + "@types/reveal.js": "^5.2.1", + "@types/ws": "^8.18.1", "@vitejs/plugin-react-swc": "^3.11.0", "drizzle-kit": "^0.31.6", "eslint": "^9.39.0", @@ -143,8 +158,15 @@ "glob": "^11.0.3", "globals": "^16.5.0", "husky": "^9.1.7", + "ink": "^6.4.0", + "ink-big-text": "^2.0.0", + "ink-box": "^2.0.0", + "ink-gradient": "^3.0.0", + "ink-spinner": "^5.0.0", + "ink-text-input": "^6.0.0", "jest": "^29.7.0", "knip": "^5.66.4", + "open": "^10.0.0", "prettier": "^3.6.2", "prettier-plugin-tailwindcss": "^0.6.14", "tailwindcss": "^4.1.16", diff --git a/src/api-types.ts b/src/api-types.ts index cf4ae0f9..0f9c0704 100644 --- a/src/api-types.ts +++ b/src/api-types.ts @@ -106,16 +106,24 @@ export type { SecretTemplatesData } from 'worker/api/controllers/secrets/types'; -// Agent/CodeGen API Types +// Agent/CodeGen API Types export type { AgentConnectionData, } from 'worker/api/controllers/agent/types'; +// Template Types +export type { + TemplateDetails, +} from 'worker/services/sandbox/sandboxTypes'; + // WebSocket Types -export type { - WebSocketMessage, +export type { + WebSocketMessage, WebSocketMessageData, - CodeFixEdits + CodeFixEdits, + ModelConfigsInfoMessage, + AgentDisplayConfig, + ModelConfigsInfo } from 'worker/api/websocketTypes'; // Database/Schema Types commonly used in frontend @@ -250,6 +258,14 @@ export interface CsrfTokenResponseData { expiresIn?: number; } +// CLI Token Response - for CLI authentication +export interface CliTokenData { + token: string; + expiresIn: number; + expiresAt: string; + instructions: string; +} + // Active Sessions Response - matches getUserSessions + isCurrent from controller export interface ActiveSessionsData { sessions: Array<{ diff --git a/src/components/config-card.tsx b/src/components/config-card.tsx index d2e9bf69..43720fc0 100644 --- a/src/components/config-card.tsx +++ b/src/components/config-card.tsx @@ -3,8 +3,7 @@ import { Button } from '@/components/ui/button'; import { Badge } from '@/components/ui/badge'; import { Card, CardContent, CardHeader } from '@/components/ui/card'; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'; -import type { ModelConfig, UserModelConfigWithMetadata } from '@/api-types'; -import type { AgentDisplayConfig } from './model-config-tabs'; +import type { ModelConfig, UserModelConfigWithMetadata, AgentDisplayConfig } from '@/api-types'; interface ConfigCardProps { agent: AgentDisplayConfig; diff --git a/src/components/config-modal.tsx b/src/components/config-modal.tsx index d7c7d980..4816e95e 100644 --- a/src/components/config-modal.tsx +++ b/src/components/config-modal.tsx @@ -24,14 +24,14 @@ import { import { Alert, AlertDescription } from '@/components/ui/alert'; import { apiClient } from '@/lib/api-client'; import { ByokApiKeysModal } from './byok-api-keys-modal'; -import type { - ModelConfig, - UserModelConfigWithMetadata, - ModelConfigUpdate, +import type { + ModelConfig, + UserModelConfigWithMetadata, + ModelConfigUpdate, AIModels, - ByokProvidersData + ByokProvidersData, + AgentDisplayConfig } from '@/api-types'; -import type { AgentDisplayConfig } from './model-config-tabs'; interface ConfigModalProps { isOpen: boolean; diff --git a/src/components/model-config-tabs.tsx b/src/components/model-config-tabs.tsx index 1b957a7d..daa60647 100644 --- a/src/components/model-config-tabs.tsx +++ b/src/components/model-config-tabs.tsx @@ -17,7 +17,12 @@ import { Badge } from '@/components/ui/badge'; import { toast } from 'sonner'; import { ConfigCard } from './config-card'; import { ConfigModal } from './config-modal'; -import type { ModelConfig, UserModelConfigWithMetadata, ModelConfigUpdate } from '@/api-types'; +import type { + ModelConfig, + UserModelConfigWithMetadata, + ModelConfigUpdate, + AgentDisplayConfig +} from '@/api-types'; // Define workflow-based tab structure with dynamic agent categorization export const WORKFLOW_TABS = { @@ -117,13 +122,6 @@ const categorizeAgent = (agentKey: string): string => { return 'advanced'; }; -// Frontend-specific agent display interface -export interface AgentDisplayConfig { - key: string; - name: string; - description: string; -} - interface ModelConfigTabsProps { agentConfigs: AgentDisplayConfig[]; modelConfigs: Record; diff --git a/src/hooks/use-github-export.ts b/src/hooks/use-github-export.ts index 9beaeb46..7e991802 100644 --- a/src/hooks/use-github-export.ts +++ b/src/hooks/use-github-export.ts @@ -25,6 +25,8 @@ export interface GitHubInstallationData { repositories?: string[]; } +export type GitHubExportHook = ReturnType; + export function useGitHubExport( _websocket?: WebSocket | null, agentId?: string, diff --git a/src/index.css b/src/index.css index e5036133..1dca497f 100644 --- a/src/index.css +++ b/src/index.css @@ -307,6 +307,15 @@ background: rgba(255, 255, 255, 0.3); } +.presentation-thumbnail-bg { + background: + radial-gradient(circle at 20% 80%, rgba(99, 102, 241, 0.15) 0%, transparent 50%), + radial-gradient(circle at 80% 20%, rgba(139, 92, 246, 0.15) 0%, transparent 50%), + radial-gradient(circle at 40% 40%, rgba(59, 130, 246, 0.1) 0%, transparent 40%), + linear-gradient(135deg, #0a0e1a 0%, #0f172a 25%, #1e293b 50%, #0f172a 75%, #0a0e1a 100%); + background-size: 100% 100%, 100% 100%, 100% 100%, 400% 400%; +} + .a-tag a { @apply text-brand; } @@ -388,4 +397,4 @@ scrollbar-width: none; /* Firefox */ } .no-scrollbar::-webkit-scrollbar { display: none; /* Chrome, Safari, Opera */ -} \ No newline at end of file +} diff --git a/src/lib/api-client.ts b/src/lib/api-client.ts index 7b46ffa7..a16d10c6 100644 --- a/src/lib/api-client.ts +++ b/src/lib/api-client.ts @@ -52,8 +52,9 @@ import type{ ProfileResponseData, AuthProvidersResponseData, CsrfTokenResponseData, + CliTokenData, OAuthProvider, - CodeGenArgs, + CodeGenArgs, AgentPreviewResponse, PlatformStatusData, RateLimitError @@ -1164,6 +1165,14 @@ class ApiClient { }); } + /** + * Get CLI authentication token + * Returns the user's existing session token for CLI use + */ + async getCliToken(): Promise> { + return this.request('/api/auth/cli-token'); + } + /** * Get available authentication providers */ diff --git a/src/routes/chat/chat.tsx b/src/routes/chat/chat.tsx index 7c1a15d0..f396933f 100644 --- a/src/routes/chat/chat.tsx +++ b/src/routes/chat/chat.tsx @@ -6,40 +6,32 @@ import { useState, type FormEvent, } from 'react'; -import { ArrowRight, Image as ImageIcon } from 'react-feather'; import { useParams, useSearchParams, useNavigate } from 'react-router'; -import { MonacoEditor } from '../../components/monaco-editor/monaco-editor'; import { AnimatePresence, motion } from 'framer-motion'; -import { Expand, Github, GitBranch, LoaderCircle, RefreshCw, MoreHorizontal, RotateCcw, X } from 'lucide-react'; +import { LoaderCircle, MoreHorizontal, RotateCcw } from 'lucide-react'; import clsx from 'clsx'; -import { Blueprint } from './components/blueprint'; -import { FileExplorer } from './components/file-explorer'; import { UserMessage, AIMessage } from './components/messages'; import { PhaseTimeline } from './components/phase-timeline'; -import { PreviewIframe } from './components/preview-iframe'; -import { ViewModeSwitch } from './components/view-mode-switch'; -import { DebugPanel, type DebugMessage } from './components/debug-panel'; +import { type DebugMessage } from './components/debug-panel'; import { DeploymentControls } from './components/deployment-controls'; -import { useChat, type FileType } from './hooks/use-chat'; -import { type ModelConfigsData, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES, ProjectType } from '@/api-types'; -import { Copy } from './components/copy'; +import { useChat } from './hooks/use-chat'; +import { type ModelConfigsInfo, type BlueprintType, type PhasicBlueprint, SUPPORTED_IMAGE_MIME_TYPES, ProjectType, type FileType } from '@/api-types'; import { useFileContentStream } from './hooks/use-file-content-stream'; import { logger } from '@/utils/logger'; import { useApp } from '@/hooks/use-app'; import { useAuth } from '@/contexts/auth-context'; import { useGitHubExport } from '@/hooks/use-github-export'; -import { GitHubExportModal } from '@/components/github-export-modal'; -import { GitCloneModal } from '@/components/shared/GitCloneModal'; -import { ModelConfigInfo } from './components/model-config-info'; import { useAutoScroll } from '@/hooks/use-auto-scroll'; import { useImageUpload } from '@/hooks/use-image-upload'; import { useDragDrop } from '@/hooks/use-drag-drop'; -import { ImageAttachmentPreview } from '@/components/image-attachment-preview'; -import { createAIMessage } from './utils/message-helpers'; import { Button } from '@/components/ui/button'; import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'; -import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'; import { sendWebSocketMessage } from './utils/websocket-helpers'; +import { detectContentType } from './utils/content-detector'; +import { mergeFiles } from '@/utils/file-helpers'; +import { ChatModals } from './components/chat-modals'; +import { MainContentPanel } from './components/main-content-panel'; +import { ChatInput } from './components/chat-input'; const isPhasicBlueprint = (blueprint?: BlueprintType | null): blueprint is PhasicBlueprint => !!blueprint && 'implementationRoadmap' in blueprint; @@ -49,7 +41,7 @@ export default function Chat() { const [searchParams] = useSearchParams(); const userQuery = searchParams.get('query'); - const projectType = searchParams.get('projectType') || 'app'; + const urlProjectType = searchParams.get('projectType') || 'app'; // Extract images from URL params if present const userImages = useMemo(() => { @@ -115,14 +107,12 @@ export default function Chat() { totalFiles, websocket, sendUserMessage, - sendAiMessage, blueprint, previewUrl, clearEdit, projectStages, phaseTimeline, isThinking, - onCompleteBootstrap, // Deployment and generation control isDeploying, cloudflareDeploymentUrl, @@ -143,11 +133,14 @@ export default function Chat() { isDebugging, // Behavior type from backend behaviorType, + projectType, + // Template metadata + templateDetails, } = useChat({ chatId: urlChatId, query: userQuery, images: userImages, - projectType: projectType as ProjectType, + projectType: urlProjectType as ProjectType, onDebugMessage: addDebugMessage, }); @@ -158,10 +151,14 @@ export default function Chat() { const navigate = useNavigate(); const [activeFilePath, setActiveFilePath] = useState(); - const [view, setView] = useState<'editor' | 'preview' | 'blueprint' | 'terminal'>( + const [view, setView] = useState<'editor' | 'preview' | 'docs' | 'blueprint' | 'terminal' | 'presentation'>( 'editor', ); + // Presentation state + const [presentationSpeakerMode, setPresentationSpeakerMode] = useState(false); + const [presentationPreviewMode, setPresentationPreviewMode] = useState(false); + // Terminal state // const [terminalLogs, setTerminalLogs] = useState([]); @@ -173,11 +170,7 @@ export default function Chat() { const [isGitCloneModalOpen, setIsGitCloneModalOpen] = useState(false); // Model config info state - const [modelConfigs, setModelConfigs] = useState<{ - agents: Array<{ key: string; name: string; description: string; }>; - userConfigs: ModelConfigsData['configs']; - defaultConfigs: ModelConfigsData['defaults']; - } | undefined>(); + const [modelConfigs, setModelConfigs] = useState(); const [loadingConfigs, setLoadingConfigs] = useState(false); // Handler for model config info requests @@ -214,6 +207,7 @@ export default function Chat() { }, [websocket]); const hasSeenPreview = useRef(false); + const prevMarkdownCountRef = useRef(0); const hasSwitchedFile = useRef(false); // const wasChatDisabled = useRef(true); // const hasShownWelcome = useRef(false); @@ -224,12 +218,6 @@ export default function Chat() { const [newMessage, setNewMessage] = useState(''); const [showTooltip, setShowTooltip] = useState(false); - - // Word count utilities - const MAX_WORDS = 4000; - const countWords = (text: string): number => { - return text.trim().split(/\s+/).filter(word => word.length > 0).length; - }; const { images, addImages, removeImage, clearImages, isProcessing } = useImageUpload({ onError: (error) => { @@ -239,12 +227,27 @@ export default function Chat() { const imageInputRef = useRef(null); // Fake stream bootstrap files - const { streamedFiles: streamedBootstrapFiles, doneStreaming } = + const { streamedFiles: streamedBootstrapFiles } = useFileContentStream(bootstrapFiles, { tps: 600, enabled: isBootstrapping, }); + // Merge streamed bootstrap files with generated files + const allFiles = useMemo(() => { + if (templateDetails?.allFiles) { + const templateFiles = Object.entries(templateDetails.allFiles).map( + ([filePath, fileContents]) => ({ + filePath, + fileContents, + }) + ); + return mergeFiles(templateFiles, files); + } + + return files; + }, [files, templateDetails]); + const handleFileClick = useCallback((file: FileType) => { logger.debug('handleFileClick()', file); clearEdit(); @@ -256,10 +259,30 @@ export default function Chat() { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const handleViewModeChange = useCallback((mode: 'preview' | 'editor' | 'blueprint') => { + const handleViewModeChange = useCallback((mode: 'preview' | 'editor' | 'docs' | 'blueprint' | 'presentation') => { setView(mode); }, []); + const handleToggleSpeakerMode = useCallback(() => { + setPresentationSpeakerMode(prev => !prev); + if (!presentationSpeakerMode) { + setPresentationPreviewMode(false); + } + }, [presentationSpeakerMode]); + + const handleTogglePreviewMode = useCallback(() => { + setPresentationPreviewMode(prev => !prev); + if (!presentationPreviewMode) { + setPresentationSpeakerMode(false); + } + }, [presentationPreviewMode]); + + const handleExportPdf = useCallback(() => { + if (previewRef.current?.contentWindow) { + previewRef.current.contentWindow.postMessage({ type: 'EXPORT_PDF' }, '*'); + } + }, []); + const handleResetConversation = useCallback(() => { if (!websocket) return; sendWebSocketMessage(websocket, 'clear_conversation'); @@ -338,8 +361,11 @@ export default function Chat() { }, [phaseTimeline]); const isGitHubExportReady = useMemo(() => { + if (behaviorType === 'agentic') { + return files.length > 0 && !!urlChatId; + } return isPhase1Complete && !!urlChatId; - }, [isPhase1Complete, urlChatId]); + }, [behaviorType, files.length, isPhase1Complete, urlChatId]); // Detect if agentic mode is showing static content (docs, markdown) const isStaticContent = useMemo(() => { @@ -356,14 +382,33 @@ export default function Chat() { }); }, [behaviorType, files]); + // Detect content type (documentation detection - works in any projectType) + const contentDetection = useMemo(() => { + return detectContentType(files); + }, [files]); + + const hasDocumentation = useMemo(() => { + return Object.values(contentDetection.Contents).some(bundle => bundle.type === 'markdown'); + }, [contentDetection]); + + // Preview available based on projectType and content + const previewAvailable = useMemo(() => { + if (hasDocumentation || !!previewUrl) return true; + return false; + }, [hasDocumentation, previewUrl]); + const showMainView = useMemo(() => { - // For agentic mode: only show preview panel when files or preview URL exist + // For agentic mode: show preview panel when files exist or preview URL exists if (behaviorType === 'agentic') { - return files.length > 0 || !!previewUrl; + const hasFiles = files.length > 0; + const hasPreview = !!previewUrl; + const result = hasFiles || hasPreview; + return result; } // For phasic mode: keep existing logic - return streamedBootstrapFiles.length > 0 || !!blueprint || files.length > 0; - }, [behaviorType, isGeneratingBlueprint, blueprint, files.length, previewUrl, streamedBootstrapFiles.length]); + const result = streamedBootstrapFiles.length > 0 || !!blueprint || files.length > 0; + return result; + }, [behaviorType, blueprint, files.length, previewUrl, streamedBootstrapFiles.length]); const [mainMessage, ...otherMessages] = useMemo(() => messages, [messages]); @@ -380,15 +425,35 @@ export default function Chat() { }, [messages.length, scrollToBottom]); useEffect(() => { - // For static content in agentic mode, show editor view instead of preview - if (isStaticContent && files.length > 0 && !hasSeenPreview.current) { + if (hasSeenPreview.current) return; + + // Get current markdown files + const markdownFiles = files.filter(f => + f.filePath.endsWith('.md') || + f.filePath.endsWith('.mdx') || + f.filePath.endsWith('.markdown') + ); + + // Check if any markdown is actively generating + const isGeneratingMarkdown = markdownFiles.some(f => f.isGenerating); + const newMarkdownAdded = markdownFiles.length > prevMarkdownCountRef.current; + + // Auto-switch to docs ONLY when NEW markdown is being generated + if (hasDocumentation && newMarkdownAdded && isGeneratingMarkdown) { + setView('docs'); + setShowTooltip(true); + setTimeout(() => setShowTooltip(false), 3000); + hasSeenPreview.current = true; + } else if (isStaticContent && files.length > 0 && !hasDocumentation) { + // For other static content (non-documentation), show editor view setView('editor'); // Auto-select first file if none selected if (!activeFilePath) { setActiveFilePath(files[0].filePath); } hasSeenPreview.current = true; - } else if (previewUrl && !hasSeenPreview.current) { + } else if (previewUrl) { + // For apps, wait for preview URL // Agentic: auto-switch immediately when preview URL available // Phasic: require phase 1 complete const shouldSwitch = behaviorType === 'agentic' || isPhase1Complete; @@ -399,9 +464,13 @@ export default function Chat() { setTimeout(() => { setShowTooltip(false); }, 3000); + hasSeenPreview.current = true; } } - }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath, behaviorType]); + + // Update ref for next comparison + prevMarkdownCountRef.current = markdownFiles.length; + }, [previewUrl, isPhase1Complete, isStaticContent, files, activeFilePath, behaviorType, hasDocumentation, projectType]); useEffect(() => { if (chatId) { @@ -436,6 +505,14 @@ export default function Chat() { } }, [view, activeFile, files, isBootstrapping, streamedBootstrapFiles]); + // Preserve active file when generation completes + useEffect(() => { + if (!generatingFile && activeFile && !hasSwitchedFile.current) { + // Generation just ended, preserve the current active file + setActiveFilePath(activeFile.filePath); + } + }, [generatingFile, activeFile]); + useEffect(() => { if (view !== 'blueprint' && isGeneratingBlueprint) { setView('blueprint'); @@ -721,551 +798,93 @@ export default function Chat() {
-
- { - const files = Array.from(e.target.files || []); - if (files.length > 0) { - addImages(files); - } - e.target.value = ''; - }} - className="hidden" - disabled={isChatDisabled} - /> -
- {isChatDragging && ( -
-

Drop images here

-
- )} - {images.length > 0 && ( -
- -
- )} -