@iloom/cli 0.6.0 → 0.7.0

package/dist/chunk-NTIZLX42.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/ValidationRunner.ts","../src/types/index.ts","../src/utils/vscode.ts","../src/lib/CommitManager.ts"],"sourcesContent":["import { getLogger } from '../utils/logger-context.js'\nimport { detectPackageManager, runScript } from '../utils/package-manager.js'\nimport { getPackageConfig, hasScript } from '../utils/package-json.js'\nimport { detectClaudeCli, launchClaude } from '../utils/claude.js'\nimport type {\n\tValidationOptions,\n\tValidationResult,\n\tValidationStepResult,\n} from '../types/index.js'\n\n/**\n * ValidationRunner orchestrates pre-merge validation pipeline\n * Runs typecheck, lint, and tests in sequence with fail-fast behavior\n */\nexport class ValidationRunner {\n\tconstructor() {\n\t\t// Uses getLogger() for all logging operations\n\t}\n\n\t/**\n\t * Run all validations in sequence: typecheck → lint → test\n\t * Fails fast on first error\n\t */\n\tasync runValidations(\n\t\tworktreePath: string,\n\t\toptions: ValidationOptions = {}\n\t): Promise<ValidationResult> {\n\t\tconst startTime = Date.now()\n\t\tconst steps: ValidationStepResult[] = []\n\n\t\t// Run typecheck\n\t\tif (!options.skipTypecheck) {\n\t\t\tconst typecheckResult = await this.runTypecheck(\n\t\t\t\tworktreePath,\n\t\t\t\toptions.dryRun ?? false\n\t\t\t)\n\t\t\tsteps.push(typecheckResult)\n\n\t\t\tif (!typecheckResult.passed && !typecheckResult.skipped) {\n\t\t\t\treturn {\n\t\t\t\t\tsuccess: false,\n\t\t\t\t\tsteps,\n\t\t\t\t\ttotalDuration: Date.now() - startTime,\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t// Run lint\n\t\tif (!options.skipLint) {\n\t\t\tconst lintResult = await this.runLint(worktreePath, options.dryRun ?? false)\n\t\t\tsteps.push(lintResult)\n\n\t\t\tif (!lintResult.passed && !lintResult.skipped) {\n\t\t\t\treturn { success: false, steps, totalDuration: Date.now() - startTime }\n\t\t\t}\n\t\t}\n\n\t\t// Run tests\n\t\tif (!options.skipTests) {\n\t\t\tconst testResult = await this.runTests(\n\t\t\t\tworktreePath,\n\t\t\t\toptions.dryRun ?? false\n\t\t\t)\n\t\t\tsteps.push(testResult)\n\n\t\t\tif (!testResult.passed && !testResult.skipped) {\n\t\t\t\treturn { success: false, steps, totalDuration: Date.now() - startTime }\n\t\t\t}\n\t\t}\n\n\t\treturn { success: true, steps, totalDuration: Date.now() - startTime }\n\t}\n\n\t/**\n\t * Run typecheck validation\n\t * Prefers 'compile' script over 'typecheck' if both exist\n\t */\n\tprivate async runTypecheck(\n\t\tworktreePath: string,\n\t\tdryRun: boolean\n\t): Promise<ValidationStepResult> {\n\t\tconst stepStartTime = Date.now()\n\n\t\tlet scriptToRun: 'compile' | 'typecheck' | null = null\n\n\t\ttry {\n\t\t\t// Check for compile and typecheck scripts - prefer compile if both exist\n\t\t\tconst pkgJson = await getPackageConfig(worktreePath)\n\t\t\tconst hasCompileScript = hasScript(pkgJson, 'compile')\n\t\t\tconst hasTypecheckScript = hasScript(pkgJson, 'typecheck')\n\n\t\t\tif (hasCompileScript) {\n\t\t\t\tscriptToRun = 'compile'\n\t\t\t} else if (hasTypecheckScript) {\n\t\t\t\tscriptToRun = 'typecheck'\n\t\t\t}\n\n\t\t\tif (!scriptToRun) {\n\t\t\t\tgetLogger().debug('Skipping typecheck - no compile or typecheck script found')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'typecheck',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: true,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (error) {\n\t\t\t// Handle missing package.json - skip validation for non-Node.js projects\n\t\t\tif (error instanceof Error && error.message.includes('package.json not found')) {\n\t\t\t\tgetLogger().debug('Skipping typecheck - no package.json found (non-Node.js project)')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'typecheck',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: true,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\t\t\t// Re-throw other errors\n\t\t\tthrow error\n\t\t}\n\n\t\tconst packageManager = await detectPackageManager(worktreePath)\n\n\t\tif (dryRun) {\n\t\t\tconst command =\n\t\t\t\tpackageManager === 'npm'\n\t\t\t\t\t? `npm run ${scriptToRun}`\n\t\t\t\t\t: `${packageManager} ${scriptToRun}`\n\t\t\tgetLogger().info(`[DRY RUN] Would run: ${command}`)\n\t\t\treturn {\n\t\t\t\tstep: scriptToRun,\n\t\t\t\tpassed: true,\n\t\t\t\tskipped: false,\n\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t}\n\t\t}\n\n\t\tgetLogger().info(`Running ${scriptToRun}...`)\n\n\t\ttry {\n\t\t\tawait runScript(scriptToRun, worktreePath, [], { quiet: true })\n\t\t\tgetLogger().success(`${scriptToRun.charAt(0).toUpperCase() + scriptToRun.slice(1)} passed`)\n\n\t\t\treturn {\n\t\t\t\tstep: scriptToRun,\n\t\t\t\tpassed: true,\n\t\t\t\tskipped: false,\n\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t}\n\t\t} catch {\n\t\t\t// Attempt Claude-assisted fix before failing\n\t\t\tconst fixed = await this.attemptClaudeFix(\n\t\t\t\tscriptToRun,\n\t\t\t\tworktreePath,\n\t\t\t\tpackageManager\n\t\t\t)\n\n\t\t\tif (fixed) {\n\t\t\t\treturn {\n\t\t\t\t\tstep: scriptToRun,\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: false,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Claude couldn't fix - throw original error\n\t\t\tconst runCommand =\n\t\t\t\tpackageManager === 'npm'\n\t\t\t\t\t? `npm run ${scriptToRun}`\n\t\t\t\t\t: `${packageManager} ${scriptToRun}`\n\n\t\t\tconst stepLabel = scriptToRun.charAt(0).toUpperCase() + scriptToRun.slice(1)\n\t\t\tthrow new Error(\n\t\t\t\t`Error: ${stepLabel} failed.\\n` +\n\t\t\t\t\t`Fix type errors before merging.\\n\\n` +\n\t\t\t\t\t`Run '${runCommand}' to see detailed errors.`\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Run lint validation\n\t */\n\tprivate async runLint(\n\t\tworktreePath: string,\n\t\tdryRun: boolean\n\t): Promise<ValidationStepResult> {\n\t\tconst stepStartTime = Date.now()\n\n\t\ttry {\n\t\t\t// Check if lint script exists\n\t\t\tconst pkgJson = await getPackageConfig(worktreePath)\n\t\t\tconst hasLintScript = hasScript(pkgJson, 'lint')\n\n\t\t\tif (!hasLintScript) {\n\t\t\t\tgetLogger().debug('Skipping lint - no lint script found')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'lint',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: true,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (error) {\n\t\t\t// Handle missing package.json - skip validation for non-Node.js projects\n\t\t\tif (error instanceof Error && error.message.includes('package.json not found')) {\n\t\t\t\tgetLogger().debug('Skipping lint - no package.json found (non-Node.js project)')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'lint',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: true,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\t\t\t// Re-throw other errors\n\t\t\tthrow error\n\t\t}\n\n\t\tconst packageManager = await detectPackageManager(worktreePath)\n\n\t\tif (dryRun) {\n\t\t\tconst command =\n\t\t\t\tpackageManager === 'npm' ? 'npm run lint' : `${packageManager} lint`\n\t\t\tgetLogger().info(`[DRY RUN] Would run: ${command}`)\n\t\t\treturn {\n\t\t\t\tstep: 'lint',\n\t\t\t\tpassed: true,\n\t\t\t\tskipped: false,\n\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t}\n\t\t}\n\n\t\tgetLogger().info('Running lint...')\n\n\t\ttry {\n\t\t\tawait runScript('lint', worktreePath, [], { quiet: true })\n\t\t\tgetLogger().success('Linting passed')\n\n\t\t\treturn {\n\t\t\t\tstep: 'lint',\n\t\t\t\tpassed: true,\n\t\t\t\tskipped: false,\n\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t}\n\t\t} catch {\n\t\t\t// Attempt Claude-assisted fix before failing\n\t\t\tconst fixed = await this.attemptClaudeFix(\n\t\t\t\t'lint',\n\t\t\t\tworktreePath,\n\t\t\t\tpackageManager\n\t\t\t)\n\n\t\t\tif (fixed) {\n\t\t\t\t// logger.success('Linting passed after Claude auto-fix')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'lint',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: false,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Claude couldn't fix - throw original error\n\t\t\tconst runCommand =\n\t\t\t\tpackageManager === 'npm' ? 'npm run lint' : `${packageManager} lint`\n\n\t\t\tthrow new Error(\n\t\t\t\t`Error: Linting failed.\\n` +\n\t\t\t\t\t`Fix linting errors before merging.\\n\\n` +\n\t\t\t\t\t`Run '${runCommand}' to see detailed errors.`\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Run test validation\n\t */\n\tprivate async runTests(\n\t\tworktreePath: string,\n\t\tdryRun: boolean\n\t): Promise<ValidationStepResult> {\n\t\tconst stepStartTime = Date.now()\n\n\t\ttry {\n\t\t\t// Check if test script exists\n\t\t\tconst pkgJson = await getPackageConfig(worktreePath)\n\t\t\tconst hasTestScript = hasScript(pkgJson, 'test')\n\n\t\t\tif (!hasTestScript) {\n\t\t\t\tgetLogger().debug('Skipping tests - no test script found')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'test',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: true,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (error) {\n\t\t\t// Handle missing package.json - skip validation for non-Node.js projects\n\t\t\tif (error instanceof Error && error.message.includes('package.json not found')) {\n\t\t\t\tgetLogger().debug('Skipping tests - no package.json found (non-Node.js project)')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'test',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: true,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\t\t\t// Re-throw other errors\n\t\t\tthrow error\n\t\t}\n\n\t\tconst packageManager = await detectPackageManager(worktreePath)\n\n\t\tif (dryRun) {\n\t\t\tconst command =\n\t\t\t\tpackageManager === 'npm' ? 'npm run test' : `${packageManager} test`\n\t\t\tgetLogger().info(`[DRY RUN] Would run: ${command}`)\n\t\t\treturn {\n\t\t\t\tstep: 'test',\n\t\t\t\tpassed: true,\n\t\t\t\tskipped: false,\n\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t}\n\t\t}\n\n\t\tgetLogger().info('Running tests...')\n\n\t\ttry {\n\t\t\tawait runScript('test', worktreePath, [], { quiet: true })\n\t\t\tgetLogger().success('Tests passed')\n\n\t\t\treturn {\n\t\t\t\tstep: 'test',\n\t\t\t\tpassed: true,\n\t\t\t\tskipped: false,\n\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t}\n\t\t} catch {\n\t\t\t// Attempt Claude-assisted fix before failing\n\t\t\tconst fixed = await this.attemptClaudeFix(\n\t\t\t\t'test',\n\t\t\t\tworktreePath,\n\t\t\t\tpackageManager\n\t\t\t)\n\n\t\t\tif (fixed) {\n\t\t\t\t// logger.success('Tests passed after Claude auto-fix')\n\t\t\t\treturn {\n\t\t\t\t\tstep: 'test',\n\t\t\t\t\tpassed: true,\n\t\t\t\t\tskipped: false,\n\t\t\t\t\tduration: Date.now() - stepStartTime,\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Claude couldn't fix - throw original error\n\t\t\tconst runCommand =\n\t\t\t\tpackageManager === 'npm' ? 'npm run test' : `${packageManager} test`\n\n\t\t\tthrow new Error(\n\t\t\t\t`Error: Tests failed.\\n` +\n\t\t\t\t\t`Fix test failures before merging.\\n\\n` +\n\t\t\t\t\t`Run '${runCommand}' to see detailed errors.`\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Attempt to fix validation errors using Claude\n\t * Pattern based on MergeManager.attemptClaudeConflictResolution\n\t *\n\t * @param validationType - Type of validation that failed ('compile' | 'typecheck' | 'lint' | 'test')\n\t * @param worktreePath - Path to the worktree\n\t * @param packageManager - Detected package manager\n\t * @returns true if Claude fixed the issue, false otherwise\n\t */\n\tprivate async attemptClaudeFix(\n\t\tvalidationType: 'compile' | 'typecheck' | 'lint' | 'test',\n\t\tworktreePath: string,\n\t\tpackageManager: string\n\t): Promise<boolean> {\n\t\t// Check if Claude CLI is available\n\t\tconst isClaudeAvailable = await detectClaudeCli()\n\t\tif (!isClaudeAvailable) {\n\t\t\tgetLogger().debug('Claude CLI not available, skipping auto-fix')\n\t\t\treturn false\n\t\t}\n\n\t\t// Build validation command for the prompt\n\t\tconst validationCommand = this.getValidationCommand(validationType, packageManager)\n\n\t\t// Build prompt based on validation type (matching bash script prompts)\n\t\tconst prompt = this.getClaudePrompt(validationType, validationCommand)\n\n\t\tconst validationTypeCapitalized = validationType.charAt(0).toUpperCase() + validationType.slice(1)\n\t\tgetLogger().info(`Launching Claude to help fix ${validationTypeCapitalized} errors...`)\n\n\t\ttry {\n\t\t\t// Launch Claude in interactive mode with acceptEdits permission\n\t\t\tawait launchClaude(prompt, {\n\t\t\t\taddDir: worktreePath,\n\t\t\t\theadless: false, // Interactive mode\n\t\t\t\tpermissionMode: 'acceptEdits', // Auto-accept edits\n\t\t\t\tmodel: 'sonnet', // Use Sonnet model\n\t\t\t})\n\n\t\t\t// After Claude completes, re-run validation to verify fix\n\t\t\tgetLogger().info(`Re-running ${validationTypeCapitalized} after Claude's fixes...`)\n\n\t\t\ttry {\n\t\t\t\tawait runScript(validationType, worktreePath, [], { quiet: true })\n\t\t\t\t// Validation passed after Claude fix\n\t\t\t\tgetLogger().success(`${validationTypeCapitalized} passed after Claude auto-fix`)\n\t\t\t\treturn true\n\t\t\t} catch {\n\t\t\t\t// Validation still failing after Claude's attempt\n\t\t\t\tgetLogger().warn(`${validationTypeCapitalized} still failing after Claude's help`)\n\t\t\t\treturn false\n\t\t\t}\n\t\t} catch (error) {\n\t\t\t// Claude launch failed or crashed\n\t\t\tgetLogger().warn('Claude auto-fix failed', {\n\t\t\t\terror: error instanceof Error ? error.message : String(error),\n\t\t\t})\n\t\t\treturn false\n\t\t}\n\t}\n\n\t/**\n\t * Get validation command string for prompts\n\t * Uses il commands for multi-language project support\n\t */\n\tprivate getValidationCommand(\n\t\tvalidationType: 'compile' | 'typecheck' | 'lint' | 'test',\n\t\t_packageManager: string\n\t): string {\n\t\t// Use il commands for consistent multi-language project support\n\t\treturn `il ${validationType}`\n\t}\n\n\t/**\n\t * Get Claude prompt for specific validation type\n\t * Matches bash script prompts exactly\n\t */\n\tprivate getClaudePrompt(\n\t\tvalidationType: 'compile' | 'typecheck' | 'lint' | 'test',\n\t\tvalidationCommand: string\n\t): string {\n\t\tswitch (validationType) {\n\t\t\tcase 'compile':\n\t\t\tcase 'typecheck':\n\t\t\t\treturn (\n\t\t\t\t\t`There are TypeScript errors in this codebase. ` +\n\t\t\t\t\t`Please analyze the ${validationType} output, identify all type errors, and fix them. ` +\n\t\t\t\t\t`Run '${validationCommand}' to see the errors, then make the necessary code changes to resolve all type issues. ` +\n\t\t\t\t\t`When you are done, tell the user to quit using /exit to continue the validation process.`\n\t\t\t\t)\n\t\t\tcase 'lint':\n\t\t\t\treturn (\n\t\t\t\t\t`There are ESLint errors in this codebase. ` +\n\t\t\t\t\t`Please analyze the linting output, identify all linting issues, and fix them. ` +\n\t\t\t\t\t`Run '${validationCommand}' to see the errors, then make the necessary code changes to resolve all linting issues. ` +\n\t\t\t\t\t`Focus on code quality, consistency, and following the project's linting rules. ` +\n\t\t\t\t\t`When you are done, tell the user to quit using /exit to continue the validation process.`\n\t\t\t\t)\n\t\t\tcase 'test':\n\t\t\t\treturn (\n\t\t\t\t\t`There are unit test failures in this codebase. ` +\n\t\t\t\t\t`Please analyze the test output to understand what's failing, then fix the issues. ` +\n\t\t\t\t\t`This might involve updating test code, fixing bugs in the source code, or updating tests to match new behavior. ` +\n\t\t\t\t\t`Run '${validationCommand}' to see the detailed test failures, then make the necessary changes to get all tests passing. ` +\n\t\t\t\t\t`When you are done, tell the user to quit using /exit to continue the validation process.`\n\t\t\t\t)\n\t\t}\n\t}\n}\n","// Core types\nexport interface Workspace {\n  id: string\n  path: string\n  branch: string\n  issueNumber?: string | number\n  prNumber?: number\n  port: number\n  databaseBranch?: string\n  createdAt: Date\n  lastAccessed: Date\n}\n\nexport interface WorkspaceInput {\n  identifier: string\n  type: 'issue' | 'pr' | 'branch'\n  skipClaude?: boolean\n}\n\nexport interface WorkspaceSummary {\n  id: string\n  issueNumber?: string | number\n  prNumber?: number\n  title: string\n  branch: string\n  port: number\n  status: 'active' | 'stale' | 'error'\n  lastAccessed: string\n}\n\n// Git types\nexport interface Worktree {\n  path: string\n  branch: string\n  commit: string\n  isPR: boolean\n  prNumber?: number\n  issueNumber?: string | number\n  port?: number\n}\n\nexport interface GitStatus {\n  hasUncommittedChanges: boolean\n  unstagedFiles: string[]\n  stagedFiles: string[]\n  currentBranch: string\n  isAheadOfRemote: boolean\n  isBehindRemote: boolean\n}\n\n// GitHub types\nexport interface Issue {\n  number: string | number\n  title: string\n  body: string\n  state: 'open' | 'closed'\n  labels: string[]\n  assignees: string[]\n  url: string\n}\n\nexport interface PullRequest {\n  number: number\n  title: string\n  body: string\n  state: 'open' | 'closed' | 'merged'\n  branch: string\n  baseBranch: string\n  url: string\n  isDraft: boolean\n}\n\n// Issue Tracker types\n/**\n * Generic input detection result for issue trackers\n * String-based identifier to support non-numeric IDs (e.g., Linear \"ENG-123\")\n */\nexport interface IssueTrackerInputDetection {\n\ttype: 'issue' | 'pr' | 'unknown'\n\tidentifier: string | null\n\trawInput: string\n}\n\n/**\n * Re-export branch naming types from branch-naming module\n * These types are provider-agnostic and support all issue trackers\n */\nexport type { BranchNameStrategy, BranchGenerationOptions } from './branch-naming.js'\n\n// Database types\n\n/**\n * Result of database branch deletion operation\n * Distinguishes between successful deletion, branch not found, and errors\n */\nexport interface DatabaseDeletionResult {\n  /** Overall operation succeeded (true even if branch didn't exist) */\n  success: boolean\n  /** True only if a branch was actually deleted */\n  deleted: boolean\n  /** True if branch didn't exist (not an error, just nothing to do) */\n  notFound: boolean\n  /** Error message if operation failed */\n  error?: string\n  /** User declined deletion (for preview databases) */\n  userDeclined?: boolean\n  /** Name of the branch that was processed */\n  branchName?: string\n}\n\nexport interface DatabaseProvider {\n  // Core operations\n  createBranch(name: string, fromBranch?: string, cwd?: string): Promise<string>\n  deleteBranch(name: string, isPreview?: boolean, cwd?: string): Promise<DatabaseDeletionResult>\n  getConnectionString(branch: string, cwd?: string): Promise<string>\n  listBranches(cwd?: string): Promise<string[]>\n  branchExists(name: string, cwd?: string): Promise<boolean>\n\n  // Additional operations for Vercel integration and validation\n  findPreviewBranch(branchName: string, cwd?: string): Promise<string | null>\n  getBranchNameFromEndpoint(endpointId: string, cwd?: string): Promise<string | null>\n  sanitizeBranchName(branchName: string): string\n  isAuthenticated(cwd?: string): Promise<boolean>\n  isCliAvailable(): Promise<boolean>\n\n  // Configuration validation\n  isConfigured(): boolean\n}\n\n// Configuration types\nexport interface Config {\n  defaultPort: number\n  databaseProvider?: 'neon' | 'supabase' | 'planetscale'\n  claudeModel?: 'opus' | 'sonnet' | 'haiku'\n  skipClaude?: boolean\n  customWorkspaceRoot?: string\n}\n\n// One-shot automation mode type\nexport type OneShotMode = 'default' | 'noReview' | 'bypassPermissions'\n\n// Command option types\nexport interface StartOptions {\n  // Individual component flags (can be combined)\n  claude?: boolean\n  code?: boolean\n  devServer?: boolean\n  terminal?: boolean\n  // Child loom control flag\n  childLoom?: boolean\n  // One-shot automation mode\n  oneShot?: OneShotMode\n  // Optional body text for issue creation\n  body?: string\n  // Output result as JSON\n  json?: boolean\n}\n\nexport interface AddIssueOptions {\n  // Optional body text for issue (skips AI enhancement)\n  body?: string\n  // Output result as JSON\n  json?: boolean\n}\n\nexport interface FeedbackOptions {\n  // Optional body text for feedback (added after diagnostics)\n  body?: string\n}\n\nexport interface EnhanceOptions {\n  noBrowser?: boolean  // --no-browser flag - skip browser opening prompt\n  json?: boolean       // --json flag - output result as JSON\n}\n\nexport interface FinishOptions {\n  force?: boolean      // -f, --force - Skip confirmation prompts\n  dryRun?: boolean    // -n, --dry-run - Preview actions without executing\n  pr?: number         // --pr <number> - Treat input as PR number\n  skipBuild?: boolean // --skip-build - Skip post-merge build verification\n  noBrowser?: boolean // --no-browser - Skip opening PR in browser (github-pr mode only)\n  cleanup?: boolean   // --cleanup / --no-cleanup - Control worktree cleanup after finishing\n  json?: boolean      // --json - Output result as JSON\n}\n\n/**\n * Options for the cleanup command\n * All flags are optional and can be combined (subject to validation)\n */\nexport interface CleanupOptions {\n  /** List all worktrees without removing anything */\n  list?: boolean\n  /** Remove all worktrees (interactive confirmation required unless --force) */\n  all?: boolean\n  /** Cleanup by specific issue number */\n  issue?: number\n  /** Skip confirmations and force removal */\n  force?: boolean\n  /** Show what would be done without actually doing it */\n  dryRun?: boolean\n  /** Output result as JSON */\n  json?: boolean\n  /** Wait specified milliseconds before cleanup execution */\n  defer?: number\n}\n\nexport interface ListOptions {\n  json?: boolean\n}\n\n// JSON output result types for add-issue and enhance commands\nexport interface AddIssueResult {\n  url: string\n  id: number\n  title: string\n  created_at: string\n}\n\nexport interface EnhanceResult {\n  url: string\n  id: number\n  title: string\n  created_at: string\n  enhanced: boolean\n}\n\nexport interface StartResult {\n  id: string\n  path: string\n  branch: string\n  port?: number\n  type: 'issue' | 'pr' | 'branch'\n  identifier: string | number\n  title?: string\n  capabilities?: string[]\n}\n\nexport interface FinishResult {\n  success: boolean\n  type: 'issue' | 'pr' | 'branch'\n  identifier: string | number\n  /** Whether this was a dry-run operation */\n  dryRun?: boolean\n  operations: Array<{\n    type: 'validation' | 'commit' | 'rebase' | 'merge' | 'cleanup' | 'pr-creation' | 'pr-ready' | 'build'\n    message: string\n    success: boolean\n    error?: string\n  }>\n  prUrl?: string\n  cleanupResult?: import('./cleanup.js').CleanupResult\n}\n\nexport interface SummaryResult {\n  summary: string\n  sessionId: string\n  issueNumber?: string | number\n  branchName: string\n  loomType: 'issue' | 'pr' | 'branch'\n}\n\n// Deprecated: Result types - use exception-based error handling instead\n// export type Result<T, E = Error> = { success: true; data: T } | { success: false; error: E }\n\n// Mock factory types for testing\nexport interface MockOptions {\n  scenario: 'empty' | 'existing' | 'conflicts' | 'error'\n  data?: unknown\n}\n\n// Worktree management types\nexport * from './worktree.js'\n\n// Environment management types\nexport * from './environment.js'\n\n// Loom types\nexport * from './loom.js'\n\n// Cleanup types\nexport * from './cleanup.js'\n\n// Process types (excluding Platform which is already defined above)\nexport type { ProcessInfo } from './process.js'\n\n// Color synchronization types\nexport interface RgbColor {\n\tr: number\n\tg: number\n\tb: number\n}\n\nexport interface ColorData {\n\trgb: RgbColor\n\thex: string\n\tindex: number\n}\n\nexport type Platform = 'darwin' | 'linux' | 'win32' | 'unsupported'\n\n// Validation types\nexport interface ValidationOptions {\n\tdryRun?: boolean\n\tskipTypecheck?: boolean\n\tskipLint?: boolean\n\tskipTests?: boolean\n}\n\nexport interface ValidationStepResult {\n\tstep: 'typecheck' | 'compile' | 'lint' | 'test'\n\tpassed: boolean\n\tskipped: boolean\n\toutput?: string\n\terror?: string\n\tduration?: number\n}\n\nexport interface ValidationResult {\n\tsuccess: boolean\n\tsteps: ValidationStepResult[]\n\ttotalDuration: number\n}\n\n// Commit management types\nexport interface CommitOptions {\n\tdryRun?: boolean\n\tissueNumber?: string | number  // For \"Fixes #N\" or \"Refs #N\" trailer\n\tissuePrefix: string            // \"#\" for GitHub, \"\" for Linear\n\tmessage?: string      // Custom message override\n\tnoReview?: boolean    // Skip user review of commit message\n\tskipVerify?: boolean  // Skip pre-commit hooks (--no-verify flag)\n\tskipVerifySilent?: boolean  // Skip without warning (for --wip-commit)\n\ttrailerType?: 'Refs' | 'Fixes'  // Trailer type: \"Refs\" references issue, \"Fixes\" closes it (default: 'Fixes' for backward compat)\n}\n\n/**\n * Error thrown when user aborts a commit operation\n * Used by CommitManager when user selects 'abort' at the commit prompt\n */\nexport class UserAbortedCommitError extends Error {\n\tconstructor(message = 'User aborted the commit') {\n\t\tsuper(message)\n\t\tthis.name = 'UserAbortedCommitError'\n\t}\n}\n\n// Merge management types\nexport interface MergeOptions {\n\tdryRun?: boolean      // Preview actions without executing\n\tforce?: boolean       // Skip confirmation prompts\n\trepoRoot?: string     // Repository root path (optional, auto-detected if not provided)\n}\n\nexport interface MergeResult {\n\tsuccess: boolean\n\tbranchName: string\n\tcommitsMerged: number\n\trebaseCompleted: boolean\n\tmergeCompleted: boolean\n}\n\n// Update notification types\nexport interface UpdateCheckCache {\n\tlastCheck: number  // Unix timestamp\n\tlatestVersion: string\n}\n\nexport interface UpdateCheckResult {\n\tcurrentVersion: string\n\tlatestVersion: string\n\tupdateAvailable: boolean\n}\n\nexport type InstallationMethod = 'global' | 'local' | 'linked' | 'unknown'\n","import { execa } from 'execa'\nimport { logger } from './logger.js'\n\n/**\n * Check if running inside VSCode's integrated terminal\n * VSCode sets TERM_PROGRAM=vscode in its integrated terminal\n */\nexport function isRunningInVSCode(): boolean {\n\treturn process.env.TERM_PROGRAM === 'vscode'\n}\n\n/**\n * Check if running inside Cursor's integrated terminal\n * Cursor sets CURSOR_TRACE_ID environment variable in its terminal\n * Note: Cursor may also set TERM_PROGRAM=vscode, so this check should be done first\n */\nexport function isRunningInCursor(): boolean {\n\treturn !!process.env.CURSOR_TRACE_ID\n}\n\n/**\n * Check if running inside Antigravity's integrated terminal\n * Antigravity sets ANTIGRAVITY_CLI_ALIAS environment variable\n * Note: This check should be done FIRST before Cursor and VSCode\n */\nexport function isRunningInAntigravity(): boolean {\n\treturn !!process.env.ANTIGRAVITY_CLI_ALIAS\n}\n\n/**\n * Check if VSCode command-line tool is available\n */\nexport async function isVSCodeAvailable(): Promise<boolean> {\n\ttry {\n\t\tawait execa('command', ['-v', 'code'], {\n\t\t\tshell: true,\n\t\t\ttimeout: 5000,\n\t\t})\n\t\treturn true\n\t} catch (error) {\n\t\tlogger.debug('VSCode CLI not available', { error })\n\t\treturn false\n\t}\n}\n\n/**\n * Check if Cursor command-line tool is available\n */\nexport async function isCursorAvailable(): Promise<boolean> {\n\ttry {\n\t\tawait execa('command', ['-v', 'cursor'], {\n\t\t\tshell: true,\n\t\t\ttimeout: 5000,\n\t\t})\n\t\treturn true\n\t} catch (error) {\n\t\tlogger.debug('Cursor CLI not available', { error })\n\t\treturn false\n\t}\n}\n\n/**\n * Check if Antigravity command-line tool is available\n */\nexport async function isAntigravityAvailable(): Promise<boolean> {\n\ttry {\n\t\tawait execa('command', ['-v', 'agy'], {\n\t\t\tshell: true,\n\t\t\ttimeout: 5000,\n\t\t})\n\t\treturn true\n\t} catch (error) {\n\t\tlogger.debug('Antigravity CLI not available', { error })\n\t\treturn false\n\t}\n}\n\n/**\n * Open VSCode window for workspace\n * Throws error if VSCode not available\n */\nexport async function openVSCodeWindow(workspacePath: string): Promise<void> {\n\t// Check availability first\n\tconst available = await isVSCodeAvailable()\n\tif (!available) {\n\t\tthrow new Error(\n\t\t\t'VSCode is not available. Please install VSCode and ensure the \"code\" command is in your PATH.\\n' +\n\t\t\t\t'Install command-line tools: Open VSCode > Command Palette > \"Shell Command: Install \\'code\\' command in PATH\"'\n\t\t)\n\t}\n\n\ttry {\n\t\t// Launch VSCode with workspace path\n\t\tawait execa('code', [workspacePath])\n\t\tlogger.debug(`Opened VSCode for workspace: ${workspacePath}`)\n\t} catch (error) {\n\t\tthrow new Error(\n\t\t\t`Failed to open VSCode: ${error instanceof Error ? error.message : 'Unknown error'}`\n\t\t)\n\t}\n}\n","import { executeGitCommand } from '../utils/git.js'\nimport { getLogger } from '../utils/logger-context.js'\nimport { launchClaude, detectClaudeCli } from '../utils/claude.js'\nimport { promptCommitAction } from '../utils/prompt.js'\nimport { isRunningInVSCode, isVSCodeAvailable, isRunningInCursor, isCursorAvailable, isRunningInAntigravity, isAntigravityAvailable } from '../utils/vscode.js'\nimport { UserAbortedCommitError } from '../types/index.js'\nimport type { GitStatus, CommitOptions } from '../types/index.js'\nimport { writeFile, readFile, unlink } from 'node:fs/promises'\nimport { join } from 'node:path'\nimport { execa } from 'execa'\n\n/**\n * CommitManager handles uncommitted changes detection and auto-commit\n * Ports logic from bash/merge-and-clean.sh lines 610-643\n */\nexport class CommitManager {\n  constructor() {\n    // Uses getLogger() for all logging operations\n  }\n\n  /**\n   * Detect uncommitted changes in a worktree\n   * Parses git status --porcelain output into structured GitStatus\n   */\n  async detectUncommittedChanges(worktreePath: string): Promise<GitStatus> {\n    // Execute: git status --porcelain\n    const porcelainOutput = await executeGitCommand(['status', '--porcelain'], {\n      cwd: worktreePath,\n    })\n\n    // Parse output to get staged and unstaged files\n    const { stagedFiles, unstagedFiles } = this.parseGitStatus(porcelainOutput)\n\n    // Get current branch name\n    const currentBranch = await executeGitCommand(['branch', '--show-current'], {\n      cwd: worktreePath,\n    })\n\n    return {\n      hasUncommittedChanges: stagedFiles.length > 0 || unstagedFiles.length > 0,\n      unstagedFiles,\n      stagedFiles,\n      currentBranch: currentBranch.trim(),\n      // Defer these to future enhancement\n      isAheadOfRemote: false,\n      isBehindRemote: false,\n    }\n  }\n\n\n  /**\n   * Stage all changes and commit with Claude-generated or simple message\n   * Tries Claude first, falls back to simple message if Claude unavailable or fails\n   * Returns the commit message that was used\n   */\n  async commitChanges(worktreePath: string, options: CommitOptions): Promise<{ message: string }> {\n    // Step 1: Check dry-run mode\n    if (options.dryRun) {\n      getLogger().info('[DRY RUN] Would run: git add -A')\n      getLogger().info('[DRY RUN] Would generate commit message with Claude (if available)')\n      const fallbackMessage = this.generateFallbackMessage(options)\n      const verifyFlag = options.skipVerify ? ' --no-verify' : ''\n      getLogger().info(`[DRY RUN] Would commit with message${verifyFlag}: ${fallbackMessage}`)\n      return { message: fallbackMessage }\n    }\n\n    // Step 2: Stage all changes\n    await executeGitCommand(['add', '-A'], { cwd: worktreePath })\n\n    // Step 3: Generate commit message (try Claude first, fallback to simple)\n    let message: string | null = null\n\n    // Skip Claude if custom message provided\n    if (!options.message) {\n      try {\n        message = await this.generateClaudeCommitMessage(worktreePath, options.issueNumber, options.issuePrefix, options.trailerType)\n      } catch (error) {\n        getLogger().debug('Claude commit message generation failed, using fallback', { error })\n      }\n    }\n\n    // Fallback to simple message if Claude failed or unavailable\n    message ??= this.generateFallbackMessage(options)\n\n    // Step 4: Log warning if --no-verify is configured (but not for silent skip like --wip-commit)\n    if (options.skipVerify && !options.skipVerifySilent) {\n      getLogger().warn('Skipping pre-commit hooks (--no-verify configured in settings)')\n    }\n\n    // Step 5: Commit with user review via prompt (unless noReview specified)\n    try {\n      if (options.noReview || options.message) {\n        // Direct commit without review (custom message or noReview flag)\n        const commitArgs = ['commit', '-m', message]\n        if (options.skipVerify) {\n          commitArgs.push('--no-verify')\n        }\n        await executeGitCommand(commitArgs, { cwd: worktreePath })\n      } else {\n        // Prompt user for action instead of going straight to editor\n        const action = await promptCommitAction(message)\n\n        if (action === 'abort') {\n          throw new UserAbortedCommitError()\n        }\n\n        if (action === 'accept') {\n          // Direct commit with -m flag (no editor)\n          const commitArgs = ['commit', '-m', message]\n          if (options.skipVerify) {\n            commitArgs.push('--no-verify')\n          }\n          await executeGitCommand(commitArgs, { cwd: worktreePath })\n        } else {\n          // action === 'edit': Use git editor for user review\n          getLogger().info('Opening editor for commit message review...')\n\n          // Check for Antigravity FIRST as it takes priority\n          if (isRunningInAntigravity() && await isAntigravityAvailable()) {\n            await this.commitWithExternalEditor(worktreePath, message, options, 'agy', 'Antigravity')\n          // Check for Cursor SECOND since it may also set TERM_PROGRAM=vscode\n          // Use Cursor-specific flow when running in Cursor terminal\n          } else if (isRunningInCursor() && await isCursorAvailable()) {\n            await this.commitWithExternalEditor(worktreePath, message, options, 'cursor', 'Cursor')\n          // Use VSCode-specific flow when running in VSCode terminal\n          // This opens the file in the current VSCode window instead of a random one\n          } else if (isRunningInVSCode() && await isVSCodeAvailable()) {\n            await this.commitWithExternalEditor(worktreePath, message, options, 'code', 'VSCode')\n          } else {\n            // Standard git editor flow for non-VSCode/Cursor/Antigravity environments\n            const commitArgs = ['commit', '-e', '-m', message]\n            if (options.skipVerify) {\n              commitArgs.push('--no-verify')\n            }\n            await executeGitCommand(commitArgs, {\n              cwd: worktreePath,\n              stdio: 'inherit',\n              timeout: 300000 // 5 minutes for interactive editing\n            })\n          }\n        }\n      }\n      return { message }\n    } catch (error) {\n      // Re-throw UserAbortedCommitError as-is\n      if (error instanceof UserAbortedCommitError) {\n        throw error\n      }\n      // Handle \"nothing to commit\" scenario gracefully\n      if (error instanceof Error && error.message.includes('nothing to commit')) {\n        getLogger().info('No changes to commit')\n        return { message: '' }\n      }\n      // Re-throw all other errors (including pre-commit hook failures)\n      throw error\n    }\n  }\n\n\n  /**\n   * Commit with external editor CLI (VSCode, Cursor, Antigravity, etc.)\n   * Handles file creation, editing, and commit to ensure the file opens\n   * in the current editor window (preserves IPC context)\n   */\n  private async commitWithExternalEditor(\n    worktreePath: string,\n    message: string,\n    options: CommitOptions,\n    cliCommand: string,\n    editorName: string\n  ): Promise<void> {\n    // Put the commit message file in the worktree root so the editor opens it\n    // in the correct window (files within a workspace folder open in that workspace's window)\n    const commitMsgPath = join(worktreePath, '.COMMIT_EDITMSG')\n\n    // Write the initial commit message (with git-style comments)\n    const initialContent = `${message}\n\n# Please enter the commit message for your changes. Lines starting\n# with '#' will be ignored, and an empty message aborts the commit.\n#\n# Save and close the file to complete the commit.\n`\n    await writeFile(commitMsgPath, initialContent, 'utf-8')\n\n    try {\n      getLogger().debug(`Opening commit message in ${editorName}: ${commitMsgPath}`)\n\n      // Open the file with --wait flag so we block until the user closes it\n      await execa(cliCommand, ['--wait', commitMsgPath], {\n        cwd: worktreePath,\n        stdio: 'inherit'\n      })\n\n      // Read the edited message\n      const editedContent = await readFile(commitMsgPath, 'utf-8')\n\n      // Strip comment lines and trim\n      const finalMessage = editedContent\n        .split('\\n')\n        .filter(line => !line.startsWith('#'))\n        .join('\\n')\n        .trim()\n\n      // Check for empty message (user aborted)\n      if (!finalMessage) {\n        throw new UserAbortedCommitError()\n      }\n\n      // Commit with the edited message\n      const commitArgs = ['commit', '-F', commitMsgPath]\n      if (options.skipVerify) {\n        commitArgs.push('--no-verify')\n      }\n\n      // Rewrite the file without comments for git commit -F\n      await writeFile(commitMsgPath, finalMessage, 'utf-8')\n      await executeGitCommand(commitArgs, { cwd: worktreePath })\n\n    } finally {\n      // Clean up - git normally handles this but we should be safe\n      try {\n        await unlink(commitMsgPath)\n      } catch {\n        // Ignore cleanup errors\n      }\n    }\n  }\n\n  /**\n   * Generate simple fallback commit message when Claude unavailable\n   * Used as fallback for Claude-powered commit messages\n   */\n  private generateFallbackMessage(options: CommitOptions): string {\n    // If custom message provided, use it\n    if (options.message) {\n      return options.message\n    }\n\n    // Generate WIP message\n    if (options.issueNumber) {\n      const trailer = options.trailerType ?? 'Fixes'\n      return `WIP: Auto-commit for issue ${options.issuePrefix}${options.issueNumber}\\n\\n${trailer} ${options.issuePrefix}${options.issueNumber}`\n    } else {\n      return 'WIP: Auto-commit uncommitted changes'\n    }\n  }\n\n  /**\n   * Parse git status --porcelain output\n   * Format: \"XY filename\" where X=index, Y=worktree\n   * Examples:\n   *   \"M  file.ts\" - staged modification\n   *   \" M file.ts\" - unstaged modification\n   *   \"MM file.ts\" - both staged and unstaged\n   *   \"?? file.ts\" - untracked\n   */\n  private parseGitStatus(porcelainOutput: string): {\n    stagedFiles: string[]\n    unstagedFiles: string[]\n  } {\n    const stagedFiles: string[] = []\n    const unstagedFiles: string[] = []\n\n    if (!porcelainOutput.trim()) {\n      return { stagedFiles, unstagedFiles }\n    }\n\n    const lines = porcelainOutput.split('\\n').filter((line) => line.trim())\n\n    for (const line of lines) {\n      if (line.length < 3) continue\n\n      const indexStatus = line[0] // First character - staging area status\n      const worktreeStatus = line[1] // Second character - working tree status\n      const filename = line.substring(3) // Everything after \"XY \"\n\n      // Check if file is staged\n      // First char != ' ' and != '?' → staged\n      if (indexStatus !== ' ' && indexStatus !== '?') {\n        stagedFiles.push(filename)\n      }\n\n      // Check if file is unstaged\n      // Second char != ' ' or line starts with '??' → unstaged\n      if (worktreeStatus !== ' ' || line.startsWith('??')) {\n        unstagedFiles.push(filename)\n      }\n    }\n\n    return { stagedFiles, unstagedFiles }\n  }\n\n  /**\n   * Generate commit message using Claude Code\n   * Claude examines the git repository directly via --add-dir option\n   * Returns null if Claude unavailable or fails validation\n   */\n  private async generateClaudeCommitMessage(\n    worktreePath: string,\n    issueNumber: string | number | undefined,\n    issuePrefix: string,\n    trailerType?: 'Refs' | 'Fixes'\n  ): Promise<string | null> {\n    const startTime = Date.now()\n\n    if (getLogger().isDebugEnabled()) {\n      getLogger().debug('Claude commit message generation started', {\n        worktreePath: worktreePath.split('/').pop(), // Just show the folder name for privacy\n        issueNumber\n      })\n    } else {\n      getLogger().info('Generating commit message with Claude...')\n    }\n\n    // Check if Claude CLI is available\n    getLogger().debug('Checking Claude CLI availability...')\n    const isClaudeAvailable = await detectClaudeCli()\n    if (!isClaudeAvailable) {\n      getLogger().info('Claude CLI not available, skipping Claude commit message generation')\n      return null\n    }\n    getLogger().debug('Claude CLI is available')\n\n    // Build XML-based structured prompt\n    getLogger().debug('Building commit message prompt...')\n    const prompt = this.buildCommitMessagePrompt(issueNumber, issuePrefix, trailerType)\n    getLogger().debug('Prompt built', { promptLength: prompt.length })\n\n    // Debug log the actual prompt content for troubleshooting\n    getLogger().debug('Claude prompt content:', {\n      prompt: prompt,\n      truncatedPreview: prompt.substring(0, 500) + (prompt.length > 500 ? '...[truncated]' : '')\n    })\n\n    try {\n      const claudeStartTime = Date.now()\n\n      // Debug log the Claude call parameters\n      const claudeOptions = {\n        headless: true,\n        addDir: worktreePath,\n        model: 'claude-haiku-4-5-20251001', // Fast, cost-effective model\n        timeout: 120000, // 120 second timeout\n        appendSystemPrompt: 'Output only the requested content. Never include preamble, analysis, or meta-commentary. Your response is used verbatim.',\n      }\n      getLogger().debug('Claude CLI call parameters:', {\n        options: claudeOptions,\n        worktreePathForAnalysis: worktreePath,\n        addDirContents: 'Will include entire worktree directory for analysis'\n      })\n\n      // Launch Claude in headless mode with repository access and shorter timeout for commit messages\n      const result = await launchClaude(prompt, claudeOptions)\n\n      const claudeDuration = Date.now() - claudeStartTime\n      getLogger().debug('Claude API call completed', { duration: `${claudeDuration}ms` })\n\n      if (typeof result !== 'string') {\n        getLogger().warn('Claude returned non-string result', { resultType: typeof result })\n        return null\n      }\n\n      getLogger().debug('Raw Claude output received', {\n        outputLength: result.length,\n        preview: result.substring(0, 200) + (result.length > 200 ? '...' : '')\n      })\n\n\n      // Sanitize output - remove meta-commentary and clean formatting\n      getLogger().debug('Sanitizing Claude output...')\n      const sanitized = this.sanitizeClaudeOutput(result)\n      getLogger().debug('Output sanitized', {\n        originalLength: result.length,\n        sanitizedLength: sanitized.length,\n        sanitized: sanitized.substring(0, 200) + (sanitized.length > 200 ? '...' : '')\n      })\n\n      // Ensure empty strings are rejected\n      if (!sanitized) {\n        getLogger().warn('Claude returned empty message after sanitization')\n        return null\n      }\n\n      // Append trailer (e.g., \"Fixes #N\" or \"Refs #N\") if issue number provided\n      let finalMessage = sanitized\n      if (issueNumber) {\n        const trailer = trailerType ?? 'Fixes'\n        const trailerRef = `${trailer} ${issuePrefix}${issueNumber}`\n        // Add trailer if not already present\n        if (!finalMessage.includes(trailerRef)) {\n          finalMessage = `${finalMessage}\\n\\n${trailerRef}`\n          getLogger().debug(`Added \"${trailerRef}\" trailer to commit message`)\n        } else {\n          getLogger().debug(`\"${trailerRef}\" already present in commit message`)\n        }\n      }\n\n      const totalDuration = Date.now() - startTime\n      if (getLogger().isDebugEnabled()) {\n        getLogger().debug('Claude commit message generated', {\n          message: finalMessage,\n          totalDuration: `${totalDuration}ms`,\n          claudeApiDuration: `${claudeDuration}ms`\n        })\n      } else {\n        getLogger().info('Commit message generated')\n      }\n\n      return finalMessage\n    } catch (error) {\n      const totalDuration = Date.now() - startTime\n      const errorMessage = error instanceof Error ? error.message : 'Unknown error'\n\n      if (errorMessage.includes('timed out') || errorMessage.includes('timeout')) {\n        getLogger().warn('Claude commit message generation timed out after 45 seconds', {\n          totalDuration: `${totalDuration}ms`,\n          worktreePath: worktreePath.split('/').pop()\n        })\n      } else {\n        getLogger().warn('Failed to generate commit message with Claude', {\n          error: errorMessage,\n          totalDuration: `${totalDuration}ms`,\n          worktreePath: worktreePath.split('/').pop()\n        })\n      }\n      return null\n    }\n  }\n\n  /**\n   * Build structured XML prompt for commit message generation\n   * Uses XML format for clear task definition and output expectations\n   */\n  private buildCommitMessagePrompt(\n    issueNumber: string | number | undefined,\n    issuePrefix: string,\n    trailerType?: 'Refs' | 'Fixes'\n  ): string {\n    const trailer = trailerType ?? 'Fixes'\n    const issueContext = issueNumber\n      ? `\\n<IssueContext>\nThis commit is associated with issue ${issuePrefix}${issueNumber}.\n${trailer === 'Fixes' ? 'If the changes appear to resolve the issue, include' : 'Include'} \"${trailer} ${issuePrefix}${issueNumber}\" at the end of the first line of commit message.\n</IssueContext>`\n      : ''\n\n    const examplePrefix = issuePrefix || ''  // Use empty string for Linear examples\n    return `<Task>\nYou are a software engineer writing a commit message for this repository.\nExamine the staged changes in the git repository and generate a concise, meaningful commit message.\n</Task>\n\n<Requirements>\n<Format>The first line must be a brief summary of the changes made as a full sentence. If it references an issue, include \"${trailer} ${examplePrefix}N\" at the end of this line.\n\nAdd 2 newlines, then add a bullet-point form description of the changes made, each change on a new line.</Format>\n<Mood>Use imperative mood (e.g., \"Add feature\" not \"Added feature\")</Mood>\n<Focus>Be specific about what was changed and why</Focus>\n<Conciseness>Keep message under 72 characters for subject line when possible</Conciseness>\n<NoMeta>CRITICAL: Do NOT include ANY explanatory text, analysis, or meta-commentary. Output ONLY the raw commit message.</NoMeta>\n<Examples>\nGood: \"Add user authentication with JWT tokens. ${trailer} ${examplePrefix}42\n\n- Implement login and registration endpoints\n- Secure routes with JWT middleware\n- Update user model to store hashed passwords\"\nGood: \"Fix navigation bug in sidebar menu.\"\nBad: \"Based on the changes, I'll create: Add user authentication\"\nBad: \"Looking at the files, this commit should be: Fix navigation bug\"\n</Examples>\n${issueContext}\n</Requirements>\n\n<Output>\nIMPORTANT: Your entire response will be used directly as the git commit message.\nDo not include any explanatory text before or after the commit message.\nStart your response immediately with the commit message text.\n</Output>`\n  }\n\n  /**\n   * Sanitize Claude output to remove meta-commentary and clean formatting\n   * Handles cases where Claude includes explanatory text despite instructions\n   */\n  private sanitizeClaudeOutput(rawOutput: string): string {\n    let cleaned = rawOutput.trim()\n\n    // Remove common meta-commentary patterns (case-insensitive)\n    const metaPatterns = [\n      /^.*?based on.*?changes.*?:/i,\n      /^.*?looking at.*?files.*?:/i,\n      /^.*?examining.*?:/i,\n      /^.*?analyzing.*?:/i,\n      /^.*?i'll.*?generate.*?:/i,\n      /^.*?let me.*?:/i,\n      /^.*?the commit message.*?should be.*?:/i,\n      /^.*?here.*?is.*?commit.*?message.*?:/i,\n    ]\n\n    for (const pattern of metaPatterns) {\n      cleaned = cleaned.replace(pattern, '').trim()\n    }\n\n    // Extract content after separators only if it looks like meta-commentary\n    // Only split on colons if there's clear meta-commentary before it\n    if (cleaned.includes(':')) {\n      const colonIndex = cleaned.indexOf(':')\n      const beforeColon = cleaned.substring(0, colonIndex).trim().toLowerCase()\n\n      // Only split if the text before colon looks like meta-commentary\n      const metaIndicators = [\n        'here is the commit message',\n        'commit message',\n        'here is',\n        'the message should be',\n        'i suggest',\n        'my suggestion'\n      ]\n\n      const isMetaCommentary = metaIndicators.some(indicator => beforeColon.includes(indicator))\n\n      if (isMetaCommentary) {\n        const afterColon = cleaned.substring(colonIndex + 1).trim()\n        if (afterColon && afterColon.length > 10) {\n          cleaned = afterColon\n        }\n      }\n    }\n\n    // Remove quotes if the entire message is wrapped in them\n    if ((cleaned.startsWith('\"') && cleaned.endsWith('\"')) ||\n        (cleaned.startsWith(\"'\") && cleaned.endsWith(\"'\"))) {\n      cleaned = cleaned.slice(1, -1).trim()\n    }\n\n    return cleaned\n  }\n}\n"],"mappings":"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","names":["execa"]}

package/dist/{chunk-PMVWQBWS.js → chunk-S7YMZQUD.js}

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 import {
-  calculatePortForBranch
-} from "./chunk-VU3QMIP2.js";
+  calculatePortForBranch,
+  calculatePortFromIdentifier
+} from "./chunk-453NC377.js";
 import {
   installDependencies,
   runScript
-} from "./chunk-AXX3QIKK.js";
+} from "./chunk-LLWX3PCW.js";
 import {
   getPackageConfig,
   hasScript
-} from "./chunk-BXCPJJYM.js";
+} from "./chunk-ITN64ENQ.js";
 import {
   branchExists,
   checkRemoteBranchStatus,
@@ -23,13 +24,13 @@ import {
   hasUncommittedChanges,
   isBranchMergedIntoMain,
   isFileTrackedByGit
-} from "./chunk-GEXP5IOF.js";
+} from "./chunk-ZA575VLF.js";
 import {
   SettingsManager
-} from "./chunk-F6WVM437.js";
+} from "./chunk-WFQ5CLTR.js";
 import {
   MetadataManager
-} from "./chunk-CFUWQHCJ.js";
+} from "./chunk-VWGKGNJP.js";
 import {
   calculateForegroundColor,
   generateColorFromBranchName,
@@ -39,8 +40,8 @@ import {
   selectDistinctColor
 } from "./chunk-433MOLAU.js";
 import {
-  generateDeterministicSessionId
-} from "./chunk-AEIMYF4P.js";
+  generateRandomSessionId
+} from "./chunk-FP7G7DG3.js";
 import {
   getLogger
 } from "./chunk-6MLEBAYZ.js";
