Merge remote-tracking branch 'origin/main' into feat/clawpatch-operating-loop

* origin/main:
  docs(changelog): note opencode diagnostics fix
  fix(provider): improve opencode JSON diagnostics
  fix(mapper): allow BOM before express imports
  fix(mapper): anchor express import scanning to declarations

# Conflicts:
#	CHANGELOG.md

Author: vincentkoc

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fixed first-time `clawpatch open-pr` branch creation to start from the recorded patch base.
 - Fixed command execution so providers that exit before reading stdin do not surface benign `EPIPE` errors.
 - Fixed `clawpatch ci --since` empty-review output so it reports `reviewed: 0`.
+- Improved OpenCode malformed JSON diagnostics with output length, event kinds, and a bounded preview, thanks @rohitjavvadi.
 - Fixed Express route mapping for aliased Router imports that follow block comment banners, thanks @rohitjavvadi.
 - Fixed Bun package-manager detection to recognize the text `bun.lock` lockfile, thanks @austinm911.
 

src/mapper.test.ts

@@ -1816,6 +1816,7 @@ describe("mapFeatures", () => {
         "",
         "const config = { import: true }",
         "export type { Router as ExportedTypeRouter } from 'express';",
+        "const importPattern = /import { Router as RegexImportRouter } from 'express'/;",
         "const app = express();",
         "const otherRouter = OtherRouter();",
         "const commentedOutRouter = CommentedOutRouter();",
@@ -1827,6 +1828,7 @@ describe("mapFeatures", () => {
         "const fromBindingRouter = FromBindingRouter();",
         "const commentedTypeRouter = CommentedTypeRouter();",
         "const exportedTypeRouter = ExportedTypeRouter();",
+        "const regexImportRouter = RegexImportRouter();",
         "const typedRouter: Router = Router();",
         "const projectRouter = Router({ mergeParams: true });",
         "let hitCount = 0;",
@@ -1847,6 +1849,7 @@ describe("mapFeatures", () => {
         "fromBindingRouter.get('/from-binding-router', listFromBindingRouter);",
         "commentedTypeRouter.get('/commented-type-router', ignoredCommentedTypeRouter);",
         "exportedTypeRouter.get('/exported-type-router', ignoredExportedTypeRouter);",
+        "regexImportRouter.get('/regex-import-router', ignoredRegexImportRouter);",
         "router.post<{ Body: CreateJob }>('/typed-jobs', createTypedJob);",
         "typedRouter.patch('/typed/:id', updateTyped);",
         "router.route('/users').get(listUsers).delete(deleteUsers);",
@@ -1874,6 +1877,7 @@ describe("mapFeatures", () => {
         "function listFromBindingRouter() {}",
         "function ignoredCommentedTypeRouter() {}",
         "function ignoredExportedTypeRouter() {}",
+        "function ignoredRegexImportRouter() {}",
         "function createTypedJob() {}",
         "function updateTyped() {}",
         "function listUsers() {}",
@@ -1975,6 +1979,18 @@ describe("mapFeatures", () => {
     await writeFixture(root, "src/fastify.test.ts", "test('fastify', () => {});\n");
     await writeFixture(root, "src/fastify-plugin.test.ts", "test('fastify plugin', () => {});\n");
     await writeFixture(root, "src/hono.test.ts", "test('hono', () => {});\n");
+    await writeFixture(
+      root,
+      "src/bom-router.ts",
+      [
+        "\uFEFFimport { Router as BomRouter } from 'express';",
+        "",
+        "const bomRouter = BomRouter();",
+        "bomRouter.get('/bom-router', listBomRouter);",
+        "function listBomRouter() {}",
+        "",
+      ].join("\n"),
+    );
     await writeFixture(
       root,
       "src/mixed.tsx",
@@ -1983,8 +1999,12 @@ describe("mapFeatures", () => {
         "",
         "const app = express();",
         "const view = <div></div>;",
+        "const docs = <code>import { Router as JsxImportRouter } from 'express'</code>;",
+        "const jsxImportRouter = JsxImportRouter();",
         "app.get('/after-jsx-close', afterJsxClose);",
+        "jsxImportRouter.get('/jsx-import-router', ignoredJsxImportRouter);",
         "function afterJsxClose() {}",
+        "function ignoredJsxImportRouter() {}",
         "",
       ].join("\n"),
     );
@@ -2061,6 +2081,7 @@ describe("mapFeatures", () => {
         "Express route DELETE /users",
         "Express route GET /reports",
         "Express route GET /projects/:projectId/items",
+        "Express route GET /bom-router",
         "Express route GET /after-jsx-close",
         "Express route GET /custom-file-real",
         "Fastify route GET /status",
@@ -2081,6 +2102,8 @@ describe("mapFeatures", () => {
     expect(titles).not.toContain("Express route GET /commented-out-router");
     expect(titles).not.toContain("Express route GET /commented-type-router");
     expect(titles).not.toContain("Express route GET /exported-type-router");
+    expect(titles).not.toContain("Express route GET /regex-import-router");
+    expect(titles).not.toContain("Express route GET /jsx-import-router");
     expect(titles).not.toContain("Express route GET /custom-import-router");
     expect(titles).not.toContain("Express route GET /custom-router");
     expect(titles).not.toContain("Express route GET /custom-alias-router");

src/mappers/node-routes.ts

@@ -339,7 +339,10 @@ function expressRouterImportBindingNames(source: string): Set<string> {
   pattern.lastIndex = 0;
   for (const match of source.matchAll(pattern)) {
     const importIndex = match.index ?? 0;
-    if (isInsideCommentOrString(source, importIndex)) {
+    if (
+      isInsideCommentOrString(source, importIndex) ||
+      !isImportDeclarationStart(source, importIndex)
+    ) {
       continue;
     }
     const clause = readExpressStaticImportClause(source, importIndex);
@@ -553,6 +556,33 @@ function isImportClauseStart(char: string | undefined): boolean {
   return char !== undefined && (char === "{" || char === "*" || /[A-Za-z_$]/u.test(char));
 }
 
+function isImportDeclarationStart(source: string, importIndex: number): boolean {
+  let cursor = importIndex - 1;
+  while (cursor >= 0) {
+    const char = source[cursor];
+    if (char === " " || char === "\t" || char === "\r" || char === "\uFEFF") {
+      cursor -= 1;
+      continue;
+    }
+    if (char === "\n") {
+      return true;
+    }
+    if (char === "/" && source[cursor - 1] === "*") {
+      const open = source.lastIndexOf("/*", cursor - 2);
+      if (open < 0) {
+        return false;
+      }
+      if (source.slice(open, cursor + 1).includes("\n")) {
+        return true;
+      }
+      cursor = open - 1;
+      continue;
+    }
+    return char === ";";
+  }
+  return true;
+}
+
 function skipWhitespace(source: string, start: number): number {
   let cursor = start;
   while (/\s/u.test(source[cursor] ?? "")) {

src/provider.test.ts

@@ -1,6 +1,7 @@
 import { afterEach, describe, expect, it } from "vitest";
 import { ClawpatchError } from "./errors.js";
 import { __testing, extractJson, providerByName } from "./provider.js";
+import { safeProviderPreview } from "./provider-json.js";
 import { revalidateOutputSchema, reviewOutputSchema } from "./types.js";
 
 // eslint-disable-next-line no-underscore-dangle
@@ -55,6 +56,10 @@ function expectMalformed(fn: () => unknown, message: RegExp): void {
   throw new Error("expected malformed-output");
 }
 
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+}
+
 describe("extractJson", () => {
   it("parses strict JSON directly", () => {
     const input = '{"findings":[],"inspected":{"files":[],"symbols":[],"notes":[]}}';
@@ -484,6 +489,46 @@ describe("extractOpencodeJson", () => {
     expectMalformed(() => extractOpencodeJson(stdout), /no extractable text.*step_finish/u);
   });
 
+  it("treats whitespace-only opencode text as no extractable text", () => {
+    const stdout = [
+      JSON.stringify({ type: "text", part: { text: " \n\t " } }),
+      JSON.stringify({ type: "step_finish", part: { reason: "stop" } }),
+    ].join("\n");
+
+    expectMalformed(() => extractOpencodeJson(stdout), /no extractable text.*text, step_finish/u);
+  });
+
+  it("throws malformed-output with a preview when opencode text is unparsable", () => {
+    const stdout = [
+      JSON.stringify({
+        type: "text",
+        part: { text: '{"findings": [' },
+      }),
+      JSON.stringify({ type: "step_finish", part: { reason: "stop" } }),
+    ].join("\n");
+
+    expectMalformed(
+      () => extractOpencodeJson(stdout),
+      /unparsable JSON.*text chars=14.*observed event kinds: \[text, step_finish\].*output preview: \{"findings": \[/u,
+    );
+  });
+
+  it("bounds the opencode unparsable text preview", () => {
+    const text = `{"findings":["${"x".repeat(300)}`;
+    const stdout = JSON.stringify({
+      type: "text",
+      part: { text },
+    });
+    const preview = safeProviderPreview(text);
+
+    expect(preview.length).toBe(200);
+
+    expectMalformed(
+      () => extractOpencodeJson(stdout),
+      new RegExp(`output preview: ${escapeRegExp(preview)}\\)`, "u"),
+    );
+  });
+
   it("throws provider-failure for opencode error events", () => {
     const stdout = JSON.stringify({
       type: "error",

src/provider.ts

@@ -700,7 +700,13 @@ export function extractOpencodeJson(stdout: string): unknown {
   }
   const parsed = extractJson(combined);
   if (parsed === null) {
-    throw new ClawpatchError("opencode provider produced unparsable JSON", 8, "malformed-output");
+    throw new ClawpatchError(
+      `opencode provider produced unparsable JSON ` +
+        `(text chars=${combined.length}, observed event kinds: ` +
+        `[${[...observedKinds].join(", ")}], output preview: ${safeProviderPreview(combined)})`,
+      8,
+      "malformed-output",
+    );
   }
   return parsed;
 }