opencode-codegraph 0.1.26 → 0.1.30

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.1.30 - 2026-03-21
+
+- align git-oriented guidance and workflow-transition rendering with the shared workflow guidance block
+
+## 0.1.29 - 2026-03-21
+
+- align workflow-transition formatting with the shared guidance block so git-oriented guidance uses the same normalized renderer as other status surfaces
+
+## 0.1.28 - 2026-03-21
+
+- surface primary issue and recovery sequence in plugin workflow summaries so competing blockers are shown in a prioritized order
+
+## 0.1.27 - 2026-03-21
+
+- surface primary issue and recovery sequence in plugin workflow summaries so competing states are presented in a prioritized order
+
 ## 0.1.26 - 2026-03-21
 
 - include lock holders, recovery steps, and maintenance action details directly in plugin workflow summaries

package/README.md

@@ -115,7 +115,7 @@ Place in `.opencode/commands/`:
 | `chat.message` (edit intent) | Add pre-edit warnings for files likely to be modified |
 | `chat.message` (workflow intent) | Add dogfooding status when the user asks what to do next |
 | `tool.execute.after` on test commands | Add after-test workflow guidance and detect failed test runs before suggesting the next command |
-| `tool.execute.after` on `git status` / `git diff` | Add current workflow guidance directly to common git inspection commands |
+| `tool.execute.after` on `git status` / `git diff` | Add the same normalized workflow guidance block used by other status-oriented surfaces |
 | `tool.execute.after` | Trigger CPG update after git commit and append structured post-commit review summary |
 | generic `tool.execute.after` | Surface workflow-state transitions after other bash commands when the underlying state changes |
 | `codegraph_review` tool | Returns review results together with current workflow guidance and suggested follow-up command |
@@ -127,6 +127,8 @@ Place in `.opencode/commands/`:
 Across status-oriented surfaces, the plugin is converging on one shared summary contract:
 
 - workflow state
+- primary issue
+- recovery sequence
 - blockers
 - warnings
 - what improved

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-codegraph",
-  "version": "0.1.26",
+  "version": "0.1.30",
   "description": "OpenCode plugin for CodeGraph CPG-powered code analysis",
   "type": "module",
   "main": "src/index.ts",

package/src/index.ts

