@pcoliveira90/pdd 0.2.6 → 0.3.1

package/src/cli/doctor-command.js

@@ -1,101 +1,140 @@
-import fs from 'fs';
-import path from 'path';
-import { PDD_TEMPLATE_VERSION } from '../core/template-registry.js';
-import { runDoctorFix } from './doctor-fix.js';
-import { buildDoctorRemediationPlan, printDoctorRemediationPlan } from '../core/remediation-advisor.js';
-
-function exists(baseDir, relativePath) {
-  return fs.existsSync(path.join(baseDir, relativePath));
-}
-
-function readVersion(baseDir) {
-  const file = path.join(baseDir, '.pdd/version.json');
-  if (!fs.existsSync(file)) return null;
-
-  try {
-    return JSON.parse(fs.readFileSync(file, 'utf-8')).templateVersion;
-  } catch {
-    return null;
-  }
-}
-
-function print(label, ok, detail = '') {
-  const icon = ok ? '✅' : '⚠️';
-  console.log(`${icon} ${label}${detail ? ` — ${detail}` : ''}`);
-}
-
-export function runDoctor(baseDir = process.cwd(), argv = []) {
-  const shouldFix = argv.includes('--fix');
-
-  console.log('🩺 PDD Doctor\n');
-
-  const coreChecks = {
-    constitution: exists(baseDir, '.pdd/constitution.md'),
-    delta: exists(baseDir, '.pdd/templates/delta-spec.md'),
-    patch: exists(baseDir, '.pdd/templates/patch-plan.md'),
-    verification: exists(baseDir, '.pdd/templates/verification-report.md'),
-    memory: exists(baseDir, '.pdd/memory/system-map.md')
-  };
-
-  const adapters = {
-    claude: exists(baseDir, '.claude/commands/pdd.md'),
-    cursor: exists(baseDir, '.cursor/pdd.prompt.md'),
-    copilot: exists(baseDir, '.github/copilot/pdd.prompt.md')
-  };
-
-  const installedVersion = readVersion(baseDir);
-
-  // Raw checks
-  print('Core constitution', coreChecks.constitution);
-  print('Delta spec', coreChecks.delta);
-  print('Patch plan', coreChecks.patch);
-  print('Verification report', coreChecks.verification);
-  print('System map', coreChecks.memory);
-
-  console.log('');
-
-  print('Claude adapter', adapters.claude, adapters.claude ? 'installed' : 'missing');
-  print('Cursor adapter', adapters.cursor, adapters.cursor ? 'installed' : 'missing');
-  print('Copilot adapter', adapters.copilot, adapters.copilot ? 'installed' : 'missing');
-
-  console.log('');
-
-  if (!installedVersion) {
-    console.log('⚠️ No template version detected. Run `pdd init --here --force`.');
-  } else if (installedVersion !== PDD_TEMPLATE_VERSION) {
-    console.log(`⚠️ Templates outdated (${installedVersion} → ${PDD_TEMPLATE_VERSION})`);
-    console.log('👉 Run: pdd init --here --upgrade');
-  } else {
-    console.log('🎉 Templates up to date');
-  }
-
-  if (!adapters.claude && !adapters.cursor && !adapters.copilot) {
-    console.log('ℹ️ No IDE adapters installed');
-    console.log('👉 Run: pdd init --here --ide=claude (or cursor/copilot)');
-  }
-
-  // Guided remediation
-  const plan = buildDoctorRemediationPlan({
-    coreChecks,
-    adapters,
-    installedVersion,
-    currentVersion: PDD_TEMPLATE_VERSION
-  });
-
-  printDoctorRemediationPlan(plan);
-
-  if (shouldFix) {
-    console.log('');
-    const result = runDoctorFix(baseDir);
-
-    if (result.changed) {
-      console.log('🔧 Auto-repair applied:');
-      result.repaired.forEach(file => console.log(`- fixed: ${file}`));
-      if (result.installedVersion && result.installedVersion !== result.currentVersion) {
-        console.log(`ℹ️ Version updated: ${result.installedVersion} → ${result.currentVersion}`);
-      }
-    } else {
-      console.log('✅ No fixes needed');
-    }
-  }
-}
+import fs from 'fs';
+import path from 'path';
+import { PDD_TEMPLATE_VERSION } from '../core/template-registry.js';
+import { runDoctorFix } from './doctor-fix.js';
+import { buildDoctorRemediationPlan, printDoctorRemediationPlan } from '../core/remediation-advisor.js';
+
+function exists(baseDir, relativePath) {
+  return fs.existsSync(path.join(baseDir, relativePath));
+}
+
+function existsAny(baseDir, relativePaths) {
+  return relativePaths.some(relativePath => exists(baseDir, relativePath));
+}
+
+function cursorAdapterInstalled(baseDir) {
+  return existsAny(baseDir, [
+    '.cursor/rules/pdd.mdc',
+    '.cursor/commands/pdd.md',
+    '.cursor/commands/pdd-recon.md',
+    '.cursor/commands/pdd-fix.md',
+    '.cursor/commands/pdd-feature.md',
+    '.cursor/commands/pdd-verify.md',
+    '.cursor/pdd.prompt.md'
+  ]);
+}
+
+function claudeAdapterInstalled(baseDir) {
+  return existsAny(baseDir, [
+    '.claude/CLAUDE.md',
+    '.claude/commands/pdd.md',
+    '.claude/commands/pdd-recon.md',
+    '.claude/commands/pdd-fix.md',
+    '.claude/commands/pdd-feature.md',
+    '.claude/commands/pdd-verify.md'
+  ]);
+}
+
+function copilotAdapterInstalled(baseDir) {
+  return existsAny(baseDir, [
+    '.github/copilot-instructions.md',
+    '.github/copilot/pdd.prompt.md',
+    '.github/prompts/pdd-recon.prompt.md',
+    '.github/prompts/pdd-fix.prompt.md',
+    '.github/prompts/pdd-feature.prompt.md',
+    '.github/prompts/pdd-verify.prompt.md'
+  ]);
+}
+
+function readVersion(baseDir) {
+  const file = path.join(baseDir, '.pdd/version.json');
+  if (!fs.existsSync(file)) return null;
+
+  try {
+    return JSON.parse(fs.readFileSync(file, 'utf-8')).templateVersion;
+  } catch {
+    return null;
+  }
+}
+
+function print(label, ok, detail = '') {
+  const icon = ok ? '✅' : '⚠️';
+  console.log(`${icon} ${label}${detail ? ` — ${detail}` : ''}`);
+}
+
+export function runDoctor(baseDir = process.cwd(), argv = []) {
+  const shouldFix = argv.includes('--fix');
+
+  console.log('🩺 PDD Doctor\n');
+
+  const coreChecks = {
+    constitution: exists(baseDir, '.pdd/constitution.md'),
+    delta: exists(baseDir, '.pdd/templates/delta-spec.md'),
+    patch: exists(baseDir, '.pdd/templates/patch-plan.md'),
+    verification: exists(baseDir, '.pdd/templates/verification-report.md'),
+    memory: exists(baseDir, '.pdd/memory/system-map.md')
+  };
+
+  const adapters = {
+    claude: claudeAdapterInstalled(baseDir),
+    cursor: cursorAdapterInstalled(baseDir),
+    copilot: copilotAdapterInstalled(baseDir)
+  };
+
+  const installedVersion = readVersion(baseDir);
+
+  // Raw checks
+  print('Core constitution', coreChecks.constitution);
+  print('Delta spec', coreChecks.delta);
+  print('Patch plan', coreChecks.patch);
+  print('Verification report', coreChecks.verification);
+  print('System map', coreChecks.memory);
+
+  console.log('');
+
+  print('Claude adapter', adapters.claude, adapters.claude ? 'installed' : 'missing');
+  print('Cursor adapter', adapters.cursor, adapters.cursor ? 'installed' : 'missing');
+  print('Copilot adapter', adapters.copilot, adapters.copilot ? 'installed' : 'missing');
+
+  console.log('');
+
+  if (!installedVersion) {
+    console.log('⚠️ No template version detected. Run `pdd init --here --force`.');
+  } else if (installedVersion !== PDD_TEMPLATE_VERSION) {
+    console.log(`⚠️ Templates outdated (${installedVersion} → ${PDD_TEMPLATE_VERSION})`);
+    console.log('👉 Run: pdd init --here --upgrade');
+  } else {
+    console.log('🎉 Templates up to date');
+  }
+  console.log('ℹ️ Note: CLI package version and template version are tracked separately.');
+
+  if (!adapters.claude && !adapters.cursor && !adapters.copilot) {
+    console.log('ℹ️ No IDE adapters installed');
+    console.log('👉 Run: pdd init --here --ide=claude (or cursor/copilot)');
+  }
+
+  // Guided remediation
+  const plan = buildDoctorRemediationPlan({
+    coreChecks,
+    adapters,
+    installedVersion,
+    currentVersion: PDD_TEMPLATE_VERSION
+  });
+
+  printDoctorRemediationPlan(plan);
+
+  if (shouldFix) {
+    console.log('');
+    const result = runDoctorFix(baseDir);
+
+    if (result.changed) {
+      console.log('🔧 Auto-repair applied:');
+      result.repaired.forEach(file => console.log(`- fixed: ${file}`));
+      if (result.installedVersion && result.installedVersion !== result.currentVersion) {
+        console.log(`ℹ️ Version updated: ${result.installedVersion} → ${result.currentVersion}`);
+      }
+    } else {
+      console.log('✅ No fixes needed');
+    }
+  }
+}