@@ -326,33 +327,31 @@ var LoomManager = class {
         );
       }
       getLogger().info("Creating placeholder commit for draft PR...");
-      const { executeGitCommand: executeGitCommand2, PLACEHOLDER_COMMIT_PREFIX, pushBranchToRemote } = await import("./git-FVMGBHC2.js");
+      const { executeGitCommand: executeGitCommand2, PLACEHOLDER_COMMIT_PREFIX, pushBranchToRemote } = await import("./git-ENLT2VNI.js");
       await executeGitCommand2(
         [
           "commit",
           "--allow-empty",
           "--no-verify",
           "-m",
-          `${PLACEHOLDER_COMMIT_PREFIX} Temporary commit for draft PR (will be removed on finish) - issue #${input.identifier}`
+          `${PLACEHOLDER_COMMIT_PREFIX} Temporary commit for draft PR (will be removed on finish)`
         ],
         { cwd: worktreePath }
       );
       getLogger().debug("Placeholder commit created");
       getLogger().info("Pushing branch to remote for draft PR...");
       await pushBranchToRemote(branchName, worktreePath, { dryRun: false });
-      const { PRManager } = await import("./PRManager-OCSB2HPT.js");
+      const { PRManager } = await import("./PRManager-2ABCWXHW.js");
       const prManager = new PRManager(settingsData);
       const prTitle = (issueData == null ? void 0 : issueData.title) ?? `Work on ${branchName}`;
       const prBody = `Draft PR for issue #${input.identifier}
 
 This PR was created automatically by iloom.`;
