@aryaminus/controlkeel-opencode 0.2.23 → 0.2.25

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

@@ -11,19 +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 extractJsonCandidates = (output: string) => {
     const trimmed = output.trim()
     if (!trimmed) {
-      return null
+      return []
     }
 
     const lines = trimmed
       .split(/\r?\n/)
-      .map((line) => line.trim())
-      .filter((line) => line.length > 0)
+      .map((line) => line.trimEnd())
+      .filter((line) => line.trim().length > 0)
+
+    const candidates: string[] = []
+    const seen = new Set<string>()
+
+    const pushCandidate = (candidate: string) => {
+      const normalized = candidate.trim()
+      if (!normalized || seen.has(normalized)) {
+        return
+      }
+
+      seen.add(normalized)
+      candidates.push(normalized)
+    }
 
-    const jsonLine = [...lines].reverse().find((line) => line.startsWith("{") || line.startsWith("["))
-    return jsonLine ?? trimmed
+    pushCandidate(trimmed)
+
+    for (let i = 0; i < lines.length; i += 1) {
+      const line = lines[i].trimStart()
+      if (line.startsWith("{") || line.startsWith("[")) {
+        pushCandidate(line)
+        pushCandidate(lines.slice(i).join("\n"))
+      }
+    }
+
+    return candidates
   }
 
   const parseJson = (output: string) => {
@@ -35,17 +57,14 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
     try {
       return JSON.parse(trimmed)
     } catch (_error) {
-      const candidate = extractJsonCandidate(trimmed)
-
-      if (!candidate || candidate === trimmed) {
-        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      for (const candidate of extractJsonCandidates(trimmed)) {
+        try {
+          return JSON.parse(candidate)
+        } catch (_fallbackError) {
+        }
       }
 
-      try {
-        return JSON.parse(candidate)
-      } catch (_fallbackError) {
-        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
-      }
+      throw new Error(`ControlKeel returned invalid JSON: ${output}`)
     }
   }
 
@@ -161,6 +180,52 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
     }
   }
 
+  const resolveReviewScope = async () => {
+    const envTaskId = process.env.CONTROLKEEL_TASK_ID
+    const envSessionId = process.env.CONTROLKEEL_SESSION_ID
+
+    if (envTaskId || envSessionId) {
+      return {
+        taskId: envTaskId ?? null,
+        sessionId: envSessionId ?? null,
+        source: "env",
+      }
+    }
+
+    const contextEnv = process.env.LOGGER_LEVEL
+      ? process.env
+      : { ...process.env, LOGGER_LEVEL: "warning" }
+
+    const contextProc = Bun.spawn(["controlkeel", "context", "--json", "--project-root", directory], {
+      stdout: "pipe",
+      stderr: "pipe",
+      env: contextEnv,
+    })
+    const contextOut = await new Response(contextProc.stdout).text()
+    const contextErr = await new Response(contextProc.stderr).text()
+    const contextExit = await contextProc.exited
+
+    if (contextExit !== 0) {
+      throw new Error(
+        `controlkeel context --json failed with exit code ${contextExit}${contextErr.trim() ? `: ${contextErr.trim()}` : ""}`
+      )
+    }
+
+    const contextPayload = parseJson([contextOut, contextErr].filter(Boolean).join("\n"))
+    const contextTaskId = contextPayload?.current_task?.id
+    const contextSessionId = contextPayload?.session_id
+
+    if (!contextTaskId && !contextSessionId) {
+      throw new Error("ControlKeel context did not include a session_id or current_task.id")
+    }
+
+    return {
+      taskId: contextTaskId != null ? String(contextTaskId) : null,
+      sessionId: contextSessionId != null ? String(contextSessionId) : null,
+      source: "context",
+    }
+  }
+
   const submitPlan = async (
     body: string,
     submittedBy: string,
@@ -169,8 +234,7 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
   ) => {
     await ensurePlanSubmitSupport()
 
-    const envTaskId = process.env.CONTROLKEEL_TASK_ID
-    const envSessionId = process.env.CONTROLKEEL_SESSION_ID
+    const reviewScope = await resolveReviewScope()
     const waitTimeout = Number(waitTimeoutSeconds ?? process.env.CONTROLKEEL_REVIEW_WAIT_TIMEOUT ?? 30)
     const waitTimeoutSecondsSafe = Number.isFinite(waitTimeout) && waitTimeout > 0 ? waitTimeout : 30
 
@@ -181,10 +245,18 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
     try {
       const submitArgs = ["controlkeel", "review", "plan", "submit", "--body-file", tmpFile, "--submitted-by", submittedBy, "--json"]
       if (title) submitArgs.push("--title", title)
-      if (envTaskId) submitArgs.push("--task-id", envTaskId)
-      else if (envSessionId) submitArgs.push("--session-id", envSessionId)
+      if (reviewScope.taskId) submitArgs.push("--task-id", reviewScope.taskId)
+      else if (reviewScope.sessionId) submitArgs.push("--session-id", reviewScope.sessionId)
 
-      const submitProc = Bun.spawn(submitArgs, { stdout: "pipe", stderr: "pipe" })
+      const submitEnv = process.env.LOGGER_LEVEL
+        ? process.env
+        : { ...process.env, LOGGER_LEVEL: "warning" }
+
+      const submitProc = Bun.spawn(submitArgs, {
+        stdout: "pipe",
+        stderr: "pipe",
+        env: submitEnv,
+      })
       const submitOut = await new Response(submitProc.stdout).text()
       const submitErr = await new Response(submitProc.stderr).text()
       const submitExit = await submitProc.exited
@@ -195,7 +267,7 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
         )
       }
 
