aiwcli 0.12.6 → 0.12.7

package/bin/dev.cmd

@@ -1,3 +1,3 @@
-@echo off
-
-node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev.js" %*
+@echo off
+
+node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev.js" %*

package/bin/dev.js

@@ -1,16 +1,16 @@
-#!/usr/bin/env -S node --loader ts-node/esm --disable-warning=ExperimentalWarning
-
-import {execute} from '@oclif/core'
-
-// Handle default command: inject 'launch' when no command is specified
-// but preserve --help and --version behavior for general CLI help
-const args = process.argv.slice(2)
-const firstArg = args[0] ?? ''
-const hasCommand = args.length > 0 && !firstArg.startsWith('-')
-const isHelpOrVersion = firstArg === '--help' || firstArg === '-h' || firstArg === '--version'
-
-await execute({
-  development: true,
-  dir: import.meta.url,
-  args: hasCommand || isHelpOrVersion ? args : ['launch', ...args],
-})
+#!/usr/bin/env -S node --loader ts-node/esm --disable-warning=ExperimentalWarning
+
+import {execute} from '@oclif/core'
+
+// Handle default command: inject 'launch' when no command is specified
+// but preserve --help and --version behavior for general CLI help
+const args = process.argv.slice(2)
+const firstArg = args[0] ?? ''
+const hasCommand = args.length > 0 && !firstArg.startsWith('-')
+const isHelpOrVersion = firstArg === '--help' || firstArg === '-h' || firstArg === '--version'
+
+await execute({
+  development: true,
+  dir: import.meta.url,
+  args: hasCommand || isHelpOrVersion ? args : ['launch', ...args],
+})

package/bin/run.cmd

@@ -1,3 +1,3 @@
-@echo off
-
-node "%~dp0\run.js" %*
+@echo off
+
+node "%~dp0\run.js" %*

package/bin/run.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
-
-// Load environment variable compatibility layer first
-const {loadEnvWithCompatibility} = await import('../dist/lib/env-compat.js')  
-loadEnvWithCompatibility()
-
-import {execute} from '@oclif/core'
-
-// Handle default command: inject 'launch' when no command is specified
-// but preserve --help and --version behavior for general CLI help
-const args = process.argv.slice(2)
-const firstArg = args[0] ?? ''
-const hasCommand = args.length > 0 && !firstArg.startsWith('-')
-const isHelpOrVersion = firstArg === '--help' || firstArg === '-h' || firstArg === '--version' || firstArg === '-v'
-
-// Map -v to --version since oclif doesn't natively understand -v
-const resolvedArgs = firstArg === '-v' ? ['--version', ...args.slice(1)] : args
-
-await execute({
-  dir: import.meta.url,
-  args: hasCommand || isHelpOrVersion ? resolvedArgs : ['launch', ...resolvedArgs],
-})
+
+// Load environment variable compatibility layer first
+const {loadEnvWithCompatibility} = await import('../dist/lib/env-compat.js')  
+loadEnvWithCompatibility()
+
+import {execute} from '@oclif/core'
+
+// Handle default command: inject 'launch' when no command is specified
+// but preserve --help and --version behavior for general CLI help
+const args = process.argv.slice(2)
+const firstArg = args[0] ?? ''
+const hasCommand = args.length > 0 && !firstArg.startsWith('-')
+const isHelpOrVersion = firstArg === '--help' || firstArg === '-h' || firstArg === '--version' || firstArg === '-v'
+
+// Map -v to --version since oclif doesn't natively understand -v
+const resolvedArgs = firstArg === '-v' ? ['--version', ...args.slice(1)] : args
+
+await execute({
+  dir: import.meta.url,
+  args: hasCommand || isHelpOrVersion ? resolvedArgs : ['launch', ...resolvedArgs],
+})

package/dist/commands/branch.js

