@ronkovic/aad 0.3.7 → 0.3.9

package/README.md

@@ -5,19 +5,25 @@ TypeScript/Bun製マルチエージェント開発オーケストレーター。
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![TypeScript](https://img.shields.io/badge/TypeScript-5.7-blue)](https://www.typescriptlang.org/)
 [![Bun](https://img.shields.io/badge/Bun-1.2+-black)](https://bun.sh/)
-[![Tests](https://img.shields.io/badge/tests-738%2B%20passing-brightgreen)]()
-[![Version](https://img.shields.io/badge/version-0.3.0-orange)]()
+[![npm](https://img.shields.io/npm/v/@ronkovic/aad)](https://www.npmjs.com/package/@ronkovic/aad)
+[![Tests](https://img.shields.io/badge/tests-913%20passing-brightgreen)]()
+[![Version](https://img.shields.io/badge/version-0.3.7-orange)]()
 
 ## 主要機能
 
 - **マルチエージェント並列実行**: 複数のClaudeエージェントが独立したタスクを並列処理
 - **TDDパイプライン**: Red → Green → Verify → Review → Merge の自動化されたテスト駆動開発
-- **マルチリポジトリ対応**: 複数リポジトリにまたがるタスクの統合管理 *(v0.3.0)*
-- **プラグインシステム**: カスタムアダプター・パイプラインステップの拡張 *(v0.3.0)*
+- **インタラクティブモード**: `aad` で対話型ウィザードを起動、認証・プロジェクト設定を簡単に *(v0.3.6)*
+- **セルフアップデート**: `aad update` で最新版に自動更新 *(v0.3.6)*
+- **スマートブランチ命名**: 要件ドキュメントから自動でconventional commit prefix付きブランチ名を生成 *(v0.3.7)*
+- **適応的エフォート調整**: タスク複雑度に応じてClaudeのeffort levelを自動調整
+- **マルチリポジトリ対応**: 複数リポジトリにまたがるタスクの統合管理
+- **プラグインシステム**: カスタムアダプター・パイプラインステップの拡張
 - **Git Workspace管理**: タスクごとに独立したworktreeを自動作成・管理
 - **依存関係解決**: タスク間の依存関係を自動検出し、適切な順序で実行
 - **リアルタイム監視**: Webダッシュボードで進捗・ログをリアルタイム表示
 - **構造化ログ**: pinoによる構造化ログで詳細なトレーシングが可能
+- **メモリ安全機構**: OOMを防止する自動メモリゲート・シーケンシャルフォールバック
 
 ## アーキテクチャ
 
@@ -129,26 +135,34 @@ bun run dev
 ### 2. タスク実行
 
 ```bash
+# 直接実行
 aad run requirements.md --workers 4
+
+# インタラクティブモード（対話型ウィザード）
+aad
 ```
 
 AADが自動的に:
-1. タスクを分解・依存関係を解析
-2. 各タスク用のworktreeを作成
-3. 4つのワーカーで並列実行 (TDD: テスト作成 → 実装 → 検証 → レビュー)
-4. 親ブランチへのマージ
+1. 要件ドキュメントからfeature名を生成（例: `feat/user-auth-impl`）
+2. タスクを分解・依存関係を解析
+3. 親ブランチ + タスクブランチをworktreeで作成
+4. ワーカーで並列実行 (TDD: テスト作成 → 実装 → 検証 → レビュー)
+5. 親ブランチへのマージ
 
-### 3. 進捗確認
+### 3. 進捗確認・管理
 
 ```bash
 # ステータス確認
-aad status
+aad status [run_id]
 
 # 実行の再開
 aad resume <run_id>
 
 # worktreeのクリーンアップ
-aad cleanup
+aad cleanup [run_id] [--force]
+
+# バージョン確認・アップデート
+aad update [--check]
 ```
 
 ### 4. Webダッシュボード
@@ -256,6 +270,20 @@ describe("MyModule", () => {
 
 設定では短縮名(`sonnet`、`opus`、`haiku`)またはフルネームが使用できます。
 
+## ブランチフロー
+
+AADは要件ドキュメントからconventional commit prefix付きのfeature名を自動生成し、以下のブランチ構造を作成します:
+
+```
+main (ソースブランチ)
+  └─ feat/user-auth-impl/parent      ← 親ブランチ + worktree
+       ├─ feat/user-auth-impl/task-001  ← タスクブランチ（parentから分岐）
+       ├─ feat/user-auth-impl/task-002
+       └─ feat/user-auth-impl/task-003
+```
+
+各タスクはparentブランチから分岐し、完了後にparentへマージされます。prefix（`feat/`, `fix/`, `refactor/`等）は要件の内容から自動判定されます。
+
 ## Claude Provider: SDK vs CLI
 
 AADはClaudeとの通信に2つのadapterを提供:
@@ -320,9 +348,7 @@ aad cleanup <run_id> --force
 
 ## リンク
 
-- [Architecture Documentation](docs/architecture.md)
-- [Case Studies](docs/case-studies/) - Real-world execution examples
-- [Rewrite Plan (Internal)](docs/rewrite-plan/README.md)
+- [npm Package](https://www.npmjs.com/package/@ronkovic/aad)
 - [Project Guidelines](CLAUDE.md)
 - [Issue Tracker](https://github.com/ronkovic/aad/issues)
 

package/package.json

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

package/src/modules/cli/app.ts

@@ -77,16 +77,19 @@ export function createApp(options: AppOptions = {}): App {
   // 2. EventBus初期化
   const eventBus = new EventBusImpl();
 
-  // 3. Logger初期化
+  // 3. LogStore初期化 (loggerより先に必要)
+  const logStore = new LogStore();
+
+  // 4. Logger初期化 (dashboard有効時はlogStore+eventBusに橋渡し)
   const logger = createLogger({
     service: "aad-cli",
     debug: config.debug,
+    logStore: config.dashboard.enabled ? logStore : undefined,
+    eventBus: config.dashboard.enabled ? eventBus : undefined,
   });
   logger.debug({ config, options }, "AAD CLI starting");
 
-  // 4. LogStore + SSE Transport初期化
-  const logStore = new LogStore();
-  // SSE transport registers EventBus listeners internally; no direct reference needed
+  // SSE transport: EventBus経由のlog:entryをLogStoreに書く (手動emitされるログ用)
   createSSETransport({ logStore, eventBus });
 
   // 5. ProviderRegistry初期化

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

@@ -228,17 +228,25 @@ export async function runPipeline(app: App, requirementsPath: string, keepWorktr
       // List all worktrees
       const worktrees = await worktreeManager.listWorktrees();
       const worktreeBase = `${process.cwd()}/.aad/worktrees`;
+      // branch field from `git worktree list --porcelain` is full ref: "refs/heads/feat/..."
+      const featurePrefix = featureBranchName?.replace(/\/parent$/, "") ?? "";
       const runWorktrees = worktrees.filter(
-        (wt) => wt.path.startsWith(worktreeBase) 
-             && (wt.branch.includes(runId) || (featureBranchName && wt.branch.startsWith(featureBranchName.replace(/\/parent$/, ""))))  // Match by runId or feature name
-             && !wt.path.includes(`parent-${runId}`)  // Keep parent worktree (contains merge results)
+        (wt) => {
+          if (!wt.path.startsWith(worktreeBase)) return false;
+          const shortBranch = wt.branch.replace(/^refs\/heads\//, "");
+          const matchesRun = shortBranch.includes(runId) || (featurePrefix && shortBranch.startsWith(featurePrefix));
+          if (!matchesRun) return false;
+          // Keep parent worktree (contains merge results for review)
+          if (wt.path.includes(`parent-${runId}`)) return false;
+          return true;
+        }
       );
 
-      // Remove worktrees for this run
+      // Remove task worktrees (parent worktree is preserved)
       let removed = 0;
       for (const worktree of runWorktrees) {
         try {
-          await worktreeManager.removeWorktree(worktree.path, false);
+          await worktreeManager.removeWorktree(worktree.path, true);
           removed++;
           logger.debug({ path: worktree.path }, "Worktree removed");
         } catch (error) {

package/src/modules/git-workspace/merge-service.ts

@@ -1,5 +1,7 @@
 import type { Logger } from "pino";
 import type { TaskId } from "@aad/shared/types";
+import { readFile } from "node:fs/promises";
+import { resolve, join } from "node:path";
 import { gitExec } from "./git-exec";
 import { FileLock } from "../persistence";
 
@@ -14,6 +16,30 @@ export interface MergeResult {
   message?: string;
 }
 
+/**
+ * Resolve the actual .git directory for a path.
+ * Worktrees have a `.git` file containing "gitdir: <path>",
+ * while regular repos have a `.git` directory.
+ */
+async function resolveGitDir(worktreePath: string): Promise<string> {
+  const dotGit = join(worktreePath, ".git");
+  try {
+    const stat = await Bun.file(dotGit).exists();
+    if (!stat) return dotGit; // fallback
+
+    const content = await readFile(dotGit, "utf-8");
+    const match = content.match(/^gitdir:\s*(.+)$/m);
+    if (match?.[1]) {
+      const gitdir = match[1].trim();
+      // gitdir can be relative or absolute
+      return resolve(worktreePath, gitdir);
+    }
+    return dotGit; // It's a directory, not a file
+  } catch {
+    return dotGit; // fallback
+  }
+}
+
 /**
  * Merge task branches into parent branch with conflict detection
  */
@@ -35,24 +61,21 @@ export class MergeService {
     parentBranch: string,
     parentWorktree: string
   ): Promise<MergeResult> {
-    const lockDir = `${parentWorktree}/.git/aad-merge.lock`;
+    const gitDir = await resolveGitDir(parentWorktree);
+    const lockDir = join(gitDir, "aad-merge.lock");
     const lock = new FileLock({ lockDir, timeout: 60000, logger: this.logger });
 
     try {
       await lock.acquire();
 
-      this.logger?.info({ taskId, taskBranch, parentBranch }, "Merging task to parent");
-
-      // Fetch latest from task branch
-      await gitExec(
-        ["fetch", this.repoRoot, taskBranch],
-        { cwd: parentWorktree, logger: this.logger }
-      );
+      this.logger?.info({ taskId, taskBranch, parentBranch, parentWorktree }, "Merging task to parent");
 
-      // Try merge
+      // Worktrees share the same git object store, so we can merge the task
+      // branch directly without fetching. This is more reliable than
+      // `git fetch <repoRoot> <branch>` + `git merge FETCH_HEAD`.
       try {
         await gitExec(
-          ["merge", "--no-ff", "-m", `Merge task ${taskId as string}: ${taskBranch}`, "FETCH_HEAD"],
+          ["merge", "--no-ff", "-m", `Merge task ${taskId as string}: ${taskBranch}`, taskBranch],
           { cwd: parentWorktree, logger: this.logger }
         );
 

package/src/modules/logging/logger.ts

@@ -1,13 +1,27 @@
 import pino from "pino";
+import { Writable } from "node:stream";
+import type { LogStore, LogEntry } from "./log-store";
+import type { EventBus } from "../../shared/events";
 
 export interface LoggerOptions {
   service: string;
   debug?: boolean;
   logFilePath?: string;
+  /** When provided, all pino logs are also forwarded to LogStore + EventBus for dashboard SSE */
+  logStore?: LogStore;
+  eventBus?: EventBus;
+}
+
+/** Map pino numeric levels to LogEntry level strings */
+function pinoLevelToString(level: number): "debug" | "info" | "warn" | "error" {
+  if (level <= 20) return "debug";
+  if (level <= 30) return "info";
+  if (level <= 40) return "warn";
+  return "error";
 }
 
 export function createLogger(options: LoggerOptions): pino.Logger {
-  const { service, debug = false, logFilePath } = options;
+  const { service, debug = false, logFilePath, logStore, eventBus } = options;
 
   const targets: pino.TransportTargetOptions[] = [];
 
@@ -46,10 +60,74 @@ export function createLogger(options: LoggerOptions): pino.Logger {
     });
   }
 
-  const logger = pino({
+  const baseLogger = pino({
     level: debug ? "debug" : "warn",
     transport: targets.length === 1 ? targets[0] : { targets },
   });
 
-  return logger.child({ service });
+  // If logStore and eventBus provided, create a multistream logger that also
+  // writes to the dashboard. We create a separate pino instance that writes
+  // to a custom Writable, then hook into the base logger.
+  if (logStore && eventBus) {
+    const dashboardStream = new Writable({
+      write(chunk: Buffer, _encoding: string, callback: () => void): void {
+        try {
+          const obj = JSON.parse(chunk.toString());
+          const entry: LogEntry = {
+            level: pinoLevelToString(obj.level ?? 30),
+            service: obj.service ?? service,
+            message: obj.msg ?? "",
+            timestamp: obj.time ?? Date.now(),
+            taskId: obj.taskId,
+            workerId: obj.workerId,
+          };
+          logStore.add(entry);
+          eventBus.emit({ type: "log:entry", entry });
+        } catch {
+          // ignore parse errors
+        }
+        callback();
+      },
+    });
+
+    // Use streams for everything when dashboard is active
+    // (pino transports run in worker threads, can't combine with custom streams)
+    const streams: pino.StreamEntry[] = [];
+
+    if (debug) {
+      // We can't use pino-pretty as a stream directly (it's a transport).
+      // Write raw JSON to stderr in debug mode instead.
+      streams.push({
+        level: "debug" as pino.Level,
+        stream: process.stderr,
+      });
+    } else {
+      streams.push({
+        level: "warn" as pino.Level,
+        stream: process.stderr,
+      });
+    }
+
+    if (logFilePath) {
+      streams.push({
+        level: "info" as pino.Level,
+        stream: pino.destination(logFilePath),
+      });
+    }
+
+    // Dashboard stream
+    streams.push({
+      level: (debug ? "debug" : "info") as pino.Level,
+      stream: dashboardStream,
+    });
+
+    const combinedLogger = pino(
+      { level: debug ? "debug" : "info" },
+      pino.multistream(streams)
+    );
+
+    return combinedLogger.child({ service });
+  }
+
+  return baseLogger.child({ service });
 }