feat(athena): council member continuation enforcer, tool allowlist, and prompt fixes

- Add council-continuation-enforcer to nudge council members until they output COUNCIL_MEMBER_RESPONSE, replacing the hacky post-compaction hack - Add background_wait + background_cancel to council member tool allowlist so members can properly manage their explore agents before responding - Update COUNCIL_DELEGATION_ADDENDUM prompt to instruct members to cancel pending tasks and wait for explore results before final response - Fix council_finalize path resolution to use project directory - Remove post-compaction-continuation.ts and recentlyCompactedSessions hack - Add council-response-checker for detecting response tag in session messages
2026-02-28 00:50:23 +01:00
parent 684b746ee7
commit 2b70130c08
14 changed files with 817 additions and 115 deletions
@@ -0,0 +1,104 @@
+import type { PluginInput } from "@opencode-ai/plugin"
+import type { BackgroundTask } from "./types"
+import {
+  log,
+  getAgentToolRestrictions,
+  createInternalAgentTextPart,
+} from "../../shared"
+import { setSessionTools } from "../../shared/session-tools-store"
+import { COUNCIL_MEMBER_KEY_PREFIX } from "../../agents/builtin-agents/council-member-agents"
+
+type OpencodeClient = PluginInput["client"]
+
+const COUNCIL_RESPONSE_TAG = "</COUNCIL_MEMBER_RESPONSE>"
+
+const CONTINUATION_PROMPT =
+  "You have not yet produced your final <COUNCIL_MEMBER_RESPONSE>. Continue your analysis and wrap your findings in <COUNCIL_MEMBER_RESPONSE> tags. If you are waiting for background tasks, use background_wait to block until they complete, then produce your response."
+
+const MAX_NUDGE_ATTEMPTS = 5
+
+const nudgeCountByTask = new Map<string, number>()
+
+export function isCouncilMemberAgent(agentName: string | undefined): boolean {
+  return !!agentName?.startsWith(COUNCIL_MEMBER_KEY_PREFIX)
+}
+
+export function resetCouncilNudgeCount(taskId: string): void {
+  nudgeCountByTask.delete(taskId)
+}
+
+export function hasCouncilResponseTag(sessionMessages: Array<{ info?: { role?: string }; parts?: Array<{ type?: string; text?: string }> }>): boolean {
+  for (let i = sessionMessages.length - 1; i >= 0; i--) {
+    const msg = sessionMessages[i]
+    if (msg.info?.role !== "assistant") continue
+    const parts = msg.parts ?? []
+    for (const part of parts) {
+      if (part.type === "text" && part.text?.includes(COUNCIL_RESPONSE_TAG)) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
+export function sendCouncilContinuationNudge(
+  client: OpencodeClient,
+  task: BackgroundTask,
+  sessionID: string,
+): boolean {
+  if (task.status !== "running") return false
+
+  const count = nudgeCountByTask.get(task.id) ?? 0
+  if (count >= MAX_NUDGE_ATTEMPTS) {
+    log("[council-continuation] Max nudge attempts reached, allowing completion:", {
+      taskId: task.id,
+      attempts: count,
+    })
+    nudgeCountByTask.delete(task.id)
+    return false
+  }
+
+  nudgeCountByTask.set(task.id, count + 1)
+
+  const resumeModel = task.model
+    ? { providerID: task.model.providerID, modelID: task.model.modelID }
+    : undefined
+  const resumeVariant = task.model?.variant
+
+  log("[council-continuation] Nudging council member to produce response:", {
+    taskId: task.id,
+    attempt: count + 1,
+    maxAttempts: MAX_NUDGE_ATTEMPTS,
+  })
+
+  client.session.promptAsync({
+    path: { id: sessionID },
+    body: {
+      agent: task.agent,
+      ...(resumeModel ? { model: resumeModel } : {}),
+      ...(resumeVariant ? { variant: resumeVariant } : {}),
+      tools: (() => {
+        const tools = {
+          task: false,
+          call_omo_agent: true,
+          question: false,
+          ...getAgentToolRestrictions(task.agent),
+        }
+        setSessionTools(sessionID, tools)
+        return tools
+      })(),
+      parts: [createInternalAgentTextPart(CONTINUATION_PROMPT)],
+    },
+  }).catch((error) => {
+    log("[council-continuation] Nudge prompt error:", {
+      taskId: task.id,
+      error: String(error),
+    })
+  })
+
+  if (task.progress) {
+    task.progress.lastUpdate = new Date()
+  }
+
+  return true
+}