@vfarcic/dot-ai 0.32.0 → 0.34.0

package/dist/core/solution-utils.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Solution utilities for working with solution data structures
+ */
+/**
+ * Extract all user answers from a solution's questions
+ */
+export declare function extractUserAnswers(solution: any): Record<string, any>;
+/**
+ * Sanitize intent string for use as Kubernetes label (63 char limit, alphanumeric + hyphens)
+ */
+export declare function sanitizeIntentForLabel(intent: string): string;
+/**
+ * Generate standard dot-ai labels for Kubernetes resources
+ */
+export declare function generateDotAiLabels(userAnswers: Record<string, any>, solution: any): Record<string, string>;
+/**
+ * Add dot-ai labels to existing labels object
+ */
+export declare function addDotAiLabels(existingLabels: Record<string, string> | undefined, userAnswers: Record<string, any>, solution: any): Record<string, string>;
+//# sourceMappingURL=solution-utils.d.ts.map

package/dist/core/solution-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solution-utils.d.ts","sourceRoot":"","sources":["../../src/core/solution-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAoBrE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiB3G;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAClD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,QAAQ,EAAE,GAAG,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGxB"}

package/dist/core/solution-utils.js

@@ -0,0 +1,65 @@
+"use strict";
+/**
+ * Solution utilities for working with solution data structures
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractUserAnswers = extractUserAnswers;
+exports.sanitizeIntentForLabel = sanitizeIntentForLabel;
+exports.generateDotAiLabels = generateDotAiLabels;
+exports.addDotAiLabels = addDotAiLabels;
+/**
+ * Extract all user answers from a solution's questions
+ */
+function extractUserAnswers(solution) {
+    const userAnswers = {};
+    // Extract from all question categories
+    const questionCategories = ['required', 'basic', 'advanced'];
+    for (const category of questionCategories) {
+        const questions = solution.questions[category] || [];
+        for (const question of questions) {
+            if (question.answer !== undefined && question.answer !== null) {
+                userAnswers[question.id] = question.answer;
+            }
+        }
+    }
+    // Include open answer if provided
+    if (solution.questions.open?.answer) {
+        userAnswers.open = solution.questions.open.answer;
+    }
+    return userAnswers;
+}
+/**
+ * Sanitize intent string for use as Kubernetes label (63 char limit, alphanumeric + hyphens)
+ */
+function sanitizeIntentForLabel(intent) {
+    return intent
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, '-')
+        .substring(0, 63)
+        .replace(/^-+|-+$/g, '');
+}
+/**
+ * Generate standard dot-ai labels for Kubernetes resources
+ */
+function generateDotAiLabels(userAnswers, solution) {
+    const appName = userAnswers.name;
+    const originalIntent = solution.intent;
+    if (!appName) {
+        throw new Error('Application name is required for dot-ai labels. This indicates a bug in the MCP workflow.');
+    }
+    if (!originalIntent) {
+        throw new Error('Application intent is required for dot-ai labels. This indicates a bug in the solution data.');
+    }
+    return {
+        'dot-ai.io/managed': 'true',
+        'dot-ai.io/app-name': appName,
+        'dot-ai.io/intent': sanitizeIntentForLabel(originalIntent)
+    };
+}
+/**
+ * Add dot-ai labels to existing labels object
+ */
+function addDotAiLabels(existingLabels, userAnswers, solution) {
+    const dotAiLabels = generateDotAiLabels(userAnswers, solution);
+    return { ...existingLabels, ...dotAiLabels };
+}

package/dist/tools/answer-question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"answer-question.d.ts","sourceRoot":"","sources":["../../src/tools/answer-question.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMhD,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AACzD,eAAO,MAAM,+BAA+B,8HAA4H,CAAC;AAGzK,eAAO,MAAM,gCAAgC;;;;CAI5C,CAAC;AAkiBF;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,EAC7G,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,CAqVxD"}
+{"version":3,"file":"answer-question.d.ts","sourceRoot":"","sources":["../../src/tools/answer-question.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOhD,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AACzD,eAAO,MAAM,+BAA+B,8HAA4H,CAAC;AAGzK,eAAO,MAAM,gCAAgC;;;;CAI5C,CAAC;AAkiBF;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,EAC7G,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,CAqUxD"}

package/dist/tools/answer-question.js

@@ -44,6 +44,7 @@ const claude_1 = require("../core/claude");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const session_utils_1 = require("../core/session-utils");
+const solution_utils_1 = require("../core/solution-utils");
 // Tool metadata for direct MCP registration
 exports.ANSWERQUESTION_TOOL_NAME = 'answerQuestion';
 exports.ANSWERQUESTION_TOOL_DESCRIPTION = 'Process user answers and return remaining questions or completion status. For open stage, use "open" as the answer key.';
@@ -724,21 +725,7 @@ async function handleAnswerQuestionTool(args, dotAI, logger, requestId) {
                 }
             }
             // Extract all user answers for handoff
