@pcoliveira90/pdd 0.3.1 → 0.4.0

package/README.en.md

@@ -22,13 +22,10 @@ Language versions: [Default README](README.md) | [Português (Brasil)](README.pt
 ## Quick Start
 
 ```bash
-# 1) Create a linked worktree (recommended and enforced for mutating flows)
-git worktree add ../pdd-worktrees/my-change -b feature/my-change
-
-# 2) Initialize PDD in the repository
+# 1) Initialize PDD in the repository (if running in primary, PDD auto-creates a linked worktree)
 pdd init --here
 
-# 3) Run a fix workflow
+# 2) Run a fix workflow
 pdd fix "login not saving incomeStatus"
 ```
 

package/README.md

@@ -22,13 +22,10 @@ Language versions: [English](README.en.md) | [Português (Brasil)](README.pt-BR.
 ## Quick Start
 
 ```bash
-# 1) Create a linked worktree (recommended and enforced for mutating flows)
-git worktree add ../pdd-worktrees/my-change -b feature/my-change
-
-# 2) Initialize PDD in the repository
+# 1) Initialize PDD in the repository (if running in primary, PDD auto-creates a linked worktree)
 pdd init --here
 
-# 3) Run a fix workflow
+# 2) Run a fix workflow
 pdd fix "login not saving incomeStatus"
 ```
 

package/README.pt-BR.md

@@ -22,13 +22,10 @@ Versoes por idioma: [README padrao](README.md) | [English](README.en.md)
 ## Inicio rapido
 
 ```bash
-# 1) Crie uma worktree vinculada (recomendado e exigido para fluxos mutaveis)
-git worktree add ../pdd-worktrees/minha-mudanca -b feature/minha-mudanca
-
-# 2) Inicialize o PDD no repositorio
+# 1) Inicialize o PDD no repositorio (se estiver na principal, o PDD cria worktree vinculada automaticamente)
 pdd init --here
 
-# 3) Rode um fluxo de correcao
+# 2) Rode um fluxo de correcao
 pdd fix "login nao salva incomeStatus"
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pcoliveira90/pdd",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Patch-Driven Development CLI — safe, resilient and guided code changes",
   "type": "module",
   "bin": {

package/src/cli/index.js

@@ -1,6 +1,7 @@
 import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
+import { spawnSync } from 'child_process';
 import { runValidation } from '../core/validator.js';
 import { openPullRequest } from '../core/pr-manager.js';
 import { generatePatchArtifacts } from '../core/patch-generator.js';
@@ -8,7 +9,7 @@ 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';
+import { createLinkedWorktree, detectWorktreeContext } from '../core/worktree-guard.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -33,6 +34,44 @@ function parseFixArgs(argv) {
   };
 }
 
+function maybeAutoRelocateToWorktree({
+  cwd,
+  argv,
+  commandName,
+  enabled
+}) {
+  if (!enabled || argv.includes('--allow-main-worktree')) {
+    return false;
+  }
+
+  const context = detectWorktreeContext(cwd);
+  if (!context.isGitRepo || !context.isPrimaryWorktree) {
+    return false;
+  }
+
+  const { worktreePath, branchName } = createLinkedWorktree({
+    baseDir: cwd,
+    commandName
+  });
+
+  console.log(`🔀 Primary worktree detected. Auto-created linked worktree: ${worktreePath}`);
+  console.log(`🪴 Branch: ${branchName}`);
+  console.log('▶️ Continuing command in the new worktree...');
+
+  const result = spawnSync(
+    process.execPath,
+    [process.argv[1], ...argv],
+    { cwd: worktreePath, stdio: 'inherit' }
+  );
+
+  if (result.error) {
+    throw result.error;
+  }
+
+  process.exitCode = typeof result.status === 'number' ? result.status : 1;
+  return true;
+}
+
 export async function runCli(argv = process.argv.slice(2)) {
   const command = argv[0];
   const cwd = process.cwd();
@@ -43,27 +82,27 @@ export async function runCli(argv = process.argv.slice(2)) {
   }
 
   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
-      });
+    if (maybeAutoRelocateToWorktree({
+      cwd,
+      argv,
+      commandName: 'init',
+      enabled: mutatesCurrentRepo
+    })) {
+      return;
     }
     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
-      });
+    if (maybeAutoRelocateToWorktree({
+      cwd,
+      argv,
+      commandName: 'doctor-fix',
+      enabled: argv.includes('--fix')
+    })) {
+      return;
     }
     runDoctor(cwd, argv);
     return;
@@ -75,7 +114,7 @@ export async function runCli(argv = process.argv.slice(2)) {
   }
 
   if (command === 'fix') {
-    const { issue, openPr, dryRun, noValidate, allowMainWorktree } = parseFixArgs(argv);
+    const { issue, openPr, dryRun, noValidate } = parseFixArgs(argv);
 
     if (!issue) {
       console.error('❌ Missing issue description.');
@@ -83,11 +122,14 @@ export async function runCli(argv = process.argv.slice(2)) {
       process.exit(1);
     }
 
-    enforceLinkedWorktree({
-      baseDir: cwd,
+    if (maybeAutoRelocateToWorktree({
+      cwd,
+      argv,
       commandName: 'fix',
-      allowMainWorktree
-    });
+      enabled: true
+    })) {
+      return;
+    }
 
     console.log('🔧 PDD Fix Workflow');
     console.log(`Issue: ${issue}`);
@@ -143,8 +185,8 @@ export async function runCli(argv = process.argv.slice(2)) {
     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('  Mutating commands auto-create and use a linked git worktree when needed.');
+    console.log('  Use --allow-main-worktree only if you intentionally want to run in primary.');
     console.log('');
     console.log('AI command (official binary):');
     console.log('  pdd-ai [--provider=openai|claude|openrouter] [--task=analysis|build|test|review] [--model=<id>] "issue"');

package/src/core/worktree-guard.js

@@ -1,4 +1,5 @@
-import { execSync } from 'child_process';
+import fs from 'fs';
+import { execSync, execFileSync } from 'child_process';
 import path from 'path';
 
 function runGit(command, baseDir) {
@@ -9,7 +10,7 @@ function normalize(p) {
   return path.resolve(String(p || '')).toLowerCase();
 }
 
-function detectWorktreeContext(baseDir = process.cwd()) {
+export function detectWorktreeContext(baseDir = process.cwd()) {
   try {
     const topLevel = runGit('git rev-parse --show-toplevel', baseDir);
     const gitDir = runGit('git rev-parse --git-dir', baseDir);
@@ -31,6 +32,45 @@ function detectWorktreeContext(baseDir = process.cwd()) {
   }
 }
 
+function slug(value) {
+  return String(value || '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .slice(0, 40);
+}
+
+export function createLinkedWorktree({
+  baseDir = process.cwd(),
+  commandName = 'change'
+}) {
+  const context = detectWorktreeContext(baseDir);
+  if (!context.isGitRepo) {
+    throw new Error('Current directory is not a git repository.');
+  }
+
+  const topLevel = context.topLevel;
+  const repoName = slug(path.basename(topLevel)) || 'repo';
+  const commandSlug = slug(commandName) || 'change';
+  const stamp = Date.now();
+  const branchName = `feature/pdd-auto-${commandSlug}-${stamp}`;
+
+  const worktreesRoot = path.join(path.dirname(topLevel), 'pdd-worktrees');
+  fs.mkdirSync(worktreesRoot, { recursive: true });
+  const worktreePath = path.join(worktreesRoot, `${repoName}-${commandSlug}-${stamp}`);
+
+  execFileSync(
+    'git',
+    ['worktree', 'add', '-b', branchName, worktreePath, 'HEAD'],
+    { cwd: topLevel, stdio: 'pipe' }
+  );
+
+  return {
+    worktreePath,
+    branchName
+  };
+}
+
 export function enforceLinkedWorktree({
   baseDir = process.cwd(),
   commandName = 'command',