@garyr/pt-cli 0.36.4 → 0.38.0

package/README.md

@@ -45,13 +45,15 @@ graph LR
 - Initialize new projects from learned templates
 - Define template variables for dynamic file customization
 - **Automatic Variable Detection:** Scans text files for `{{ var }}` syntax during `learn`/`update`
+- **Nested Variable Expansion (v0.36.0+):** Variables can contain other variable placeholders that are resolved iteratively
+- **Parent Directory `.env` File Scanning:** Automatically scans parent directories for `.env` files and uses their values as defaults
 - Auto-detect and suggest post-config setup tasks
 - Configure global post-config tasks in `~/.pt/config.yaml` (apply to all projects)
 - Baked-in defaults for common project types (javascript, python, godot, etc.)
 - Share templates or use as an API with JSON export/import
 - **Direct JSON scaffolding:** Initialize projects from a JSON file without registering in `config.yaml`
 - **Portable template configs:** `.pt-template.json` files make shared directories fully self-describing
-- Fully supports non-interactive mode (`--yes`, `--vars`) for AI agent automation
+- Fully supports non-interactive mode (`--yes`, `--vars`, `--name`, `--desc`) for AI agent automation
 
 ## Quick Start
 

package/dist/commands/initCommand.js

@@ -5,6 +5,61 @@ import { loadConfig, sanitizePath } from '../config.js';
 import chalk from 'chalk';
 import { processCopyFiles } from '../substitute.js';
 import { execSync } from 'child_process';