package/src/cli/doctor-fix.js

@@ -1,51 +1,51 @@
-import fs from 'fs';
-import path from 'path';
-import { CORE_TEMPLATES, PDD_TEMPLATE_VERSION } from '../core/template-registry.js';
-
-function ensureDir(filePath) {
-  fs.mkdirSync(path.dirname(filePath), { recursive: true });
-}
-
-function writeFile(baseDir, relativePath, content) {
-  const fullPath = path.join(baseDir, relativePath);
-  ensureDir(fullPath);
-  fs.writeFileSync(fullPath, content, 'utf-8');
-}
-
-function readInstalledVersion(baseDir) {
-  const versionFile = path.join(baseDir, '.pdd/version.json');
-  if (!fs.existsSync(versionFile)) return null;
-
-  try {
-    return JSON.parse(fs.readFileSync(versionFile, 'utf-8')).templateVersion || null;
-  } catch {
-    return null;
-  }
-}
-
-function isCoreFile(relativePath) {
-  return relativePath.startsWith('.pdd/');
-}
-
-export function runDoctorFix(baseDir = process.cwd()) {
-  const installedVersion = readInstalledVersion(baseDir);
-  const repaired = [];
-
-  for (const [relativePath, content] of Object.entries(CORE_TEMPLATES)) {
-    const fullPath = path.join(baseDir, relativePath);
-    const missing = !fs.existsSync(fullPath);
-    const outdatedVersionFile = relativePath === '.pdd/version.json' && installedVersion !== PDD_TEMPLATE_VERSION;
-
-    if (isCoreFile(relativePath) && (missing || outdatedVersionFile)) {
-      writeFile(baseDir, relativePath, content);
-      repaired.push(relativePath);
-    }
-  }
-
-  return {
-    repaired,
-    installedVersion,
-    currentVersion: PDD_TEMPLATE_VERSION,
-    changed: repaired.length > 0
-  };
-}
+import fs from 'fs';
+import path from 'path';
+import { CORE_TEMPLATES, PDD_TEMPLATE_VERSION } from '../core/template-registry.js';
+
+function ensureDir(filePath) {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+}
+
+function writeFile(baseDir, relativePath, content) {
+  const fullPath = path.join(baseDir, relativePath);
+  ensureDir(fullPath);
+  fs.writeFileSync(fullPath, content, 'utf-8');
+}
+
+function readInstalledVersion(baseDir) {
+  const versionFile = path.join(baseDir, '.pdd/version.json');
+  if (!fs.existsSync(versionFile)) return null;
+
+  try {
+    return JSON.parse(fs.readFileSync(versionFile, 'utf-8')).templateVersion || null;
+  } catch {
+    return null;
+  }
+}
+
+function isCoreFile(relativePath) {
+  return relativePath.startsWith('.pdd/');
+}
+
+export function runDoctorFix(baseDir = process.cwd()) {
+  const installedVersion = readInstalledVersion(baseDir);
+  const repaired = [];
+
+  for (const [relativePath, content] of Object.entries(CORE_TEMPLATES)) {
+    const fullPath = path.join(baseDir, relativePath);
+    const missing = !fs.existsSync(fullPath);
+    const outdatedVersionFile = relativePath === '.pdd/version.json' && installedVersion !== PDD_TEMPLATE_VERSION;
+
+    if (isCoreFile(relativePath) && (missing || outdatedVersionFile)) {
+      writeFile(baseDir, relativePath, content);
+      repaired.push(relativePath);
+    }
+  }
+
+  return {
+    repaired,
+    installedVersion,
+    currentVersion: PDD_TEMPLATE_VERSION,
+    changed: repaired.length > 0
+  };
+}

