ai-spec-dev 0.37.0 → 0.41.0

package/core/mock-server-generator.ts

@@ -1,7 +1,17 @@
 import * as path from "path";
 import * as fs from "fs-extra";
-import { spawn } from "child_process";
-import { SpecDSL, ApiEndpoint, FieldMap } from "./dsl-types";
+import { SpecDSL } from "./dsl-types";
+import { buildEndpointFixture } from "./mock/fixtures";
+import { generateProxyConfig } from "./mock/proxy";
+
+// Re-export public symbols for backward compatibility
+export {
+  applyMockProxy,
+  restoreMockProxy,
+  startMockServerBackground,
+  saveMockServerPid,
+  ProxyApplyResult,
+} from "./mock/proxy";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -20,94 +30,6 @@ export interface MockGenerationResult {
   files: Array<{ path: string; description: string }>;
 }
 
-// ─── Fixture Generator ────────────────────────────────────────────────────────
-
-/**
- * Convert a type-description string to a fixture value (JavaScript literal).
- */
-function typeToFixture(fieldName: string, typeDesc: string): unknown {
-  const t = typeDesc.toLowerCase();
-
-  if (t.includes("boolean") || t === "bool") return true;
-  if (t.includes("int") || t.includes("number") || t.includes("float") || t.includes("decimal")) {
-    if (fieldName.toLowerCase().includes("id")) return 1;
-    if (fieldName.toLowerCase().includes("count") || fieldName.toLowerCase().includes("total")) return 42;
-    if (fieldName.toLowerCase().includes("price") || fieldName.toLowerCase().includes("amount")) return 9.99;
-    return 1;
-  }
-  if (t.includes("datetime") || t.includes("date") || t.includes("timestamp")) {
-    return "2024-01-15T10:30:00.000Z";
-  }
-  if (t.includes("[]") || t.includes("array") || t.includes("list")) return [];
-  if (t.includes("object") || t.includes("json") || t.includes("record")) return {};
-
-  // String heuristics by field name
-  const name = fieldName.toLowerCase();
-  if (name === "id" || name.endsWith("id")) return "abc123";
-  if (name.includes("email")) return "user@example.com";
-  if (name.includes("phone")) return "+1-555-0100";
-  if (name.includes("url") || name.includes("image") || name.includes("avatar")) return "https://example.com/sample.jpg";
-  if (name.includes("token") || name.includes("secret")) return "mock-token-xyz";
-  if (name.includes("name")) return "Example Name";
-  if (name.includes("title")) return "Example Title";
-  if (name.includes("description") || name.includes("content") || name.includes("body")) return "Example description text";
-  if (name.includes("status")) return "active";
-  if (name.includes("type") || name.includes("role")) return "default";
-  if (name.includes("code")) return "CODE001";
-
-  return `example_${fieldName}`;
-}
-
-function buildFixtureObject(fields: FieldMap): Record<string, unknown> {
-  const obj: Record<string, unknown> = {};
-  for (const [name, type] of Object.entries(fields)) {
-    obj[name] = typeToFixture(name, type);
-  }
-  return obj;
-}
-
-/**
- * Build a fixture response object for an endpoint.
- * For endpoints without explicit response schemas, generate minimal fixtures from model context.
- */
-function buildEndpointFixture(endpoint: ApiEndpoint, dsl: SpecDSL): unknown {
-  const method = endpoint.method;
-  const status = endpoint.successStatus;
-
-  // DELETE with 204 → no body
-  if (status === 204) return null;
-
-  // Try to derive fixture from model names mentioned in endpoint description
-  const descLower = endpoint.description.toLowerCase();
-  const matchedModel = dsl.models.find((m) =>
-    descLower.includes(m.name.toLowerCase())
-  );
-
-  if (matchedModel) {
-    const fields: FieldMap = {};
-    for (const f of matchedModel.fields) {
-      fields[f.name] = f.type;
-    }
-    const item = buildFixtureObject(fields);
-
-    // List endpoints return arrays
-    if (method === "GET" && (descLower.includes("list") || descLower.includes("all") || descLower.includes("paginate"))) {
-      return {
-        data: [item, { ...item, id: "def456" }],
-        total: 2,
-        page: 1,
-        pageSize: 10,
-      };
-    }
-    return { data: item };
-  }
-
-  // Fallback based on method
-  if (method === "POST") return { data: { id: "abc123", createdAt: "2024-01-15T10:30:00.000Z" } };
-  if (method === "GET") return { data: { id: "abc123" } };
-  return { success: true };
-}
-
 // ─── Express Mock Server Generator ───────────────────────────────────────────
 
 function generateMockServerJs(dsl: SpecDSL, port: number): string {
@@ -197,167 +119,6 @@ function generateMockServerJs(dsl: SpecDSL, port: number): string {
   return lines.join("\n");
 }
 
-// ─── Proxy Config Generators ──────────────────────────────────────────────────
-
-function detectFrontendFramework(projectDir: string): "vite" | "next" | "webpack" | "cra" | "unknown" {
-  // Check vite.config
-  for (const f of ["vite.config.ts", "vite.config.js", "vite.config.mts"]) {
-    if (fs.existsSync(path.join(projectDir, f))) return "vite";
-  }
-  // Check next.config
-  for (const f of ["next.config.js", "next.config.ts", "next.config.mjs"]) {
-    if (fs.existsSync(path.join(projectDir, f))) return "next";
-  }
-  // Check for CRA (react-scripts in package.json)
-  const pkgPath = path.join(projectDir, "package.json");
-  if (fs.existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-      const deps = { ...(pkg.dependencies ?? {}), ...(pkg.devDependencies ?? {}) };
-      if (deps["react-scripts"]) return "cra";
-    } catch { /* ignore */ }
-  }
-  // Check webpack.config
-  for (const f of ["webpack.config.js", "webpack.config.ts"]) {
-    if (fs.existsSync(path.join(projectDir, f))) return "webpack";
-  }
-  return "unknown";
-}
-
-function generateViteProxyBlock(mockPort: number, endpoints: ApiEndpoint[]): string {
-  // Collect unique path prefixes
-  const prefixes = new Set<string>();
-  for (const ep of endpoints) {
-    const parts = ep.path.split("/").filter(Boolean);
-    if (parts.length > 0) prefixes.add(`/${parts[0]}`);
-  }
-  const target = `http://localhost:${mockPort}`;
-  const proxyEntries = Array.from(prefixes)
-    .map((p) => `    '${p}': { target: '${target}', changeOrigin: true }`)
-    .join(",\n");
-
-  return `// Add this proxy block to your vite.config.ts / vite.config.js
-// Inside the defineConfig({ server: { proxy: { ... } } }) section:
-//
-// server: {
-//   proxy: {
-${proxyEntries
-  .split("\n")
-  .map((l) => `//   ${l}`)
-  .join("\n")}
-//   }
-// }
-
-// ─── Standalone proxy snippet for vite.config.ts ─────────────────────────────
-// import { defineConfig } from 'vite';
-// export default defineConfig({
-//   server: {
-//     proxy: {
-${proxyEntries
-  .split("\n")
-  .map((l) => `//       ${l.trim()}`)
-  .join("\n")}
-//     }
-//   }
-// });
-`;
-}
-
-function generateNextProxyBlock(mockPort: number, endpoints: ApiEndpoint[]): string {
-  const prefixes = new Set<string>();
-  for (const ep of endpoints) {
-    const parts = ep.path.split("/").filter(Boolean);
-    if (parts.length > 0) prefixes.add(`/${parts[0]}`);
-  }
-  const rewrites = Array.from(prefixes).map(
-    (p) => `    { source: '${p}/:path*', destination: 'http://localhost:${mockPort}${p}/:path*' }`
-  );
-
-  return `// Add this to your next.config.js rewrites():
-//
-// module.exports = {
-//   async rewrites() {
-//     return [
-${rewrites.map((r) => `//       ${r}`).join(",\n")}
-//     ];
-//   },
-// };
-`;
-}
-
-function generateWebpackProxyBlock(mockPort: number, endpoints: ApiEndpoint[]): string {
-  const prefixes = new Set<string>();
-  for (const ep of endpoints) {
-    const parts = ep.path.split("/").filter(Boolean);
-    if (parts.length > 0) prefixes.add(`/${parts[0]}`);
-  }
-  const proxyEntries = Array.from(prefixes)
-    .map(
-      (p) =>
-        `    '${p}': {\n      target: 'http://localhost:${mockPort}',\n      changeOrigin: true\n    }`
-    )
-    .join(",\n");
-
-  return `// Add this to your webpack.config.js devServer.proxy section:
-//
-// devServer: {
-//   proxy: {
-${proxyEntries
-  .split("\n")
-  .map((l) => `//   ${l}`)
-  .join("\n")}
-//   }
-// }
-`;
-}
-
-function generateCraProxyBlock(mockPort: number): string {
-  return `// For Create React App: add a "proxy" field to package.json
-// This only proxies requests that don't match static files:
-//
-// {
-//   "proxy": "http://localhost:${mockPort}"
-// }
-//
-// Or use src/setupProxy.js for per-path control:
-// const { createProxyMiddleware } = require('http-proxy-middleware');
-// module.exports = function(app) {
-//   app.use('/api', createProxyMiddleware({ target: 'http://localhost:${mockPort}', changeOrigin: true }));
-// };
-`;
-}
-
-function generateProxyConfig(
-  dsl: SpecDSL,
-  mockPort: number,
-  projectDir: string
-): { content: string; filename: string } {
-  const framework = detectFrontendFramework(projectDir);
-
-  switch (framework) {
-    case "vite":
-      return {
-        filename: "mock/proxy.vite.comment.txt",
-        content: generateViteProxyBlock(mockPort, dsl.endpoints),
-      };
-    case "next":
-      return {
-        filename: "mock/proxy.next.comment.txt",
-        content: generateNextProxyBlock(mockPort, dsl.endpoints),
-      };
-    case "cra":
-      return {
-        filename: "mock/proxy.cra.comment.txt",
-        content: generateCraProxyBlock(mockPort),
-      };
-    default:
-      return {
-        filename: "mock/proxy.webpack.comment.txt",
-        content: generateWebpackProxyBlock(mockPort, dsl.endpoints),
-      };
-  }
-}
-
 // ─── MSW Handler Generator ────────────────────────────────────────────────────
 
 function generateMswHandlers(dsl: SpecDSL): string {
@@ -435,215 +196,6 @@ export const worker = setupWorker(...handlers);
 `;
 }
 
