@renseiai/agentfactory-cli 0.8.9 → 0.8.10

package/dist/src/cleanup.d.ts

@@ -10,7 +10,7 @@
  * Options:
  *   --dry-run              Show what would be cleaned up without removing anything
  *   --force                Force removal / include branches with gone remotes
- *   --path <dir>           Custom worktrees directory (default: .worktrees)
+ *   --path <dir>           Custom worktrees directory (default: ../{repoName}.wt)
  *   --skip-worktrees       Skip worktree cleanup
  *   --skip-branches        Skip branch cleanup
  *   --help, -h             Show this help message

package/dist/src/cleanup.js

@@ -10,7 +10,7 @@
  * Options:
  *   --dry-run              Show what would be cleaned up without removing anything
  *   --force                Force removal / include branches with gone remotes
- *   --path <dir>           Custom worktrees directory (default: .worktrees)
+ *   --path <dir>           Custom worktrees directory (default: ../{repoName}.wt)
  *   --skip-worktrees       Skip worktree cleanup
  *   --skip-branches        Skip branch cleanup
  *   --help, -h             Show this help message
@@ -62,7 +62,7 @@ Usage:
 Options:
   --dry-run              Show what would be cleaned up without removing
   --force                Force worktree removal + delete branches with gone remotes
-  --path <dir>           Custom worktrees directory (default: .worktrees)
+  --path <dir>           Custom worktrees directory (default: ../{repoName}.wt)
   --skip-worktrees       Skip worktree cleanup
   --skip-branches        Skip branch cleanup
   --help, -h             Show this help message

package/dist/src/lib/cleanup-runner.d.ts

