android2harmony 0.1.6 → 0.1.8

package/skills/a2h-app-req-gen/scripts/reqgen/src/agent-render/output-parse.js

@@ -0,0 +1,50 @@
+// Verbatim port of the old ai-render.mjs output parsing: fenced ```json
+// extraction plus the unescaped-quote repair that salvages a common LLM
+// mistake (a literal " inside a JSON string value).
+// A quote found while inside a string only closes the string if a
+// JSON-structural character (, } ] : or end-of-input) follows — otherwise it
+// is treated as literal content and escaped.
+export function repairUnescapedQuotes(text) {
+  let result = "";
+  let inString = false;
+  for (let i = 0; i < text.length; i += 1) {
+    const ch = text[i];
+    if (inString && ch === "\\") {
+      result += ch + (text[i + 1] ?? "");
+      i += 1;
+      continue;
+    }
+    if (ch === '"') {
+      if (!inString) {
+        inString = true;
+        result += ch;
+        continue;
+      }
+      let j = i + 1;
+      while (j < text.length && /\s/.test(text[j])) j += 1;
+      const next = text[j];
+      if (next === undefined || [",", "}", "]", ":"].includes(next)) {
+        inString = false;
+        result += ch;
+      } else {
+        result += '\\"';
+      }
+      continue;
+    }
+    result += ch;
+  }
+  return result;
+}
+export function extractJsonBlock(text) {
+  const match = text.match(/```json\s*\n([\s\S]*?)```/);
+  if (!match) throw new Error("No fenced json block found in agent output");
+  try {
+    return JSON.parse(match[1]);
+  } catch (error) {
+    try {
+      return JSON.parse(repairUnescapedQuotes(match[1]));
+    } catch {
+      throw error;
+    }
+  }
+}

package/skills/a2h-app-req-gen/scripts/reqgen/src/agent-render/overview.js

@@ -0,0 +1,10 @@
+// Programmatic req-model overview. Quote consistency checks have been removed
+// — they are a prompt-level concern, not something to gate on or audit here.
+import { expandRenderItems } from "./orchestrate.js";
+export function overviewQuoteCheck(reqModel, _nameTrace) {
+  const items = expandRenderItems(reqModel);
+  return {
+    totalAreas: reqModel.areas.length,
+    totalFeatures: items.length,
+  };
+}

package/skills/a2h-app-req-gen/scripts/reqgen/src/agent-render/pool.js

@@ -0,0 +1,23 @@
+// Generic bounded-concurrency worker pool, shared by renderAllFeatures.
+export async function runPool(items, concurrency, worker) {
+  const results = new Array(items.length);
+  let nextIndex = 0;
+  async function runNext() {
+    while (nextIndex < items.length) {
+      const index = nextIndex;
+      nextIndex += 1;
+      try {
+        results[index] = {
+          status: "fulfilled",
+          value: await worker(items[index], index),
+        };
+      } catch (reason) {
+        results[index] = { status: "rejected", reason };
+      }
+    }
+  }
+  await Promise.all(
+    Array.from({ length: Math.min(concurrency, items.length) }, runNext),
+  );
+  return results;
+}

package/skills/a2h-app-req-gen/scripts/reqgen/src/agent-render/post-merge-fix.js

