@prompd/cli 0.4.11 → 0.5.0-beta.2

package/dist/lib/compiler/package-resolver.js

@@ -42,6 +42,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePackage = resolvePackage;
 exports.parsePackageReference = parsePackageReference;
 exports.isValidPackageReference = isValidPackageReference;
+exports.findProjectRoot = findProjectRoot;
+exports.getGlobalBaseDir = getGlobalBaseDir;
+exports.getLocalBaseDir = getLocalBaseDir;
 exports.getGlobalCacheDir = getGlobalCacheDir;
 exports.getLocalCacheDir = getLocalCacheDir;
 exports.getPackageCacheDir = getPackageCacheDir;
@@ -53,6 +56,7 @@ const os = __importStar(require("os"));
 const registry_1 = require("../registry");
 const errors_1 = require("../errors");
 const file_system_1 = require("./file-system");
+const types_1 = require("../../types");
 /**
  * Resolve a package reference to a local file path or in-memory path.
  *
@@ -107,26 +111,39 @@ async function resolvePackage(packageRef, fileSystemOrOptions, registryUrl) {
         }
     }
     // Default: disk-based resolution
-    // Resolution order (matches Python CLI):
-    // 1. Check local project cache (./.prompd/cache/)
-    // 2. Check global cache (~/.prompd/cache/)
-    // 3. Download from registry
-    // Package path follows Python CLI structure: @namespace/package-name/version
-    // e.g., @prompd/public-examples -> cache/@prompd/public-examples/1.1.0/
-    // Also check legacy format: @namespace/package-name@version (frontend packageCache)
+    // Resolution order:
+    // 1. Check local type directories (.prompd/packages/, .prompd/workflows/, etc.)
+    // 2. Check global type directories (~/.prompd/packages/, ~/.prompd/workflows/, etc.)
+    // 3. Check legacy cache dirs (.prompd/cache/) for backward compatibility
+    // 4. Download from registry
+    const localBase = getLocalBaseDir(workspaceRoot);
+    const globalBase = getGlobalBaseDir();
+    const typeDirs = Object.values(types_1.PACKAGE_TYPE_DIRS);
+    // Check all type directories locally first
+    for (const typeDir of typeDirs) {
+        const dir = path.join(localBase, typeDir, name, version);
+        if (await fs.pathExists(dir)) {
+            return dir;
+        }
+    }
+    // Check all type directories globally
+    for (const typeDir of typeDirs) {
+        const dir = path.join(globalBase, typeDir, name, version);
+        if (await fs.pathExists(dir)) {
+            return dir;
+        }
+    }
+    // Legacy: check old flat cache directories
     const localCacheDir = getLocalCacheDir(workspaceRoot);
     const globalCacheDir = getGlobalCacheDir();
-    // Check local project cache first (both formats)
     const localPackageDir = path.join(localCacheDir, name, version);
     if (await fs.pathExists(localPackageDir)) {
         return localPackageDir;
     }
-    // Legacy format: name@version as single directory (frontend packageCache.ts format)
     const localPackageDirLegacy = path.join(localCacheDir, `${name}@${version}`);
     if (await fs.pathExists(localPackageDirLegacy)) {
         return localPackageDirLegacy;
     }
-    // Check global cache (both formats)
     const globalPackageDir = path.join(globalCacheDir, name, version);
     if (await fs.pathExists(globalPackageDir)) {
         return globalPackageDir;
@@ -140,14 +157,18 @@ async function resolvePackage(packageRef, fileSystemOrOptions, registryUrl) {
         // Create registry client with optional URL override
         const registry = new registry_1.RegistryClient(resolvedRegistryUrl ? { registryUrl: resolvedRegistryUrl } : undefined);
         await registry.install(packageRef, { skipCache: false, workspaceRoot });
-        // After installation, check both caches again
-        if (await fs.pathExists(localPackageDir)) {
-            return localPackageDir;
-        }
-        if (await fs.pathExists(globalPackageDir)) {
-            return globalPackageDir;
+        // After installation, check type directories again (new install location)
+        for (const typeDir of typeDirs) {
+            const localDir = path.join(localBase, typeDir, name, version);
+            if (await fs.pathExists(localDir)) {
+                return localDir;
+            }
+            const globalDir = path.join(globalBase, typeDir, name, version);
+            if (await fs.pathExists(globalDir)) {
+                return globalDir;
+            }
         }
-        throw new Error(`Package installation succeeded but package not found in cache: ${packageRef}`);
+        throw new Error(`Package installation succeeded but package not found: ${packageRef}`);
     }
     catch (error) {
         throw new Error(`Failed to resolve package ${packageRef}: ${error instanceof Error ? error.message : String(error)}`);
@@ -189,23 +210,72 @@ function isValidPackageReference(packageRef) {
     }
     return true;
 }
+/**
+ * Find the project root by walking up the directory tree looking for a
+ * prompd.json with both 'name' and 'version' fields (a real project manifest,
+ * not a dependency-only fragment).
+ *
+ * Falls back to startDir (or process.cwd()) if no project root is found.
+ *
+ * @param startDir - Directory to start searching from. Defaults to process.cwd().
+ */
+function findProjectRoot(startDir) {
+    let dir = path.resolve(startDir || process.cwd());
+    const root = path.parse(dir).root;
+    while (true) {
+        const candidate = path.join(dir, 'prompd.json');
+        if (fs.pathExistsSync(candidate)) {
+            try {
+                const content = fs.readJsonSync(candidate);
+                if (content.name && content.version) {
+                    return dir;
+                }
+            }
+            catch {
+                // Invalid JSON, skip and keep walking
+            }
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir || dir === root) {
+            break;
+        }
+        dir = parent;
+    }
+    return path.resolve(startDir || process.cwd());
+}
+/**
+ * Get the global .prompd base directory (~/.prompd/).
+ */
+function getGlobalBaseDir() {
+    return path.join(os.homedir(), '.prompd');
+}
+/**
+ * Get the local project .prompd base directory (./.prompd/).
+ * @param workspaceRoot - Optional workspace root directory. If not provided, auto-detects project root.
+ */
+function getLocalBaseDir(workspaceRoot) {
+    const basePath = workspaceRoot || findProjectRoot();
+    return path.join(basePath, '.prompd');
+}
 /**
  * Get the global package cache directory (~/.prompd/cache/).
+ * @deprecated Legacy path. New installs use type-specific dirs (packages/, workflows/, etc.)
  */
 function getGlobalCacheDir() {
     return path.join(os.homedir(), '.prompd', 'cache');
 }
 /**
  * Get the local project package cache directory (./.prompd/cache/).
- * @param workspaceRoot - Optional workspace root directory. If not provided, uses process.cwd()
+ * @deprecated Legacy path. New installs use type-specific dirs (packages/, workflows/, etc.)
+ * @param workspaceRoot - Optional workspace root directory. If not provided, auto-detects project root.
  */
 function getLocalCacheDir(workspaceRoot) {
-    const basePath = workspaceRoot || process.cwd();
+    const basePath = workspaceRoot || findProjectRoot();
     return path.join(basePath, '.prompd', 'cache');
 }
 /**
  * Get the package cache directory (for backward compatibility).
- * @deprecated Use getGlobalCacheDir() or getLocalCacheDir() instead
+ * @deprecated Use getGlobalBaseDir() or getLocalBaseDir() instead
  */
 function getPackageCacheDir() {
     return getGlobalCacheDir();
@@ -235,21 +305,36 @@ function resolvePackageFile(packagePath, filePath) {
     return resolvedPath;
 }
 /**
- * Check if a package is installed (in local or global cache).
+ * Check if a package is installed (in any type directory, local or global).
  * @param packageRef - Package reference to check
  * @param workspaceRoot - Optional workspace root directory for local cache
  */
 async function isPackageInstalled(packageRef, workspaceRoot) {
     try {
         const { name, version } = parsePackageReference(packageRef);
-        // Check local cache first
-        const localPackageDir = path.join(getLocalCacheDir(workspaceRoot), name, version);
-        if (await fs.pathExists(localPackageDir)) {
+        const localBase = getLocalBaseDir(workspaceRoot);
+        const globalBase = getGlobalBaseDir();
+        const typeDirs = Object.values(types_1.PACKAGE_TYPE_DIRS);
+        // Check all type directories locally
+        for (const typeDir of typeDirs) {
+            if (await fs.pathExists(path.join(localBase, typeDir, name, version))) {
+                return true;
+            }
+        }
+        // Check all type directories globally
+        for (const typeDir of typeDirs) {
+            if (await fs.pathExists(path.join(globalBase, typeDir, name, version))) {
+                return true;
+            }
+        }
+        // Legacy: check flat cache directories
+        if (await fs.pathExists(path.join(getLocalCacheDir(workspaceRoot), name, version))) {
             return true;
         }
-        // Check global cache
-        const globalPackageDir = path.join(getGlobalCacheDir(), name, version);
-        return await fs.pathExists(globalPackageDir);
+        if (await fs.pathExists(path.join(getGlobalCacheDir(), name, version))) {
+            return true;
+        }
+        return false;
     }
     catch {
         return false;

package/dist/lib/compiler/package-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-resolver.js","sourceRoot":"","sources":["../../../src/lib/compiler/package-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-resolver.js","sourceRoot":"","sources":["../../../src/lib/compiler/package-resolver.ts"],"names":[],"mappings":"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"}

package/dist/lib/compiler/stages/semantic.d.ts

@@ -11,6 +11,13 @@ export declare class SemanticAnalysisStage implements CompilerStage {
      * Validate parameter type.
      */
     private validateParameterType;
+    /**
+     * Coerce a parameter value to its declared type.
+     * CLI args always arrive as strings; this converts them to the correct runtime type
+     * before the value is handed to the template engine.
+     * Already-correct types (e.g. from a JSON params file) are passed through unchanged.
+     */
+    private coerceParameterValue;
     /**
      * Validate required metadata fields (id, name, version).
      */

package/dist/lib/compiler/stages/semantic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../../../src/lib/compiler/stages/semantic.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE7D,qBAAa,qBAAsB,YAAW,aAAa;IACnD,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiFzD;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAmB7B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAoEhC,OAAO,IAAI,MAAM;CAGlB"}
+{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../../../src/lib/compiler/stages/semantic.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE7D,qBAAa,qBAAsB,YAAW,aAAa;IACnD,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0FzD;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA4B7B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAwC5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAoEhC,OAAO,IAAI,MAAM;CAGlB"}

package/dist/lib/compiler/stages/semantic.js

@@ -34,6 +34,11 @@ class SemanticAnalysisStage {
                 if (isExecutionMode && param.required && !(param.name in context.parameters)) {
                     context.addWarning(`Required parameter '${param.name}' not provided`);
                 }
+                // Type coercion for provided parameters.
+                // CLI args always arrive as strings; coerce to the declared type before validation.
+                if (param.name in context.parameters) {
+                    context.parameters[param.name] = this.coerceParameterValue(context.parameters[param.name], param.type);
+                }
                 // Type validation for provided parameters
                 if (param.name in context.parameters) {
                     const value = context.parameters[param.name];
@@ -73,19 +78,90 @@ class SemanticAnalysisStage {
     validateParameterType(value, expectedType) {
         switch (expectedType) {
             case 'string':
+            case 'file': // file path provided as a string
+            case 'base64': // base64-encoded binary provided as a string
                 return typeof value === 'string';
             case 'number':
-            case 'integer':
             case 'float':
                 return typeof value === 'number' && !isNaN(value);
+            case 'integer':
+                return typeof value === 'number' && !isNaN(value) && Number.isInteger(value);
             case 'boolean':
                 return typeof value === 'boolean';
             case 'array':
                 return Array.isArray(value);
             case 'object':
                 return typeof value === 'object' && value !== null && !Array.isArray(value);
+            case 'json':
+                // Accepts any JSON-compatible value: already-parsed object/array, primitives,
+                // or a string that is valid JSON.
+                if (value === null || value === undefined)
+                    return false;
+                if (typeof value !== 'string')
+                    return true; // already parsed
+                try {
+                    JSON.parse(value);
+                    return true;
+                }
+                catch {
+                    return false;
+                }
+            default:
+                return true; // Unknown type — allow it
+        }
+    }
+    /**
+     * Coerce a parameter value to its declared type.
+     * CLI args always arrive as strings; this converts them to the correct runtime type
+     * before the value is handed to the template engine.
+     * Already-correct types (e.g. from a JSON params file) are passed through unchanged.
+     */
+    coerceParameterValue(value, type) {
+        if (value === null || value === undefined)
+            return value;
+        switch (type) {
+            case 'boolean':
+                if (typeof value === 'boolean')
+                    return value;
+                if (typeof value === 'string') {
+                    if (value.toLowerCase() === 'true')
+                        return true;
+                    if (value.toLowerCase() === 'false')
+                        return false;
+                }
+                return value;
+            case 'integer':
+                if (typeof value === 'number')
+                    return value;
+                if (typeof value === 'string') {
+                    const n = Number(value);
+                    if (!isNaN(n))
+                        return n;
+                }
+                return value;
+            case 'number':
+            case 'float':
+                if (typeof value === 'number')
+                    return value;
+                if (typeof value === 'string') {
+                    const n = parseFloat(value);
+                    if (!isNaN(n))
+                        return n;
+                }
+                return value;
+            case 'json':
+            case 'array':
+            case 'object':
+                if (typeof value !== 'string')
+                    return value; // already parsed
+                try {
+                    return JSON.parse(value);
+                }
+                catch {
+                    return value;
+                }
             default:
-                return true; // Unknown type, allow it
+                return value;
         }
     }
     /**

package/dist/lib/compiler/stages/semantic.js.map

@@ -1 +1 @@
-{"version":3,"file":"semantic.js","sourceRoot":"","sources":["../../../../src/lib/compiler/stages/semantic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"semantic.js","sourceRoot":"","sources":["../../../../src/lib/compiler/stages/semantic.ts"],"names":[],"mappings":"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"}

package/dist/lib/compiler/stages/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../src/lib/compiler/stages/template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO7D,qBAAa,uBAAwB,YAAW,aAAa;IAC3D,OAAO,CAAC,gBAAgB,CAA2B;IACnD,OAAO,CAAC,WAAW,CAAuB;;IAyB1C;;OAEG;IACH,OAAO,CAAC,eAAe;IAgLvB;;OAEG;IACH,OAAO,CAAC,QAAQ;IA8BhB;;OAEG;IACH,OAAO,CAAC,YAAY;IA6Bd,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCzD;;OAEG;YACW,wBAAwB;IAuCtC;;OAEG;YACW,mBAAmB;IAgDjC;;OAEG;YACW,kBAAkB;IAyHhC;;OAEG;YACW,0BAA0B;IA8ExC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,yBAAyB;IAmCjC;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAsBhC;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAuCxB;;;OAGG;YACW,eAAe;IAgF7B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgP5B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAiDlC;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB,OAAO,IAAI,MAAM;CAGlB"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../src/lib/compiler/stages/template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO7D,qBAAa,uBAAwB,YAAW,aAAa;IAC3D,OAAO,CAAC,gBAAgB,CAA2B;IACnD,OAAO,CAAC,WAAW,CAAuB;;IAyB1C;;OAEG;IACH,OAAO,CAAC,eAAe;IAiLvB;;OAEG;IACH,OAAO,CAAC,QAAQ;IA8BhB;;OAEG;IACH,OAAO,CAAC,YAAY;IA6Bd,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCzD;;OAEG;YACW,wBAAwB;IAuCtC;;OAEG;YACW,mBAAmB;IAgDjC;;OAEG;YACW,kBAAkB;IAyHhC;;OAEG;YACW,0BAA0B;IA8ExC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,yBAAyB;IAmCjC;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAsBhC;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAuCxB;;;OAGG;YACW,eAAe;IAqF7B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAiP5B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAiDlC;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB,OAAO,IAAI,MAAM;CAGlB"}

package/dist/lib/compiler/stages/template.js

@@ -83,13 +83,16 @@ class TemplateProcessingStage {
             }
             return this.parseCsv(csvString);
         });
-        // fromjson - Parse JSON string into object/array
-        this.nunjucksEnv.addFilter('fromjson', (jsonString) => {
-            if (!jsonString || typeof jsonString !== 'string') {
+        // fromjson - Parse JSON string into object/array.
+        // If the value is already a parsed object or array (e.g. from a JSON params file),
+        // pass it through unchanged instead of returning null.
+        this.nunjucksEnv.addFilter('fromjson', (value) => {
+            if (value === null || value === undefined)
                 return null;
-            }
+            if (typeof value !== 'string')
+                return value; // already parsed
             try {
-                return JSON.parse(jsonString);
+                return JSON.parse(value);
             }
             catch {
                 return null;
@@ -719,10 +722,16 @@ class TemplateProcessingStage {
                     reject(error);
                 }
             });
+            let timeoutId;
             const timeoutPromise = new Promise((_, reject) => {
-                setTimeout(() => reject(new Error('Template rendering timeout')), renderTimeout);
+                timeoutId = setTimeout(() => reject(new Error('Template rendering timeout')), renderTimeout);
             });
-            content = await Promise.race([renderPromise, timeoutPromise]);
+            try {
+                content = await Promise.race([renderPromise, timeoutPromise]);
+            }
+            finally {
+                clearTimeout(timeoutId);
+            }
         }
         catch (error) {
             // Report template syntax errors properly
@@ -825,13 +834,16 @@ class TemplateProcessingStage {
             }
             return this.parseCsv(csvString);
         });
-        // fromjson - Parse JSON string into object/array
-        env.addFilter('fromjson', (jsonString) => {
-            if (!jsonString || typeof jsonString !== 'string') {
+        // fromjson - Parse JSON string into object/array.
+        // If the value is already a parsed object or array (e.g. from a JSON params file),
+        // pass it through unchanged instead of returning null.
+        env.addFilter('fromjson', (value) => {
+            if (value === null || value === undefined)
                 return null;
-            }
+            if (typeof value !== 'string')
+                return value; // already parsed
             try {
-                return JSON.parse(jsonString);
+                return JSON.parse(value);
             }
             catch {
                 return null;