@aryaminus/controlkeel-opencode 0.2.20 → 0.2.21

package/.opencode/plugins/controlkeel-governance.ts

@@ -11,11 +11,41 @@ import { tool } from "@opencode-ai/plugin"
  * - routes plan submission and wait decisions through the CK CLI
  */
 export const ControlKeelGovernance: Plugin = async ({ project, client, $, directory }) => {
+  const extractJsonCandidate = (output: string) => {
+    const trimmed = output.trim()
+    if (!trimmed) {
+      return null
+    }
+
+    const lines = trimmed
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter((line) => line.length > 0)
+
+    const jsonLine = [...lines].reverse().find((line) => line.startsWith("{") || line.startsWith("["))
+    return jsonLine ?? trimmed
+  }
+
   const parseJson = (output: string) => {
+    const trimmed = output.trim()
+    if (!trimmed) {
+      throw new Error("ControlKeel returned empty output")
+    }
+
     try {
-      return JSON.parse(output)
+      return JSON.parse(trimmed)
     } catch (_error) {
-      throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      const candidate = extractJsonCandidate(trimmed)
+
+      if (!candidate || candidate === trimmed) {
+        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      }
+
+      try {
+        return JSON.parse(candidate)
+      } catch (_fallbackError) {
+        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      }
     }
   }
 
@@ -156,9 +186,16 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
 
       const submitProc = Bun.spawn(submitArgs, { stdout: "pipe", stderr: "pipe" })
       const submitOut = await new Response(submitProc.stdout).text()
-      await submitProc.exited
+      const submitErr = await new Response(submitProc.stderr).text()
+      const submitExit = await submitProc.exited
+
+      if (submitExit !== 0) {
+        throw new Error(
+          `controlkeel review plan submit failed with exit code ${submitExit}${submitErr.trim() ? `: ${submitErr.trim()}` : ""}`
+        )
+      }
 
-      const submitPayload = parseJson(submitOut)
+      const submitPayload = parseJson(submitOut || submitErr)
 
       if (typeof submitPayload?.error === "string" && submitPayload.error.includes("session_id")) {
         throw new Error(
@@ -173,9 +210,16 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
 
       const waitProc = Bun.spawn(["controlkeel", "review", "plan", "wait", "--id", String(reviewId), "--timeout", String(waitTimeoutSecondsSafe), "--json"], { stdout: "pipe", stderr: "pipe" })
       const waitOut = await new Response(waitProc.stdout).text()
-      await waitProc.exited
+      const waitErr = await new Response(waitProc.stderr).text()
+      const waitExit = await waitProc.exited
+
+      if (waitExit !== 0) {
+        throw new Error(
+          `controlkeel review plan wait failed with exit code ${waitExit}${waitErr.trim() ? `: ${waitErr.trim()}` : ""}`
+        )
+      }
 
-      const waitPayload = parseJson(waitOut)
+      const waitPayload = parseJson(waitOut || waitErr)
       return {
         reviewId,
         submitPayload,

package/index.js

@@ -7,11 +7,41 @@ import { tool } from "@opencode-ai/plugin"
  * but ships as plain JavaScript for npm-based installs.
  */
 export const ControlKeelGovernance = async ({ $, directory }) => {
+  const extractJsonCandidate = (output) => {
+    const trimmed = output.trim()
+    if (!trimmed) {
+      return null
+    }
+
+    const lines = trimmed
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter((line) => line.length > 0)
+
+    const jsonLine = [...lines].reverse().find((line) => line.startsWith("{") || line.startsWith("["))
+    return jsonLine ?? trimmed
+  }
+
   const parseJson = (output) => {
+    const trimmed = output.trim()
+    if (!trimmed) {
+      throw new Error("ControlKeel returned empty output")
+    }
+
     try {
-      return JSON.parse(output)
+      return JSON.parse(trimmed)
     } catch (_error) {
-      throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      const candidate = extractJsonCandidate(trimmed)
+
+      if (!candidate || candidate === trimmed) {
+        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      }
+
+      try {
+        return JSON.parse(candidate)
+      } catch (_fallbackError) {
+        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      }
     }
   }
 
@@ -144,9 +174,16 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
 
       const submitProc = Bun.spawn(submitArgs, { stdout: "pipe", stderr: "pipe" })
       const submitOut = await new Response(submitProc.stdout).text()
-      await submitProc.exited
+      const submitErr = await new Response(submitProc.stderr).text()
+      const submitExit = await submitProc.exited
+
+      if (submitExit !== 0) {
+        throw new Error(
+          `controlkeel review plan submit failed with exit code ${submitExit}${submitErr.trim() ? `: ${submitErr.trim()}` : ""}`
+        )
+      }
 
-      const submitPayload = parseJson(submitOut)
+      const submitPayload = parseJson(submitOut || submitErr)
 
       if (typeof submitPayload?.error === "string" && submitPayload.error.includes("session_id")) {
         throw new Error(
@@ -161,9 +198,16 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
 
       const waitProc = Bun.spawn(["controlkeel", "review", "plan", "wait", "--id", String(reviewId), "--timeout", String(waitTimeoutSecondsSafe), "--json"], { stdout: "pipe", stderr: "pipe" })
       const waitOut = await new Response(waitProc.stdout).text()
-      await waitProc.exited
+      const waitErr = await new Response(waitProc.stderr).text()
+      const waitExit = await waitProc.exited
+
+      if (waitExit !== 0) {
+        throw new Error(
+          `controlkeel review plan wait failed with exit code ${waitExit}${waitErr.trim() ? `: ${waitErr.trim()}` : ""}`
+        )
+      }
 
-      const waitPayload = parseJson(waitOut)
+      const waitPayload = parseJson(waitOut || waitErr)
       return {
         reviewId,
         submitPayload,

package/package.json

@@ -35,5 +35,5 @@
     "url": "git+https://github.com/aryaminus/controlkeel.git"
   },
   "type": "module",
-  "version": "0.2.20"
+  "version": "0.2.21"
 }