@@ -80,7 +80,12 @@ export default class BranchCommand extends BaseCommand {
         const { args, flags } = await this.parse(BranchCommand);
         // Validate that one of the flags is provided
         if (!flags.main && !flags.launch && !flags.delete) {
-            this.error('Either --main, --launch, or --delete flag is required', { exit: EXIT_CODES.INVALID_USAGE });
+            if (args.branchName) {
+                // Bare positional arg = shorthand for --launch <name>
+                await this.handleWorktreeLaunch(args.branchName);
+                return;
+            }
+            this.error('Either provide a branch name directly (aiw branch <name>) or use --main, --launch, or --delete', { exit: EXIT_CODES.INVALID_USAGE });
         }
         // Route to appropriate handler
         if (flags.main) {
@@ -396,7 +401,7 @@ export default class BranchCommand extends BaseCommand {
     async handleWorktreeLaunch(branchName) {
         // Validate branch name
         if (!branchName || branchName.trim().length === 0) {
-            this.error('Branch name is required when using --launch flag', { exit: EXIT_CODES.INVALID_USAGE });
+            this.error('Branch name is required. Usage: aiw branch <name> or aiw branch --launch <name>', { exit: EXIT_CODES.INVALID_USAGE });
         }
         // Validate branch name format (no spaces, special chars that could cause issues)
         const validBranchNamePattern = /^[a-zA-Z0-9._/-]+$/;

package/dist/lib/bmad-installer.js

@@ -11,15 +11,15 @@ const BMAD_VERSION = '6.0.0-alpha.22';
  */
 function generateCoreConfig(username) {
     const now = new Date().toISOString();
-    return `# CORE Module Configuration
-# Generated by AI Workflow CLI
-# Version: ${BMAD_VERSION}
-# Date: ${now}
-
-user_name: ${username}
-communication_language: English
-document_output_language: English
-output_folder: "{project-root}/_bmad-output"
+    return `# CORE Module Configuration
+# Generated by AI Workflow CLI
+# Version: ${BMAD_VERSION}
+# Date: ${now}
+
+user_name: ${username}
+communication_language: English
+document_output_language: English
+output_folder: "{project-root}/_bmad-output"
 `;
 }
 /**
@@ -27,24 +27,24 @@ output_folder: "{project-root}/_bmad-output"
  */
 function generateBmmConfig(projectName, username) {
     const now = new Date().toISOString();
-    return `# BMM Module Configuration
-# Generated by AI Workflow CLI
-# Version: ${BMAD_VERSION}
-# Date: ${now}
-
-project_name: ${projectName}
-user_skill_level: intermediate
-planning_artifacts: "{project-root}/_bmad-output/planning-artifacts"
-implementation_artifacts: "{project-root}/_bmad-output/implementation-artifacts"
-project_knowledge: "{project-root}/docs"
-tea_use_mcp_enhancements: false
-tea_use_playwright_utils: false
-
-# Core Configuration Values
-user_name: ${username}
-communication_language: English
-document_output_language: English
-output_folder: "{project-root}/_bmad-output"
+    return `# BMM Module Configuration
+# Generated by AI Workflow CLI
+# Version: ${BMAD_VERSION}
+# Date: ${now}
+
+project_name: ${projectName}
+user_skill_level: intermediate
+planning_artifacts: "{project-root}/_bmad-output/planning-artifacts"
+implementation_artifacts: "{project-root}/_bmad-output/implementation-artifacts"
+project_knowledge: "{project-root}/docs"
+tea_use_mcp_enhancements: false
+tea_use_playwright_utils: false
+
+# Core Configuration Values
+user_name: ${username}
+communication_language: English
+document_output_language: English
+output_folder: "{project-root}/_bmad-output"
 `;
 }
 /**
@@ -52,16 +52,16 @@ output_folder: "{project-root}/_bmad-output"
  */
 function generateManifest() {
     const now = new Date().toISOString();
-    return `installation:
-  version: ${BMAD_VERSION}
-  installDate: ${now}
-  lastUpdated: ${now}
-  installedBy: aiwcli
-modules:
-  - core
-  - bmm
-ides:
-  - claude-code
+    return `installation:
+  version: ${BMAD_VERSION}
+  installDate: ${now}
+  lastUpdated: ${now}
+  installedBy: aiwcli
+modules:
+  - core
+  - bmm
+ides:
+  - claude-code
 `;
 }
 /**

package/dist/lib/terminal.d.ts

@@ -7,6 +7,7 @@
  * ## Supported Platforms
  * - **Windows**: Windows Terminal (wt.exe) with PowerShell 7 (pwsh) fallback to PowerShell 5.1
  * - **macOS**: Terminal.app via AppleScript
+ * - **WSL**: Windows Terminal (wt.exe) via wsl.exe, falls back to Linux emulators
  * - **Linux**: gnome-terminal, konsole, xterm, x-terminal-emulator (in order of preference)
  *
  * ## Usage
@@ -64,6 +65,7 @@ interface TerminalLaunchResult {
  * terminal emulator:
  * - **Windows**: Windows Terminal (wt.exe) with PowerShell, falls back to PowerShell directly
  * - **macOS**: Terminal.app via AppleScript
+ * - **WSL**: Windows Terminal (wt.exe) via wsl.exe, falls back to Linux terminals
  * - **Linux**: Tries gnome-terminal, konsole, xterm, x-terminal-emulator in order
  *
  * The terminal is launched in detached mode, allowing the parent process to exit

package/dist/lib/terminal.js

@@ -7,6 +7,7 @@
  * ## Supported Platforms
  * - **Windows**: Windows Terminal (wt.exe) with PowerShell 7 (pwsh) fallback to PowerShell 5.1
  * - **macOS**: Terminal.app via AppleScript
+ * - **WSL**: Windows Terminal (wt.exe) via wsl.exe, falls back to Linux emulators
  * - **Linux**: gnome-terminal, konsole, xterm, x-terminal-emulator (in order of preference)
  *
  * ## Usage
@@ -28,14 +29,21 @@
  */
 import { execSync, spawn } from 'node:child_process';
 /**
- * Escape a shell argument for safe execution.
- * Wraps path in double quotes and escapes internal quotes.
+ * Return a copy of process.env with Claude Code nesting-detection vars removed.
  *
- * @param arg - Argument to escape
- * @returns Escaped argument safe for shell execution
+ * Claude Code sets CLAUDECODE and CLAUDE_CODE_ENTRYPOINT when running. Child
+ * processes that inherit these vars are blocked from launching their own Claude
+ * Code instance ("cannot launch claude within claude").
+ *
+ * Source of truth: packages/cli/src/templates/_shared/lib-ts/base/subprocess-utils.ts
+ * → getInternalSubprocessEnv() — if Claude Code adds more nesting-detection vars
+ * in a future release, add them here too.
  */
-function escapeShellArg(arg) {
-    return `"${arg.replaceAll('\\', '\\\\').replaceAll('"', String.raw `\"`)}"`;
+function cleanTerminalEnv() {
+    const env = { ...process.env };
+    delete env['CLAUDECODE'];
+    delete env['CLAUDE_CODE_ENTRYPOINT'];
+    return env;
 }
 /**
  * Detect which PowerShell is available on Windows.
@@ -68,6 +76,7 @@ async function launchPowerShellFallback(cwd, command, powershellCmd, debugLog) {
         const terminal = spawn(powershellCmd, ['-Command', psCommand], {
             detached: true,
             stdio: 'ignore',
+            env: cleanTerminalEnv(),
         });
         terminal.on('error', (err) => {
             resolve({ success: false, error: `Failed to launch PowerShell: ${err.message}` });
@@ -90,6 +99,7 @@ async function launchWindowsTerminal(cwd, command, debugLog) {
         const terminal = spawn('wt', ['-d', cwd, powershellCmd, '-NoExit', '-Command', command], {
             detached: true,
             stdio: 'ignore',
+            env: cleanTerminalEnv(),
         });
         terminal.on('error', (err) => {
             // If wt.exe not found, try fallback to Start-Process
@@ -125,6 +135,7 @@ async function launchMacTerminal(cwd, command, debugLog) {
         const terminal = spawn('osascript', ['-e', `tell application "Terminal" to do script "${escapedCommand}"`], {
             detached: true,
             stdio: 'ignore',
+            env: cleanTerminalEnv(),
         });
         terminal.on('error', (err) => {
             resolve({ success: false, error: `Failed to launch Terminal.app: ${err.message}` });
@@ -161,6 +172,36 @@ function findAvailableLinuxTerminal() {
     }
     return null;
 }
+function isWSL() {
+    return Boolean(process.env['WSL_DISTRO_NAME']);
+}
+/**
+ * Launch Windows Terminal (wt.exe) from WSL, running the command inside a new bash session.
+ *
+ * Uses wt.exe → wsl.exe → bash so the new terminal inherits the correct WSL distro.
+ * Claude Code nesting-detection vars are stripped via cleanTerminalEnv().
+ *
+ * @param cwd - Working directory (WSL path)
+ * @param command - Command to execute
+ * @param debugLog - Optional debug logging function
+ */
+async function launchWSLTerminal(cwd, command, debugLog) {
+    const escapedPath = cwd.replaceAll("'", String.raw `'\''`);
+    const bashCmd = `cd '${escapedPath}' && ${command}; exec bash`;
+    debugLog?.(`Launching WSL via wt.exe with command: ${bashCmd}`);
+    return new Promise((resolve) => {
+        const proc = spawn('wt.exe', ['wsl.exe', '--', 'bash', '-c', bashCmd], {
+            detached: true,
+            stdio: 'ignore',
+            env: cleanTerminalEnv(),
+        });
+        proc.on('error', (err) => {
+            resolve({ success: false, error: `wt.exe failed: ${err.message}` });
+        });
+        proc.unref();
+        resolve({ success: true });
+    });
+}
 /**
  * Launch Linux terminal emulator with command.
  * Tries gnome-terminal, konsole, xterm, x-terminal-emulator in order.
@@ -187,6 +228,7 @@ async function launchLinuxTerminal(cwd, command, debugLog) {
         const proc = spawn(terminal.cmd, terminal.getArgs(fullCommand), {
             detached: true,
             stdio: 'ignore',
+            env: cleanTerminalEnv(),
         });
         proc.on('error', (err) => {
             resolve({ error: `Failed to launch ${terminal.cmd}: ${err.message}`, success: false });
@@ -202,6 +244,7 @@ async function launchLinuxTerminal(cwd, command, debugLog) {
  * terminal emulator:
  * - **Windows**: Windows Terminal (wt.exe) with PowerShell, falls back to PowerShell directly
  * - **macOS**: Terminal.app via AppleScript
+ * - **WSL**: Windows Terminal (wt.exe) via wsl.exe, falls back to Linux terminals
  * - **Linux**: Tries gnome-terminal, konsole, xterm, x-terminal-emulator in order
  *
  * The terminal is launched in detached mode, allowing the parent process to exit
@@ -236,6 +279,13 @@ export async function launchTerminal(options) {
     if (platform === 'darwin') {
         return launchMacTerminal(cwd, command, debugLog);
     }
-    // Linux/Unix
+    // Linux/Unix — try WSL (wt.exe) first, fall back to native Linux terminals
+    if (isWSL()) {
+        debugLog?.('WSL detected, trying wt.exe');
+        const wslResult = await launchWSLTerminal(cwd, command, debugLog);
+        if (wslResult.success)
+            return wslResult;
+        debugLog?.(`wt.exe failed (${wslResult.error}), falling back to Linux terminals`);
+    }
     return launchLinuxTerminal(cwd, command, debugLog);
 }