sdd-forge 0.1.0-alpha.549 → 0.1.0-alpha.622

package/README.md

@@ -1,7 +1,7 @@
 # <!-- {{data("cli.project.name")}} -->sdd-forge<!-- {{/data}} -->
 
 <!-- {{data("cli.docs.langSwitcher", {labels: "absolute"})}} -->
-**English** | [日本語](https://github.com/SpreadWorks/sdd-forge/blob/main/docs/ja/README.md)
+[日本語](https://github.com/SpreadWorks/sdd-forge/blob/main/docs/ja/README.md) | **English**
 <!-- {{/data}} -->
 
 [![npm version](https://img.shields.io/npm/v/sdd-forge.svg)](https://www.npmjs.com/package/sdd-forge)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdd-forge",
-  "version": "0.1.0-alpha.549",
+  "version": "0.1.0-alpha.622",
   "description": "Spec-Driven Development tooling for automated documentation generation",
   "repository": {
     "type": "git",

package/src/AGENTS.md

@@ -27,7 +27,7 @@ src/
 │   ├── presets.js            プリセット自動探索・親チェーン解決
 │   ├── flow-state.js         SDD フロー状態永続化
 │   ├── flow-envelope.js      flow get/set/run の JSON envelope
-│   ├── git-state.js          git/gh 状態取得ヘルパー
+│   ├── git-helpers.js          git/gh 状態取得ヘルパー
 │   ├── include.js            include ディレクティブ展開
 │   ├── i18n.js               3層 i18n（ドメイン名前空間付き）
 │   └── types.js              型エイリアス解決・バリデーション

package/src/docs/commands/agents.js

@@ -12,7 +12,7 @@ import path from "path";
 import { runIfDirect } from "../../lib/entrypoint.js";
 import { parseArgs } from "../../lib/cli.js";
 import { sddOutputDir } from "../../lib/config.js";
-import { callAgent, loadAgentConfig, DEFAULT_AGENT_TIMEOUT_MS } from "../../lib/agent.js";
+import { callAgent, loadAgentConfig } from "../../lib/agent.js";
 import { translate } from "../../lib/i18n.js";
 import { createResolver } from "../lib/resolver-factory.js";
 import { createLogger } from "../../lib/progress.js";
@@ -201,7 +201,7 @@ async function main(ctx) {
     const prompt = buildRefinePrompt(projectContent, combinedDocs, config, srcRoot, sddContent);
 
     try {
-      const result = callAgent(agent, prompt, DEFAULT_AGENT_TIMEOUT_MS, undefined, { systemPrompt });
+      const result = callAgent(agent, prompt, agent.timeoutMs, undefined, { systemPrompt });
 
       let refined = result.trim();
 

package/src/docs/commands/enrich.js

@@ -441,7 +441,7 @@ async function main(ctx) {
   const batches = splitIntoBatches(pending, maxTokens);
   const concurrency = resolveConcurrency(config);
 
-  const timeoutMs = config.agent?.timeout ? Number(config.agent.timeout) * 1000 : DEFAULT_AGENT_TIMEOUT_MS;
+  const timeoutMs = agent.timeoutMs || DEFAULT_AGENT_TIMEOUT_MS;
   let totalEnriched = 0;
 
   logger.log(`${batches.length} batches (token limit: ${maxTokens}, concurrency: ${concurrency})`);

package/src/docs/commands/forge.js

@@ -13,7 +13,7 @@
 
 import fs from "fs";
 import path from "path";
-import { execFile } from "child_process";
+import { runCmdAsync } from "../../lib/process.js";
 import { runIfDirect } from "../../lib/entrypoint.js";
 import { populateFromAnalysis } from "./data.js";
 import { textFillFromAnalysis } from "./text.js";
@@ -119,28 +119,14 @@ function printHelp() {
 }
 
 /**
- * コマンド文字列をコマンドと引数に分割して execFile で実行する。
+ * コマンド文字列をコマンドと引数に分割して実行する。
  * bash に依存しない。
  */
 function runCommand(cmdString, cwd) {
   const parts = cmdString.match(/"[^"]*"|'[^']*'|\S+/g) || [];
   const command = parts[0];
   const args = parts.slice(1).map((s) => s.replace(/^["']|["']$/g, ""));
-  return new Promise((resolve) => {
-    execFile(
-      command,
-      args,
-      { cwd, maxBuffer: 20 * 1024 * 1024 },
-      (err, stdout, stderr) => {
-        resolve({
-          ok: !err,
-          code: err?.code ?? 0,
-          stdout: String(stdout || ""),
-          stderr: String(stderr || ""),
-        });
-      }
-    );
-  });
+  return runCmdAsync(command, args, { cwd });
 }
 
 /**
@@ -220,7 +206,7 @@ async function main() {
   const t = translate();
   const agent = resolveAgent(config, "docs.forge");
   const mode = cli.mode || DEFAULT_MODE;
-  const timeoutMs = config.agent?.timeout ? Number(config.agent.timeout) * 1000 : undefined;
+  const timeoutMs = agent?.timeoutMs;
 
   if (mode === "agent" && !agent) {
     throw new Error(
@@ -397,7 +383,7 @@ async function main() {
     // docs/ を直接編集するため generate ステップは不要
 
     const review = await runCommand(cli.reviewCmd, root);
-    console.log(`[forge] review: ${review.ok ? "ok" : "failed"} (code=${review.code})`);
+    console.log(`[forge] review: ${review.ok ? "ok" : "failed"} (code=${review.status})`);
     if (review.ok) {
       console.log("[forge] review passed.");
       const readme = await runCommand(`node "${path.join(PKG_DIR, "docs", "commands", "readme.js")}"`, root);

package/src/docs/commands/readme.js

@@ -21,7 +21,7 @@ import { resolveCommandContext, loadFullAnalysis } from "../lib/command-context.
 import { processTemplate } from "./text.js";
 import { buildTextSystemPrompt } from "../lib/text-prompts.js";
 import { loadConfig, resolveConcurrency } from "../../lib/config.js";
-import { loadAgentConfig, ensureAgentWorkDir, DEFAULT_AGENT_TIMEOUT_MS } from "../../lib/agent.js";
+import { loadAgentConfig, ensureAgentWorkDir } from "../../lib/agent.js";
 
 const logger = createLogger("readme");
 
@@ -148,7 +148,7 @@ async function main(ctx) {
       const analysis = loadFullAnalysis(root) || {};
       const documentStyle = cfg.docs?.style;
       const systemPrompt = buildTextSystemPrompt(documentStyle, lang);
-      const timeoutMs = DEFAULT_AGENT_TIMEOUT_MS;
+      const timeoutMs = agent.timeoutMs;
 
       const result = await processTemplate(
         resolved, analysis, "README.md", agent, timeoutMs,

package/src/docs/commands/text.js

@@ -687,11 +687,10 @@ async function main(ctx) {
     logger.verbose(`--id=${ctx.id}: per-directive mode forced.`);
   }
 
-  const configTimeout = cfg.agent?.timeout ? Number(cfg.agent.timeout) * 1000 : undefined;
   const retryCount = Number(cfg?.agent?.retryCount) || 0;
   const processFn = ctx.perDirective ? processTemplate : processTemplateFileBatch;
   if (!ctx.perDirective) {
-    if (!ctx.timeout) ctx.timeout = configTimeout || DEFAULT_TIMEOUT_MS;
+    if (!ctx.timeout) ctx.timeout = agent.timeoutMs || DEFAULT_TIMEOUT_MS;
     logger.verbose(`Mode: batch (file-level, ${targetFiles.length} file(s), concurrency=${concurrency}, timeout=${ctx.timeout}ms). Use --per-directive for single-call mode.`);
   }
 

package/src/docs/commands/translate.js

@@ -15,13 +15,12 @@ import { runIfDirect } from "../../lib/entrypoint.js";
 import { parseArgs } from "../../lib/cli.js";
 import { resolveOutputConfig } from "../../lib/types.js";
 import { resolveConcurrency } from "../../lib/config.js";
-import { callAgentAsync, DEFAULT_AGENT_TIMEOUT_MS } from "../../lib/agent.js";
+import { callAgentAsync } from "../../lib/agent.js";
 import { createLogger } from "../../lib/progress.js";
 import { resolveCommandContext, getChapterFiles, stripResponsePreamble } from "../lib/command-context.js";
 import { mapWithConcurrency } from "../lib/concurrency.js";
 
 const logger = createLogger("translate");
-const DEFAULT_TIMEOUT_MS = DEFAULT_AGENT_TIMEOUT_MS;
 
 /**
  * Translate a Markdown document from one language to another via AI agent.
@@ -72,7 +71,7 @@ async function translateDocument(content, fromLang, toLang, agent, root, documen
 
   const prompt = content;
 
-  const result = await callAgentAsync(agent, prompt, DEFAULT_TIMEOUT_MS, root, {
+  const result = await callAgentAsync(agent, prompt, agent.timeoutMs, root, {
     systemPrompt,
   });
 

package/src/flow/commands/merge.js

@@ -5,10 +5,11 @@
  * Called by finalize.js with ctx containing root, flowState, worktreePath, mainRepoPath, mergeStrategy.
  */
 
-import { execFileSync } from "child_process";
 import { readFileSync } from "fs";
+import { runCmd } from "../../lib/process.js";
 import path from "path";
 import { loadConfig } from "../../lib/config.js";
+import { isGhAvailable } from "../../lib/git-helpers.js";
 
 /**
  * Resolve push remote from config.
@@ -19,19 +20,6 @@ function resolveRemote(cfg) {
   return cfg?.flow?.push?.remote || "origin";
 }
 
-/**
- * Check if gh command is available.
- * @returns {boolean}
- */
-function isGhAvailable() {
-  try {
-    execFileSync("gh", ["--version"], { stdio: "ignore" });
-    return true;
-  } catch (_) {
-    return false;
-  }
-}
-
 /**
  * Extract a markdown section body by heading name.
  * @param {string} content - full markdown text
@@ -177,14 +165,16 @@ function main(ctx) {
     const title = buildPrTitle(spec, fallbackTitle);
     const body = buildPrBody(state, spec);
 
-    execFileSync("git", ["push", "-u", remote, featureBranch], { stdio: "inherit" });
-    execFileSync("gh", [
+    const pushRes = runCmd("git", ["push", "-u", remote, featureBranch]);
+    if (!pushRes.ok) throw new Error(pushRes.stderr || "git push failed");
+    const prRes = runCmd("gh", [
       "pr", "create",
       "--base", baseBranch,
       "--head", featureBranch,
       "--title", title,
       ...(body ? ["--body", body] : []),
-    ], { stdio: "inherit" });
+    ]);
+    if (!prRes.ok) throw new Error(prRes.stderr || "gh pr create failed");
     return { strategy: "pr" };
   }
 
@@ -192,16 +182,27 @@ function main(ctx) {
   const specTitle = state.spec?.replace(/^specs\/\d+-/, "").replace(/\/spec\.md$/, "") || featureBranch;
   const commitMsg = state.issue ? `${specTitle}\n\nfixes #${state.issue}` : specTitle;
 
+  function runSquashMerge(gitPrefix, hint) {
+    const mergeArgs = [...gitPrefix, "merge", "--squash", featureBranch];
+    const resetArgs = [...gitPrefix, "reset", "--merge"];
+    const mergeRes = runCmd("git", mergeArgs);
+    if (!mergeRes.ok) {
+      runCmd("git", resetArgs);
+      throw new Error(`Merge conflict detected. ${hint}`);
+    }
+    const commitRes = runCmd("git", [...gitPrefix, "commit", "-m", commitMsg]);
+    if (!commitRes.ok) throw new Error(commitRes.stderr || "commit after squash merge failed");
+  }
+
   if (worktree && mainRepoPath) {
-    execFileSync("git", ["-C", mainRepoPath, "merge", "--squash", featureBranch], { stdio: "inherit" });
-    execFileSync("git", ["-C", mainRepoPath, "commit", "-m", commitMsg], { stdio: "inherit" });
+    runSquashMerge(["-C", mainRepoPath], `Run 'git rebase ${baseBranch}' in the worktree and retry finalize.`);
     return { strategy: "squash" };
   }
 
   // Branch mode
-  execFileSync("git", ["checkout", baseBranch], { stdio: "inherit" });
-  execFileSync("git", ["merge", "--squash", featureBranch], { stdio: "inherit" });
-  execFileSync("git", ["commit", "-m", commitMsg], { stdio: "inherit" });
+  const checkoutRes = runCmd("git", ["checkout", baseBranch]);
+  if (!checkoutRes.ok) throw new Error(checkoutRes.stderr || "git checkout failed");
+  runSquashMerge([], `Run 'git rebase ${baseBranch}' and retry finalize.`);
   return { strategy: "squash" };
 }
 

package/src/flow/commands/report.js

@@ -7,7 +7,7 @@
 
 import fs from "fs";
 import path from "path";
-import { loadRedoLog } from "../set/redo.js";
+import { loadIssueLog } from "../lib/set-issue-log.js";
 
 /**
  * Aggregate metrics across all phases.
@@ -15,7 +15,7 @@ import { loadRedoLog } from "../set/redo.js";
  * @returns {{ docsRead: number, srcRead: number, question: number, redo: number }}
  */
 function aggregateMetrics(metrics) {
-  const totals = { docsRead: 0, srcRead: 0, question: 0, redo: 0 };
+  const totals = { docsRead: 0, srcRead: 0, question: 0, issueLog: 0 };
   if (!metrics) return totals;
   for (const phase of Object.values(metrics)) {
     if (!phase || typeof phase !== "object") continue;
@@ -31,13 +31,13 @@ function aggregateMetrics(metrics) {
  * @param {Object} input
  * @param {Object} input.state - flow.json state
  * @param {Object} input.results - finalize step results
- * @param {Object} input.redolog - redolog data { entries: [] }
+ * @param {Object} input.issueLog - issue-log data { entries: [] }
  * @param {string} input.implDiffStat - git diff --stat output for implementation
  * @param {string[]} input.commitMessages - commit messages from feature branch
  * @returns {{ data: Object, text: string }}
  */
 export function generateReport(input) {
-  const { state, results, redolog, implDiffStat, commitMessages } = input;
+  const { state, results, issueLog, implDiffStat, commitMessages } = input;
 
   // Implementation
   const implementation = {
@@ -52,8 +52,8 @@ export function generateReport(input) {
     : null;
 
   // Redolog
-  const entries = redolog?.entries || [];
-  const redologData = {
+  const entries = issueLog?.entries || [];
+  const issueLogData = {
     count: entries.length,
     entries: entries.map(e => ({
       step: e.step,
@@ -96,7 +96,7 @@ export function generateReport(input) {
     tests = { unit, integration, acceptance, total: unit + integration + acceptance };
   }
 
-  const data = { implementation, retro, redolog: redologData, metrics, tests, sync };
+  const data = { implementation, retro, issueLog: issueLogData, metrics, tests, sync };
   const text = formatText(data);
 
   return { data, text };
@@ -150,7 +150,7 @@ function formatText(data) {
   lines.push("  Metrics");
   lines.push(`  ${thin}`);
   const m = data.metrics;
-  lines.push(`    docs ${m.docsRead}  src ${m.srcRead}  Q&A ${m.question}  redo ${m.redo}`);
+  lines.push(`    docs ${m.docsRead}  src ${m.srcRead}  Q&A ${m.question}  issues ${m.issueLog}`);
 
   // Tests
   if (data.tests) {
@@ -162,11 +162,11 @@ function formatText(data) {
   }
 
   // Redo (only if entries exist)
-  if (data.redolog.count > 0) {
+  if (data.issueLog.count > 0) {
     lines.push("");
-    lines.push(`  Redo (${data.redolog.count})`);
+    lines.push(`  Issue Log (${data.issueLog.count})`);
     lines.push(`  ${thin}`);
-    for (const e of data.redolog.entries) {
+    for (const e of data.issueLog.entries) {
       lines.push(`    [${e.step}] ${e.reason}${e.resolution ? ` -> ${e.resolution}` : ""}`);
     }
   }