-      const mainBranch = settingsData.mainBranch ?? "main";
       getLogger().info("Creating draft PR...");
       const prResult = await prManager.createDraftPR(
         branchName,
         prTitle,
         prBody,
-        mainBranch,
         worktreePath
       );
       draftPrNumber = prResult.number;
@@ -393,8 +392,8 @@ This PR was created automatically by iloom.`;
     const setArguments = (_j = input.options) == null ? void 0 : _j.setArguments;
     const executablePath = (_k = input.options) == null ? void 0 : _k.executablePath;
     if (enableClaude || enableCode || enableDevServer || enableTerminal) {
-      const { LoomLauncher } = await import("./LoomLauncher-5LFM4LXB.js");
-      const { ClaudeContextManager } = await import("./ClaudeContextManager-6J2EB4QU.js");
+      const { LoomLauncher } = await import("./LoomLauncher-NL65LSKP.js");
+      const { ClaudeContextManager } = await import("./ClaudeContextManager-KE5TBZVZ.js");
       const claudeContext = new ClaudeContextManager(void 0, void 0, this.settings);
       const launcher = new LoomLauncher(claudeContext, this.settings);
       await launcher.launchLoom({
@@ -429,7 +428,7 @@ This PR was created automatically by iloom.`;
       }
     }
     const pr_numbers = input.type === "pr" ? [String(input.identifier)] : [];