@@ -0,0 +1,146 @@
+// Post-merge audit and fix for stage2 shell / shell-legacy modes.
+//
+// After all rendering units complete and req.md + req-{idx}.txt are written,
+// this module:
+//   1. Runs the deterministic reqgen-audit.mjs script against req.md
+//   2. For shell / shell-legacy modes, spawns a fix agent to address issues
+//
+// The fix agent handles both deterministic issues (quote consistency from the
+// audit script) and judgment-based review from subagent-render.md section 4
+// (format uniformity, awkward wording, terminology consistency).
+//
+// ## Sync strategy (req.md → req-{idx}.txt)
+//
+// The .txt files are merged independently from output.json (the per-unit
+// agent-rendered data).  When the fix agent edits req.md directly, the .txt
+// files fall out of sync.  We address this by writing the fix prompt so the
+// agent MUST also read and edit each req-{idx}.txt file, applying the same
+// corrections.  This is manual but the agent is capable of matching sections
+// by title/content.
+//
+// A future improvement could be a programmatic re-merge from output.json after
+// deterministic quote fixes, but that requires the fixes to be applied at the
+// output.json layer rather than the merged-text layer — see ADR-0005 follow-ups.
+import { appendFile, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { spawnAsync } from "./backend.js";
+/** Full-width Chinese double-quote characters used in the prompt — assigned
+ * to variables so the source file never has raw curly quotes that could get
+ * corrupted by encoding conversion. */
+const LQ = "“"; // left double quotation mark "
+const RQ = "”"; // right double quotation mark "
+function auditScriptPath() {
+  return resolve(
+    dirname(fileURLToPath(import.meta.url)),
+    "..",
+    "..",
+    "..",
+    "reqgen-audit.mjs",
+  );
+}
+/** Build the fix-agent prompt.  Includes the audit report path and paths to
+ * all files the agent needs to read and edit. */
+function buildFixPrompt(reqMdPath, outputDir, auditReportPath) {
+  return [
+    "You are a requirements-document auditor. Review and fix the merged req.md.",
+    "",
+    "## Audit Report",
+    `An automated audit script ran against the merged output. Read the report at: ${auditReportPath}`,
+    "",
+    "## Steps",
+    "",
+    `1. Read the audit report at ${auditReportPath}`,
+    `2. Read the full ${reqMdPath}`,
+    "3. Fix all issues found in the audit report (quote formatting, etc.)",
+    "4. Also check:",
+    `   - Title format consistency (${LQ}Main - ... - ...${RQ} pattern, UI text wrapped in full-width ${LQ}${RQ} quotes)`,
+    "   - Consistent enumeration format",
+    "   - Awkward or contradictory wording",
+    "   - Consistent terminology across different areas",
+    `5. Edit ${reqMdPath} to apply fixes`,
+    `6. Read all req-{idx}.txt files in ${outputDir}`,
+    "7. Apply the same fixes to the corresponding .txt files to keep them in sync with req.md",
+    "",
+    "Report what you changed when done.",
+  ].join("\n");
+}
+/** Run the deterministic audit script, print a summary to stderr, and for
+ * shell / shell-legacy modes, spawn a fix agent to address the issues.
+ *
+ * In subagent mode this is a no-op — the main Agent handles the equivalent
+ * review per subagent-render.md section 4. */
+export async function runPostMergeAudit(
+  reqMdPath,
+  inputDir,
+  outputDir,
+  mode,
+  io,
+) {
+  const startTime = Date.now();
+  // 1. Run deterministic audit
+  const script = auditScriptPath();
+  const auditResult = await spawnAsync("node", [script, reqMdPath, inputDir], {
+    cwd: outputDir,
+    shell: process.platform === "win32",
+  });
+  let auditOk = true;
+  let auditJson;
+  try {
+    auditJson = JSON.parse(auditResult.stdout);
+    auditOk = auditJson.ok === true;
+  } catch {
+    io.stderr("  ⚠ audit script output could not be parsed\n");
+    return;
+  }
+  const summary = auditJson.summary;
+  const issueCount = summary?.issues ?? 0;
+  io.stderr(
+    `\n--- req.md audit: ${auditOk ? "✅ passed" : `⚠ ${issueCount} issues`} ---\n`,
+  );
+  if (!auditOk && issueCount > 0) {
+    io.stderr(`  format: ${summary?.formatIssues ?? 0}\n`);
+  }
+  // 2. subagent mode: main agent handles the review (subagent-render.md §4)
+  //    shell / shell-legacy: spawn fix agent
+  if (mode !== "subagent") {
+    const auditReportPath = join(outputDir, "audit-report.json");
+    await writeFile(
+      auditReportPath,
+      JSON.stringify(auditJson, null, 2),
+      "utf8",
+    );
+    const fixPrompt = buildFixPrompt(reqMdPath, outputDir, auditReportPath);
+    io.stderr("Spawning fix agent…\n");
+    const fixResult = await spawnAsync(
+      "claude",
+      ["-p", "--permission-mode", "bypassPermissions", fixPrompt],
+      { cwd: outputDir, shell: process.platform === "win32" },
+    );
+    if (fixResult.status === 0) {
+      io.stderr("Fix agent completed.\n");
+    } else {
+      io.stderr(
+        `⚠ Fix agent exited abnormally (${fixResult.status ?? "signal"}): ${fixResult.stderr.slice(0, 200)}\n`,
+      );
+    }
+  }
+  // Write overview event after audit + optional fix agent complete
+  const statusPath = join(outputDir, "rendering", "status.ndjson");
+  await appendFile(
+    statusPath,
+    `${JSON.stringify({
+      timestamp: Date.now(),
+      phase: "overview",
+      kind: "overview",
+      status: auditOk ? "ok" : issueCount > 0 ? "issues" : "error",
+      attempt: 1,
+      durationMs: Date.now() - startTime,
+      issues: issueCount,
+      unquotedUiText: summary?.unquotedUiText ?? 0,
+      quotedCodeIdent: summary?.quotedCodeIdent ?? 0,
+      formatIssues: summary?.formatIssues ?? 0,
+    })}\n`,
+    "utf8",
+  );
+}

package/skills/a2h-app-req-gen/scripts/reqgen/src/agent-render/prompt-loader.js

@@ -0,0 +1,51 @@
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+const promptPath = resolve(
+  dirname(fileURLToPath(import.meta.url)),
+  "prompts.md",
+);
+const raw = readFileSync(promptPath, "utf8").replaceAll("\r\n", "\n");
+// Parse sections: each `## UPPERCASE_NAME\n<content>` block. Content extends
+// until the next extracted section header or EOF; prompt prose may itself use
+// lower-case Markdown headings such as `## subagentIO`. The newline that
+// terminates a section belongs to the Markdown separator rather than the
+// prompt text, so we remove exactly one trailing newline.
+const SECTION_RE =
+  /^## ([A-Z][A-Z_]*)\n([\s\S]*?)(?=^## [A-Z][A-Z_]*\n|(?![\s\S]))/gm;
+const sections = new Map();
+let match;
+while ((match = SECTION_RE.exec(raw)) !== null) {
+  const name = match[1];
+  let content = match[2];
+  // Strip exactly one trailing \n (the blank-line separator before the next
+  // section header). The original TS template literals never end with \n.
+  if (content.endsWith("\n")) {
+    content = content.slice(0, -1);
+  }
+  sections.set(name, content);
+}
+/**
+ * Return the raw text of a prompt section, with `${placeholder}` markers
+ * intact (no interpolation).
+ */
+export function getSection(name) {
+  const text = sections.get(name);
+  if (text === undefined) {
+    throw new Error(`Unknown prompt section: ${name}`);
+  }
+  return text;
+}
+/**
+ * Return a prompt section with `${varName}` placeholders replaced by values
+ * from `vars`. Unknown `${...}` references (no matching key) are left as-is.
+ */
+export function renderSection(name, vars) {
+  let text = getSection(name);
+  if (vars) {
+    for (const [key, value] of Object.entries(vars)) {
+      text = text.replaceAll(`\${${key}}`, value);
+    }
+  }
+  return text;
+}