@intend-it/cli 1.1.2 → 1.1.4

package/dist/index.js

@@ -137,6 +137,7 @@ function printHelp() {
   console.log(`  ${cmd("--config")} ${dim("<path>")}   Path to config file`);
   console.log(`  ${cmd("--output")} ${dim("<dir>")}    Output directory`);
   console.log(`  ${cmd("--provider")} ${dim("<name>")} AI provider ${dim("(gemini | ollama)")}`);
+  console.log(`  ${cmd("--model")} ${dim("<name>")}    AI model name`);
   console.log(`  ${cmd("--api-key")} ${dim("<key>")}   Gemini API key`);
   console.log(`  ${cmd("--force")}            Force regeneration (skip cache)`);
   console.log(`  ${cmd("--help")}             Show this help`);
@@ -174,7 +175,7 @@ async function initCommand(args) {
       text: warn(error2.message)
     });
   }
-  const typesPath = join2(directory, "src", "types.ts");
+  const typesPath = join2(srcDir, "types.ts");
   if (!existsSync2(typesPath)) {
     const typesContent = `export interface User {
   name: string;
@@ -182,11 +183,11 @@ async function initCommand(args) {
   createdAt: Date;
 }`;
     writeFileSync2(typesPath, typesContent, "utf-8");
-    console.log(bullet(`${dim("src/types.ts")} ${dim("(typescript definition)")}`));
+    console.log(bullet(`${dim("src/intents/types.ts")} ${dim("(typescript definition)")}`));
   }
   const examplePath = join2(srcDir, "example.intent");
   if (!existsSync2(examplePath)) {
-    const exampleContent = `import { User } from "../types";
+    const exampleContent = `import { User } from "./types";
 
 export intent CreateUser(name: string) -> User {
     step "Generate a random ID" => const id
@@ -225,9 +226,10 @@ out/
 }
 
 // src/commands/build.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3, readFileSync as readFileSync2 } from "fs";
-import { join as join3, resolve as resolve3, basename } from "path";
-import { AICodeGenerator, FileSystemCAS, computeHash } from "@intend-it/core";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3, readFileSync as readFileSync2, copyFileSync } from "fs";
+import { join as join3, resolve as resolve3, dirname, basename } from "path";
+import { AICodeGenerator, FileSystemCAS, computeHash, OllamaProvider } from "@intend-it/core";
+import * as readline from "readline";
 import { parseToAST } from "@intend-it/parser";
 import { readdirSync, statSync } from "fs";
 function findIntentFiles(dir, fileList = []) {
@@ -247,6 +249,26 @@ function findIntentFiles(dir, fileList = []) {
   });
   return fileList;
 }
+function copyResources(src, dest) {
+  if (!existsSync3(src))
+    return;
+  if (!existsSync3(dest))
+    mkdirSync2(dest, { recursive: true });
+  const entries = readdirSync(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = join3(src, entry.name);
+    const destPath = join3(dest, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name !== "node_modules" && entry.name !== ".git") {
+        copyResources(srcPath, destPath);
+      }
+    } else if (entry.isFile()) {
+      if (entry.name.endsWith(".ts") && !entry.name.endsWith(".d.ts")) {
+        copyFileSync(srcPath, destPath);
+      }
+    }
+  }
+}
 async function buildCommand(options) {
   const config = loadConfig(options.config);
   if (options.output)
@@ -255,6 +277,13 @@ async function buildCommand(options) {
     config.gemini.apiKey = options.apiKey;
   if (options.provider)
     config.provider = options.provider;
+  if (options.model) {
+    if (config.provider === "ollama" && config.ollama) {
+      config.ollama.model = options.model;
+    } else if (config.gemini) {
+      config.gemini.model = options.model;
+    }
+  }
   const sourceDir = resolve3(process.cwd(), config.sourceDir);
   const outDir = resolve3(process.cwd(), config.outDir);
   const providerName = config.provider || "gemini";
@@ -325,6 +354,42 @@ async function buildCommand(options) {
     connectSpinner.fail(error(`Connection failed: ${error2.message}`));
     process.exit(1);
   }
+  const provider = generator.getProvider();
+  if (provider instanceof OllamaProvider) {
+    const ollama = provider;
+    if (typeof ollama.checkModelExists === "function") {
+      const exists = await ollama.checkModelExists();
+      if (!exists) {
+        const modelName = config.ollama?.model || "llama3";
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        console.log();
+        const answer = await new Promise((resolve4) => {
+          rl.question(`  ${icons.info} Model '${accent(modelName)}' is not found locally.
+  ${dim("Do you want to pull it now? [Y/n]")} `, resolve4);
+        });
+        rl.close();
+        if (answer.toLowerCase() === "n") {
+          printError("Model missing, cannot proceed.");
+          process.exit(1);
+        }
+        const pullSpinner = spinner(`Pulling ${modelName}...`).start();
+        try {
+          await ollama.pullModel((status, completed, total) => {
+            if (completed && total) {
+              const percent = Math.round(completed / total * 100);
+              pullSpinner.text = `Pulling ${modelName}: ${status} ${percent}%`;
+            } else {
+              pullSpinner.text = `Pulling ${modelName}: ${status}`;
+            }
+          });
+          pullSpinner.succeed(`${modelName} ready`);
+        } catch (e) {
+          pullSpinner.fail(`Failed to pull model: ${e.message}`);
+          process.exit(1);
+        }
+      }
+    }
+  }
   const casDir = resolve3(process.cwd(), ".intend", "store");
   const cas = new FileSystemCAS(casDir);
   let successCount = 0;
@@ -333,14 +398,18 @@ async function buildCommand(options) {
   if (!existsSync3(outDir)) {
     mkdirSync2(outDir, { recursive: true });
   }
+  copyResources(sourceDir, outDir);
   newline();
   console.log(heading("Compiling"));
   for (const file of files) {
     if (!fileData.has(file))
       continue;
     const relativePath = file.substring(sourceDir.length + 1);
-    const fileName = basename(file, ".intent");
-    const outFile = join3(outDir, `${fileName}.ts`);
+    const outFile = join3(outDir, relativePath.replace(/\.intent$/, ".ts"));
+    const outDirForFile = dirname(outFile);
+    if (!existsSync3(outDirForFile)) {
+      mkdirSync2(outDirForFile, { recursive: true });
+    }
     const fileSpinner = spinner(`${relativePath}`).start();
     const fileStart = Date.now();
     try {
@@ -456,6 +525,8 @@ async function handleBuild(args2) {
       options.apiKey = args2[i + 1];
     if (args2[i] === "--provider")
       options.provider = args2[i + 1];
+    if (args2[i] === "--model")
+      options.model = args2[i + 1];
     if (args2[i] === "--watch")
       options.watch = true;
     if (args2[i] === "--force")
@@ -480,6 +551,8 @@ async function handleWatch(args2) {
       options.apiKey = args2[i + 1];
     if (args2[i] === "--provider")
       options.provider = args2[i + 1];
+    if (args2[i] === "--model")
+      options.model = args2[i + 1];
   }
   await watchCommand(options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intend-it/cli",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "CLI for the Intend programming language",
   "type": "module",
   "bin": {
@@ -29,8 +29,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@intend-it/parser": "^1.1.2",
-    "@intend-it/core": "^2.0.2",
+    "@intend-it/parser": "^1.1.4",
+    "@intend-it/core": "^2.0.4",
     "picocolors": "^1.1.1",
     "ora": "^8.1.1"
   },