-      const submitPayload = parseJson(submitOut || submitErr)
+      const submitPayload = parseJson([submitOut, submitErr].filter(Boolean).join("\n"))
 
       if (typeof submitPayload?.error === "string" && submitPayload.error.includes("session_id")) {
         throw new Error(
@@ -208,7 +280,15 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
         throw new Error("ControlKeel did not return a review id")
       }
 
-      const waitProc = Bun.spawn(["controlkeel", "review", "plan", "wait", "--id", String(reviewId), "--timeout", String(waitTimeoutSecondsSafe), "--json"], { stdout: "pipe", stderr: "pipe" })
+      const waitEnv = process.env.LOGGER_LEVEL
+        ? process.env
+        : { ...process.env, LOGGER_LEVEL: "warning" }
+
+      const waitProc = Bun.spawn(["controlkeel", "review", "plan", "wait", "--id", String(reviewId), "--timeout", String(waitTimeoutSecondsSafe), "--json"], {
+        stdout: "pipe",
+        stderr: "pipe",
+        env: waitEnv,
+      })
       const waitOut = await new Response(waitProc.stdout).text()
       const waitErr = await new Response(waitProc.stderr).text()
       const waitExit = await waitProc.exited
@@ -219,7 +299,7 @@ export const ControlKeelGovernance: Plugin = async ({ project, client, $, direct
         )
       }
 
-      const waitPayload = parseJson(waitOut || waitErr)
+      const waitPayload = parseJson([waitOut, waitErr].filter(Boolean).join("\n"))
       return {
         reviewId,
         submitPayload,

package/index.js

@@ -7,19 +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 extractJsonCandidates = (output) => {
     const trimmed = output.trim()
     if (!trimmed) {
-      return null
+      return []
     }
 
     const lines = trimmed
       .split(/\r?\n/)
-      .map((line) => line.trim())
-      .filter((line) => line.length > 0)
+      .map((line) => line.trimEnd())
+      .filter((line) => line.trim().length > 0)
+
+    const candidates = []
+    const seen = new Set()
+
+    const pushCandidate = (candidate) => {
+      const normalized = candidate.trim()
+      if (!normalized || seen.has(normalized)) {
+        return
+      }
+
+      seen.add(normalized)
+      candidates.push(normalized)
+    }
 
-    const jsonLine = [...lines].reverse().find((line) => line.startsWith("{") || line.startsWith("["))
-    return jsonLine ?? trimmed
+    pushCandidate(trimmed)
+
+    for (let i = 0; i < lines.length; i += 1) {
+      const line = lines[i].trimStart()
+      if (line.startsWith("{") || line.startsWith("[")) {
+        pushCandidate(line)
+        pushCandidate(lines.slice(i).join("\n"))
+      }
+    }
+
+    return candidates
   }
 
   const parseJson = (output) => {
@@ -31,17 +53,14 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
     try {
       return JSON.parse(trimmed)
     } catch (_error) {
-      const candidate = extractJsonCandidate(trimmed)
-
-      if (!candidate || candidate === trimmed) {
-        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
+      for (const candidate of extractJsonCandidates(trimmed)) {
+        try {
+          return JSON.parse(candidate)
+        } catch (_fallbackError) {
+        }
       }
 
-      try {
-        return JSON.parse(candidate)
-      } catch (_fallbackError) {
-        throw new Error(`ControlKeel returned invalid JSON: ${output}`)
-      }
+      throw new Error(`ControlKeel returned invalid JSON: ${output}`)
     }
   }
 
@@ -154,11 +173,56 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
     }
   }
 
+  const resolveReviewScope = async () => {
+    const envTaskId = process.env.CONTROLKEEL_TASK_ID
+    const envSessionId = process.env.CONTROLKEEL_SESSION_ID
+
+    if (envTaskId || envSessionId) {
+      return {
+        taskId: envTaskId ?? null,
+        sessionId: envSessionId ?? null,
+        source: "env",
+      }
+    }
+
+    const contextEnv = process.env.LOGGER_LEVEL
+      ? process.env
+      : { ...process.env, LOGGER_LEVEL: "warning" }
+
+    const contextProc = Bun.spawn(["controlkeel", "context", "--json", "--project-root", directory], {
+      stdout: "pipe",
+      stderr: "pipe",
+      env: contextEnv,
+    })
+    const contextOut = await new Response(contextProc.stdout).text()
+    const contextErr = await new Response(contextProc.stderr).text()
+    const contextExit = await contextProc.exited
+
+    if (contextExit !== 0) {
+      throw new Error(
+        `controlkeel context --json failed with exit code ${contextExit}${contextErr.trim() ? `: ${contextErr.trim()}` : ""}`
+      )
+    }
+
+    const contextPayload = parseJson([contextOut, contextErr].filter(Boolean).join("\n"))
+    const contextTaskId = contextPayload?.current_task?.id
+    const contextSessionId = contextPayload?.session_id
+
+    if (!contextTaskId && !contextSessionId) {
+      throw new Error("ControlKeel context did not include a session_id or current_task.id")
+    }
+
+    return {
+      taskId: contextTaskId != null ? String(contextTaskId) : null,
+      sessionId: contextSessionId != null ? String(contextSessionId) : null,
+      source: "context",
+    }
+  }
+
   const submitPlan = async (body, submittedBy, title, waitTimeoutSeconds) => {
     await ensurePlanSubmitSupport()
 
-    const envTaskId = process.env.CONTROLKEEL_TASK_ID
-    const envSessionId = process.env.CONTROLKEEL_SESSION_ID
+    const reviewScope = await resolveReviewScope()
     const waitTimeout = Number(waitTimeoutSeconds ?? process.env.CONTROLKEEL_REVIEW_WAIT_TIMEOUT ?? 30)
     const waitTimeoutSecondsSafe = Number.isFinite(waitTimeout) && waitTimeout > 0 ? waitTimeout : 30
 
@@ -169,10 +233,18 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
     try {
       const submitArgs = ["controlkeel", "review", "plan", "submit", "--body-file", tmpFile, "--submitted-by", submittedBy, "--json"]
       if (title) submitArgs.push("--title", title)
-      if (envTaskId) submitArgs.push("--task-id", envTaskId)
-      else if (envSessionId) submitArgs.push("--session-id", envSessionId)
+      if (reviewScope.taskId) submitArgs.push("--task-id", reviewScope.taskId)
+      else if (reviewScope.sessionId) submitArgs.push("--session-id", reviewScope.sessionId)
 
-      const submitProc = Bun.spawn(submitArgs, { stdout: "pipe", stderr: "pipe" })
+      const submitEnv = process.env.LOGGER_LEVEL
+        ? process.env
+        : { ...process.env, LOGGER_LEVEL: "warning" }
+
+      const submitProc = Bun.spawn(submitArgs, {
+        stdout: "pipe",
+        stderr: "pipe",
+        env: submitEnv,
+      })
       const submitOut = await new Response(submitProc.stdout).text()
       const submitErr = await new Response(submitProc.stderr).text()
       const submitExit = await submitProc.exited
@@ -183,7 +255,7 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
         )
       }
 
-      const submitPayload = parseJson(submitOut || submitErr)
+      const submitPayload = parseJson([submitOut, submitErr].filter(Boolean).join("\n"))
 
       if (typeof submitPayload?.error === "string" && submitPayload.error.includes("session_id")) {
         throw new Error(
@@ -196,7 +268,15 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
         throw new Error("ControlKeel did not return a review id")
       }
 
-      const waitProc = Bun.spawn(["controlkeel", "review", "plan", "wait", "--id", String(reviewId), "--timeout", String(waitTimeoutSecondsSafe), "--json"], { stdout: "pipe", stderr: "pipe" })
+      const waitEnv = process.env.LOGGER_LEVEL
+        ? process.env
+        : { ...process.env, LOGGER_LEVEL: "warning" }
+
+      const waitProc = Bun.spawn(["controlkeel", "review", "plan", "wait", "--id", String(reviewId), "--timeout", String(waitTimeoutSecondsSafe), "--json"], {
+        stdout: "pipe",
+        stderr: "pipe",
+        env: waitEnv,
+      })
       const waitOut = await new Response(waitProc.stdout).text()
       const waitErr = await new Response(waitProc.stderr).text()
       const waitExit = await waitProc.exited
@@ -207,7 +287,7 @@ export const ControlKeelGovernance = async ({ $, directory }) => {
         )
       }
 
-      const waitPayload = parseJson(waitOut || waitErr)
+      const waitPayload = parseJson([waitOut, waitErr].filter(Boolean).join("\n"))
       return {
         reviewId,
         submitPayload,

package/package.json

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