-// ─── Proxy Patching (applyMockProxy / restoreMockProxy) ──────────────────────
-
-const MOCK_LOCK_FILE = ".ai-spec-mock.lock.json";
-
-interface MockLock {
-  framework: string;
-  mockPort: number;
-  frontendDir: string;
-  mockServerPid?: number;
-  actions: Array<
-    | { type: "wrote-file"; filePath: string }
-    | { type: "patched-pkg-proxy"; originalProxy?: string | null }
-    | { type: "added-pkg-script"; key: string; originalValue?: string | null }
-  >;
-}
-
-export interface ProxyApplyResult {
-  framework: string;
-  applied: boolean;
-  devCommand: string | null;
-  note?: string;
-}
-
-function findViteConfigFile(projectDir: string): string | null {
-  for (const f of ["vite.config.ts", "vite.config.mts", "vite.config.js", "vite.config.mjs"]) {
-    if (fs.existsSync(path.join(projectDir, f))) return f;
-  }
-  return null;
-}
-
-function buildViteProxyEntries(endpoints: ApiEndpoint[], mockPort: number): string {
-  const prefixes = new Set<string>();
-  for (const ep of endpoints) {
-    const parts = ep.path.split("/").filter(Boolean);
-    if (parts.length > 0) prefixes.add(`/${parts[0]}`);
-  }
-  if (prefixes.size === 0) prefixes.add("/api");
-  const target = `http://localhost:${mockPort}`;
-  return Array.from(prefixes)
-    .map((p) => `        '${p}': { target: '${target}', changeOrigin: true },`)
-    .join("\n");
-}
-
-function generateViteMockConfigTs(baseConfigFile: string, mockPort: number, endpoints: ApiEndpoint[]): string {
-  const importPath = `./${baseConfigFile.replace(/\.(ts|mts|js|mjs)$/, "")}`;
-  const proxyEntries = buildViteProxyEntries(endpoints, mockPort);
-  return `// Auto-generated by ai-spec mock --serve
-// LOCAL DEVELOPMENT ONLY — do not commit this file
-// Remove with: ai-spec mock --restore
-import { defineConfig, mergeConfig } from 'vite';
-
-export default defineConfig(async (env) => {
-  const mod = await import('${importPath}');
-  const baseConfigOrFn = mod.default;
-  const baseConfig =
-    typeof baseConfigOrFn === 'function'
-      ? await baseConfigOrFn(env)
-      : baseConfigOrFn;
-
-  return mergeConfig(baseConfig ?? {}, {
-    server: {
-      proxy: {
-${proxyEntries}
-      },
-    },
-  });
-});
-`;
-}
-
-/**
- * Patch the frontend project's proxy config to point to the mock server.
- * Vite: writes vite.config.ai-spec-mock.ts + adds "dev:mock" npm script.
- * CRA : patches package.json "proxy" field (original backed up in lock file).
- * Saves .ai-spec-mock.lock.json so restoreMockProxy() can undo all changes.
- */
-export async function applyMockProxy(
-  frontendDir: string,
-  mockPort: number,
-  endpoints: ApiEndpoint[] = []
-): Promise<ProxyApplyResult> {
-  const framework = detectFrontendFramework(frontendDir);
-  const actions: MockLock["actions"] = [];
-
-  if (framework === "vite") {
-    const viteConfigFile = findViteConfigFile(frontendDir) ?? "vite.config.ts";
-    const mockConfigContent = generateViteMockConfigTs(viteConfigFile, mockPort, endpoints);
-    const mockConfigPath = path.join(frontendDir, "vite.config.ai-spec-mock.ts");
-    await fs.writeFile(mockConfigPath, mockConfigContent, "utf-8");
-    actions.push({ type: "wrote-file", filePath: "vite.config.ai-spec-mock.ts" });
-
-    const pkgPath = path.join(frontendDir, "package.json");
-    if (await fs.pathExists(pkgPath)) {
-      const pkg = await fs.readJson(pkgPath);
-      pkg.scripts = pkg.scripts ?? {};
-      const originalValue: string | null = pkg.scripts["dev:mock"] ?? null;
-      pkg.scripts["dev:mock"] = "vite --config vite.config.ai-spec-mock.ts";
-      await fs.writeJson(pkgPath, pkg, { spaces: 2 });
-      actions.push({ type: "added-pkg-script", key: "dev:mock", originalValue });
-    }
-
-    const lock: MockLock = { framework, mockPort, frontendDir, actions };
-    await fs.writeJson(path.join(frontendDir, MOCK_LOCK_FILE), lock, { spaces: 2 });
-    return { framework, applied: true, devCommand: "npm run dev:mock" };
-  }
-
-  if (framework === "cra") {
-    const pkgPath = path.join(frontendDir, "package.json");
-    if (await fs.pathExists(pkgPath)) {
-      const pkg = await fs.readJson(pkgPath);
-      const originalProxy: string | null = pkg.proxy ?? null;
-      pkg.proxy = `http://localhost:${mockPort}`;
-      await fs.writeJson(pkgPath, pkg, { spaces: 2 });
-      actions.push({ type: "patched-pkg-proxy", originalProxy });
-      const lock: MockLock = { framework, mockPort, frontendDir, actions };
-      await fs.writeJson(path.join(frontendDir, MOCK_LOCK_FILE), lock, { spaces: 2 });
-      return { framework, applied: true, devCommand: "npm start" };
-    }
-    return { framework, applied: false, devCommand: null, note: "No package.json found." };
-  }
-
-  // next / webpack / unknown — save lock but no auto-patch
-  const lock: MockLock = { framework, mockPort, frontendDir, actions };
-  await fs.writeJson(path.join(frontendDir, MOCK_LOCK_FILE), lock, { spaces: 2 });
-  const manualNote =
-    framework === "next"
-      ? `Add rewrites in next.config.js to proxy API calls to http://localhost:${mockPort}`
-      : `Add proxy in webpack.config.js devServer to target http://localhost:${mockPort}`;
-  return { framework, applied: false, devCommand: null, note: manualNote };
-}
-
-/**
- * Undo all proxy changes made by applyMockProxy().
- * Also kills the mock server if its PID was stored in the lock file.
- */
-export async function restoreMockProxy(
-  frontendDir: string
-): Promise<{ restored: boolean; note?: string }> {
-  const lockPath = path.join(frontendDir, MOCK_LOCK_FILE);
-  if (!(await fs.pathExists(lockPath))) {
-    return { restored: false, note: "No lock file found — nothing to restore." };
-  }
-
-  const lock: MockLock = await fs.readJson(lockPath);
-
-  for (const action of lock.actions) {
-    if (action.type === "wrote-file") {
-      const fp = path.join(frontendDir, action.filePath);
-      if (await fs.pathExists(fp)) await fs.remove(fp);
-    } else if (action.type === "added-pkg-script") {
-      const pkgPath = path.join(frontendDir, "package.json");
-      if (await fs.pathExists(pkgPath)) {
-        const pkg = await fs.readJson(pkgPath);
-        if (action.originalValue == null) {
-          delete pkg.scripts?.[action.key];
-        } else {
-          pkg.scripts = pkg.scripts ?? {};
-          pkg.scripts[action.key] = action.originalValue;
-        }
-        await fs.writeJson(pkgPath, pkg, { spaces: 2 });
-      }
-    } else if (action.type === "patched-pkg-proxy") {
-      const pkgPath = path.join(frontendDir, "package.json");
-      if (await fs.pathExists(pkgPath)) {
-        const pkg = await fs.readJson(pkgPath);
-        if (action.originalProxy == null) {
-          delete pkg.proxy;
-        } else {
-          pkg.proxy = action.originalProxy;
-        }
-        await fs.writeJson(pkgPath, pkg, { spaces: 2 });
-      }
-    }
-  }
-
-  if (lock.mockServerPid) {
-    try { process.kill(lock.mockServerPid, "SIGTERM"); } catch { /* already dead */ }
-  }
-
-  await fs.remove(lockPath);
-  return { restored: true };
-}
-
-/**
- * Start mock/server.js as a detached background process.
- * Returns the spawned PID so it can be stored for later cleanup.
- */
-export function startMockServerBackground(serverJsPath: string, port: number): number {
-  const child = spawn("node", [serverJsPath], {
-    detached: true,
-    stdio: "ignore",
-    env: { ...process.env, MOCK_PORT: String(port) },
-  });
-  child.unref();
-  return child.pid!;
-}
-
-/**
- * Save the mock server PID into an existing lock file.
- */
-export async function saveMockServerPid(frontendDir: string, pid: number): Promise<void> {
-  const lockPath = path.join(frontendDir, MOCK_LOCK_FILE);
-  if (await fs.pathExists(lockPath)) {
-    const lock: MockLock = await fs.readJson(lockPath);
-    lock.mockServerPid = pid;
-    await fs.writeJson(lockPath, lock, { spaces: 2 });
-  }
-}
-
 // ─── Public API ───────────────────────────────────────────────────────────────
 
 /**

package/core/requirement-decomposer.ts

@@ -3,6 +3,7 @@ import { WorkspaceConfig, RepoRole } from "./workspace-loader";
 import { ProjectContext } from "./context-loader";
 import { FrontendContext } from "./frontend-context-loader";
 import { decomposeSystemPrompt, buildDecomposePrompt } from "../prompts/decompose.prompt";
+import { parseJsonFromAiOutput } from "./safe-json";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -45,35 +46,10 @@ export interface DecompositionResult {
   coordinationNotes: string;
 }
 
-// ─── JSON Parser (same approach as dsl-extractor.ts) ─────────────────────────
+// ─── JSON Parser ─────────────────────────────────────────────────────────────
 
-function parseJsonFromOutput(raw: string): unknown {
-  const trimmed = raw.trim();
-
-  if (trimmed.startsWith("{")) {
-    return JSON.parse(trimmed);
-  }
-
-  const fenceStart = trimmed.indexOf("```");
-  if (fenceStart !== -1) {
-    const afterFence = trimmed.slice(fenceStart + 3);
-    const newlinePos = afterFence.indexOf("\n");
-    const jsonStart = newlinePos !== -1 ? newlinePos + 1 : 0;
-    const fenceEnd = afterFence.lastIndexOf("```");
-    if (fenceEnd > jsonStart) {
-      const jsonStr = afterFence.slice(jsonStart, fenceEnd).trim();
-      return JSON.parse(jsonStr);
-    }
-  }
-
-  const objStart = trimmed.indexOf("{");
-  const objEnd = trimmed.lastIndexOf("}");
-  if (objStart !== -1 && objEnd > objStart) {
-    return JSON.parse(trimmed.slice(objStart, objEnd + 1));
-  }
-
-  throw new SyntaxError("No JSON object found in AI output");
-}
+// Uses shared parseJsonFromAiOutput from safe-json.ts
+const parseJsonFromOutput = parseJsonFromAiOutput;
 
 // ─── Validator ────────────────────────────────────────────────────────────────
 

package/core/reviewer.ts

@@ -140,7 +140,7 @@ export class CodeReviewer {
 
   private getGitDiff(): string {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const silent: any = { encoding: "utf-8", stdio: "pipe" };
+    const silent: any = { encoding: "utf-8", stdio: "pipe", cwd: this.projectRoot, timeout: 30_000 };
     try {
       execSync("git rev-parse --is-inside-work-tree", silent);
     } catch {

package/core/safe-json.ts

@@ -0,0 +1,76 @@
+/**
+ * safe-json.ts — Shared JSON parsing utilities for AI output.
+ *
+ * Consolidates the duplicated parseJsonFromOutput logic from
+ * dsl-extractor.ts, requirement-decomposer.ts, and spec-updater.ts.
+ */
+
+/**
+ * Parse JSON from raw AI output, returning `null` on failure.
+ *
+ * Handles:
+ *   1. Bare JSON starting with `{` or `[`
+ *   2. JSON inside ```json ... ``` fences
+ *   3. First `{ ... }` or `[ ... ]` pair found in text
+ */
+export function safeParseJson<T = unknown>(raw: string): T | null {
+  const trimmed = raw.trim();
+
+  // Case 1: bare JSON object or array
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+    try {
+      return JSON.parse(trimmed) as T;
+    } catch {
+      // fall through to other strategies
+    }
+  }
+
+  // Case 2: fenced JSON — extract between first ``` and last ```
+  const fenceStart = trimmed.indexOf("```");
+  if (fenceStart !== -1) {
+    const afterFence = trimmed.slice(fenceStart + 3);
+    const newlinePos = afterFence.indexOf("\n");
+    const jsonStart = newlinePos !== -1 ? newlinePos + 1 : 0;
+    const fenceEnd = afterFence.lastIndexOf("```");
+    if (fenceEnd > jsonStart) {
+      try {
+        return JSON.parse(afterFence.slice(jsonStart, fenceEnd).trim()) as T;
+      } catch {
+        // fall through
+      }
+    }
+  }
+
+  // Case 3: find first `{...}` or `[...]` pair
+  const objStart = trimmed.indexOf("{");
+  const arrStart = trimmed.indexOf("[");
+  const start =
+    objStart !== -1 && (arrStart === -1 || objStart < arrStart)
+      ? objStart
+      : arrStart;
+  if (start !== -1) {
+    const isObj = start === objStart;
+    const end = isObj ? trimmed.lastIndexOf("}") : trimmed.lastIndexOf("]");
+    if (end > start) {
+      try {
+        return JSON.parse(trimmed.slice(start, end + 1)) as T;
+      } catch {
+        // fall through
+      }
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Parse JSON from AI output, throwing on failure.
+ * Drop-in replacement for the previously duplicated parseJsonFromOutput.
+ */
+export function parseJsonFromAiOutput<T = unknown>(raw: string): T {
+  const result = safeParseJson<T>(raw);
+  if (result === null) {
+    throw new SyntaxError("No valid JSON found in AI output");
+  }
+  return result;
+}

package/core/spec-updater.ts

@@ -15,6 +15,7 @@ import {
   buildAffectedFilesPrompt,
 } from "../prompts/update.prompt";
 import { getCodeGenSystemPrompt } from "../prompts/codegen.prompt";
+import { parseJsonFromAiOutput } from "./safe-json";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -44,27 +45,10 @@ export interface SpecUpdaterOptions {
   repoType?: string;
 }
 
-// ─── JSON parser (same pattern as requirement-decomposer.ts) ─────────────────
-
-function parseJsonFromOutput(raw: string): unknown {
-  const trimmed = raw.trim();
-  if (trimmed.startsWith("{")) return JSON.parse(trimmed);
-  const fenceStart = trimmed.indexOf("```");
-  if (fenceStart !== -1) {
-    const afterFence = trimmed.slice(fenceStart + 3);
-    const newlinePos = afterFence.indexOf("\n");
-    const jsonStart = newlinePos !== -1 ? newlinePos + 1 : 0;
-    const fenceEnd = afterFence.lastIndexOf("```");
-    if (fenceEnd > jsonStart) return JSON.parse(afterFence.slice(jsonStart, fenceEnd).trim());
-  }
-  const objStart = trimmed.indexOf("{");
-  const arrStart = trimmed.indexOf("[");
-  const start = objStart !== -1 && (arrStart === -1 || objStart < arrStart) ? objStart : arrStart;
-  const isObj = start === objStart && objStart !== -1;
-  const end = isObj ? trimmed.lastIndexOf("}") : trimmed.lastIndexOf("]");
-  if (start !== -1 && end > start) return JSON.parse(trimmed.slice(start, end + 1));
-  throw new SyntaxError("No JSON found in output");
-}
+// ─── JSON Parser ─────────────────────────────────────────────────────────────
+
+// Uses shared parseJsonFromAiOutput from safe-json.ts
+const parseJsonFromOutput = parseJsonFromAiOutput;
 
 function parseAffectedFiles(raw: string): AffectedFile[] {
   try {