+/**
+ * Scan parent directories for .env files and parse their variables.
+ * Returns a map of variable names to their values, supporting:
+ * - KEY=VALUE format
+ * - KEY="VALUE with spaces" format
+ * - KEY='VALUE with spaces' format
+ * - Comments (lines starting with #)
+ * - Empty lines
+ */
+function scanEnvForVariables(targetPath) {
+    const envVars = {};
+    let currentDir = path.resolve(targetPath);
+    // Scan up to 5 parent directories for .env files
+    const maxDepth = 5;
+    for (let depth = 0; depth < maxDepth; depth++) {
+        const envPath = path.join(currentDir, '.env');
+        if (fs.existsSync(envPath)) {
+            try {
+                const content = fs.readFileSync(envPath, 'utf-8');
+                const lines = content.split('\n');
+                for (const line of lines) {
+                    const trimmed = line.trim();
+                    // Skip empty lines and comments
+                    if (!trimmed || trimmed.startsWith('#')) {
+                        continue;
+                    }
+                    // Match KEY=VALUE patterns
+                    const match = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.+)$/);
+                    if (match) {
+                        const key = match[1];
+                        let value = match[2];
+                        // Remove surrounding quotes if present
+                        if ((value.startsWith('"') && value.endsWith('"')) ||
+                            (value.startsWith("'") && value.endsWith("'"))) {
+                            value = value.slice(1, -1);
+                        }
+                        envVars[key] = value;
+                    }
+                }
+            }
+            catch (err) {
+                // Silently skip unreadable .env files
+                continue;
+            }
+        }
+        // Move to parent directory
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir) {
+            // Reached filesystem root
+            break;
+        }
+        currentDir = parentDir;
+    }
+    return envVars;
+}
 export async function init(targetName, destPath, options = {}) {
     const config = loadConfig();
     let typeName = targetName;
@@ -86,6 +141,16 @@ export async function init(targetName, destPath, options = {}) {
     // Handle Variables
     let variables = {};
     if (template.variables && template.variables.length > 0) {
+        // Scan parent directories for .env files and pre-fill variables
+        const envVars = scanEnvForVariables(resolvedDest);
+        // Merge .env variables into variables (with lower priority than --vars)
+        if (Object.keys(envVars).length > 0) {
+            for (const [key, value] of Object.entries(envVars)) {
+                if (!variables[key]) {
+                    variables[key] = value;
+                }
+            }
+        }
         if (options.vars) {
             // Parse --vars "key=val,key2=val2"
             const pairs = options.vars.split(',').map((p) => p.trim());

package/dist/commands/learnCommand.js

@@ -9,7 +9,16 @@ export async function learn(sourcePath, updateTemplate = null, options = {}) {
     // Phase 1: Remote Check
     if (sourcePath.startsWith('http')) {
         console.log(chalk.cyan(`Downloading remote template from: ${sourcePath}...`));
-        resolvedPath = await downloadAndExtract(sourcePath, options.json || false, options.allowUntrusted || false);
+        try {
+            resolvedPath = await downloadAndExtract(sourcePath, options.json || false, options.allowUntrusted || false);
+        }
+        catch (err) {
+            if (err.message === 'Download cancelled by user due to untrusted source') {
+                console.log(chalk.yellow('Download cancelled. Exiting.'));
+                process.exit(0);
+            }
+            throw err;
+        }
     }
     else {
         resolvedPath = path.resolve(sourcePath);
@@ -65,6 +74,8 @@ export async function learn(sourcePath, updateTemplate = null, options = {}) {
         }
     }
     else {
+        // Track whether name came from .info.md or JSON (not user-provided)
+        const nameFromSource = !options.name && (fileTemplateConfig.name || infoName);
         if (options.name) {
             targetName = options.name;
         }
@@ -92,6 +103,34 @@ export async function learn(sourcePath, updateTemplate = null, options = {}) {
                 targetName = newName;
             }
         }
+        // If name came from .info.md or JSON, prompt to confirm/edit
+        // This prevents accidental overwrites when creating new templates based on existing ones
+        if (nameFromSource && !options.json) {
+            if (options.yes) {
+                // In --yes mode, keep the auto-detected name but warn
+                const existingNames = getTemplateNames(config);
+                if (existingNames.includes(targetName)) {
+                    console.warn(chalk.yellow(`⚠ Warning: "${targetName}" already exists. Using this name will overwrite the existing template.`));
+                }
+            }
+            else {
+                const { confirmName } = await inquirer.prompt({
+                    type: 'confirm',
+                    name: 'confirmName',
+                    message: `Use "${targetName}" as the template name?`,
+                    default: true
+                });
+                if (!confirmName) {
+                    const { newName } = await inquirer.prompt({
+                        type: 'input',
+                        name: 'newName',
+                        message: 'Name this template:',
+                        default: targetName
+                    });
+                    targetName = newName;
+                }
+            }
+        }
     }
     let description = '';
     if (options.desc) {
@@ -124,6 +163,8 @@ export async function learn(sourcePath, updateTemplate = null, options = {}) {
         }
     }
     else {
+        // Track whether description came from .info.md or JSON (not user-provided)
+        const descFromSource = !options.desc && (fileTemplateConfig.description || infoDesc);
         if (fileTemplateConfig.description) {
             description = fileTemplateConfig.description;
             if (!options.json)
@@ -146,6 +187,34 @@ export async function learn(sourcePath, updateTemplate = null, options = {}) {
             });
             description = newDesc;
         }
+        // If description came from .info.md or JSON, prompt to confirm/edit
+        // This prevents accidental overwrites when creating new templates based on existing ones
+        if (descFromSource && !options.json) {
+            if (options.yes) {
+                // In --yes mode, keep the auto-detected description but warn
+                const existingNames = getTemplateNames(config);
+                if (existingNames.includes(targetName)) {
+                    console.warn(chalk.yellow(`⚠ Warning: "${targetName}" already exists. Using this name will overwrite the existing template.`));
+                }
+            }
+            else {
+                const { confirmDesc } = await inquirer.prompt({
+                    type: 'confirm',
+                    name: 'confirmDesc',
+                    message: `Use "${description}" as the template description?`,
+                    default: true
+                });
+                if (!confirmDesc) {
+                    const { newDesc } = await inquirer.prompt({
+                        type: 'input',
+                        name: 'newDesc',
+                        message: 'Purpose/Description of this template:',
+                        default: description
+                    });
+                    description = newDesc;
+                }
+            }
+        }
     }
     const cliIgnore = options.ignore ? options.ignore.split(',').map((s) => s.trim()).filter(Boolean) : [];
     const ignorePatterns = [...(config.ignore || []), ...cliIgnore];

package/dist/substitute.js

@@ -4,11 +4,32 @@ import path from 'path';
 import { sanitizePath } from './config.js';
 /**
  * Replaces all {{var}} patterns in the content with values from the variables object.
+ * Supports nested variable expansion - if a variable's value contains {{other_var}},
+ * it will be expanded iteratively until no more placeholders remain or maxIterations is reached.
  */
-export function substituteVariables(content, variables) {
-    return content.replace(/\{\{\s*(\w+)\s*\}\}/g, (_, varName) => {
-        return variables[varName] ?? `{{${varName}}}`;
-    });
+export function substituteVariables(content, variables, maxIterations = 10) {
+    let result = content;
+    let iteration = 0;
+    // Keep expanding until no more placeholders remain or we hit the limit
+    while (/\{\{[^}]+\}\}/.test(result) && iteration < maxIterations) {
+        // Use a more complex regex that captures the full placeholder including spaces
+        result = result.replace(/(\{\{\s*)(\w+)(\s*\}\})/g, (_, prefix, varName, suffix) => {
+            const val = variables[varName];
+            // If variable not found, leave placeholder as-is with original spacing
+            if (val === undefined) {
+                return `${prefix}${varName}${suffix}`;
+            }
+            // Return the value (which may contain more placeholders to expand)
+            return val;
+        });
+        iteration++;
+        // Prevent infinite loops by checking if we're stuck
+        if (iteration > 1 && result === content) {
+            console.warn(chalk.yellow(`Warning: Potential infinite loop detected in variable expansion, stopping after ${iteration} iterations`));
+            break;
+        }
+    }
+    return result;
 }
 /**
  * Processes copy_files tasks from a template.

package/doc/configuration.md

@@ -28,6 +28,58 @@ Instead of manual definition, `pt learn` and `pt update` automatically scan for
 
 These variables are then used during `copy_files` operations to replace `{{variable_name}}` placeholders in copied files.
 
+### Nested Variable Expansion (v0.36.0+)
+
+Starting with v0.36.0, `pt` supports **nested variable expansion** — variables can contain other variable placeholders that are resolved iteratively. This enables powerful configuration patterns like:
+
+```bash
+# In ~/.env or parent directory .env file:
+prefix='rst_{{ project }}'
+project=MyProject
+```
+
+During initialization, the system will:
+1. Load `prefix='rst_{{ project }}'` from `.env`
+2. Detect that `prefix` contains a `{{ project }}` placeholder
+3. Resolve `{{ project }}` to `MyProject`
+4. Set `prefix` to `rst_MyProject`
+
+This is particularly useful for:
+- **Project naming conventions**: `prefix='app_{{ env }}'` + `env=prod` → `app_prod`
+- **Path templates**: `template_path='docs/{{ project }}'` + `project=wiki` → `docs/wiki`
+- **Multi-level configurations**: Combine multiple `.env` files with nested references
+
+**How it works:**
+- Variables are expanded iteratively (up to 10 passes) to prevent infinite loops
+- Circular references are detected and stopped gracefully
+- Missing nested variables remain as `{{ variable }}` placeholders
+- Whitespace is preserved: `{{ unknown }}` stays as `{{ unknown }}` (not `{{unknown}}`)
+
+### Parent Directory `.env` File Scanning
+
+`pt` automatically scans parent directories for `.env` files and uses their values as defaults during initialization. This enables:
+
+- **Project-wide defaults**: Store common values in a parent `.env` file
+- **Environment-specific configurations**: Use different `.env` files for dev/staging/prod
+- **Team collaboration**: Share common variable values across team projects
+
+**Example:**
+```bash
+# Project structure:
+my-project/
+├── .env          # Contains: prefix='rst_'
+├── sub-project/  # Initialize here
+│   └── ...
+```
+
+When you run `pt init my-template sub-project`, the `prefix` variable will be pre-filled with `rst_` from the parent `.env` file.
+
+**Behavior:**
+- Scans from the current directory up to 3 parent levels
+- Uses values from `.env` as defaults (still prompts if not in `.env`)
+- `--vars` CLI option overrides `.env` values
+- `.env` files are not committed to version control (use `.gitignore`)
+
 ## Post-Config Tasks
 
 Post-config tasks are optional commands that run after a project is initialized. They can be defined in a template or auto-detected from the source directory.

package/doc/usage.md

@@ -46,6 +46,72 @@ During `pt learn` or `pt update`, the tool automatically scans text files at the
 - **Global Suggestions:** Your global variables (defined in `~/.pt/config.yaml`) are automatically injected as additional suggestions during the learn process.
 - **Updating:** You can add new placeholders to a project folder and run `pt update <template_name>` to automatically register them in your existing template.
 
+### Using `.env` Files for Variable Defaults (v0.36.0+)
+
+Starting with v0.36.0, `pt` automatically scans parent directories for `.env` files and uses their values as defaults during initialization. This enables powerful configuration patterns:
+
+```bash
+# Create a .env file in your project directory
+echo "prefix='rst_'" > .env
+echo "project='MyProject'" >> .env
+
+# Initialize a project - variables are pre-filled from .env
+pt init my-template my-new-project
+```
+
+**Key Features:**
+- **Automatic Scanning:** Scans up to 3 parent directories for `.env` files
+- **Variable Pre-filling:** Values from `.env` are used as defaults in prompts
+- **Nested Variables:** Supports nested placeholders like `prefix='app_{{ env }}'`
+- **Override Support:** Use `--vars` to override `.env` values: `--vars project=OverriddenProject`
+
+**Example with Nested Variables:**
+```bash
+# .env file
+prefix='app_{{ env }}'
+env=prod
+project=MyApp
+
+# Template README.md.tmpl
+# Content: {{prefix}}_{{project}}
+
+# Result: app_prod_MyApp
+```
+
+**Security Note:** `.env` files are not committed to version control. Use `.gitignore` to exclude them:
+```bash
+# .gitignore
+.env
+*.env
+```
+
+### Nested Variable Expansion (v0.36.0+)
+
+The `pt` CLI now supports **nested variable expansion** — variables can contain other variable placeholders that are resolved iteratively. This enables powerful configuration patterns:
+
+```bash
+# In .env file:
+prefix='rst_{{ project }}'
+project=MyProject
+
+# During initialization, the system will:
+# 1. Load prefix='rst_{{ project }}' from .env
+# 2. Detect that prefix contains a {{ project }} placeholder
+# 3. Resolve {{ project }} to MyProject
+# 4. Set prefix to rst_MyProject
+```
+
+**Use Cases:**
+- **Project naming conventions:** `prefix='app_{{ env }}'` + `env=prod` → `app_prod`
+- **Path templates:** `template_path='docs/{{ project }}'` + `project=wiki` → `docs/wiki`
+- **Multi-level configurations:** Combine multiple `.env` files with nested references
+
+**How it works:**
+- Variables are expanded iteratively (up to 10 passes) to prevent infinite loops
+- Circular references are detected and stopped gracefully
+- Missing nested variables remain as `{{ variable }}` placeholders
+- Whitespace is preserved: `{{ unknown }}` stays as `{{ unknown }}` (not `{{unknown}}`)
+
 ## Initialize a project
 
 ```bash

package/doc/variable_substitution_example.md

@@ -76,3 +76,67 @@ The resulting `package.json` in `my-new-project/` will be:
   "license": "MIT"
 }
 ```
+
+## 4. Nested Variable Expansion (v0.36.0+)
+
+Starting with v0.36.0, you can use **nested variables** for more complex configurations. Create a `.env` file in your project directory or parent directory:
+
+```bash
+# .env file in parent directory
+prefix='rst_'
+project=MyProject
+```
+
+Then use these variables in your template files:
+
+**`templates/README.md.tmpl`**:
+```markdown
+# {{prefix}}{{project}}
+
+This is a nested variable example where:
+- prefix = 'rst_'
+- project = 'MyProject'
+- Result: 'rst_MyProject'
+```
+
+**Even more complex nesting:**
+```bash
+# .env file
+prefix='app_{{ env }}'
+env=prod
+project=MyApp
+version=2.0
+```
+
+Then in your template:
+```json
+{
+  "name": "{{prefix}}_{{project}}",
+  "version": "{{version}}"
+}
+```
+
+This will resolve to:
+```json
+{
+  "name": "app_prod_MyApp",
+  "version": "2.0"
+}
+```
+
+**How it works:**
+1. `pt` scans parent directories for `.env` files
+2. Loads variables from `.env` as defaults
+3. Expands nested placeholders iteratively (up to 10 passes)
+4. Resolves circular references gracefully
+
+**Example with nested placeholders:**
+```bash
+# .env file
+template_path='docs/{{ project }}'
+project=wiki
+```
+
+Result: `template_path` becomes `docs/wiki`
+
+**Important:** Missing nested variables remain as `{{ variable }}` placeholders (with preserved whitespace) to help identify configuration issues.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@garyr/pt-cli",
-  "version": "0.36.4",
+  "version": "0.38.0",
   "description": "Project Template CLI - Learn structures and initialize projects",
   "main": "dist/index.js",
   "bin": {

package/src/commands/initCommand.ts

@@ -14,6 +14,71 @@ export interface InitOptions {
   file?: string;
 }
 
+/**
+ * Scan parent directories for .env files and parse their variables.
+ * Returns a map of variable names to their values, supporting:
+ * - KEY=VALUE format
+ * - KEY="VALUE with spaces" format
+ * - KEY='VALUE with spaces' format
+ * - Comments (lines starting with #)
+ * - Empty lines
+ */
+function scanEnvForVariables(targetPath: string): Record<string, string> {
+  const envVars: Record<string, string> = {};
+  let currentDir = path.resolve(targetPath);
+  
+  // Scan up to 5 parent directories for .env files
+  const maxDepth = 5;
+  
+  for (let depth = 0; depth < maxDepth; depth++) {
+    const envPath = path.join(currentDir, '.env');
+    
+    if (fs.existsSync(envPath)) {
+      try {
+        const content = fs.readFileSync(envPath, 'utf-8');
+        const lines = content.split('\n');
+        
+        for (const line of lines) {
+          const trimmed = line.trim();
+          
+          // Skip empty lines and comments
+          if (!trimmed || trimmed.startsWith('#')) {
+            continue;
+          }
+          
+          // Match KEY=VALUE patterns
+          const match = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.+)$/);
+          if (match) {
+            const key = match[1];
+            let value = match[2];
+            
+            // Remove surrounding quotes if present
+            if ((value.startsWith('"') && value.endsWith('"')) || 
+                (value.startsWith("'") && value.endsWith("'"))) {
+              value = value.slice(1, -1);
+            }
+            
+            envVars[key] = value;
+          }
+        }
+      } catch (err) {
+        // Silently skip unreadable .env files
+        continue;
+      }
+    }
+    
+    // Move to parent directory
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      // Reached filesystem root
+      break;
+    }
+    currentDir = parentDir;
+  }
+  
+  return envVars;
+}
+
 export async function init(targetName: string | undefined, destPath: string | undefined, options: InitOptions = {}) {
   const config = loadConfig();
 
@@ -103,6 +168,18 @@ export async function init(targetName: string | undefined, destPath: string | un
   // Handle Variables
   let variables: Record<string, string> = {};
   if (template.variables && template.variables.length > 0) {
+    // Scan parent directories for .env files and pre-fill variables
+    const envVars = scanEnvForVariables(resolvedDest);
+    
+    // Merge .env variables into variables (with lower priority than --vars)
+    if (Object.keys(envVars).length > 0) {
+      for (const [key, value] of Object.entries(envVars)) {
+        if (!variables[key]) {
+          variables[key] = value;
+        }
+      }
+    }
+    
     if (options.vars) {
       // Parse --vars "key=val,key2=val2"
       const pairs = options.vars.split(',').map((p: string) => p.trim());

package/src/commands/learnCommand.ts

@@ -21,7 +21,15 @@ export async function learn(sourcePath: string, updateTemplate: string | null =
   // Phase 1: Remote Check
   if (sourcePath.startsWith('http')) {
     console.log(chalk.cyan(`Downloading remote template from: ${sourcePath}...`));
-    resolvedPath = await downloadAndExtract(sourcePath, options.json || false, options.allowUntrusted || false);
+    try {
+      resolvedPath = await downloadAndExtract(sourcePath, options.json || false, options.allowUntrusted || false);
+    } catch (err) {
+      if ((err as Error).message === 'Download cancelled by user due to untrusted source') {
+        console.log(chalk.yellow('Download cancelled. Exiting.'));
+        process.exit(0);
+      }
+      throw err;
+    }
   } else {
     resolvedPath = path.resolve(sourcePath);
   }
@@ -78,6 +86,9 @@ export async function learn(sourcePath: string, updateTemplate: string | null =
       process.exit(1);
     }
   } else {
+    // Track whether name came from .info.md or JSON (not user-provided)
+    const nameFromSource = !options.name && (fileTemplateConfig.name || infoName);
+    
     if (options.name) {
       targetName = options.name;
     } else if (fileTemplateConfig.name) {
@@ -99,6 +110,34 @@ export async function learn(sourcePath: string, updateTemplate: string | null =
         targetName = newName;
       }
     }
+    
+    // If name came from .info.md or JSON, prompt to confirm/edit
+    // This prevents accidental overwrites when creating new templates based on existing ones
+    if (nameFromSource && !options.json) {
+      if (options.yes) {
+        // In --yes mode, keep the auto-detected name but warn
+        const existingNames = getTemplateNames(config);
+        if (existingNames.includes(targetName)) {
+          console.warn(chalk.yellow(`⚠ Warning: "${targetName}" already exists. Using this name will overwrite the existing template.`));
+        }
+      } else {
+        const { confirmName } = await inquirer.prompt({
+          type: 'confirm',
+          name: 'confirmName',
+          message: `Use "${targetName}" as the template name?`,
+          default: true
+        });
+        if (!confirmName) {
+          const { newName } = await inquirer.prompt({
+            type: 'input',
+            name: 'newName',
+            message: 'Name this template:',
+            default: targetName
+          });
+          targetName = newName;
+        }
+      }
+    }
   }
 
   let description = '';
@@ -129,6 +168,9 @@ export async function learn(sourcePath: string, updateTemplate: string | null =
       }
     }
   } else {
+    // Track whether description came from .info.md or JSON (not user-provided)
+    const descFromSource = !options.desc && (fileTemplateConfig.description || infoDesc);
+    
     if (fileTemplateConfig.description) {
       description = fileTemplateConfig.description;
       if (!options.json) console.log(chalk.cyan(`Auto-detected template description from JSON: ${description}`));
@@ -146,6 +188,34 @@ export async function learn(sourcePath: string, updateTemplate: string | null =
       });
       description = newDesc;
     }
+    
+    // If description came from .info.md or JSON, prompt to confirm/edit
+    // This prevents accidental overwrites when creating new templates based on existing ones
+    if (descFromSource && !options.json) {
+      if (options.yes) {
+        // In --yes mode, keep the auto-detected description but warn
+        const existingNames = getTemplateNames(config);
+        if (existingNames.includes(targetName)) {
+          console.warn(chalk.yellow(`⚠ Warning: "${targetName}" already exists. Using this name will overwrite the existing template.`));
+        }
+      } else {
+        const { confirmDesc } = await inquirer.prompt({
+          type: 'confirm',
+          name: 'confirmDesc',
+          message: `Use "${description}" as the template description?`,
+          default: true
+        });
+        if (!confirmDesc) {
+          const { newDesc } = await inquirer.prompt({
+            type: 'input',
+            name: 'newDesc',
+            message: 'Purpose/Description of this template:',
+            default: description
+          });
+          description = newDesc;
+        }
+      }
+    }
   }
 
   const cliIgnore = options.ignore ? options.ignore.split(',').map((s: string) => s.trim()).filter(Boolean) : [];