aiwcli 0.13.3 → 0.13.5

package/dist/commands/clear.d.ts

@@ -31,12 +31,12 @@ export default class ClearCommand extends BaseCommand {
      */
     private cleanupBackupFiles;
     /**
-     * Clean up gitignore entries and prune stale entries.
+     * Clean up git exclude entries and prune stale entries.
      *
      * @param targetDir - Project root directory
-     * @returns True if gitignore was updated
+     * @returns True if git exclude was updated
      */
-    private cleanupGitignore;
+    private cleanupGitExclude;
     /**
      * Display a list of folders to remove.
      *
@@ -103,7 +103,7 @@ export default class ClearCommand extends BaseCommand {
      */
     private findWorkflowFolders;
     /**
-     * Perform all post-deletion cleanup: empty dir removal, gitignore, settings, IDE folders.
+     * Perform all post-deletion cleanup: empty dir removal, git exclude, settings, IDE folders.
      *
      * @param targetDir - Project root directory
      * @param methodsToRemove - Method names being removed
@@ -139,7 +139,7 @@ export default class ClearCommand extends BaseCommand {
      * @param deleteCounts.deletedOutput - Number of output folders deleted
      * @param deleteCounts.deletedIde - Number of IDE method folders deleted
      * @param cleanup - Cleanup operation results
-     * @param cleanup.gitignoreUpdated - Whether gitignore was updated
+     * @param cleanup.gitExcludeUpdated - Whether git exclude was updated
      * @param cleanup.removedOutputDir - Whether _output dir was removed
      * @param cleanup.removedAiwcliContainer - Whether .aiwcli dir was removed
      * @param cleanup.removedClaudeDir - Whether .claude dir was removed

package/dist/commands/clear.js

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import confirm from '@inquirer/confirm';
 import { Flags } from '@oclif/core';
 import BaseCommand from '../lib/base-command.js';
-import { computeGitignoreRemovals, pruneGitignoreStaleEntries, removeGitignoreEntries } from '../lib/gitignore-manager.js';
+import { computeExcludeRemovals, pruneExcludeStaleEntries, removeExcludeEntries, resolveGitDir } from '../lib/git-exclude-manager.js';
 import { pathExists } from '../lib/paths.js';
 import { getSharedTemplatePath } from '../lib/template-resolver.js';
 import { reconstructIdeSettings } from '../lib/template-settings-reconstructor.js';
@@ -660,23 +660,26 @@ export default class ClearCommand extends BaseCommand {
         await Promise.all(cleanups);
     }
     /**
-     * Clean up gitignore entries and prune stale entries.
+     * Clean up git exclude entries and prune stale entries.
      *
      * @param targetDir - Project root directory
-     * @returns True if gitignore was updated
+     * @returns True if git exclude was updated
      */
-    async cleanupGitignore(targetDir) {
-        const { toRemove, toKeep } = await computeGitignoreRemovals(targetDir);
+    async cleanupGitExclude(targetDir) {
+        const gitDir = await resolveGitDir(targetDir);
+        if (!gitDir)
+            return false;
+        const { toRemove, toKeep } = await computeExcludeRemovals(gitDir, targetDir);
         for (const { entry, reason } of toKeep) {
-            this.logDebug(`Keeping ${entry}/ in .gitignore (${reason})`);
+            this.logDebug(`Keeping ${entry}/ in git exclude (${reason})`);
         }
         if (toRemove.length > 0) {
-            await removeGitignoreEntries(targetDir, toRemove);
-            this.logDebug(`Removed from .gitignore: ${toRemove.join(', ')}`);
+            await removeExcludeEntries(gitDir, toRemove);
+            this.logDebug(`Removed from git exclude: ${toRemove.join(', ')}`);
         }
-        const pruned = await pruneGitignoreStaleEntries(targetDir);
+        const pruned = await pruneExcludeStaleEntries(gitDir, targetDir);
         if (pruned) {
-            this.logDebug('Pruned stale .gitignore entries');
+            this.logDebug('Pruned stale git exclude entries');
         }
         return toRemove.length > 0 || pruned;
     }
@@ -736,14 +739,15 @@ export default class ClearCommand extends BaseCommand {
             this.logInfo(`${IDE_FOLDERS.windsurf.root}/ folder will be removed (will be empty)`);
             this.log('');
         }
-        // Compute gitignore changes for dry-run display
-        const gitignoreSimulation = await computeGitignoreRemovals(targetDir);
-        if (gitignoreSimulation.toRemove.length > 0 || gitignoreSimulation.toKeep.length > 0) {
-            this.logInfo('Gitignore changes:');
-            for (const { entry, reason } of gitignoreSimulation.toKeep) {
+        // Compute git exclude changes for dry-run display
+        const gitDir = await resolveGitDir(targetDir);
+        const excludeSimulation = gitDir ? await computeExcludeRemovals(gitDir, targetDir) : { toRemove: [], toKeep: [] };
+        if (excludeSimulation.toRemove.length > 0 || excludeSimulation.toKeep.length > 0) {
+            this.logInfo('Git exclude changes:');
+            for (const { entry, reason } of excludeSimulation.toKeep) {
                 this.log(`  keep ${entry}/ (${reason})`);
             }
-            for (const entry of gitignoreSimulation.toRemove) {
+            for (const entry of excludeSimulation.toRemove) {
                 this.log(`  remove ${entry}/`);
             }
             this.log('');
@@ -923,7 +927,7 @@ export default class ClearCommand extends BaseCommand {
         return foundFolders;
     }
     /**
-     * Perform all post-deletion cleanup: empty dir removal, gitignore, settings, IDE folders.
+     * Perform all post-deletion cleanup: empty dir removal, git exclude, settings, IDE folders.
      *
      * @param targetDir - Project root directory
      * @param methodsToRemove - Method names being removed
@@ -942,8 +946,8 @@ export default class ClearCommand extends BaseCommand {
         if (removedAiwcliContainer) {
             this.logDebug(`Removed empty ${AIWCLI_CONTAINER}/ folder`);
         }
-        // Smart gitignore removal
-        const gitignoreUpdated = await this.cleanupGitignore(targetDir);
+        // Smart git exclude removal
+        const gitExcludeUpdated = await this.cleanupGitExclude(targetDir);
         // Reconstruct IDE settings
         let { updatedClaudeSettings, updatedWindsurfSettings } = await this.reconstructSettingsAfterRemoval(targetDir, methodsToRemove);
         // Clean up backup files
@@ -957,7 +961,7 @@ export default class ClearCommand extends BaseCommand {
             updatedWindsurfSettings = false;
         return {
             removedOutputDir, removedAiwcliContainer, removedClaudeDir, removedWindsurfDir,
-            updatedClaudeSettings, updatedWindsurfSettings, gitignoreUpdated,
+            updatedClaudeSettings, updatedWindsurfSettings, gitExcludeUpdated,
         };
     }
     /**
@@ -1056,7 +1060,7 @@ export default class ClearCommand extends BaseCommand {
      * @param deleteCounts.deletedOutput - Number of output folders deleted
      * @param deleteCounts.deletedIde - Number of IDE method folders deleted
      * @param cleanup - Cleanup operation results
-     * @param cleanup.gitignoreUpdated - Whether gitignore was updated
+     * @param cleanup.gitExcludeUpdated - Whether git exclude was updated
      * @param cleanup.removedOutputDir - Whether _output dir was removed
      * @param cleanup.removedAiwcliContainer - Whether .aiwcli dir was removed
      * @param cleanup.removedClaudeDir - Whether .claude dir was removed
@@ -1082,8 +1086,8 @@ export default class ClearCommand extends BaseCommand {
         if (cleanup.removedWindsurfDir)
             parts.push(`${IDE_FOLDERS.windsurf.root}/ folder`);
         this.logSuccess(`Cleared: ${parts.join(', ')}.`);
-        if (cleanup.gitignoreUpdated) {
-            this.logSuccess('Updated .gitignore.');
+        if (cleanup.gitExcludeUpdated) {
+            this.logSuccess('Updated git exclude.');
         }
         if (cleanup.updatedClaudeSettings) {
             this.logSuccess('Updated .claude/settings.json (backup: settings.json.backup).');

package/dist/commands/init/index.d.ts

@@ -41,7 +41,7 @@ export default class Init extends BaseCommand {
      * Perform minimal installation (_shared folder only, no template method).
      *
      * @param targetDir - Target directory for installation
-     * @param hasGit - Whether git repository exists
+     * @param gitDir - Resolved git directory path, or null if not a git repo
      */
     private performMinimalInstall;
     /**
@@ -56,8 +56,8 @@ export default class Init extends BaseCommand {
      * @param config.targetDir - Project directory
      * @param config.method - Method name that was installed
      * @param config.ides - IDEs that were configured
-     * @param config.hasGit - Whether git repository exists
-     * @param config.foldersForGitignore - Folders to add to .gitignore
+     * @param config.gitDir - Resolved git directory path, or null if not a git repo
+     * @param config.foldersForExclude - Folders to add to git exclude
      */
     private performPostInstallActions;
     /**

package/dist/commands/init/index.js

@@ -8,7 +8,7 @@ import input from '@inquirer/input';
 import select from '@inquirer/select';
 import { Flags } from '@oclif/core';
 import BaseCommand from '../../lib/base-command.js';
-import { AIW_GITIGNORE_ENTRIES, updateGitignore } from '../../lib/gitignore-manager.js';
+import { AIW_EXCLUDE_ENTRIES, resolveGitDir, updateGitExclude } from '../../lib/git-exclude-manager.js';
 import { IdePathResolver } from '../../lib/ide-path-resolver.js';
 import { pathExists } from '../../lib/paths.js';
 import { getTargetSettingsFile, readClaudeSettings, writeClaudeSettings } from '../../lib/settings-hierarchy.js';
@@ -24,20 +24,7 @@ const AVAILABLE_IDES = [
     { value: 'claude', name: 'Claude Code', description: 'Anthropic Claude Code CLI' },
     { value: 'windsurf', name: 'Windsurf', description: 'Codeium Windsurf IDE' },
 ];
-/**
- * Detect if current directory is a git repository.
- * Checks for .git directory existence.
- */
-async function detectGitRepository(targetDir) {
-    try {
-        const gitPath = join(targetDir, '.git');
-        await fs.access(gitPath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+// detectGitRepository replaced by resolveGitDir from git-exclude-manager
 /**
  * Extract project name from directory path.
  * Returns the basename of the given directory.
@@ -82,12 +69,12 @@ export default class Init extends BaseCommand {
             // Get available templates for validation
             const availableTemplates = await getAvailableTemplates();
             // Check git repository early (needed by both install paths)
-            const hasGit = await detectGitRepository(targetDir);
+            const gitDir = await resolveGitDir(targetDir);
             // Resolve installation configuration from flags or interactive wizard
             const config = await this.resolveInstallationConfig(flags, targetDir, availableTemplates);
             // If config is null, perform minimal install (shared folder only)
             if (!config) {
-                await this.performMinimalInstall(targetDir, hasGit);
+                await this.performMinimalInstall(targetDir, gitDir);
                 return;
             }
             const { method, ides, username, projectName } = config;
@@ -144,22 +131,22 @@ export default class Init extends BaseCommand {
                 projectName,
                 templatePath,
             });
-            // Collect all folders that need gitignore entries
+            // Collect all folders that need exclude entries
             // The .aiwcli/ container holds all template infrastructure and runtime data
-            const foldersForGitignore = [...AIW_GITIGNORE_ENTRIES];
+            const foldersForExclude = [...AIW_EXCLUDE_ENTRIES];
             // Report installation results
             if (result.installedFolders.length > 0) {
                 this.logSuccess(`✓ Installed: ${result.installedFolders.join(', ')}`);
             }
             // Install global resolver for cwd-drift-proof hook/status line commands
             await this.installGlobalResolver();
-            // Perform post-installation actions (settings tracking, hook merging, gitignore updates)
+            // Perform post-installation actions (settings tracking, hook merging, git exclude updates)
             await this.performPostInstallActions({
                 targetDir,
                 method,
                 ides,
-                hasGit,
-                foldersForGitignore,
+                gitDir,
+                foldersForExclude,
             });
             this.log('');
             this.logSuccess(`✓ ${method} initialized successfully`);
@@ -261,9 +248,9 @@ export default class Init extends BaseCommand {
      * Perform minimal installation (_shared folder only, no template method).
      *
      * @param targetDir - Target directory for installation
-     * @param hasGit - Whether git repository exists
+     * @param gitDir - Resolved git directory path, or null if not a git repo
      */
-    async performMinimalInstall(targetDir, hasGit) {
+    async performMinimalInstall(targetDir, gitDir) {
         this.logInfo('Performing minimal installation (_shared folder only)...');
         this.log('');
         // Create .aiwcli container and install _shared
@@ -292,10 +279,10 @@ export default class Init extends BaseCommand {
         await this.installGlobalResolver();
         // Reconstruct settings from _shared template
         await reconstructIdeSettings(targetDir, [], ['claude']);
-        // Update .gitignore if git repository exists
-        if (hasGit) {
-            await updateGitignore(targetDir, [...AIW_GITIGNORE_ENTRIES]);
-            this.logSuccess('✓ .gitignore updated');
+        // Update git exclude if git repository exists
+        if (gitDir) {
+            await updateGitExclude(gitDir, [...AIW_EXCLUDE_ENTRIES]);
+            this.logSuccess('✓ git exclude updated');
         }
         this.log('');
         this.logSuccess('✓ Minimal installation completed successfully');
@@ -316,11 +303,11 @@ export default class Init extends BaseCommand {
      * @param config.targetDir - Project directory
      * @param config.method - Method name that was installed
      * @param config.ides - IDEs that were configured
-     * @param config.hasGit - Whether git repository exists
-     * @param config.foldersForGitignore - Folders to add to .gitignore
+     * @param config.gitDir - Resolved git directory path, or null if not a git repo
+     * @param config.foldersForExclude - Folders to add to git exclude
      */
     async performPostInstallActions(config) {
-        const { targetDir, method, ides, hasGit, foldersForGitignore } = config;
+        const { targetDir, method, ides, gitDir, foldersForExclude } = config;
         // Track method installation in settings.json first (so reconstructor can read methods list)
         await this.trackMethodInstallation(targetDir, method, ides);
         // Read installed methods to build active templates list
@@ -330,10 +317,10 @@ export default class Init extends BaseCommand {
         // Reconstruct IDE settings from all active templates
         await reconstructIdeSettings(targetDir, activeTemplates, ides);
         this.logSuccess('✓ Reconstructed IDE settings from active templates');
-        // Update .gitignore if git repository exists
-        if (hasGit) {
-            await updateGitignore(targetDir, foldersForGitignore);
-            this.logSuccess('✓ .gitignore updated');
+        // Update git exclude if git repository exists
+        if (gitDir) {
+            await updateGitExclude(gitDir, foldersForExclude);
+            this.logSuccess('✓ git exclude updated');
         }
     }
     /**

package/dist/lib/git-exclude-manager.d.ts

@@ -0,0 +1,59 @@
+/** Standard exclude entries managed by AIW */
+export declare const AIW_EXCLUDE_ENTRIES: string[];
+/**
+ * Resolve the git directory for a given target directory.
+ * Handles normal repos, worktrees, and submodules via `git rev-parse --git-dir`.
+ *
+ * @param targetDir - Directory to resolve git dir for
+ * @returns Absolute path to the git directory, or null if not a git repo
+ */
+export declare function resolveGitDir(targetDir: string): Promise<string | null>;
+/**
+ * Prune stale entries from the AIW Installation section in git exclude file.
+ * Checks each entry against disk existence and removes entries whose paths don't exist.
+ * Removes the entire section if no entries remain after pruning.
+ *
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param targetDir - Project root directory (for disk-existence checks)
+ * @returns True if any entries were pruned
+ */
+export declare function pruneExcludeStaleEntries(gitDir: string, targetDir: string): Promise<boolean>;
+/**
+ * Update git exclude file with patterns for installed folders.
+ *
+ * Creates exclude file if it doesn't exist, or appends to existing file.
+ * Prevents duplicate patterns by checking each pattern individually.
+ *
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param folders - List of folder names to add as exclude patterns (e.g., ['.aiwcli', '.claude'])
+ */
+export declare function updateGitExclude(gitDir: string, folders: string[]): Promise<void>;
+/**
+ * Compute which AIW exclude entries should be removed during clear.
+ * Returns a simulation result — the caller decides whether to apply.
+ *
+ * Logic per entry:
+ * - If in permanentEntries → keep (reason: "permanent")
+ * - If directory exists and is non-empty → keep (reason: "directory has content")
+ * - Otherwise → mark for removal
+ *
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param targetDir - Project root directory (for disk-existence checks)
+ * @param permanentEntries - Entries that should never be removed (defaults to AIW_PERMANENT_ENTRIES)
+ * @returns Lists of entries to remove and entries to keep with reasons
+ */
+export declare function computeExcludeRemovals(gitDir: string, targetDir: string, permanentEntries?: string[]): Promise<{
+    toKeep: Array<{
+        entry: string;
+        reason: string;
+    }>;
+    toRemove: string[];
+}>;
+/**
+ * Remove specific entries from the AIW section in git exclude file.
+ * Cleans up the section header if no entries remain.
+ *
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param entriesToRemove - Entry names to remove (without trailing slash)
+ */
+export declare function removeExcludeEntries(gitDir: string, entriesToRemove: string[]): Promise<void>;

package/dist/lib/{gitignore-manager.js → git-exclude-manager.js}

@@ -1,27 +1,60 @@
+import { execFile } from 'node:child_process';
 import { promises as fs } from 'node:fs';
-import { join } from 'node:path';
+import { isAbsolute, join } from 'node:path';
+import { promisify } from 'node:util';
 import { pathExists } from './paths.js';
+const execFileAsync = promisify(execFile);
 /**
- * AIW gitignore section header marker
+ * AIW exclude section header marker
  */
-const AIW_GITIGNORE_HEADER = '# AIW Installation';
-/** Standard gitignore entries managed by AIW */
-export const AIW_GITIGNORE_ENTRIES = ['.aiwcli', '_output', '.claude', '.windsurf'];
-/** Entries that should NEVER be removed from gitignore, even on clear */
+const AIW_EXCLUDE_HEADER = '# AIW Installation';
+/** Standard exclude entries managed by AIW */
+export const AIW_EXCLUDE_ENTRIES = ['.aiwcli', '_output', '.claude', '.windsurf'];
+/** Entries that should NEVER be removed from exclude, even on clear */
 const AIW_PERMANENT_ENTRIES = ['_output'];
 /**
- * Prune stale entries from the AIW Installation section in .gitignore.
+ * Resolve the git directory for a given target directory.
+ * Handles normal repos, worktrees, and submodules via `git rev-parse --git-dir`.
+ *
+ * @param targetDir - Directory to resolve git dir for
+ * @returns Absolute path to the git directory, or null if not a git repo
+ */
+export async function resolveGitDir(targetDir) {
+    try {
+        const { stdout } = await execFileAsync('git', ['rev-parse', '--git-dir'], { cwd: targetDir });
+        const gitDir = stdout.trim();
+        return isAbsolute(gitDir) ? gitDir : join(targetDir, gitDir);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Get the path to the exclude file within the git directory.
+ */
+function getExcludePath(gitDir) {
+    return join(gitDir, 'info', 'exclude');
+}
+/**
+ * Ensure the info/ directory exists within the git directory.
+ */
+async function ensureInfoDir(gitDir) {
+    await fs.mkdir(join(gitDir, 'info'), { recursive: true });
+}
+/**
+ * Prune stale entries from the AIW Installation section in git exclude file.
  * Checks each entry against disk existence and removes entries whose paths don't exist.
  * Removes the entire section if no entries remain after pruning.
  *
- * @param targetDir - Directory containing .gitignore
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param targetDir - Project root directory (for disk-existence checks)
  * @returns True if any entries were pruned
  */
-export async function pruneGitignoreStaleEntries(targetDir) {
-    const gitignorePath = join(targetDir, '.gitignore');
+export async function pruneExcludeStaleEntries(gitDir, targetDir) {
+    const excludePath = getExcludePath(gitDir);
     try {
-        const content = await fs.readFile(gitignorePath, 'utf8');
-        if (!content.includes(AIW_GITIGNORE_HEADER)) {
+        const content = await fs.readFile(excludePath, 'utf8');
+        if (!content.includes(AIW_EXCLUDE_HEADER)) {
             return false;
         }
         const lines = content.split('\n');
@@ -30,7 +63,7 @@ export async function pruneGitignoreStaleEntries(targetDir) {
         const aiwSectionLines = [];
         let pruned = false;
         for (const line of lines) {
-            if (line === AIW_GITIGNORE_HEADER) {
+            if (line === AIW_EXCLUDE_HEADER) {
                 inAiwSection = true;
                 aiwSectionLines.push(line);
                 continue;
@@ -40,7 +73,7 @@ export async function pruneGitignoreStaleEntries(targetDir) {
                 continue;
             }
             // AIW section ends at empty line or another comment header
-            if (line === '' || (line.startsWith('#') && line !== AIW_GITIGNORE_HEADER)) {
+            if (line === '' || (line.startsWith('#') && line !== AIW_EXCLUDE_HEADER)) {
                 inAiwSection = false;
                 const { lines: filtered, pruned: sectionPruned } = await pruneSection(aiwSectionLines, targetDir); // eslint-disable-line no-await-in-loop
                 if (sectionPruned)
@@ -68,7 +101,7 @@ export async function pruneGitignoreStaleEntries(targetDir) {
         if (result.trim() === '') {
             result = '';
         }
-        await fs.writeFile(gitignorePath, result, 'utf8');
+        await fs.writeFile(excludePath, result, 'utf8');
         return true;
     }
     catch {
@@ -77,14 +110,14 @@ export async function pruneGitignoreStaleEntries(targetDir) {
 }
 /**
  * Prune stale entries from a parsed AIW section.
- * Checks each gitignore pattern against disk existence.
+ * Checks each exclude pattern against disk existence.
  */
 async function pruneSection(sectionLines, targetDir) {
     let pruned = false;
     const filtered = [];
     for (const line of sectionLines) {
         // Always keep the header
-        if (line === AIW_GITIGNORE_HEADER) {
+        if (line === AIW_EXCLUDE_HEADER) {
             filtered.push(line);
             continue;
         }
@@ -108,7 +141,7 @@ function cleanupEmptySections(content) {
     const newLines = [];
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
-        if (line === AIW_GITIGNORE_HEADER) {
+        if (line === AIW_EXCLUDE_HEADER) {
             // Look ahead to see if there are any patterns
             const nextLine = lines[i + 1];
             if (nextLine === undefined || nextLine === '' || nextLine.startsWith('#')) {
@@ -125,20 +158,21 @@ function cleanupEmptySections(content) {
     return newLines.join('\n');
 }
 /**
- * Update .gitignore with patterns for installed folders.
+ * Update git exclude file with patterns for installed folders.
  *
- * Creates .gitignore if it doesn't exist, or appends to existing file.
+ * Creates exclude file if it doesn't exist, or appends to existing file.
  * Prevents duplicate patterns by checking each pattern individually.
  *
- * @param targetDir - Directory containing .gitignore file
- * @param folders - List of folder names to add as gitignore patterns (e.g., ['_bmad', '.claude'])
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param folders - List of folder names to add as exclude patterns (e.g., ['.aiwcli', '.claude'])
  */
-export async function updateGitignore(targetDir, folders) {
-    const gitignorePath = join(targetDir, '.gitignore');
+export async function updateGitExclude(gitDir, folders) {
+    await ensureInfoDir(gitDir);
+    const excludePath = getExcludePath(gitDir);
     try {
-        // Try to read existing .gitignore
-        const existing = await fs.readFile(gitignorePath, 'utf8');
-        // Filter out patterns that already exist in .gitignore
+        // Try to read existing exclude file
+        const existing = await fs.readFile(excludePath, 'utf8');
+        // Filter out patterns that already exist in exclude file
         const newPatterns = folders.filter((folder) => {
             const pattern = `${folder}/`;
             // Check if this exact pattern exists in the file
@@ -173,17 +207,17 @@ export async function updateGitignore(targetDir, folders) {
             const separator = existing.length > 0 && existing.endsWith('\n') ? '\n' : existing.length > 0 ? '\n\n' : '';
             updatedContent = existing + separator + `# AIW Installation\n${patterns}\n`;
         }
-        await fs.writeFile(gitignorePath, updatedContent, 'utf8');
+        await fs.writeFile(excludePath, updatedContent, 'utf8');
     }
     catch {
-        // .gitignore doesn't exist, create it
+        // Exclude file doesn't exist, create it
         const patterns = folders.map((folder) => `${folder}/`).join('\n');
         const patternsBlock = `# AIW Installation\n${patterns}`;
-        await fs.writeFile(gitignorePath, patternsBlock + '\n', 'utf8');
+        await fs.writeFile(excludePath, patternsBlock + '\n', 'utf8');
     }
 }
 /**
- * Compute which AIW gitignore entries should be removed during clear.
+ * Compute which AIW exclude entries should be removed during clear.
  * Returns a simulation result — the caller decides whether to apply.
  *
  * Logic per entry:
@@ -191,23 +225,24 @@ export async function updateGitignore(targetDir, folders) {
  * - If directory exists and is non-empty → keep (reason: "directory has content")
  * - Otherwise → mark for removal
  *
- * @param targetDir - Directory containing .gitignore
+ * @param gitDir - Git directory (contains info/exclude)
+ * @param targetDir - Project root directory (for disk-existence checks)
  * @param permanentEntries - Entries that should never be removed (defaults to AIW_PERMANENT_ENTRIES)
  * @returns Lists of entries to remove and entries to keep with reasons
  */
-export async function computeGitignoreRemovals(targetDir, permanentEntries = AIW_PERMANENT_ENTRIES) {
-    const gitignorePath = join(targetDir, '.gitignore');
+export async function computeExcludeRemovals(gitDir, targetDir, permanentEntries = AIW_PERMANENT_ENTRIES) {
+    const excludePath = getExcludePath(gitDir);
     const toRemove = [];
     const toKeep = [];
-    // Read AIW section entries from .gitignore
+    // Read AIW section entries from exclude file
     let content;
     try {
-        content = await fs.readFile(gitignorePath, 'utf8');
+        content = await fs.readFile(excludePath, 'utf8');
     }
     catch {
         return { toRemove, toKeep };
     }
-    if (!content.includes(AIW_GITIGNORE_HEADER)) {
+    if (!content.includes(AIW_EXCLUDE_HEADER)) {
         return { toRemove, toKeep };
     }
     // Parse entries from the AIW section
@@ -215,12 +250,12 @@ export async function computeGitignoreRemovals(targetDir, permanentEntries = AIW
     let inAiwSection = false;
     const aiwEntries = [];
     for (const line of lines) {
-        if (line === AIW_GITIGNORE_HEADER) {
+        if (line === AIW_EXCLUDE_HEADER) {
             inAiwSection = true;
             continue;
         }
         if (inAiwSection) {
-            if (line === '' || (line.startsWith('#') && line !== AIW_GITIGNORE_HEADER)) {
+            if (line === '' || (line.startsWith('#') && line !== AIW_EXCLUDE_HEADER)) {
                 inAiwSection = false;
             }
             else {
@@ -261,17 +296,17 @@ export async function computeGitignoreRemovals(targetDir, permanentEntries = AIW
     return { toRemove, toKeep };
 }
 /**
- * Remove specific entries from the AIW section in .gitignore.
+ * Remove specific entries from the AIW section in git exclude file.
  * Cleans up the section header if no entries remain.
  *
- * @param targetDir - Directory containing .gitignore
+ * @param gitDir - Git directory (contains info/exclude)
  * @param entriesToRemove - Entry names to remove (without trailing slash)
  */
-export async function removeGitignoreEntries(targetDir, entriesToRemove) {
-    const gitignorePath = join(targetDir, '.gitignore');
+export async function removeExcludeEntries(gitDir, entriesToRemove) {
+    const excludePath = getExcludePath(gitDir);
     try {
-        const content = await fs.readFile(gitignorePath, 'utf8');
-        if (!content.includes(AIW_GITIGNORE_HEADER)) {
+        const content = await fs.readFile(excludePath, 'utf8');
+        if (!content.includes(AIW_EXCLUDE_HEADER)) {
             return;
         }
         const patternsToRemove = new Set(entriesToRemove.map((e) => `${e}/`));
@@ -280,16 +315,16 @@ export async function removeGitignoreEntries(targetDir, entriesToRemove) {
         let inAiwSection = false;
         const aiwSectionLines = [];
         for (const line of lines) {
-            if (line === AIW_GITIGNORE_HEADER) {
+            if (line === AIW_EXCLUDE_HEADER) {
                 inAiwSection = true;
                 aiwSectionLines.push(line);
                 continue;
             }
             if (inAiwSection) {
-                if (line === '' || (line.startsWith('#') && line !== AIW_GITIGNORE_HEADER)) {
+                if (line === '' || (line.startsWith('#') && line !== AIW_EXCLUDE_HEADER)) {
                     inAiwSection = false;
                     // Filter the AIW section
-                    const filtered = aiwSectionLines.filter((l) => l === AIW_GITIGNORE_HEADER || !patternsToRemove.has(l));
+                    const filtered = aiwSectionLines.filter((l) => l === AIW_EXCLUDE_HEADER || !patternsToRemove.has(l));
                     newLines.push(...filtered, line);
                 }
                 else {
@@ -302,7 +337,7 @@ export async function removeGitignoreEntries(targetDir, entriesToRemove) {
         }
         // Handle AIW section at end of file
         if (inAiwSection) {
-            const filtered = aiwSectionLines.filter((l) => l === AIW_GITIGNORE_HEADER || !patternsToRemove.has(l));
+            const filtered = aiwSectionLines.filter((l) => l === AIW_EXCLUDE_HEADER || !patternsToRemove.has(l));
             newLines.push(...filtered);
         }
         // Clean up empty AIW section
@@ -311,9 +346,9 @@ export async function removeGitignoreEntries(targetDir, entriesToRemove) {
         if (result.trim() === '') {
             result = '';
         }
-        await fs.writeFile(gitignorePath, result, 'utf8');
+        await fs.writeFile(excludePath, result, 'utf8');
     }
     catch {
-        // .gitignore doesn't exist or can't be read
+        // Exclude file doesn't exist or can't be read
     }
 }

package/dist/templates/_shared/lib-ts/base/subprocess-utils.ts

@@ -138,6 +138,17 @@ export function isExecSyncError(e: unknown): e is ExecSyncError {
  * On non-Windows platforms, returns the string unchanged (execFile
  * handles quoting automatically without shell).
  */
+/**
+ * Normalize a file path for CLI subprocess usage.
+ * Replaces backslashes with forward slashes on Windows to avoid
+ * cmd.exe escape interpretation issues. No-op on other platforms.
+ * Forward slashes are valid path separators on Windows in all modern CLIs.
+ */
+export function normalizePathForCli(p: string): string {
+  if (process.platform !== "win32") return p;
+  return p.replaceAll("\\", "/");
+}
+
 export function shellQuoteWin(arg: string): string {
   if (process.platform !== "win32") return arg;
   return '"' + arg.replaceAll('"', '""') + '"';

package/dist/templates/_shared/scripts/status_line.ts

@@ -199,6 +199,15 @@ function isWideChar(cp: number): boolean {
 	);
 }
 
+function measureWidth(str: string): number {
+	const stripped = str.replace(ANSI_RE, "");
+	let w = 0;
+	for (const ch of stripped) {
+		w += isWideChar(ch.codePointAt(0) ?? 0) ? 2 : 1;
+	}
+	return w;
+}
+
 function truncateToWidth(str: string, maxWidth: number): string {
 	// Walk through string preserving ANSI codes (zero-width) and measuring visible chars
 	let w = 0;
@@ -244,9 +253,8 @@ function truncateToWidth(str: string, maxWidth: number): string {
 // Separator (dynamic width)
 // ---------------------------------------------------------------------------
 
-function makeSeparator(termWidth: number): string {
-	const w = Math.min(termWidth, 120);
-	return `${SLATE_600}${"─".repeat(w)}${RESET}`;
+function makeSeparator(width: number): string {
+	return `${SLATE_600}${"─".repeat(Math.max(1, width))}${RESET}`;
 }
 
 // ---------------------------------------------------------------------------
@@ -276,7 +284,7 @@ function renderContext(
 	contextK: number,
 	maxK: number,
 	modelName: string,
-): void {
+): string {
 	let pctColor: string;
 	if (contextPct <= 33) pctColor = EMERALD;
 	else if (contextPct <= 66) pctColor = AMBER;
@@ -342,8 +350,7 @@ function renderContext(
 		}
 	}
 
-	console.log(truncateToWidth(line, termWidth));
-	console.log(makeSeparator(termWidth));
+	return truncateToWidth(line, termWidth);
 }
 
 // ---------------------------------------------------------------------------
@@ -461,14 +468,16 @@ function renderGit(
 	termWidth: number,
 	git: GitStatus | null,
 	dirName: string,
-): void {
+): string {
 	const totalChanged = git ? git.modified + git.staged : 0;
 	const statusIcon =
 		git && (totalChanged > 0 || git.untracked > 0) ? "*" : "\u2713";
 
+	let line: string;
+
 	switch (mode) {
 		case "micro": {
-			let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+			line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
 			if (git) {
 				line += ` ${GIT_VALUE}${git.branch}${RESET}`;
 				if (git.age_display) {
@@ -481,12 +490,10 @@ function renderGit(
 					line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
 				}
 			}
-			console.log(truncateToWidth(line, termWidth));
-
 			break;
 		}
 		case "mini": {
-			let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+			line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
 			if (git) {
 				line += ` ${SLATE_600}\u2502${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
 				if (git.age_display) {
@@ -502,12 +509,10 @@ function renderGit(
 					}
 				}
 			}
-			console.log(truncateToWidth(line, termWidth));
-
 			break;
 		}
 		case "nano": {
-			let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+			line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
 			if (git) {
 				line += ` ${GIT_VALUE}${git.branch}${RESET} `;
 				if (statusIcon === "\u2713") {
@@ -516,12 +521,10 @@ function renderGit(
 					line += `${GIT_MODIFIED}*${totalChanged}${RESET}`;
 				}
 			}
-			console.log(truncateToWidth(line, termWidth));
-
 			break;
 		}
 		default: {
-			let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET}`;
+			line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET}`;
 			if (git) {
 				line +=
 					` ${SLATE_600}\u2502${RESET} ` +
@@ -556,9 +559,10 @@ function renderGit(
 					}
 				}
 			}
-			console.log(truncateToWidth(line, termWidth));
 		}
 	}
+
+	return truncateToWidth(line, termWidth);
 }
 
 // ---------------------------------------------------------------------------
@@ -587,7 +591,7 @@ function renderContextManager(
 	mode: string,
 	contextId: string,
 	contextState: Record<string, unknown> | null,
-): void {
+): string {
 	// Strip YYMMDD-HHMM- timestamp prefix from context ID for display
 	let displayId = contextId.replace(/^\d{6}-\d{4}-/, "");
 	if (!displayId) displayId = contextId;
@@ -650,47 +654,24 @@ function renderContextManager(
 		planPart = ` ${SLATE_600}\u2502${RESET} ${CTX_SECONDARY}Plan:${RESET} ${SLATE_300}${truncatedPlan}${RESET}`;
 	}
 
+	// Note: termWidth not available here — caller truncates via main()
 	switch (mode) {
-		case "micro": {
-			console.log(
-				`${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`,
-			);
-
-			break;
-		}
-		case "mini": {
-			console.log(
-				`${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}` +
-					`${modeBadge}${planPart}`,
-			);
-
-			break;
-		}
-		case "nano": {
-			console.log(
-				`${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`,
-			);
-
-			break;
-		}
-		default: {
-			console.log(
-				`${CTX_ACCENT}\u25C6${RESET} ${CTX_SECONDARY}Context:${RESET} ${SLATE_300}${truncatedId}${RESET}` +
-					`${modeBadge}${planPart}`,
-			);
-		}
+		case "micro":
+		case "nano":
+			return `${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`;
+		case "mini":
+			return `${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}${planPart}`;
+		default:
+			return `${CTX_ACCENT}\u25C6${RESET} ${CTX_SECONDARY}Context:${RESET} ${SLATE_300}${truncatedId}${RESET}${modeBadge}${planPart}`;
 	}
 }
 
-function renderNoContext(mode: string): void {
+function renderNoContext(mode: string): string {
 	const warn = `${ROSE}\u26A0 ${RESET}`;
 	if (mode === "normal") {
-		console.log(
-			`${warn} ${ROSE}NO CONTEXT${RESET} ${SLATE_500}\u2014 type ^ for context manager${RESET}`,
-		);
-	} else {
-		console.log(`${warn} ${ROSE}NO CONTEXT${RESET}`);
+		return `${warn} ${ROSE}NO CONTEXT${RESET} ${SLATE_500}\u2014 type ^ for context manager${RESET}`;
 	}
+	return `${warn} ${ROSE}NO CONTEXT${RESET}`;
 }
 
 // ---------------------------------------------------------------------------
@@ -826,22 +807,35 @@ function main(): void {
 	// Resolve context ID for display and persistence
 	const contextId = resolveContextId(sessionId);
 
-	// Render context section
-	renderContext(mode, termWidth, contextPct, contextK, maxK, modelName);
-
-	// Render PWD + git section (PWD always shown, git stats only when in a repo)
+	// Render content lines first, truncate all to terminal width, then size separators
+	const contextLine = renderContext(mode, termWidth, contextPct, contextK, maxK, modelName);
 	const git = getGitStatus(currentDir);
-	renderGit(mode, termWidth, git, dirName);
+	const gitLine = renderGit(mode, termWidth, git, dirName);
 
-	// Render context manager line (line 3) with separator
-	console.log(makeSeparator(termWidth));
+	let ctxMgrLine: string;
 	if (contextId) {
 		const contextState = loadContextState(contextId);
-		renderContextManager(mode, contextId, contextState);
+		ctxMgrLine = truncateToWidth(renderContextManager(mode, contextId, contextState), termWidth);
 	} else {
-		renderNoContext(mode);
+		ctxMgrLine = truncateToWidth(renderNoContext(mode), termWidth);
 	}
 
+	// Measure visible width of each content line, cap separator at terminal width
+	const maxContentWidth = Math.min(
+		termWidth,
+		Math.max(
+			measureWidth(contextLine),
+			measureWidth(gitLine),
+			measureWidth(ctxMgrLine),
+		),
+	);
+	const sep = makeSeparator(maxContentWidth);
+
+	const lines = [contextLine, sep, gitLine, sep, ctxMgrLine];
+
+	// Single atomic write — prevents partial output if process is interrupted
+	process.stdout.write(lines.join("\n") + "\n");
+
 	// Persist context_window to state.json
 	if (contextId) {
 		writeContextWindow(contextId, {

package/dist/templates/cc-native/_cc-native/cc-native.config.json

@@ -7,7 +7,7 @@
       },
       "codex": {
         "enabled": true,
-        "models": ["gpt-5.1-codex-mini"]
+        "models": ["codex-mini-latest"]
       }
     }
   },

package/dist/templates/cc-native/_cc-native/lib-ts/settings.ts

@@ -71,7 +71,7 @@ export const DEFAULT_COMPLEXITY_CATEGORIES = ["code", "infrastructure", "documen
 export const DEFAULT_MODELS_CONFIG: ModelsConfig = {
   providers: {
     claude: { enabled: true, models: ["sonnet"] },
-    codex: { enabled: true, models: ["gpt-5.1-codex-mini"] },
+    codex: { enabled: true, models: ["codex-mini-latest"] },
   },
 };
 

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/base/base-agent.ts

@@ -5,7 +5,7 @@
  */
 
 import { logDebug, logInfo, logWarn, logError } from "../../../../../_shared/lib-ts/base/logger.js";
-import { getInternalSubprocessEnv, findExecutable, execFileAsync } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
+import { getInternalSubprocessEnv, findExecutable, execFileAsync, normalizePathForCli } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
 import { debugLog, debugRaw } from "../../../../lib-ts/debug.js";
 import type { AgentConfig } from "../../../../lib-ts/types.js";
 
@@ -176,7 +176,8 @@ export abstract class BaseCliAgent<T> {
 
     // 3. Execute subprocess
     const env = getInternalSubprocessEnv();
-    const result = await execFileAsync(cliPath, args, {
+    const normalizedCliPath = normalizePathForCli(cliPath);
+    const result = await execFileAsync(normalizedCliPath, args, {
       input: prompt,
       timeout: this.timeout * 1000,
       env: env as Record<string, string>,

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/providers/codex-agent.ts

@@ -8,7 +8,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 
 import { logDebug, logWarn } from "../../../../../_shared/lib-ts/base/logger.js";
-import { getInternalSubprocessEnv, execFileAsync } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
+import { getInternalSubprocessEnv, execFileAsync, normalizePathForCli, shellQuoteWin } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
 import { debugLog, debugRaw } from "../../../../lib-ts/debug.js";
 import { parseJsonMaybe, coerceToReview } from "../../../../lib-ts/json-parser.js";
 import type { ReviewerResult } from "../../../../lib-ts/types.js";
@@ -35,9 +35,12 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
     const outPath = path.join(this.tempDir, "output.json");
     fs.writeFileSync(schemaPath, JSON.stringify(this.schema, null, 2), "utf-8");
 
-    const cmdArgs = ["exec", "--sandbox", "read-only"];
+    const normalizedSchema = shellQuoteWin(normalizePathForCli(schemaPath));
+    const normalizedOut = shellQuoteWin(normalizePathForCli(outPath));
+
+    const cmdArgs = ["exec", "--sandbox", "read-only", "--reasoning", "medium"];
     if (this.agent.model) cmdArgs.push("--model", this.agent.model);
-    cmdArgs.push("--output-schema", schemaPath, "-o", outPath, "-");
+    cmdArgs.push("--output-schema", normalizedSchema, "-o", normalizedOut, "-");
 
     return cmdArgs;
   }

package/oclif.manifest.json

@@ -416,5 +416,5 @@
       ]
     }
   },
-  "version": "0.13.3"
+  "version": "0.13.5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aiwcli",
   "description": "AI Workflow CLI - Command-line interface for AI-powered workflows",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "author": "jofu-tofu",
   "bin": {
     "aiw": "bin/run.js"

package/dist/lib/gitignore-manager.d.ts

@@ -1,49 +0,0 @@
-/** Standard gitignore entries managed by AIW */
-export declare const AIW_GITIGNORE_ENTRIES: string[];
-/**
- * Prune stale entries from the AIW Installation section in .gitignore.
- * Checks each entry against disk existence and removes entries whose paths don't exist.
- * Removes the entire section if no entries remain after pruning.
- *
- * @param targetDir - Directory containing .gitignore
- * @returns True if any entries were pruned
- */
-export declare function pruneGitignoreStaleEntries(targetDir: string): Promise<boolean>;
-/**
- * Update .gitignore with patterns for installed folders.
- *
- * Creates .gitignore if it doesn't exist, or appends to existing file.
- * Prevents duplicate patterns by checking each pattern individually.
- *
- * @param targetDir - Directory containing .gitignore file
- * @param folders - List of folder names to add as gitignore patterns (e.g., ['_bmad', '.claude'])
- */
-export declare function updateGitignore(targetDir: string, folders: string[]): Promise<void>;
-/**
- * Compute which AIW gitignore entries should be removed during clear.
- * Returns a simulation result — the caller decides whether to apply.
- *
- * Logic per entry:
- * - If in permanentEntries → keep (reason: "permanent")
- * - If directory exists and is non-empty → keep (reason: "directory has content")
- * - Otherwise → mark for removal
- *
- * @param targetDir - Directory containing .gitignore
- * @param permanentEntries - Entries that should never be removed (defaults to AIW_PERMANENT_ENTRIES)
- * @returns Lists of entries to remove and entries to keep with reasons
- */
-export declare function computeGitignoreRemovals(targetDir: string, permanentEntries?: string[]): Promise<{
-    toKeep: Array<{
-        entry: string;
-        reason: string;
-    }>;
-    toRemove: string[];
-}>;
-/**
- * Remove specific entries from the AIW section in .gitignore.
- * Cleans up the section header if no entries remain.
- *
- * @param targetDir - Directory containing .gitignore
- * @param entriesToRemove - Entry names to remove (without trailing slash)
- */
-export declare function removeGitignoreEntries(targetDir: string, entriesToRemove: string[]): Promise<void>;