@einja/dev-cli 0.1.20 → 0.1.23

package/dist/commands/task-loop/lib/issue-validator.js

@@ -0,0 +1,400 @@
+/**
+ * GitHub Issue タスク一覧バリデーター
+ *
+ * タスク管理ガイドラインに基づいてフォーマットを検証
+ */
+import { detectHorizontalSplit } from "./horizontal-split-detector.js";
+import { parseIssueBody } from "./issue-parser.js";
+/** 必須メタデータ一覧 */
+const REQUIRED_METADATA = [
+    "要件",
+    "依存関係",
+    "完了条件",
+    "対応設計",
+    "シナリオテスト",
+];
+/**
+ * Issue本文をバリデーション
+ */
+export function validateIssueBody(body) {
+    const errors = [];
+    // 🔴 横切り検出を最優先で実行
+    const dummyIssue = { number: 0, title: "", body, state: "open" };
+    const parsedIssue = parseIssueBody(dummyIssue);
+    for (const phase of parsedIssue.phases) {
+        const result = detectHorizontalSplit(phase);
+        if (result) {
+            errors.push({
+                type: "horizontal_split_detected",
+                phaseNumber: phase.number,
+                message: result.reason,
+                fixSuggestion: result.suggestion,
+            });
+        }
+    }
+    // 横切りエラーがあれば他のチェックをスキップして即座に返却
+    if (errors.some(e => e.type === "horizontal_split_detected")) {
+        return { isValid: false, errors };
+    }
+    // 既存のチェック
+    errors.push(...validatePhaseStructure(body));
+    errors.push(...validateIndentation(body));
+    errors.push(...validateMetadata(body));
+    errors.push(...validateDependencies(body));
+    return {
+        isValid: errors.length === 0,
+        errors,
+    };
+}
+/**
+ * 解析済みIssueをバリデーション
+ */
+export function validateParsedIssue(parsedIssue) {
+    const errors = [];
+    // 🔴 横切り検出を最優先で実行
+    for (const phase of parsedIssue.phases) {
+        const result = detectHorizontalSplit(phase);
+        if (result) {
+            errors.push({
+                type: "horizontal_split_detected",
+                phaseNumber: phase.number,
+                message: result.reason,
+                fixSuggestion: result.suggestion,
+            });
+        }
+    }
+    // 横切りエラーがあれば他のチェックをスキップして即座に返却
+    if (errors.some(e => e.type === "horizontal_split_detected")) {
+        return { isValid: false, errors };
+    }
+    // Phase番号の連番チェック
+    const phaseNumbers = parsedIssue.phases
+        .map((p) => p.number)
+        .sort((a, b) => a - b);
+    for (let i = 0; i < phaseNumbers.length; i++) {
+        const expected = i + 1;
+        const actual = phaseNumbers[i];
+        // Phase 99 はドキュメント反映専用なので例外
+        if (actual !== expected && actual !== 99) {
+            errors.push({
+                type: "phase_number_discontinuous",
+                phaseNumber: actual,
+                message: `Phase番号が不連続です: 期待=${expected}, 実際=${actual}`,
+                fixSuggestion: `Phase ${actual} を Phase ${expected} に変更してください`,
+            });
+        }
+    }
+    // Phase数チェック（99を除く）
+    const regularPhases = parsedIssue.phases.filter((p) => p.number !== 99);
+    if (regularPhases.length > 3) {
+        errors.push({
+            type: "too_many_phases",
+            message: `Phase数が多すぎます: ${regularPhases.length}個（推奨: 2-3個）`,
+            fixSuggestion: "関連するPhaseを統合してください",
+        });
+    }
+    // タスクグループID形式チェック
+    for (const phase of parsedIssue.phases) {
+        for (const taskGroup of phase.taskGroups) {
+            if (!isValidTaskGroupId(taskGroup.id)) {
+                errors.push({
+                    type: "invalid_task_group_id",
+                    taskGroupId: taskGroup.id,
+                    phaseNumber: phase.number,
+                    message: `タスクグループIDが不正です: ${taskGroup.id}`,
+                    fixSuggestion: "X.Y 形式（例: 1.1, 2.3）で記述してください",
+                });
+            }
+            // タスクID形式チェック
+            for (const task of taskGroup.tasks) {
+                if (!isValidTaskId(task.id, taskGroup.id)) {
+                    errors.push({
+                        type: "invalid_task_id",
+                        taskId: task.id,
+                        taskGroupId: taskGroup.id,
+                        message: `タスクIDが不正です: ${task.id}`,
+                        fixSuggestion: `${taskGroup.id}.N 形式（例: ${taskGroup.id}.1）で記述してください`,
+                    });
+                }
+            }
+        }
+    }
+    // 依存関係の参照先チェック
+    const allTaskGroupIds = getAllTaskGroupIds(parsedIssue);
+    for (const phase of parsedIssue.phases) {
+        for (const taskGroup of phase.taskGroups) {
+            for (const dep of taskGroup.dependencies) {
+                // "Phase X完了" 形式はスキップ
+                if (dep.startsWith("Phase "))
+                    continue;
+                // Issue参照 (#123) はスキップ
+                if (dep.startsWith("#"))
+                    continue;
+                if (!allTaskGroupIds.has(dep)) {
+                    errors.push({
+                        type: "missing_dependency_target",
+                        taskGroupId: taskGroup.id,
+                        message: `存在しない依存関係: ${dep}（タスクグループ ${taskGroup.id}）`,
+                        fixSuggestion: `依存先 ${dep} が存在するか確認してください`,
+                    });
+                }
+            }
+        }
+    }
+    return {
+        isValid: errors.length === 0,
+        errors,
+    };
+}
+/**
+ * Phase構造を検証
+ */
+function validatePhaseStructure(body) {
+    const errors = [];
+    const phasePattern = /^###\s*Phase\s*(\d+):/gim;
+    const matches = [...body.matchAll(phasePattern)];
+    const phaseNumbers = matches
+        .map((m) => Number.parseInt(m[1], 10))
+        .sort((a, b) => a - b);
+    for (let i = 0; i < phaseNumbers.length; i++) {
+        const expected = i + 1;
+        const actual = phaseNumbers[i];
+        if (actual !== expected && actual !== 99) {
+            errors.push({
+                type: "phase_number_discontinuous",
+                phaseNumber: actual,
+                message: `Phase番号が不連続です: 期待=${expected}, 実際=${actual}`,
+                fixSuggestion: `Phase ${actual} を Phase ${expected} に変更してください`,
+            });
+        }
+    }
+    return errors;
+}
+/**
+ * インデント検証
+ */
+function validateIndentation(body) {
+    const errors = [];
+    const lines = body.split("\n");
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (!line)
+            continue;
+        // タスク行の検証（X.Y.Z 形式）
+        const taskMatch = line.match(/^(\s*)-\s*(\d+\.\d+\.\d+)\s/);
+        if (taskMatch) {
+            const indent = taskMatch[1].length;
+            if (indent !== 2) {
+                errors.push({
+                    type: "invalid_indent",
+                    line: i + 1,
+                    message: `タスクのインデントが不正です（期待: 2スペース、実際: ${indent}スペース）`,
+                    fixSuggestion: "タスク行は2スペースでインデントしてください",
+                });
+            }
+        }
+        // メタデータ行の検証（**要件**: など）
+        const metadataMatch = line.match(/^(\s*)-?\s*\*\*(要件|依存関係|完了条件|対応設計|シナリオテスト)\*\*:/);
+        if (metadataMatch) {
+            const indent = metadataMatch[1].length;
+            if (indent !== 4) {
+                errors.push({
+                    type: "invalid_indent",
+                    line: i + 1,
+                    message: `メタデータのインデントが不正です（期待: 4スペース、実際: ${indent}スペース）`,
+                    fixSuggestion: "メタデータ行は4スペースでインデントしてください",
+                });
+            }
+        }
+    }
+    return errors;
+}
+/**
+ * メタデータ検証
+ */
+function validateMetadata(body) {
+    const errors = [];
+    const lines = body.split("\n");
+    // タスク（X.Y.Z）ごとにメタデータをチェック
+    let currentTaskId = null;
+    let currentTaskMetadata = new Set();
+    let taskStartLine = 0;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (!line)
+            continue;
+        // 新しいタスク行の検出
+        const taskMatch = line.match(/^\s*-\s*(\d+\.\d+\.\d+)\s/);
+        if (taskMatch) {
+            // 前のタスクのメタデータをチェック
+            if (currentTaskId) {
+                const missing = REQUIRED_METADATA.filter((m) => !currentTaskMetadata.has(m));
+                for (const m of missing) {
+                    errors.push({
+                        type: "missing_metadata",
+                        taskId: currentTaskId,
+                        line: taskStartLine,
+                        message: `タスク ${currentTaskId} に必須メタデータがありません: ${m}`,
+                        fixSuggestion: `**${m}**: [内容] を追加してください`,
+                    });
+                }
+            }
+            currentTaskId = taskMatch[1];
+            currentTaskMetadata = new Set();
+            taskStartLine = i + 1;
+        }
+        // メタデータ行の検出
+        const metadataMatch = line.match(/\*\*(要件|依存関係|完了条件|対応設計|シナリオテスト)\*\*:/);
+        if (metadataMatch && currentTaskId) {
+            currentTaskMetadata.add(metadataMatch[1]);
+        }
+        // タスクグループ行（新しいセクション）の検出
+        const taskGroupMatch = line.match(/^-\s*\[[ xX]\]\s*\d+\.\d+\s/);
+        if (taskGroupMatch && currentTaskId) {
+            // 前のタスクのメタデータをチェック
+            const missing = REQUIRED_METADATA.filter((m) => !currentTaskMetadata.has(m));
+            for (const m of missing) {
+                errors.push({
+                    type: "missing_metadata",
+                    taskId: currentTaskId,
+                    line: taskStartLine,
+                    message: `タスク ${currentTaskId} に必須メタデータがありません: ${m}`,
+                    fixSuggestion: `**${m}**: [内容] を追加してください`,
+                });
+            }
+            currentTaskId = null;
+            currentTaskMetadata = new Set();
+        }
+    }
+    // 最後のタスクのチェック
+    if (currentTaskId) {
+        const missing = REQUIRED_METADATA.filter((m) => !currentTaskMetadata.has(m));
+        for (const m of missing) {
+            errors.push({
+                type: "missing_metadata",
+                taskId: currentTaskId,
+                line: taskStartLine,
+                message: `タスク ${currentTaskId} に必須メタデータがありません: ${m}`,
+                fixSuggestion: `**${m}**: [内容] を追加してください`,
+            });
+        }
+    }
+    return errors;
+}
+/**
+ * 依存関係検証
+ */
+function validateDependencies(body) {
+    const errors = [];
+    const lines = body.split("\n");
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (!line)
+            continue;
+        const depMatch = line.match(/\*\*依存関係\*\*:\s*(.+)$/);
+        if (depMatch) {
+            const depText = depMatch[1].trim();
+            if (depText === "なし" || depText === "-")
+                continue;
+            const deps = depText.split(/[,、]/).map((d) => d.trim());
+            for (const dep of deps) {
+                // 無効な形式をチェック
+                if (dep.match(/^\d+\.\d+完了$/)) {
+                    errors.push({
+                        type: "invalid_dependency_format",
+                        line: i + 1,
+                        message: `依存関係の書式が不正です: "${dep}"（task:loop非互換）`,
+                        fixSuggestion: `"${dep}" → "${dep.replace("完了", "")}" に変更してください`,
+                    });
+                }
+                if (dep.match(/^タスク\d+\.\d+$/)) {
+                    errors.push({
+                        type: "invalid_dependency_format",
+                        line: i + 1,
+                        message: `依存関係の書式が不正です: "${dep}"（task:loop非互換）`,
+                        fixSuggestion: `"${dep}" → "${dep.replace("タスク", "")}" に変更してください`,
+                    });
+                }
+            }
+        }
+    }
+    return errors;
+}
+/**
+ * タスクグループIDの形式チェック
+ */
+function isValidTaskGroupId(id) {
+    return /^\d+\.\d+$/.test(id);
+}
+/**
+ * タスクIDの形式チェック
+ */
+function isValidTaskId(taskId, taskGroupId) {
+    const pattern = new RegExp(`^${taskGroupId.replace(".", "\\.")}\\.\\d+$`);
+    return pattern.test(taskId);
+}
+/**
+ * 全タスクグループIDを取得
+ */
+function getAllTaskGroupIds(parsedIssue) {
+    const ids = new Set();
+    for (const phase of parsedIssue.phases) {
+        for (const taskGroup of phase.taskGroups) {
+            ids.add(taskGroup.id);
+        }
+    }
+    return ids;
+}
+/**
+ * エラーをMarkdown形式でフォーマット
+ */
+export function formatValidationErrors(result, retryCount, maxRetries) {
+    if (result.isValid) {
+        return `## バリデーション結果: SUCCESS
+
+タスク一覧のフォーマットは正しいです。
+次のフェーズに進んでください。`;
+    }
+    const errorList = result.errors
+        .map((error, index) => {
+        const location = error.taskId
+            ? `**タスク ${error.taskId}**`
+            : error.taskGroupId
+                ? `**タスクグループ ${error.taskGroupId}**`
+                : error.line
+                    ? `**行 ${error.line}**`
+                    : `**Phase ${error.phaseNumber}**`;
+        return `${index + 1}. ${location} - ${error.type}
+   - 問題: ${error.message}
+   - 修正案: ${error.fixSuggestion}`;
+    })
+        .join("\n\n");
+    const remaining = maxRetries - retryCount;
+    if (remaining <= 0) {
+        return `## バリデーション結果: MAX_RETRIES_EXCEEDED
+
+${maxRetries}回の試行で検証に合格しませんでした。
+
+### 最終エラー一覧
+
+${errorList}
+
+### 次のアクション
+ユーザーに手動での修正を依頼してください。
+自動修正では解決できない構造的な問題がある可能性があります。`;
+    }
+    return `## バリデーション結果: FAILURE
+
+### エラー一覧
+
+${errorList}
+
+### リトライ情報
+- 現在の試行回数: ${retryCount}
+- 最大試行回数: ${maxRetries}
+- 残り試行回数: ${remaining}
+
+### 次のアクション
+spec-tasks-generator に差し戻し、上記エラーを修正した新しいタスク一覧を生成してください。`;
+}
+//# sourceMappingURL=issue-validator.js.map

