@ronkovic/aad 0.3.3 → 0.3.5

package/README.md

@@ -63,13 +63,13 @@ cli (エントリポイント)
 ### インストール不要で実行 (推奨)
 
 ```bash
-bunx aad run requirements.md
+bunx @ronkovic/aad run requirements.md
 ```
 
 ### グローバルインストール
 
 ```bash
-bun install -g aad
+bun install -g @ronkovic/aad
 aad run requirements.md
 ```
 
@@ -151,14 +151,15 @@ aad resume <run_id>
 aad cleanup
 ```
 
-### 4. Webダッシュボード (オプション)
+### 4. Webダッシュボード
 
+ダッシュボードはデフォルトで有効です。`http://localhost:7333` でリアルタイムの進捗・ログ・依存グラフを確認できます。
+
+無効にする場合:
 ```bash
-aad run requirements.md --workers 4 --dashboard
+aad run requirements.md --workers 4 --no-dashboard
 ```
 
-ブラウザで `http://localhost:7333` を開くと、リアルタイムで進捗・ログ・依存グラフを確認できます。
-
 ## 開発ガイド
 
 ### 環境セットアップ
@@ -264,16 +265,14 @@ AADはClaudeとの通信に2つのadapterを提供:
 
 サービスごとに使い分け可能:
 
-```typescript
-const providerConfig = {
-  default: 'cli',
-  overrides: {
-    splitter: 'sdk',    // 構造化JSON出力
-    reviewer: 'sdk',    // 構造化レビュー結果
-  }
-};
+デフォルトは `sdk` です。CLIに変更する場合:
+
+```bash
+aad run requirements.md --provider cli
 ```
 
+サービスごとに使い分けも可能です（設定ファイルで指定）。
+
 ## トラブルシューティング
 
 ### ログの確認
@@ -286,7 +285,11 @@ cat .aad/docs/<run_id>/logs/structured.jsonl | bunx pino-pretty
 ### Worktreeが残っている
 
 ```bash
-aad cleanup --all
+# 全AAD worktreeをクリーンアップ
+aad cleanup
+
+# 特定のrunのみ
+aad cleanup <run_id>
 ```
 
 ### タスクがスタックした
@@ -296,7 +299,7 @@ aad cleanup --all
 aad status <run_id>
 
 # 強制クリーンアップ
-aad cleanup --run <run_id> --force
+aad cleanup <run_id> --force
 ```
 
 ## ライセンス

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronkovic/aad",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Autonomous Agent Development Orchestrator - Multi-agent TDD pipeline powered by Claude",
   "module": "src/main.ts",
   "type": "module",

package/src/modules/cli/commands/cleanup.ts

@@ -102,10 +102,10 @@ export async function cleanupWorktrees(
   await worktreeManager.pruneWorktrees();
   logger.info("Pruned orphaned worktrees");
 
-  // 4. Cleanup orphaned branches
+  // 4. Cleanup orphaned branches (always force-delete — AAD branches are safe to remove)
   const deletedBranches = runId
-    ? await branchManager.cleanupOrphanBranches(runId)
-    : await branchManager.cleanupOrphanBranches();
+    ? await branchManager.cleanupOrphanBranches(runId, true)
+    : await branchManager.cleanupOrphanBranches(undefined, true);
 
   if (deletedBranches.length > 0) {
     console.log(`\nDeleted ${deletedBranches.length} orphan branch(es):`);

package/src/modules/cli/commands/resume.ts

@@ -122,7 +122,15 @@ export async function resumeRun(app: App, runIdStr: string): Promise<void> {
     stores: { runStore: stores.runStore, taskStore: stores.taskStore },
     logger,
   });
-  registerTaskDispatchHandler({ app, runId, parentBranch: runState.parentBranch });
+  // Check if parent worktree exists from a previous run
+  const parentWorktreePath = `${process.cwd()}/.aad/worktrees/parent-${runId}`;
+  const parentWorktreeExists = await Bun.file(`${parentWorktreePath}/.git`).exists();
+  registerTaskDispatchHandler({
+    app,
+    runId,
+    parentBranch: runState.parentBranch,
+    parentWorktreePath: parentWorktreeExists ? parentWorktreePath : undefined,
+  });
 
   // 6. Dispatcher.start()
   dispatcher.start();

package/src/modules/cli/commands/run.ts

@@ -144,8 +144,17 @@ export async function runPipeline(app: App, requirementsPath: string, keepWorktr
     logger,
   });
 
-  // 5. Register task dispatch handler (shared with resume)
-  registerTaskDispatchHandler({ app, runId, parentBranch });
+  // 5. Create parent worktree for merging task branches
+  let parentWorktreePath: string | undefined;
+  try {
+    parentWorktreePath = await worktreeManager.createParentWorktree(runId, parentBranch);
+    logger.info({ parentWorktreePath }, "Parent worktree created for merging");
+  } catch (error) {
+    logger.warn({ error }, "Failed to create parent worktree, using repo root as fallback");
+  }
+
+  // 5.5. Register task dispatch handler (shared with resume)
+  registerTaskDispatchHandler({ app, runId, parentBranch, parentWorktreePath });
 
   // 6. 進捗表示
   const progressSpinner = createSpinner("Executing tasks...");

package/src/modules/cli/commands/task-dispatch-handler.ts