package/src/cli/index.js

@@ -1,130 +1,164 @@
-import { readFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
-import { runValidation } from '../core/validator.js';
-import { openPullRequest } from '../core/pr-manager.js';
-import { generatePatchArtifacts } from '../core/patch-generator.js';
-import { runInit } from './init-command.js';
-import { runDoctor } from './doctor-command.js';
-import { runStatus } from './status-command.js';
-import { runResilientFixWorkflow } from '../core/fix-runner.js';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-function readCliVersion() {
-  const pkgPath = join(__dirname, '../../package.json');
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-  return pkg.version;
-}
-
-function parseFixArgs(argv) {
-  const issue = argv
-    .filter(arg => !arg.startsWith('--') && arg !== 'fix')
-    .join(' ')
-    .trim();
-
-  return {
-    issue,
-    openPr: argv.includes('--open-pr'),
-    dryRun: argv.includes('--dry-run'),
-    noValidate: argv.includes('--no-validate')
-  };
-}
-
-export async function runCli(argv = process.argv.slice(2)) {
-  const command = argv[0];
-  const cwd = process.cwd();
-
-  if (command === '--version' || command === '-v' || command === '-V' || command === 'version') {
-    console.log(readCliVersion());
-    return;
-  }
-
-  if (command === 'init') {
-    await runInit(argv);
-    return;
-  }
-
-  if (command === 'doctor') {
-    runDoctor(cwd, argv);
-    return;
-  }
-
-  if (command === 'status') {
-    runStatus(cwd);
-    return;
-  }
-
-  if (command === 'fix') {
-    const { issue, openPr, dryRun, noValidate } = parseFixArgs(argv);
-
-    if (!issue) {
-      console.error('❌ Missing issue description.');
-      console.log('Use: pdd fix "description" [--open-pr] [--dry-run] [--no-validate]');
-      process.exit(1);
-    }
-
-    console.log('🔧 PDD Fix Workflow');
-    console.log(`Issue: ${issue}`);
-    console.log(`Open PR prep: ${openPr ? 'yes' : 'no'}`);
-    console.log(`Dry run: ${dryRun ? 'yes' : 'no'}`);
-    console.log(`Validation: ${noValidate ? 'skipped' : 'enabled'}`);
-
-    try {
-      const result = await runResilientFixWorkflow({
-        baseDir: cwd,
-        issue,
-        dryRun,
-        noValidate,
-        openPr,
-        generatePatchArtifacts,
-        runValidation,
-        openPullRequest
-      });
-
-      if (result.status === 'dry-run') {
-        console.log('📝 Dry run only. No files created.');
-        return;
-      }
-
-      if (result.changeId) {
-        console.log(`Tracking change: ${result.changeId}`);
-      }
-
-      if (Array.isArray(result.files) && result.files.length > 0) {
-        console.log('🧩 Patch artifacts created:');
-        result.files.forEach(file => console.log(`- ${file}`));
-      }
-
-      console.log('✅ Fix workflow finished.');
-    } catch (error) {
-      console.error(`❌ ${error.message}`);
-      process.exitCode = 1;
-    }
-
-    return;
-  }
-
-  if (command === 'help' || !command) {
-    console.log(`PDD CLI ${readCliVersion()}`);
-    console.log('');
-    console.log('Commands:');
-    console.log('  pdd init <project-name>');
-    console.log('  pdd init --here [--force] [--upgrade] [-y] [--no-ide-prompt] [--no-project-review] [--ide=claude|cursor|copilot|...]');
-    console.log('  pdd doctor [--fix]');
-    console.log('  pdd status');
-    console.log('  pdd fix "description" [--open-pr] [--dry-run] [--no-validate]');
-    console.log('  pdd version   (or: pdd --version, pdd -v)');
-    console.log('');
-    console.log('Examples:');
-    console.log('  pdd doctor --fix');
-    console.log('  pdd status');
-    console.log('  pdd init --here --upgrade');
-    console.log('  pdd fix "login not saving incomeStatus" --open-pr');
-    console.log('');
-    return;
-  }
-
-  console.log(`❌ Unknown command: ${command}`);
-  console.log('Use: pdd help');
-}
+import { readFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { runValidation } from '../core/validator.js';
+import { openPullRequest } from '../core/pr-manager.js';
+import { generatePatchArtifacts } from '../core/patch-generator.js';
+import { runInit } from './init-command.js';
+import { runDoctor } from './doctor-command.js';
+import { runStatus } from './status-command.js';
+import { runResilientFixWorkflow } from '../core/fix-runner.js';
+import { enforceLinkedWorktree } from '../core/worktree-guard.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+function readCliVersion() {
+  const pkgPath = join(__dirname, '../../package.json');
+  const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+  return pkg.version;
+}
+
+function parseFixArgs(argv) {
+  const issue = argv
+    .filter(arg => !arg.startsWith('--') && arg !== 'fix')
+    .join(' ')
+    .trim();
+
+  return {
+    issue,
+    openPr: argv.includes('--open-pr'),
+    dryRun: argv.includes('--dry-run'),
+    noValidate: argv.includes('--no-validate'),
+    allowMainWorktree: argv.includes('--allow-main-worktree')
+  };
+}
+
+export async function runCli(argv = process.argv.slice(2)) {
+  const command = argv[0];
+  const cwd = process.cwd();
+
+  if (command === '--version' || command === '-v' || command === '-V' || command === 'version') {
+    console.log(readCliVersion());
+    return;
+  }
+
+  if (command === 'init') {
+    const allowMainWorktree = argv.includes('--allow-main-worktree');
+    const mutatesCurrentRepo = argv.includes('--here') || argv.includes('--upgrade');
+    if (mutatesCurrentRepo) {
+      enforceLinkedWorktree({
+        baseDir: cwd,
+        commandName: 'init',
+        allowMainWorktree
+      });
+    }
+    await runInit(argv);
+    return;
+  }
+
+  if (command === 'doctor') {
+    const allowMainWorktree = argv.includes('--allow-main-worktree');
+    if (argv.includes('--fix')) {
+      enforceLinkedWorktree({
+        baseDir: cwd,
+        commandName: 'doctor --fix',
+        allowMainWorktree
+      });
+    }
+    runDoctor(cwd, argv);
+    return;
+  }
+
+  if (command === 'status') {
+    runStatus(cwd);
+    return;
+  }
+
+  if (command === 'fix') {
+    const { issue, openPr, dryRun, noValidate, allowMainWorktree } = parseFixArgs(argv);
+
+    if (!issue) {
+      console.error('❌ Missing issue description.');
+      console.log('Use: pdd fix "description" [--open-pr] [--dry-run] [--no-validate] [--allow-main-worktree]');
+      process.exit(1);
+    }
+
+    enforceLinkedWorktree({
+      baseDir: cwd,
+      commandName: 'fix',
+      allowMainWorktree
+    });
+
+    console.log('🔧 PDD Fix Workflow');
+    console.log(`Issue: ${issue}`);
+    console.log(`Open PR prep: ${openPr ? 'yes' : 'no'}`);
+    console.log(`Dry run: ${dryRun ? 'yes' : 'no'}`);
+    console.log(`Validation: ${noValidate ? 'skipped' : 'enabled'}`);
+
+    try {
+      const result = await runResilientFixWorkflow({
+        baseDir: cwd,
+        issue,
+        dryRun,
+        noValidate,
+        openPr,
+        generatePatchArtifacts,
+        runValidation,
+        openPullRequest
+      });
+
+      if (result.status === 'dry-run') {
+        console.log('📝 Dry run only. No files created.');
+        return;
+      }
+
+      if (result.changeId) {
+        console.log(`Tracking change: ${result.changeId}`);
+      }
+
+      if (Array.isArray(result.files) && result.files.length > 0) {
+        console.log('🧩 Patch artifacts created:');
+        result.files.forEach(file => console.log(`- ${file}`));
+      }
+
+      console.log('✅ Fix workflow finished.');
+    } catch (error) {
+      console.error(`❌ ${error.message}`);
+      process.exitCode = 1;
+    }
+
+    return;
+  }
+
+  if (command === 'help' || !command) {
+    console.log(`PDD CLI ${readCliVersion()}`);
+    console.log('');
+    console.log('Core commands:');
+    console.log('  pdd init <project-name>                                          Initialize PDD templates in a new folder');
+    console.log('  pdd init --here [--force] [--upgrade] [-y] [--no-ide-prompt]     Initialize or upgrade templates in current project');
+    console.log('      [--no-project-review] [--ide=claude|cursor|copilot|...]');
+    console.log('  pdd doctor [--fix]                                                Check installation health and optionally auto-repair');
+    console.log('  pdd status                                                        Show current change workflow state');
+    console.log('  pdd fix "description" [--open-pr] [--dry-run] [--no-validate]    Run fix workflow and generate artifacts');
+    console.log('  pdd version   (or: pdd --version, pdd -v)                        Show CLI version');
+    console.log('');
+    console.log('Worktree policy:');
+    console.log('  Mutating commands require linked git worktree by default.');
+    console.log('  Override intentionally with --allow-main-worktree.');
+    console.log('');
+    console.log('AI command (official binary):');
+    console.log('  pdd-ai [--provider=openai|claude|openrouter] [--task=analysis|build|test|review] [--model=<id>] "issue"');
+    console.log('');
+    console.log('Examples:');
+    console.log('  pdd doctor --fix');
+    console.log('  pdd status');
+    console.log('  pdd init --here --upgrade');
+    console.log('  pdd fix "login not saving incomeStatus" --open-pr');
+    console.log('  pdd-ai --provider=openai --task=analysis "login not saving incomeStatus"');
+    console.log('');
+    return;
+  }
+
+  console.log(`❌ Unknown command: ${command}`);
+  console.log('Use: pdd help');
+}