feat(08-01): return council task ids without blocking

- make athena_council launch-only and remove internal polling/formatting

- return JSON payload with running task mappings and launch failures

- update tool tests for task-id visibility, filtering, failure reporting, and dedup
This commit is contained in:
ismeth
2026-02-13 11:19:25 +01:00
committed by YeonGyu-Kim
parent e0b6ad1a53
commit 5efe5af49c
4 changed files with 204 additions and 104 deletions
+25 -101
View File
@@ -1,14 +1,10 @@
import { tool, type ToolDefinition } from "@opencode-ai/plugin"
import { executeCouncil } from "../../agents/athena/council-orchestrator"
import type { CouncilConfig, CouncilMemberConfig, CouncilMemberResponse } from "../../agents/athena/types"
import type { BackgroundManager, BackgroundTask, BackgroundTaskStatus } from "../../features/background-agent"
import type { CouncilConfig, CouncilMemberConfig } from "../../agents/athena/types"
import type { BackgroundManager } from "../../features/background-agent"
import { ATHENA_COUNCIL_TOOL_DESCRIPTION_TEMPLATE } from "./constants"
import { createCouncilLauncher } from "./council-launcher"
import type { AthenaCouncilToolArgs } from "./types"
const WAIT_INTERVAL_MS = 500
const WAIT_TIMEOUT_MS = 600000
const TERMINAL_STATUSES: Set<BackgroundTaskStatus> = new Set(["completed", "error", "cancelled", "interrupt"])
import type { AthenaCouncilLaunchResult, AthenaCouncilToolArgs } from "./types"
/** Tracks active council executions per session to prevent duplicate launches. */
const activeCouncilSessions = new Set<string>()
@@ -17,90 +13,6 @@ function isCouncilConfigured(councilConfig: CouncilConfig | undefined): councilC
return Boolean(councilConfig && councilConfig.members.length > 0)
}
async function waitForTasksToSettle(
taskIds: string[],
manager: BackgroundManager,
abortSignal: AbortSignal
): Promise<Map<string, BackgroundTask>> {
const settledIds = new Set<string>()
const latestTasks = new Map<string, BackgroundTask>()
const startedAt = Date.now()
while (settledIds.size < taskIds.length && Date.now() - startedAt < WAIT_TIMEOUT_MS) {
if (abortSignal.aborted) {
break
}
for (const taskId of taskIds) {
if (settledIds.has(taskId)) {
continue
}
const task = manager.getTask(taskId)
if (!task) {
continue
}
latestTasks.set(taskId, task)
if (TERMINAL_STATUSES.has(task.status)) {
settledIds.add(taskId)
}
}
if (settledIds.size < taskIds.length) {
await new Promise((resolve) => setTimeout(resolve, WAIT_INTERVAL_MS))
}
}
return latestTasks
}
function mapTaskStatus(status: BackgroundTaskStatus): CouncilMemberResponse["status"] {
if (status === "completed") {
return "completed"
}
if (status === "cancelled" || status === "interrupt") {
return "timeout"
}
return "error"
}
function refreshResponse(response: CouncilMemberResponse, task: BackgroundTask | undefined): CouncilMemberResponse {
if (!task) {
return response
}
const status = mapTaskStatus(task.status)
const durationMs =
task.startedAt && task.completedAt
? Math.max(0, task.completedAt.getTime() - task.startedAt.getTime())
: response.durationMs
return {
...response,
status,
response: status === "completed" ? task.result : undefined,
error: status === "completed" ? undefined : (task.error ?? `Task status: ${task.status}`),
durationMs,
}
}
function formatCouncilOutput(responses: CouncilMemberResponse[], totalMembers: number): string {
const completedCount = responses.filter((item) => item.status === "completed").length
const lines = responses.map((item, index) => {
const model = item.member.name ?? item.member.model
const content = item.status === "completed"
? (item.response ?? "(no response)")
: (item.error ?? "Unknown error")
return `${index + 1}. ${model}\n Status: ${item.status}\n Result: ${content}`
})
return `${completedCount}/${totalMembers} council members completed.\n\n${lines.join("\n\n")}`
}
interface FilterCouncilMembersResult {
members: CouncilMemberConfig[]
error?: string
@@ -201,18 +113,30 @@ export function createAthenaCouncilTool(args: {
parentAgent: toolContext.agent,
})
const taskIds = execution.responses
.map((response) => response.taskId)
.filter((taskId) => taskId.length > 0)
const launchResult: AthenaCouncilLaunchResult = {
launched: execution.responses.filter((response) => response.taskId.length > 0).length,
members: execution.responses
.filter((response) => response.taskId.length > 0)
.map((response) => ({
task_id: response.taskId,
name: response.member.name ?? response.member.model,
model: response.member.model,
status: "running",
})),
failed: execution.responses
.filter((response) => response.taskId.length === 0)
.map((response) => ({
name: response.member.name ?? response.member.model,
model: response.member.model,
error: response.error ?? "Launch failed",
})),
}
const latestTasks = await waitForTasksToSettle(taskIds, backgroundManager, toolContext.abort)
const refreshedResponses = execution.responses.map((response) =>
response.taskId ? refreshResponse(response, latestTasks.get(response.taskId)) : response
)
return formatCouncilOutput(refreshedResponses, execution.totalMembers)
} finally {
activeCouncilSessions.delete(toolContext.sessionID)
return JSON.stringify(launchResult)
} catch (error) {
activeCouncilSessions.delete(toolContext.sessionID)
throw error
}
},
})