@@ -25,6 +25,9 @@ export interface TaskDispatchContext {
   app: App;
   runId: RunId;
   parentBranch: string;
+  /** Path to the parent worktree where task branches are merged into.
+   *  If not provided, falls back to process.cwd() (repo root). */
+  parentWorktreePath?: string;
 }
 
 /**
@@ -32,7 +35,8 @@ export interface TaskDispatchContext {
  * Handles memory gate, worker state, worktree creation, and TDD pipeline execution.
  */
 export function registerTaskDispatchHandler(ctx: TaskDispatchContext): void {
-  const { app, runId, parentBranch } = ctx;
+  const { app, runId, parentBranch, parentWorktreePath } = ctx;
+  const mergeTarget = parentWorktreePath ?? process.cwd();
   const { eventBus, logger, config, processManager, worktreeManager, providerRegistry, stores } = app;
 
   let memoryGateLock: Promise<void> = Promise.resolve();
@@ -63,7 +67,7 @@ export function registerTaskDispatchHandler(ctx: TaskDispatchContext): void {
 
       const provider = providerRegistry.getProvider("implementer");
       const result = await executeTddPipeline(
-        task, workspace, branchName, parentBranch, process.cwd(),
+        task, workspace, branchName, parentBranch, mergeTarget,
         runId, app.config, provider, app.mergeService, eventBus,
       );
 

package/src/shared/memory-check.ts

@@ -17,8 +17,26 @@ export interface MemoryStatus {
 
 /**
  * Get current system memory status (macOS only)
+ *
+ * Uses vm_stat but counts inactive + free + speculative as "available" memory.
+ * macOS aggressively caches files in inactive pages which are immediately
+ * reclaimable — counting only "free" pages dramatically underreports
+ * available memory (e.g. 0.2GB "free" when 4GB+ is actually available).
+ *
+ * Environment variable AAD_SKIP_MEMORY_CHECK=1 disables all memory checks.
  */
 export async function getMemoryStatus(): Promise<MemoryStatus> {
+  // Allow disabling memory checks entirely
+  if (process.env.AAD_SKIP_MEMORY_CHECK === "1") {
+    return {
+      totalGB: 16,
+      usedGB: 0,
+      freeGB: 16,
+      usedPercent: 0,
+      isLowMemory: false,
+    };
+  }
+
   const proc = Bun.spawn(["vm_stat"], { stdout: "pipe" });
   const stdout = await new Response(proc.stdout).text();
   const code = await proc.exited;
@@ -31,6 +49,7 @@ export async function getMemoryStatus(): Promise<MemoryStatus> {
   const inactiveMatch = stdout.match(/Pages inactive:\s+(\d+)/);
   const speculativeMatch = stdout.match(/Pages speculative:\s+(\d+)/);
   const wiredMatch = stdout.match(/Pages wired down:\s+(\d+)/);
+  const purgableMatch = stdout.match(/Pages purgeable:\s+(\d+)/);
 
   if (!pageSizeMatch || !freeMatch || !activeMatch || !inactiveMatch || !wiredMatch) {
     throw new Error("Failed to parse vm_stat output");
@@ -42,30 +61,33 @@ export async function getMemoryStatus(): Promise<MemoryStatus> {
   const inactivePages = parseInt(inactiveMatch[1]!, 10);
   const speculativePages = parseInt(speculativeMatch?.[1] ?? "0", 10);
   const wiredPages = parseInt(wiredMatch[1]!, 10);
+  const purgablePages = parseInt(purgableMatch?.[1] ?? "0", 10);
 
   // Calculate memory in GB
   const bytesToGB = (bytes: number) => bytes / (1024 * 1024 * 1024);
   const pagesToGB = (pages: number) => bytesToGB(pages * pageSize);
 
-  const freeGB = pagesToGB(freePages + speculativePages);
-  const usedGB = pagesToGB(activePages + inactivePages + wiredPages);
-  const totalGB = freeGB + usedGB;
+  // Available = free + inactive + speculative + purgeable
+  // macOS reclaims inactive/purgeable pages on demand — they are effectively free
+  const availableGB = pagesToGB(freePages + inactivePages + speculativePages + purgablePages);
+  const usedGB = pagesToGB(activePages + wiredPages);
+  const totalGB = availableGB + usedGB;
   const usedPercent = (usedGB / totalGB) * 100;
 
-  // Determine if memory is low
-  const isLowMemory = freeGB < 2.0; // Less than 2GB free
+  // Determine if memory is low (using available, not just free)
+  const isLowMemory = availableGB < 2.0;
   let recommendedAction: string | undefined;
 
-  if (freeGB < 1.5) {
-    recommendedAction = "Critical: Free memory < 1.5GB. Close heavy applications (Chrome, Docker) before running AAD.";
-  } else if (freeGB < 2.5) {
-    recommendedAction = "Warning: Free memory < 2.5GB. Consider closing unnecessary applications.";
+  if (availableGB < 1.5) {
+    recommendedAction = "Critical: Available memory < 1.5GB. Close heavy applications (Chrome, Docker) before running AAD.";
+  } else if (availableGB < 2.5) {
+    recommendedAction = "Warning: Available memory < 2.5GB. Consider closing unnecessary applications.";
   }
 
   return {
     totalGB: Math.round(totalGB * 10) / 10,
     usedGB: Math.round(usedGB * 10) / 10,
-    freeGB: Math.round(freeGB * 10) / 10,
+    freeGB: Math.round(availableGB * 10) / 10,
     usedPercent: Math.round(usedPercent),
     isLowMemory,
     recommendedAction,