ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(core): align task tool with unified registry

Browse source
This commit is contained in:
Kit Langton 2026-06-06 21:30:54 -04:00
commit af22efb4e4
2 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/core/src/public/opencode.ts
View file

@ -90,7 +90,7 @@ export const layer = Layer.effect(
const locations = yield* LocationServiceMap const locations = yield* LocationServiceMap
const tools = yield* ApplicationTools.Service const tools = yield* ApplicationTools.Service
const validation = yield* SessionModelValidation const validation = yield* SessionModelValidation
yield* tools.attach({ yield* tools.register({
task: yield* TaskTool.make(sessions, (location, id) => task: yield* TaskTool.make(sessions, (location, id) =>
AgentV2.Service.pipe( AgentV2.Service.pipe(
Effect.flatMap((agents) => agents.get(id)), Effect.flatMap((agents) => agents.get(id)),

50
packages/core/test/tool-task.test.ts
View file

@ -9,6 +9,7 @@ import { SessionV2 } from "@opencode-ai/core/session"
import { SessionInput } from "@opencode-ai/core/session/input" import { SessionInput } from "@opencode-ai/core/session/input"
import { SessionMessage } from "@opencode-ai/core/session/message" import { SessionMessage } from "@opencode-ai/core/session/message"
import { TaskTool } from "@opencode-ai/core/tool/task" import { TaskTool } from "@opencode-ai/core/tool/task"
import { Tool } from "@opencode-ai/core/tool/tool"
import { DateTime, Deferred, Effect, Layer, Stream } from "effect" import { DateTime, Deferred, Effect, Layer, Stream } from "effect"
import { testEffect } from "./lib/effect" import { testEffect } from "./lib/effect"
@ -49,7 +50,8 @@ const assistant = new SessionMessage.Assistant({
describe("TaskTool", () => { describe("TaskTool", () => {
const it = testEffect(Layer.empty) const it = testEffect(Layer.empty)
const resolveAgent = () => Effect.succeed(AgentV2.Info.empty(AgentV2.ID.make("explore"))) const resolveAgent = (): Effect.Effect<AgentV2.Info | undefined> =>
Effect.succeed(AgentV2.Info.empty(AgentV2.ID.make("explore")))
it.effect("runs a foreground child with an admit-only steer and explicit resume", () => it.effect("runs a foreground child with an admit-only steer and explicit resume", () =>
Effect.gen(function* () { Effect.gen(function* () {
@ -64,17 +66,18 @@ describe("TaskTool", () => {
}) })
const tool = yield* TaskTool.make(sessions, resolveAgent) const tool = yield* TaskTool.make(sessions, resolveAgent)
const result = yield* tool.execute( const result = yield* execute(
tool,
{ {
description: "Map auth", description: "Map auth",
prompt: "Map the authentication flow", prompt: "Map the authentication flow",
subagent_type: "explore", subagent_type: "explore",
background: false, background: false,
}, },
{ sessionID: parentID, id: "call_task", name: "task" }, "call_task",
) )
expect(result).toEqual({ sessionID: childID, status: "completed", output: "Task output" }) expect(result.structured).toEqual({ sessionID: childID, status: "completed", output: "Task output" })
expect(inputs).toHaveLength(1) expect(inputs).toHaveLength(1)
expect(inputs[0]).toMatchObject({ sessionID: childID, delivery: "steer", resume: false }) expect(inputs[0]).toMatchObject({ sessionID: childID, delivery: "steer", resume: false })
expect(resumed).toBe(1) expect(resumed).toBe(1)
@ -95,16 +98,15 @@ describe("TaskTool", () => {
}) })
const tool = yield* TaskTool.make(sessions, () => Effect.succeed(undefined)) const tool = yield* TaskTool.make(sessions, () => Effect.succeed(undefined))
const error = yield* tool const error = yield* execute(
.execute( tool,
{ {
description: "Map auth", description: "Map auth",
prompt: "Map the authentication flow", prompt: "Map the authentication flow",
subagent_type: "missing", subagent_type: "missing",
}, },
{ sessionID: parentID, id: "call_task_unknown", name: "task" }, "call_task_unknown",
) ).pipe(Effect.flip)
.pipe(Effect.flip)
expect(error.message).toBe("Unknown subagent: missing") expect(error.message).toBe("Unknown subagent: missing")
expect(created).toBe(false) expect(created).toBe(false)
@ -127,17 +129,18 @@ describe("TaskTool", () => {
}) })
const tool = yield* TaskTool.make(sessions, resolveAgent) const tool = yield* TaskTool.make(sessions, resolveAgent)
const result = yield* tool.execute( const result = yield* execute(
tool,
{ {
description: "Map auth", description: "Map auth",
prompt: "Map the authentication flow", prompt: "Map the authentication flow",
subagent_type: "explore", subagent_type: "explore",
background: true, background: true,
}, },
{ sessionID: parentID, id: "call_task_background", name: "task" }, "call_task_background",
) )
expect(result).toEqual({ sessionID: childID, status: "running" }) expect(result.structured).toEqual({ sessionID: childID, status: "running" })
expect(inputs).toHaveLength(1) expect(inputs).toHaveLength(1)
yield* Deferred.succeed(gate, undefined) yield* Deferred.succeed(gate, undefined)
const notification = yield* Deferred.await(notified) const notification = yield* Deferred.await(notified)
@ -183,3 +186,16 @@ function admission(input: Parameters<SessionV2.Interface["prompt"]>[0]) {
timeCreated: DateTime.makeUnsafe(0), timeCreated: DateTime.makeUnsafe(0),
}) })
} }
function execute(tool: Tool.AnyTool, input: unknown, toolCallID: string) {
return Tool.settle(
tool,
{ type: "tool-call", id: toolCallID, name: "task", input },
{
sessionID: parentID,
agent: AgentV2.ID.make("build"),
assistantMessageID: SessionMessage.ID.make("msg_task_tool"),
toolCallID,
},
)
}