package/dist/commands/task-loop/lib/issue-validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"issue-validator.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/issue-validator.ts"],"names":[],"mappings":"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"}

package/dist/commands/task-loop/lib/pull-request-manager.d.ts

@@ -27,6 +27,32 @@ export declare function createPullRequest(headBranch: string, baseBranch: string
     success: boolean;
     url?: string;
     error?: string;
+    noDiff?: boolean;
+};
+/**
+ * Pull Requestをマージ
+ */
+export declare function mergePullRequest(prNumberOrUrl: string, options?: {
+    mergeMethod?: "merge" | "squash" | "rebase";
+    deleteBranch?: boolean;
+}): {
+    success: boolean;
+    error?: string;
+    conflicted?: boolean;
+};
+/**
+ * PRを作成してマージする統合関数
+ * Phase→Issue マージで使用
+ */
+export declare function createAndMergePullRequest(headBranch: string, baseBranch: string, title: string, body: string, options?: {
+    mergeMethod?: "merge" | "squash" | "rebase";
+    deleteBranch?: boolean;
+}): {
+    success: boolean;
+    prUrl?: string;
+    error?: string;
+    conflicted?: boolean;
+    noDiff?: boolean;
 };
 /**
  * Pull Requestの作成を保証（既存チェック + 作成）

package/dist/commands/task-loop/lib/pull-request-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-request-manager.d.ts","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/pull-request-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAuCnD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAWrF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAuBpF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,GACX;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAuCpD;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,WAAW,GACvB,IAAI,CAmCN"}
+{"version":3,"file":"pull-request-manager.d.ts","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/pull-request-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAuCnD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAWrF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAuBpF;AAqBD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,GACX;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAkDtE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC5C,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GACA;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,CA6B5D;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC5C,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GACA;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAoE9F;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,WAAW,GACvB,IAAI,CAmCN"}

package/dist/commands/task-loop/lib/pull-request-manager.js

@@ -75,6 +75,24 @@ export function generatePrBody(parsedIssue, issueNumber) {
     body += "*このPRは `pnpm task:loop` によって自動作成されました*\n";
     return body;
 }
+/**
+ * execFileSync のエラーから stderr を取得
+ */
+function getStderrFromError(error) {
+    if (error && typeof error === "object" && "stderr" in error) {
+        const stderr = error.stderr;
+        if (typeof stderr === "string") {
+            return stderr;
+        }
+        if (Buffer.isBuffer(stderr)) {
+            return stderr.toString("utf-8");
+        }
+    }
+    if (error instanceof Error) {
+        return error.message;
+    }
+    return String(error);
+}
 /**
  * Pull Requestを作成
  */