@@ -68,8 +68,8 @@ const codegraphPlugin: Plugin = async (input) => {
   }
 
   const workflowTransition = (status: Record<string, unknown>) => {
-    const { workflowState, nextAction, nextCommand } = workflowFields(status)
-    const message = formatWorkflowStateTransition(lastWorkflowState, workflowState, nextAction, nextCommand)
+    const message = formatWorkflowStateTransition(lastWorkflowState, status as any)
+    const { workflowState } = workflowFields(status)
     if (workflowState) {
       lastWorkflowState = workflowState
     }
@@ -280,7 +280,7 @@ const codegraphPlugin: Plugin = async (input) => {
           const rawStatus = await $`python -m src.cli.import_commands dogfood status --json`.quiet().text()
           const status = JSON.parse(rawStatus)
           const transition = workflowTransition(status)
-          const guidance = formatDogfoodStatusSummary(status)
+          const guidance = formatWorkflowGuidanceBlock(status)
           if (guidance) {
             output.title = "CodeGraph: git workflow guidance ready"
             const existingOutput = output.output?.trimEnd() || ""

package/src/util.ts

@@ -48,6 +48,8 @@ export type DogfoodStatusSnapshot = {
   workflow_state?: string
   recommended_next_action?: string
   recommended_command?: string
+  primary_issue?: string
+  recovery_sequence?: string[]
   blockers?: string[]
   warnings?: string[]
   closure?: {
@@ -56,6 +58,75 @@ export type DogfoodStatusSnapshot = {
     before_push?: string
   }
 }
+
+function workflowSummaryLines(snapshot: DogfoodStatusSnapshot): string[] {
+  const workflowState = snapshot.workflow_state
+  const nextAction = snapshot.recommended_next_action
+  const nextCommand = snapshot.recommended_command
+  const primaryIssue = snapshot.primary_issue
+  const recoverySequence = Array.isArray(snapshot.recovery_sequence)
+    ? snapshot.recovery_sequence.filter(Boolean)
+    : []
+  const blockers = Array.isArray(snapshot.blockers) ? snapshot.blockers.filter(Boolean) : []
+  const warnings = Array.isArray(snapshot.warnings) ? snapshot.warnings.filter(Boolean) : []
+  const closure = snapshot.closure || {}
+  const dbLock = snapshot.db_lock || null
+  const maintenance = snapshot.db_maintenance || null
+
+  const lines: string[] = []
+  if (workflowState) {
+    lines.push(`- Workflow state: ${workflowState}`)
+  }
+  if (nextAction) {
+    lines.push(`- Next action: ${nextAction}`)
+  }
+  if (nextCommand) {
+    lines.push(`- Suggested command: ${nextCommand}`)
+  }
+  if (primaryIssue) {
+    lines.push(`- Primary issue: ${primaryIssue}`)
+  }
+  if (recoverySequence.length) {
+    lines.push(`- Recovery sequence: ${recoverySequence.join(" -> ")}`)
+  }
+  if (blockers.length) {
+    lines.push(`- Blockers: ${blockers.join("; ")}`)
+  }
+  if (warnings.length) {
+    lines.push(`- Warnings: ${warnings.join("; ")}`)
+  }
+  if (closure.what_improved) {
+    lines.push(`- What improved: ${closure.what_improved}`)
+  }
+  if (closure.still_blocked) {
+    lines.push(`- Still blocked: ${closure.still_blocked}`)
+  }
+  if (closure.before_push) {
+    lines.push(`- Before push: ${closure.before_push}`)
+  }
+  if (maintenance?.recommended_action) {
+    lines.push(`- Maintenance action: ${maintenance.recommended_action}`)
+  }
+  if (dbLock?.locked) {
+    const holders = Array.isArray(dbLock.holders) ? dbLock.holders.filter(Boolean) : []
+    const recovery = Array.isArray(dbLock.recovery) ? dbLock.recovery.filter(Boolean) : []
+    if (holders.length) {
+      lines.push(`- Lock holders: ${holders.join("; ")}`)
+    }
+    if (recovery.length) {
+      lines.push(`- Lock recovery: ${recovery.join("; ")}`)
+    }
+  }
+  return lines
+}
+
+function formatSummaryBlock(title: string, snapshot: DogfoodStatusSnapshot): string | null {
+  const lines = workflowSummaryLines(snapshot)
+  if (!lines.length) {
+    return null
+  }
+  return [title, "", ...lines].join("\n")
+}
 
 /**
  * Extract file references from message parts.
@@ -407,14 +478,9 @@ export function formatDogfoodStatusSummary(snapshot: DogfoodStatusSnapshot): str
   const maintenance = snapshot.db_maintenance || null
   const dbLock = snapshot.db_lock || null
   const traceStatus = reviewTrace?.status || "missing"
-  const workflowState = snapshot.workflow_state
-  const nextAction = snapshot.recommended_next_action
-  const nextCommand = (snapshot as { recommended_command?: string }).recommended_command
-  const blockers = Array.isArray(snapshot.blockers) ? snapshot.blockers.filter(Boolean) : []
-  const warnings = Array.isArray(snapshot.warnings) ? snapshot.warnings.filter(Boolean) : []
-  const closure = snapshot.closure || {}
+  const summaryLines = workflowSummaryLines(snapshot)
 
-  if (typeof isFresh === "undefined" && !headCommit && !nextAction) {
+  if (typeof isFresh === "undefined" && !headCommit && summaryLines.length === 0) {
     return null
   }
 
@@ -452,110 +518,47 @@ export function formatDogfoodStatusSummary(snapshot: DogfoodStatusSnapshot): str
     }
   }
   lines.push(`- Review trace: ${traceStatus}`)
-  if (workflowState) {
-    lines.push(`- Workflow state: ${workflowState}`)
-  }
-  if (nextAction) {
-    lines.push(`- Next action: ${nextAction}`)
-  }
-  if (nextCommand) {
-    lines.push(`- Suggested command: ${nextCommand}`)
-  }
-  if (blockers.length) {
-    lines.push(`- Blockers: ${blockers.join("; ")}`)
-  }
-  if (warnings.length) {
-    lines.push(`- Warnings: ${warnings.join("; ")}`)
-  }
-  if (closure.what_improved) {
-    lines.push(`- What improved: ${closure.what_improved}`)
-  }
-  if (closure.still_blocked) {
-    lines.push(`- Still blocked: ${closure.still_blocked}`)
-  }
-  if (closure.before_push) {
-    lines.push(`- Before push: ${closure.before_push}`)
-  }
+  lines.push(...summaryLines)
   return lines.join("\n")
 }
 
 export function formatWorkflowGuidanceBlock(snapshot: DogfoodStatusSnapshot): string | null {
-  const workflowState = snapshot.workflow_state
-  const nextAction = snapshot.recommended_next_action
-  const nextCommand = snapshot.recommended_command
-  const blockers = Array.isArray(snapshot.blockers) ? snapshot.blockers.filter(Boolean) : []
-  const warnings = Array.isArray(snapshot.warnings) ? snapshot.warnings.filter(Boolean) : []
-  const closure = snapshot.closure || {}
-  const dbLock = snapshot.db_lock || null
-  const maintenance = snapshot.db_maintenance || null
-
-  if (!workflowState && !nextAction && !nextCommand && !blockers.length && !warnings.length) {
-    return null
-  }
-
-  const lines = ["## CodeGraph Workflow Guidance", ""]
-  if (workflowState) {
-    lines.push(`- Workflow state: ${workflowState}`)
-  }
-  if (nextAction) {
-    lines.push(`- Next action: ${nextAction}`)
-  }
-  if (nextCommand) {
-    lines.push(`- Suggested command: ${nextCommand}`)
-  }
-  if (blockers.length) {
-    lines.push(`- Blockers: ${blockers.join("; ")}`)
-  }
-  if (warnings.length) {
-    lines.push(`- Warnings: ${warnings.join("; ")}`)
-  }
-  if (closure.what_improved) {
-    lines.push(`- What improved: ${closure.what_improved}`)
-  }
-  if (closure.still_blocked) {
-    lines.push(`- Still blocked: ${closure.still_blocked}`)
-  }
-  if (closure.before_push) {
-    lines.push(`- Before push: ${closure.before_push}`)
-  }
-  if (maintenance?.recommended_action) {
-    lines.push(`- Maintenance action: ${maintenance.recommended_action}`)
-  }
-  if (dbLock?.locked) {
-    const holders = Array.isArray(dbLock.holders) ? dbLock.holders.filter(Boolean) : []
-    const recovery = Array.isArray(dbLock.recovery) ? dbLock.recovery.filter(Boolean) : []
-    if (holders.length) {
-      lines.push(`- Lock holders: ${holders.join("; ")}`)
-    }
-    if (recovery.length) {
-      lines.push(`- Lock recovery: ${recovery.join("; ")}`)
-    }
-  }
-  return lines.join("\n")
+  return formatSummaryBlock("## CodeGraph Workflow Guidance", snapshot)
 }
 
 export function formatWorkflowStateTransition(
   previousState: string | null,
-  currentState: string | null,
-  nextAction: string | undefined,
-  nextCommand: string | undefined,
+  snapshot: DogfoodStatusSnapshot,
 ): string | null {
+  const currentState = snapshot.workflow_state || null
   if (!previousState || !currentState || previousState === currentState) {
     return null
   }
 
+  const nextAction = snapshot.recommended_next_action
+  const nextCommand = snapshot.recommended_command
+  const primaryIssue = snapshot.primary_issue
+  const blockers = Array.isArray(snapshot.blockers) ? snapshot.blockers.filter(Boolean) : []
+
   const lines = [
     "## CodeGraph Workflow Update",
     "",
     `- Workflow state changed: ${previousState} -> ${currentState}`,
   ]
 
+  if (primaryIssue) {
+    lines.push(`- Primary issue: ${primaryIssue}`)
+  }
+
   if (nextAction) {
     lines.push(`- Next action: ${nextAction}`)
   }
   if (nextCommand) {
     lines.push(`- Suggested command: ${nextCommand}`)
   }
+  if (blockers.length) {
+    lines.push(`- Blockers: ${blockers.join("; ")}`)
+  }
   return lines.join("\n")
 }
 
@@ -578,34 +581,7 @@ export function formatAfterTestGuidance(
     lines.push("- Suggested command: rerun the failing tests after you fix them")
     return lines.join("\n")
   }
-  if (workflowState) {
-    lines.push(`- Workflow state: ${workflowState}`)
-  }
-  if (nextAction) {
-    lines.push(`- Next action: ${nextAction}`)
-  }
-  if (nextCommand) {
-    lines.push(`- Suggested command: ${nextCommand}`)
-  }
-  const blockers = Array.isArray(snapshot.blockers) ? snapshot.blockers.filter(Boolean) : []
-  const warnings = Array.isArray(snapshot.warnings) ? snapshot.warnings.filter(Boolean) : []
-  const closure = snapshot.closure || {}
-  if (blockers.length) {
-    lines.push(`- Blockers: ${blockers.join("; ")}`)
-  }
-  if (warnings.length) {
-    lines.push(`- Warnings: ${warnings.join("; ")}`)
-  }
-  if (closure.what_improved) {
-    lines.push(`- What improved: ${closure.what_improved}`)
-  }
-  if (closure.still_blocked) {
-    lines.push(`- Still blocked: ${closure.still_blocked}`)
-  }
-  if (closure.before_push) {
-    lines.push(`- Before push: ${closure.before_push}`)
-  }
-  return lines.join("\n")
+  return formatSummaryBlock("## CodeGraph After-Test Guidance", snapshot)
 }
 
 // File extensions recognized as source code