@@ -9,7 +9,7 @@ export interface CleanupRunnerConfig {
     dryRun?: boolean;
     /** Force removal even if worktree appears active (default: false) */
     force?: boolean;
-    /** Custom worktrees directory (default: {gitRoot}/.worktrees) */
+    /** Custom worktrees directory (default: ../{repoName}.wt) */
     worktreePath?: string;
     /** Git root for default worktree path (default: auto-detect) */
     gitRoot?: string;

package/dist/src/lib/cleanup-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/cleanup-runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,MAAM,WAAW,mBAAmB;IAClC,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,6CAA6C;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAC/C;AAED,MAAM,WAAW,aAAc,SAAQ,qBAAqB;IAC1D,QAAQ,EAAE,mBAAmB,CAAA;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACjD;AAuBD,wBAAgB,UAAU,IAAI,MAAM,CASnC;AA8bD,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,aAAa,CAkBtE"}
+{"version":3,"file":"cleanup-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/cleanup-runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,MAAM,WAAW,mBAAmB;IAClC,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,6DAA6D;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,6CAA6C;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAC/C;AAED,MAAM,WAAW,aAAc,SAAQ,qBAAqB;IAC1D,QAAQ,EAAE,mBAAmB,CAAA;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACjD;AAuBD,wBAAgB,UAAU,IAAI,MAAM,CASnC;AA8bD,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,aAAa,CAyCtE"}

package/dist/src/lib/cleanup-runner.js

@@ -430,14 +430,36 @@ function cleanupBranches(options) {
 // ---------------------------------------------------------------------------
 export function runCleanup(config) {
     const gitRoot = config?.gitRoot ?? getGitRoot();
+    const defaultWorktreePath = resolve(gitRoot, '..', basename(gitRoot) + '.wt');
     const options = {
         dryRun: config?.dryRun ?? false,
         force: config?.force ?? false,
-        worktreePath: config?.worktreePath ?? resolve(gitRoot, '.worktrees'),
+        worktreePath: config?.worktreePath ?? defaultWorktreePath,
     };
-    const worktreeResult = config?.skipWorktrees
-        ? { scanned: 0, orphaned: 0, cleaned: 0, skipped: 0, errors: [] }
-        : cleanup(options);
+    // Also scan legacy .worktrees/ location during migration period
+    const legacyPath = resolve(gitRoot, '.worktrees');
+    const hasLegacyWorktrees = !config?.worktreePath && existsSync(legacyPath);
+    if (hasLegacyWorktrees) {
+        console.log(`\nNote: Found worktrees at legacy location ${legacyPath}`);
+        console.log('  Run "af-migrate-worktrees" to move them to the new default location.\n');
+    }
+    let worktreeResult;
+    if (config?.skipWorktrees) {
+        worktreeResult = { scanned: 0, orphaned: 0, cleaned: 0, skipped: 0, errors: [] };
+    }
+    else {
+        worktreeResult = cleanup(options);
+        // Merge results from legacy .worktrees/ location if it exists
+        if (hasLegacyWorktrees) {
+            const legacyOptions = { ...options, worktreePath: legacyPath };
+            const legacyResult = cleanup(legacyOptions);
+            worktreeResult.scanned += legacyResult.scanned;
+            worktreeResult.orphaned += legacyResult.orphaned;
+            worktreeResult.cleaned += legacyResult.cleaned;
+            worktreeResult.skipped += legacyResult.skipped;
+            worktreeResult.errors.push(...legacyResult.errors);
+        }
+    }
     const branchResult = config?.skipBranches
         ? { scanned: 0, deleted: 0, errors: [] }
         : cleanupBranches(options);

package/dist/src/lib/orchestrator-runner.js

@@ -84,7 +84,7 @@ export async function runOrchestrator(config) {
     const orchestratorConfig = {
         project: config.project,
         maxConcurrent,
-        worktreePath: path.resolve(gitRoot, '.worktrees'),
+        worktreePath: path.resolve(gitRoot, '..', path.basename(gitRoot) + '.wt'),
         linearApiKey: config.linearApiKey,
         issueTrackerClient,
         statusMappings,

package/dist/src/lib/worker-runner.js

@@ -421,7 +421,7 @@ export async function runWorker(config, signal) {
             const statusMappings = createLinearStatusMappings();
             const orchestrator = createOrchestrator({
                 maxConcurrent: 1,
-                worktreePath: path.resolve(gitRoot, '.worktrees'),
+                worktreePath: path.resolve(gitRoot, '..', path.basename(gitRoot) + '.wt'),
                 issueTrackerClient,
                 statusMappings,
                 toolPlugins: [linearPlugin, codeIntelligencePlugin],

package/dist/src/migrate-worktrees.d.ts

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+/**
+ * AgentFactory Worktree Migration CLI
+ *
+ * Migrates worktrees from the legacy .worktrees/ directory (inside repo)
+ * to the new sibling directory pattern (../{repoName}.wt/).
+ *
+ * Usage:
+ *   af-migrate-worktrees [options]
+ *
+ * Options:
+ *   --dry-run    Preview changes without executing
+ *   --force      Move even if processes are using worktrees
+ *   --help, -h   Show this help message
+ */
+export {};
+//# sourceMappingURL=migrate-worktrees.d.ts.map

package/dist/src/migrate-worktrees.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-worktrees.d.ts","sourceRoot":"","sources":["../../src/migrate-worktrees.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;GAaG"}

package/dist/src/migrate-worktrees.js

@@ -0,0 +1,231 @@
+#!/usr/bin/env node
+/**
+ * AgentFactory Worktree Migration CLI
+ *
+ * Migrates worktrees from the legacy .worktrees/ directory (inside repo)
+ * to the new sibling directory pattern (../{repoName}.wt/).
+ *
+ * Usage:
+ *   af-migrate-worktrees [options]
+ *
+ * Options:
+ *   --dry-run    Preview changes without executing
+ *   --force      Move even if processes are using worktrees
+ *   --help, -h   Show this help message
+ */
+import { execSync } from 'child_process';
+import { existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync } from 'fs';
+import { basename, resolve } from 'path';
+function getGitRoot() {
+    try {
+        return execSync('git rev-parse --show-toplevel', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        return process.cwd();
+    }
+}
+function parseArgs() {
+    const args = process.argv.slice(2);
+    const result = { dryRun: false, force: false };
+    for (const arg of args) {
+        switch (arg) {
+            case '--dry-run':
+                result.dryRun = true;
+                break;
+            case '--force':
+                result.force = true;
+                break;
+            case '--help':
+            case '-h':
+                printHelp();
+                process.exit(0);
+        }
+    }
+    return result;
+}
+function printHelp() {
+    console.log(`
+AgentFactory Worktree Migration
+
+Migrates worktrees from .worktrees/ (inside repo) to ../{repoName}.wt/ (sibling directory).
+This prevents VSCode file watcher crashes when running multiple concurrent agents.
+
+Usage:
+  af-migrate-worktrees [options]
+
+Options:
+  --dry-run    Preview changes without executing
+  --force      Move even if processes are using worktrees
+  --help, -h   Show this help message
+`);
+}
+function main() {
+    const { dryRun, force } = parseArgs();
+    const gitRoot = getGitRoot();
+    const repoName = basename(gitRoot);
+    const legacyDir = resolve(gitRoot, '.worktrees');
+    const newDir = resolve(gitRoot, '..', `${repoName}.wt`);
+    console.log('\n=== AgentFactory Worktree Migration ===\n');
+    if (dryRun) {
+        console.log('[DRY RUN MODE - No changes will be made]\n');
+    }
+    if (!existsSync(legacyDir)) {
+        console.log(`No legacy worktrees directory found at ${legacyDir}`);
+        console.log('Nothing to migrate.\n');
+        return;
+    }
+    // List worktree entries (skip hidden directories like .patches)
+    const entries = readdirSync(legacyDir).filter(entry => {
+        if (entry.startsWith('.'))
+            return false;
+        try {
+            return statSync(resolve(legacyDir, entry)).isDirectory();
+        }
+        catch {
+            return false;
+        }
+    });
+    if (entries.length === 0) {
+        console.log(`Legacy worktrees directory exists but is empty: ${legacyDir}`);
+        if (!dryRun) {
+            rmSync(legacyDir, { recursive: true, force: true });
+            console.log('Removed empty legacy directory.\n');
+        }
+        return;
+    }
+    console.log(`Found ${entries.length} worktree(s) to migrate:`);
+    console.log(`  From: ${legacyDir}`);
+    console.log(`  To:   ${newDir}\n`);
+    // Check for running processes unless --force
+    if (!force && !dryRun) {
+        for (const entry of entries) {
+            const entryPath = resolve(legacyDir, entry);
+            try {
+                const lsofOutput = execSync(`lsof +D "${entryPath}" 2>/dev/null || true`, {
+                    encoding: 'utf-8',
+                    stdio: ['pipe', 'pipe', 'pipe'],
+                }).trim();
+                if (lsofOutput) {
+                    console.log(`WARNING: Processes are using worktree ${entry}:`);
+                    console.log(`  ${lsofOutput.split('\n')[0]}`);
+                    console.log('  Use --force to move anyway, or stop the processes first.\n');
+                    process.exit(1);
+                }
+            }
+            catch {
+                // lsof not available or failed, skip check
+            }
+        }
+    }
+    // Ensure target directory exists
+    if (!dryRun && !existsSync(newDir)) {
+        mkdirSync(newDir, { recursive: true });
+    }
+    let migrated = 0;
+    let failed = 0;
+    for (const entry of entries) {
+        const oldPath = resolve(legacyDir, entry);
+        const newPath = resolve(newDir, entry);
+        console.log(`  ${entry}:`);
+        console.log(`    ${oldPath} -> ${newPath}`);
+        if (dryRun) {
+            console.log('    [DRY RUN] Would move\n');
+            migrated++;
+            continue;
+        }
+        if (existsSync(newPath)) {
+            console.log(`    SKIPPED: Target already exists\n`);
+            failed++;
+            continue;
+        }
+        try {
+            // Try git worktree move first (preferred — updates git tracking)
+            execSync(`git worktree move "${oldPath}" "${newPath}"`, {
+                stdio: 'pipe',
+                encoding: 'utf-8',
+                cwd: gitRoot,
+            });
+            console.log('    OK (git worktree move)\n');
+            migrated++;
+        }
+        catch {
+            // Fallback: manual move + repair
+            try {
+                renameSync(oldPath, newPath);
+                execSync(`git worktree repair`, {
+                    stdio: 'pipe',
+                    encoding: 'utf-8',
+                    cwd: gitRoot,
+                });
+                console.log('    OK (manual move + repair)\n');
+                migrated++;
+            }
+            catch (fallbackError) {
+                console.log(`    FAILED: ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}\n`);
+                failed++;
+            }
+        }
+    }
+    // Move .patches directory if it exists
+    const legacyPatchDir = resolve(legacyDir, '.patches');
+    if (existsSync(legacyPatchDir)) {
+        const newPatchDir = resolve(newDir, '.patches');
+        if (!dryRun) {
+            try {
+                renameSync(legacyPatchDir, newPatchDir);
+                console.log('  Moved .patches directory\n');
+            }
+            catch (error) {
+                console.log(`  Failed to move .patches: ${error instanceof Error ? error.message : String(error)}\n`);
+            }
+        }
+        else {
+            console.log('  [DRY RUN] Would move .patches directory\n');
+        }
+    }
+    // Clean up empty legacy directory
+    if (!dryRun && migrated > 0) {
+        try {
+            const remaining = readdirSync(legacyDir);
+            if (remaining.length === 0) {
+                rmSync(legacyDir, { recursive: true, force: true });
+                console.log(`Removed empty legacy directory: ${legacyDir}\n`);
+            }
+            else {
+                console.log(`Legacy directory not empty (${remaining.length} remaining entries), keeping it.\n`);
+            }
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+    }
+    // Summary
+    console.log('=== Summary ===\n');
+    console.log(`  Migrated: ${migrated}`);
+    if (failed > 0) {
+        console.log(`  Failed:   ${failed}`);
+    }
+    console.log('');
+    // Verify git tracking
+    if (!dryRun && migrated > 0) {
+        try {
+            const worktreeList = execSync('git worktree list', {
+                encoding: 'utf-8',
+                cwd: gitRoot,
+            }).trim();
+            console.log('Git worktree list after migration:');
+            console.log(worktreeList);
+            console.log('');
+        }
+        catch {
+            // Ignore
+        }
+    }
+    if (failed > 0) {
+        process.exit(1);
+    }
+}
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@renseiai/agentfactory-cli",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "type": "module",
   "description": "CLI tools for AgentFactory — local orchestrator, remote worker, queue admin",
   "author": "Rensei AI (https://rensei.ai)",
@@ -38,7 +38,8 @@
     "af-linear": "dist/src/linear.js",
     "af-governor": "dist/src/governor.js",
     "af-sync-routes": "dist/src/sync-routes.js",
-    "af-status": "dist/src/status.js"
+    "af-status": "dist/src/status.js",
+    "af-migrate-worktrees": "dist/src/migrate-worktrees.js"
   },
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
@@ -107,10 +108,10 @@
   ],
   "dependencies": {
     "dotenv": "^17.2.3",
-    "@renseiai/agentfactory": "0.8.9",
-    "@renseiai/plugin-linear": "0.8.9",
-    "@renseiai/agentfactory-server": "0.8.9",
-    "@renseiai/agentfactory-code-intelligence": "0.8.9"
+    "@renseiai/agentfactory": "0.8.10",
+    "@renseiai/agentfactory-code-intelligence": "0.8.10",
+    "@renseiai/plugin-linear": "0.8.10",
+    "@renseiai/agentfactory-server": "0.8.10"
   },
   "devDependencies": {
     "@types/node": "^22.5.4",