-    const sessionId = generateDeterministicSessionId(worktreePath);
+    const sessionId = generateRandomSessionId();
     let issueUrls = {};
     if (input.type === "issue" && (issueData == null ? void 0 : issueData.url)) {
       issueUrls = { [String(input.identifier)]: issueData.url };
@@ -451,6 +450,7 @@ This PR was created automatically by iloom.`;
       projectPath: this.gitWorktree.workingDirectory,
       issueUrls,
       prUrls,
+      capabilities,
       ...draftPrNumber && { draftPrNumber },
       ...input.parentLoom && { parentLoom: input.parentLoom }
     };
@@ -540,7 +540,7 @@ This PR was created automatically by iloom.`;
   async checkAndWarnChildLooms(branchName) {
     let targetBranch = branchName;
     if (!targetBranch) {
-      const { getCurrentBranch } = await import("./git-FVMGBHC2.js");
+      const { getCurrentBranch } = await import("./git-ENLT2VNI.js");
       targetBranch = await getCurrentBranch();
     }
     if (!targetBranch) {
@@ -848,7 +848,7 @@ This PR was created automatically by iloom.`;
       if (typeof input.identifier === "number") {
         return this.environment.calculatePort({ basePort, issueNumber: input.identifier });
       } else if (typeof input.identifier === "string") {
-        return this.environment.calculatePort({ basePort, branchName: input.identifier });
+        return this.environment.calculatePort({ basePort, issueNumber: input.identifier });
       }
     }
     if (input.type === "pr" && typeof input.identifier === "number") {
@@ -1020,8 +1020,8 @@ This PR was created automatically by iloom.`;
     const executablePath = (_i = input.options) == null ? void 0 : _i.executablePath;
     if (enableClaude || enableCode || enableDevServer || enableTerminal) {
       getLogger().info("Launching workspace components...");
-      const { LoomLauncher } = await import("./LoomLauncher-5LFM4LXB.js");
-      const { ClaudeContextManager } = await import("./ClaudeContextManager-6J2EB4QU.js");
+      const { LoomLauncher } = await import("./LoomLauncher-NL65LSKP.js");
+      const { ClaudeContextManager } = await import("./ClaudeContextManager-KE5TBZVZ.js");
       const claudeContext = new ClaudeContextManager(void 0, void 0, this.settings);
       const launcher = new LoomLauncher(claudeContext, this.settings);
       await launcher.launchLoom({
@@ -1057,7 +1057,7 @@ This PR was created automatically by iloom.`;
         }
       }
       const pr_numbers = input.type === "pr" ? [String(input.identifier)] : [];
-      const sessionId = generateDeterministicSessionId(worktreePath);
+      const sessionId = generateRandomSessionId();
       let issueUrls = {};
       if (input.type === "issue" && (issueData == null ? void 0 : issueData.url)) {
         issueUrls = { [String(input.identifier)]: issueData.url };
@@ -1079,6 +1079,7 @@ This PR was created automatically by iloom.`;
         projectPath: this.gitWorktree.workingDirectory,
         issueUrls,
         prUrls,
+        capabilities,
         ...input.parentLoom && { parentLoom: input.parentLoom }
       };
       await this.metadataManager.writeMetadata(worktreePath, metadataInput);
@@ -1216,30 +1217,15 @@ var EnvironmentManager = class {
    * Implements:
    * - Issue/PR: 3000 + issue/PR number
    * - Branch: 3000 + deterministic hash offset (1-999)
+   * Delegates to calculatePortFromIdentifier for the core calculation.
    */
   calculatePort(options) {
     const basePort = options.basePort ?? 3e3;
     if (options.issueNumber !== void 0) {
-      const numericIssue = typeof options.issueNumber === "number" ? options.issueNumber : parseInt(String(options.issueNumber), 10);
-      if (!isNaN(numericIssue) && String(numericIssue) === String(options.issueNumber)) {
-        const port = basePort + numericIssue;
-        if (port > 65535) {
-          throw new Error(
-            `Calculated port ${port} exceeds maximum (65535). Use a lower base port or issue number.`
-          );
-        }
-        return port;
-      }
-      return calculatePortForBranch(String(options.issueNumber), basePort);
+      return calculatePortFromIdentifier(options.issueNumber, basePort);
     }
     if (options.prNumber !== void 0) {
-      const port = basePort + options.prNumber;
-      if (port > 65535) {
-        throw new Error(
-          `Calculated port ${port} exceeds maximum (65535). Use a lower base port or PR number.`
-        );
-      }
-      return port;
+      return calculatePortFromIdentifier(options.prNumber, basePort);
     }
     if (options.branchName !== void 0) {
       return calculatePortForBranch(options.branchName, basePort);
@@ -1787,14 +1773,16 @@ var ResourceCleanup = class {
    * @param options - Cleanup options
    */
   async cleanupWorktree(parsed, options = {}) {
-    var _a;
+    var _a, _b, _c;
     const operations = [];
     const errors = [];
     const displayIdentifier = parsed.branchName ?? ((_a = parsed.number) == null ? void 0 : _a.toString()) ?? parsed.originalInput;
     getLogger().info(`Starting cleanup for: ${displayIdentifier}`);
     const number = parsed.number;
     if (number !== void 0) {
-      const port = this.processManager.calculatePort(number);
+      const settings = await this.settingsManager.loadSettings();
+      const basePort = ((_c = (_b = settings == null ? void 0 : settings.capabilities) == null ? void 0 : _b.web) == null ? void 0 : _c.basePort) ?? 3e3;
+      const port = calculatePortFromIdentifier(number, basePort);
       if (options.dryRun) {
         operations.push({
           type: "dev-server",
@@ -1924,8 +1912,6 @@ ${blockerMessage}`);
           success: true,
           message: `Worktree removed: ${worktree.path}`
         });
-        await this.metadataManager.deleteMetadata(worktree.path);
-        getLogger().debug(`Metadata file cleanup attempted for: ${worktree.path}`);
       } catch (error) {
         const err = error instanceof Error ? error : new Error("Unknown error");
         errors.push(err);
@@ -2427,4 +2413,4 @@ export {
   DatabaseManager,
   ResourceCleanup
 };
-//# sourceMappingURL=chunk-PMVWQBWS.js.map
+//# sourceMappingURL=chunk-S7YMZQUD.js.map