@@ -102,7 +120,14 @@ export function createPullRequest(headBranch, baseBranch, title, body) {
         return { success: true, url };
     }
     catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorMessage = getStderrFromError(error);
+        // 差分がない場合を検出
+        if (errorMessage.includes("no commits between") ||
+            errorMessage.includes("No commits between") ||
+            errorMessage.includes("already exists") ||
+            errorMessage.includes("already up to date")) {
+            return { success: false, error: errorMessage, noDiff: true };
+        }
         return { success: false, error: errorMessage };
     }
     finally {
@@ -112,6 +137,101 @@ export function createPullRequest(headBranch, baseBranch, title, body) {
         }
     }
 }
+/**
+ * Pull Requestをマージ
+ */
+export function mergePullRequest(prNumberOrUrl, options) {
+    var _a, _b;
+    const mergeMethod = (_a = options === null || options === void 0 ? void 0 : options.mergeMethod) !== null && _a !== void 0 ? _a : "merge";
+    const deleteBranch = (_b = options === null || options === void 0 ? void 0 : options.deleteBranch) !== null && _b !== void 0 ? _b : true;
+    try {
+        const args = ["pr", "merge", prNumberOrUrl, `--${mergeMethod}`];
+        if (deleteBranch) {
+            args.push("--delete-branch");
+        }
+        execFileSync("gh", args, {
+            encoding: "utf-8",
+            stdio: "pipe",
+        });
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = getStderrFromError(error);
+        // コンフリクトかどうかを判定（stderrベース）
+        const isConflict = errorMessage.includes("Merge conflict") ||
+            errorMessage.includes("merge conflict") ||
+            errorMessage.includes("CONFLICT") ||
+            errorMessage.includes("could not be merged");
+        return { success: false, error: errorMessage, conflicted: isConflict };
+    }
+}
+/**
+ * PRを作成してマージする統合関数
+ * Phase→Issue マージで使用
+ */
+export function createAndMergePullRequest(headBranch, baseBranch, title, body, options) {
+    try {
+        // 既存PRをチェック
+        const existing = checkExistingPullRequest(headBranch, baseBranch);
+        let prUrl;
+        if (existing.exists && existing.url) {
+            // 既存PRがある場合
+            if (existing.state === "MERGED") {
+                console.log(`   ✅ PRは既にマージ済み: ${existing.url}`);
+                return { success: true, prUrl: existing.url };
+            }
+            if (existing.state === "CLOSED") {
+                // CLOSEDの場合は新規作成
+                console.log(`   ⚠️ 既存PRはCLOSED状態のため、新規PRを作成: ${existing.url}`);
+                const createResult = createPullRequest(headBranch, baseBranch, title, body);
+                if (!createResult.success) {
+                    if (createResult.noDiff) {
+                        console.log("   ✅ 差分がないためマージ不要");
+                        return { success: true, noDiff: true };
+                    }
+                    return { success: false, error: createResult.error };
+                }
+                prUrl = createResult.url;
+                console.log(`   ✅ PRを作成: ${prUrl}`);
+            }
+            else {
+                // OPEN状態のPRを再利用
+                prUrl = existing.url;
+                console.log(`   📋 既存PRを使用: ${prUrl}`);
+            }
+        }
+        else {
+            // PRを新規作成
+            console.log("   📝 PRを作成中...");
+            const createResult = createPullRequest(headBranch, baseBranch, title, body);
+            if (!createResult.success) {
+                if (createResult.noDiff) {
+                    console.log("   ✅ 差分がないためマージ不要");
+                    return { success: true, noDiff: true };
+                }
+                return { success: false, error: createResult.error };
+            }
+            prUrl = createResult.url;
+            console.log(`   ✅ PRを作成: ${prUrl}`);
+        }
+        // PRをマージ
+        console.log("   🔀 PRをマージ中...");
+        const mergeResult = mergePullRequest(prUrl, options);
+        if (!mergeResult.success) {
+            // コンフリクトかどうかを判定（mergePullRequestが判定済み）
+            if (mergeResult.conflicted) {
+                return { success: false, prUrl, error: mergeResult.error, conflicted: true };
+            }
+            return { success: false, prUrl, error: mergeResult.error };
+        }
+        console.log(`   ✅ PRマージ完了: ${prUrl}`);
+        return { success: true, prUrl };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return { success: false, error: errorMessage };
+    }
+}
 /**
  * Pull Requestの作成を保証（既存チェック + 作成）
  */

