@intend-it/core 3.0.1 → 4.0.0

package/README.md

@@ -17,6 +17,7 @@
 ### ✨ Key Features
 
 - **🧠 AI Code Generation** - Transforms natural language steps into actual code
+- **🔀 Hybrid Orchestration** - Mix AI steps with deterministic function calls
 - **🔄 Self-Correction Loop** - Validates output and auto-fixes errors
 - **⚡ Smart Caching (CAS)** - Content-addressable storage for instant rebuilds
 - **🔌 Multi-Provider** - Supports Gemini and Ollama (local)

package/dist/index.js

@@ -168911,6 +168911,9 @@ class TypeScriptGenerator {
   }
   generateStep(step, index) {
     const blocks = [];
+    if (step.type === "Call") {
+      return this.generateCall(step);
+    }
     if (this.options.includeTodos) {
       blocks.push({
         type: "comment",
@@ -168934,6 +168937,33 @@ class TypeScriptGenerator {
     blocks.push({ type: "comment", content: "", indent: 0 });
     return blocks;
   }
+  generateCall(call) {
+    const blocks = [];
+    const args = call.args.map((arg) => this.generateValue(arg)).join(", ");
+    const callExpr = `await ${call.intent}(${args})`;
+    if (call.resultVariable) {
+      const decl = call.variableKind || "const";
+      blocks.push({
+        type: "statement",
+        content: `${decl} ${call.resultVariable} = ${callExpr};`,
+        indent: 1
+      });
+    } else {
+      blocks.push({
+        type: "statement",
+        content: `${callExpr};`,
+        indent: 1
+      });
+    }
+    blocks.push({ type: "comment", content: "", indent: 0 });
+    return blocks;
+  }
+  generateValue(v) {
+    if (v.type === "String") {
+      return JSON.stringify(v.value);
+    }
+    return v.value;
+  }
   generateEnsure(ensure) {
     const blocks = [];
     const expr = ensure.expression.trim();
@@ -169185,7 +169215,12 @@ Rules:
       lines.push("");
     }
     lines.push(`Step ${stepIndex + 1} of ${context.steps.length}:`);
-    lines.push(`"${step.instruction}"`);
+    if (step.type === "Call") {
+      const args = step.args.map((a) => a.type === "String" ? JSON.stringify(a.value) : a.value).join(", ");
+      lines.push(`Execute Call: ${step.intent}(${args})`);
+    } else {
+      lines.push(`"${step.instruction}"`);
+    }
     if (step.resultVariable) {
       lines.push(`
 This step must store its result in a variable named: ${step.resultVariable}`);
@@ -169195,10 +169230,17 @@ This step must store its result in a variable named: ${step.resultVariable}`);
 Previous steps:`);
       for (let i = 0;i < stepIndex; i++) {
         const prevStep = context.steps[i];
+        let desc = "";
+        if (prevStep.type === "Call") {
+          const args = prevStep.args.map((a) => a.type === "String" ? JSON.stringify(a.value) : a.value).join(", ");
+          desc = `Call: ${prevStep.intent}(${args})`;
+        } else {
+          desc = `"${prevStep.instruction}"`;
+        }
         if (prevStep.resultVariable) {
-          lines.push(`- Step ${i + 1}: ${prevStep.instruction} => const ${prevStep.resultVariable}`);
+          lines.push(`- Step ${i + 1}: ${desc} => const ${prevStep.resultVariable}`);
         } else {
-          lines.push(`- Step ${i + 1}: ${prevStep.instruction}`);
+          lines.push(`- Step ${i + 1}: ${desc}`);
         }
       }
     }
@@ -169247,10 +169289,16 @@ Generate ONLY the TypeScript code for this step (no explanations, no markdown).`
     }
     lines.push(`Implementation Steps (in order):`);
     context.steps.forEach((step, i) => {
-      let line = `${i + 1}. "${step.instruction}"`;
+      let line = `${i + 1}. `;
+      if (step.type === "Call") {
+        const args = step.args.map((a) => a.type === "String" ? JSON.stringify(a.value) : a.value).join(", ");
+        line += `Call: ${step.intent}(${args})`;
+      } else {
+        line += `"${step.instruction}"`;
+      }
       if (step.resultVariable) {
         line += ` => const ${step.resultVariable}`;
-        if (step.resultType) {
+        if (step.type === "Step" && step.resultType) {
           line += `: ${step.resultType}`;
         }
       }
@@ -169321,10 +169369,16 @@ Response Format:
 `);
     lines.push(`Required Steps:`);
     context.steps.forEach((step, i) => {
-      let line = `${i + 1}. "${step.instruction}"`;
+      let line = `${i + 1}. `;
+      if (step.type === "Call") {
+        const args = step.args.map((a) => a.type === "String" ? JSON.stringify(a.value) : a.value).join(", ");
+        line += `Call: ${step.intent}(${args})`;
+      } else {
+        line += `"${step.instruction}"`;
+      }
       if (step.resultVariable) {
         line += ` => ${step.resultVariable}`;
-        if (step.resultType)
+        if (step.type === "Step" && step.resultType)
           line += `: ${step.resultType}`;
       }
       lines.push(line);
@@ -169562,6 +169616,7 @@ ${request.prompt}`;
 var DEFAULT_MODEL3 = "llama3";
 var DEFAULT_BASE_URL = "http://localhost:11434";
 var DEFAULT_TEMPERATURE3 = 0.2;
+var DEFAULT_TIMEOUT = 90 * 60 * 1000;
 
 class OllamaProvider {
   name = "ollama";
@@ -169569,11 +169624,13 @@ class OllamaProvider {
   baseUrl;
   temperature;
   num_thread;
+  timeout;
   constructor(config) {
     this.model = config.model || DEFAULT_MODEL3;
     this.baseUrl = config.baseUrl || DEFAULT_BASE_URL;
     this.temperature = config.temperature ?? DEFAULT_TEMPERATURE3;
     this.num_thread = config.num_thread;
+    this.timeout = config.timeout ?? DEFAULT_TIMEOUT;
   }
   async generateCode(request) {
     try {
@@ -169632,15 +169689,18 @@ ${request.prompt}`;
         num_thread: this.num_thread
       }
     };
-    body.think = true;
     try {
+      const controller = new AbortController;
+      const timeoutId = setTimeout(() => controller.abort(), this.timeout);
       const response = await fetch(url, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal: controller.signal
       });
+      clearTimeout(timeoutId);
       if (!response.ok) {
         throw new Error(`Ollama API error: ${response.status} - ${response.statusText}`);
       }
@@ -169780,7 +169840,7 @@ class AICodeGenerator {
     this.promptBuilder = new PromptBuilder;
     this.validator = new TypeScriptValidator;
     this.mode = options.mode || "full";
-    this.maxAttempts = options.maxAttempts ?? 5;
+    this.maxAttempts = options.maxAttempts ?? 3;
     this.projectContext = options.projectContext;
     this.debug = options.debug ?? false;
     const providerName = options.provider || "gemini";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intend-it/core",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "Core compiler and AI integration for the Intend programming language",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -35,7 +35,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@intend-it/parser": "^1.2.1",
+    "@intend-it/parser": "^1.3.0",
     "@google/generative-ai": "^0.21.0"
   },
   "devDependencies": {
@@ -43,6 +43,6 @@
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
-    "@intend-it/parser": ">=1.2.1"
+    "@intend-it/parser": ">=1.3.0"
   }
 }