-            const userAnswers = {};
-            // Extract from all question categories
-            const questionCategories = ['required', 'basic', 'advanced'];
-            for (const category of questionCategories) {
-                const questions = solution.questions[category] || [];
-                for (const question of questions) {
-                    if (question.answer !== undefined && question.answer !== null) {
-                        userAnswers[question.id] = question.answer;
-                    }
-                }
-            }
-            // Include open answer if provided
-            if (openAnswer) {
-                userAnswers.open = openAnswer;
-            }
+            const userAnswers = (0, solution_utils_1.extractUserAnswers)(solution);
             const response = {
                 status: 'ready_for_manifest_generation',
                 solutionId: args.solutionId,

package/dist/tools/generate-manifests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-manifests.d.ts","sourceRoot":"","sources":["../../src/tools/generate-manifests.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQhD,eAAO,MAAM,2BAA2B,sBAAsB,CAAC;AAC/D,eAAO,MAAM,kCAAkC,+IAA+I,CAAC;AAG/L,eAAO,MAAM,mCAAmC;;CAE/C,CAAC;AAiSF;;GAEG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAC5B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,CAqLxD"}
+{"version":3,"file":"generate-manifests.d.ts","sourceRoot":"","sources":["../../src/tools/generate-manifests.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAShD,eAAO,MAAM,2BAA2B,sBAAsB,CAAC;AAC/D,eAAO,MAAM,kCAAkC,+IAA+I,CAAC;AAG/L,eAAO,MAAM,mCAAmC;;CAE/C,CAAC;AA2VF;;GAEG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAC5B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,CAqMxD"}

package/dist/tools/generate-manifests.js

@@ -46,6 +46,7 @@ const path = __importStar(require("path"));
 const yaml = __importStar(require("js-yaml"));
 const child_process_1 = require("child_process");
 const session_utils_1 = require("../core/session-utils");
+const solution_utils_1 = require("../core/solution-utils");
 // Tool metadata for direct MCP registration
 exports.GENERATEMANIFESTS_TOOL_NAME = 'generateManifests';
 exports.GENERATEMANIFESTS_TOOL_DESCRIPTION = 'Generate final Kubernetes manifests from fully configured solution (ONLY after completing ALL stages: required, basic, advanced, and open)';
@@ -216,7 +217,7 @@ async function validateManifests(yamlPath) {
 /**
  * Generate manifests using AI with Claude integration
  */
-async function generateManifestsWithAI(solution, dotAI, logger, errorContext) {
+async function generateManifestsWithAI(solution, dotAI, logger, errorContext, dotAiLabels) {
     // Load prompt template
     const promptPath = path.join(__dirname, '..', '..', 'prompts', 'manifest-generation.md');
     const template = fs.readFileSync(promptPath, 'utf8');
@@ -239,11 +240,13 @@ ${errorContext.previousManifests}
 ` : 'None - this is the first attempt.';
     // Replace template variables
     const schemasData = JSON.stringify(resourceSchemas, null, 2);
+    const labelsData = dotAiLabels ? JSON.stringify(dotAiLabels, null, 2) : '{}';
     const aiPrompt = template
         .replace('{solution}', solutionData)
         .replace('{schemas}', schemasData)
         .replace('{previous_attempt}', previousAttempt)
-        .replace('{error_details}', errorDetails);
+        .replace('{error_details}', errorDetails)
+        .replace('{labels}', labelsData);
     const isRetry = !!errorContext;
     logger.info('Generating manifests with AI', {
         isRetry,
@@ -272,6 +275,57 @@ ${errorContext.previousManifests}
     });
     return manifestContent;
 }
+/**
+ * Generate dot-ai application metadata ConfigMap
+ */
+function generateMetadataConfigMap(solution, userAnswers, logger) {
+    const appName = userAnswers.name;
+    const namespace = userAnswers.namespace || 'default';
+    const solutionId = solution.solutionId;
+    const originalIntent = solution.intent;
+    // Validate required fields (will throw if missing)
+    const dotAiLabels = (0, solution_utils_1.addDotAiLabels)(undefined, userAnswers, solution);
+    // Extract resource references from solution
+    const resources = (solution.resources || []).map((resource) => ({
+        apiVersion: resource.apiVersion,
+        kind: resource.kind,
+        name: resource.name || appName, // Use app name as fallback
+        namespace: resource.namespace || namespace
+    }));
+    // Create ConfigMap object
+    const configMap = {
+        apiVersion: 'v1',
+        kind: 'ConfigMap',
+        metadata: {
+            name: `dot-ai-app-${appName}-${solutionId}`,
+            namespace: namespace,
+            labels: dotAiLabels,
+            annotations: {
+                'dot-ai.io/original-intent': originalIntent
+            }
+        },
+        data: {
+            'deployment-info.yaml': yaml.dump({
+                appName,
+                deployedAt: new Date().toISOString(),
+                originalIntent,
+                resources
+            })
+        }
+    };
+    try {
+        return yaml.dump(configMap);
+    }
+    catch (error) {
+        logger.error('Failed to generate YAML for ConfigMap', error, {
+            configMap,
+            appName,
+            solutionId,
+            namespace
+        });
+        throw new Error(`ConfigMap YAML generation failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
 /**
  * Direct MCP tool handler for generateManifests functionality
  */
@@ -339,8 +393,15 @@ async function handleGenerateManifestsTool(args, dotAI, logger, requestId) {
                 requestId
             });
             try {
-                // Generate manifests with AI
-                const manifests = await generateManifestsWithAI(solution, dotAI, logger, lastError);
+                // Extract user answers and generate required labels
+                const userAnswers = (0, solution_utils_1.extractUserAnswers)(solution);
+                const dotAiLabels = (0, solution_utils_1.addDotAiLabels)(undefined, userAnswers, solution);
+                // Generate manifests with AI (including labels)
+                const aiManifests = await generateManifestsWithAI(solution, dotAI, logger, lastError, dotAiLabels);
+                // Generate metadata ConfigMap
+                const metadataConfigMap = generateMetadataConfigMap(solution, userAnswers, logger);
+                // Combine ConfigMap with AI-generated manifests
+                const manifests = metadataConfigMap + '---\n' + aiManifests;
                 // Save manifests to file
                 fs.writeFileSync(yamlPath, manifests, 'utf8');
                 logger.info('Manifests saved to file', { yamlPath, attempt, requestId });
@@ -397,8 +458,12 @@ async function handleGenerateManifestsTool(args, dotAI, logger, requestId) {
             }
             catch (error) {
                 logger.error('Error during manifest generation attempt', error);
-                // If this is the last attempt, throw the error
-                if (attempt === maxAttempts) {
+                // Check if this is a validation error that should not be retried
+                const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+                const isValidationError = errorMessage.includes('Application name is required') ||
+                    errorMessage.includes('Application intent is required');
+                // If this is a validation error or the last attempt, throw the error immediately
+                if (isValidationError || attempt === maxAttempts) {
                     throw error;
                 }
                 // Prepare error context for retry
@@ -406,9 +471,9 @@ async function handleGenerateManifestsTool(args, dotAI, logger, requestId) {
                     attempt,
                     previousManifests: lastError?.previousManifests || '',
                     yamlSyntaxValid: false,
-                    kubectlOutput: error instanceof Error ? error.message : 'Unknown error',
+                    kubectlOutput: errorMessage,
                     exitCode: -1,
-                    stderr: error instanceof Error ? error.message : 'Unknown error',
+                    stderr: errorMessage,
                     stdout: ''
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vfarcic/dot-ai",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "Universal Kubernetes application deployment agent with CLI and MCP interfaces",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/prompts/manifest-generation.md

@@ -7,6 +7,10 @@
 The following schemas are available for the resources selected in the solution:
 {schemas}
 
+## Required Labels
+Add these labels to the metadata.labels section of EVERY resource you generate:
+{labels}
+
 ## Previous Attempt (if retry)
 {previous_attempt}
 
@@ -30,13 +34,18 @@ Generate production-ready Kubernetes YAML manifests from the complete solution c
    - Do not invent or guess field names - refer to the schema section above
    - Apply configuration values appropriately for the specific resource type
 
-3. **Cross-Resource Field Mapping**:
+3. **Apply Required Labels**:
+   - **CRITICAL**: Add the required labels shown above to EVERY resource's metadata.labels section
+   - Merge required labels with any existing labels the resource needs
+   - These labels are essential for application tracking and management
+
+4. **Cross-Resource Field Mapping**:
    - Many user answers apply to multiple resources in the solution
    - Use the same values consistently across related resources where appropriate
    - Ensure proper relationships between resources through consistent naming and labeling
    - Apply configuration values to all relevant fields across different resource types
 
-4. **Process Open Requirements**:
+5. **Process Open Requirements**:
    - If user provided open requirements, analyze their specific needs
    - Use available cluster resources to fulfill those requirements intelligently
    - Make enhancement decisions based on actual cluster capabilities
@@ -49,8 +58,11 @@ Generate production-ready Kubernetes YAML manifests from the complete solution c
      * **Network policies** → Add NetworkPolicy resources
      * **Resource limits** → Add ResourceQuota or LimitRange resources
 
-5. **Generate Appropriate Manifests**:
-   - Create manifests for the selected resource types
+6. **Generate Appropriate Manifests**:
+   - **CRITICAL**: Analyze resource relationships before generating separate manifests
+   - When multiple resources can be integrated (e.g., one resource has fields that reference another), prefer integration over separate resources
+   - Generate separate manifests only when resources must be standalone or when integration is not supported by the schema
+   - Use resource schemas to determine integration possibilities and required field relationships
    - **IMPORTANT**: Include any additional supporting resources needed to fulfill open requirements
    - Use correct API versions and schemas from the solution data
    - Ensure all resources work together to meet user's complete requirements