package/dist/commands/task-loop/lib/pull-request-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-request-manager.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/pull-request-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pull-request-manager.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/pull-request-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@einja/dev-cli",
-  "version": "0.1.20",
+  "version": "0.1.23",
   "description": "Einja CLI - .claude設定とテンプレート同期をnpxでインストール",
   "type": "module",
   "main": "./dist/index.js",

package/presets/default/.claude/agents/einja/backend-architect.md

@@ -3,11 +3,13 @@ name: backend-architect
 description: バックエンドアーキテクチャ設計の専門家。4層アーキテクチャ、Repository/Mapper/Result型パターン、API設計、DB設計、テスト設計方針を担当します。技術選定、アーキテクチャ決定、スケーラブルな設計パターンの提案に特化しています。<example>Context: バックエンド機能のアーキテクチャを設計したい場合。user: "投稿管理APIのアーキテクチャを設計して" assistant: "backend-architectエージェントを使用して、4層アーキテクチャ、Repository設計、API設計、テスト方針を策定します" <commentary>バックエンドアーキテクチャ設計が必要なため、backend-architectエージェントを起動します。</commentary></example> <example>Context: 既存バックエンドアーキテクチャの改善提案が必要な場合。user: "現在のRepository実装を改善して" assistant: "backend-architectエージェントを起動して、Repository/Mapper設計、Result型パターン、エラーハンドリングの観点から設計改善を提案します" <commentary>アーキテクチャレビューと改善提案が必要なため、backend-architectエージェントに依頼します。</commentary></example>
 model: sonnet
 color: orange
+skills:
+  - output-format
 ---
 
 ## ✅ 最重要: 出力形式
 
-**@.claude/skills/einja-output-format/SKILL.md の「backend-architect」テンプレートに従って報告すること。この形式から逸脱しないこと。**
+**「backend-architect」テンプレートに従って報告すること。この形式から逸脱しないこと。**
 
 ---