Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/opencode/src/tool/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export namespace ToolRegistry {
TaskTool,
WebFetchTool,
TodoWriteTool,
// TodoReadTool,
TodoReadTool,
WebSearchTool,
CodeSearchTool,
SkillTool,
Expand Down
23 changes: 6 additions & 17 deletions packages/opencode/src/tool/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@ export const TaskTool = Tool.define("task", async (ctx) => {
parentID: ctx.sessionID,
title: params.description + ` (@${agent.name} subagent)`,
permission: [
{
permission: "todowrite",
pattern: "*",
action: "deny",
},
{
permission: "todoread",
pattern: "*",
action: "deny",
},
...(hasTaskPermission
? []
: [
Expand All @@ -95,7 +85,7 @@ export const TaskTool = Tool.define("task", async (ctx) => {
]),
...(config.experimental?.primary_tools?.map((t) => ({
pattern: "*",
action: "allow" as const,
action: "deny" as const,
permission: t,
})) ?? []),
],
Expand Down Expand Up @@ -125,6 +115,10 @@ export const TaskTool = Tool.define("task", async (ctx) => {
ctx.abort.addEventListener("abort", cancel)
using _ = defer(() => ctx.abort.removeEventListener("abort", cancel))
const promptParts = await SessionPrompt.resolvePromptParts(params.prompt)
const toolOverrides = {
...(hasTaskPermission ? {} : { task: false }),
...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])),
}

const result = await SessionPrompt.prompt({
messageID,
Expand All @@ -134,12 +128,7 @@ export const TaskTool = Tool.define("task", async (ctx) => {
providerID: model.providerID,
},
agent: agent.name,
tools: {
todowrite: false,
todoread: false,
...(hasTaskPermission ? {} : { task: false }),
...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])),
},
...(Object.keys(toolOverrides).length > 0 ? { tools: toolOverrides } : {}),
parts: promptParts,
})

Expand Down
13 changes: 13 additions & 0 deletions packages/opencode/test/tool/registry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ import { Instance } from "../../src/project/instance"
import { ToolRegistry } from "../../src/tool/registry"

describe("tool.registry", () => {
test("registers built-in todo tools", async () => {
await using tmp = await tmpdir()

await Instance.provide({
directory: tmp.path,
fn: async () => {
const ids = await ToolRegistry.ids()
expect(ids).toContain("todowrite")
expect(ids).toContain("todoread")
},
})
})

test("loads tools from .opencode/tool (singular)", async () => {
await using tmp = await tmpdir({
init: async (dir) => {
Expand Down
88 changes: 88 additions & 0 deletions packages/opencode/test/tool/task.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { describe, expect, spyOn, test } from "bun:test"
import { TaskTool } from "../../src/tool/task"
import { Agent } from "../../src/agent/agent"
import { Config } from "../../src/config/config"
import { MessageV2 } from "../../src/session/message-v2"
import { Session } from "../../src/session"
import { SessionPrompt } from "../../src/session/prompt"
import { MessageID, SessionID } from "../../src/session/schema"
import type { Agent as AgentNamespace } from "../../src/agent/agent"

const ctx = {
sessionID: SessionID.make("ses_parent"),
messageID: MessageID.make("msg_parent"),
callID: "call-task",
agent: "build",
abort: AbortSignal.any([]),
messages: [],
metadata: () => {},
ask: async () => {},
}

describe("tool.task", () => {
test("does not hard-disable todo tools for subagents that allow them", async () => {
const subagent = {
name: "todo-enabled-subagent",
mode: "subagent",
options: {},
permission: [
{ permission: "todowrite", pattern: "*", action: "allow" },
{ permission: "todoread", pattern: "*", action: "allow" },
],
} satisfies AgentNamespace.Info

let createdSessionInput: any
let promptInput: any

const listSpy = spyOn(Agent, "list").mockResolvedValue([subagent])
const getSpy = spyOn(Agent, "get").mockImplementation((async () => subagent) as any)
const configSpy = spyOn(Config, "get").mockResolvedValue({ experimental: {} } as any)
const createSpy = spyOn(Session, "create").mockImplementation((async (input: any) => {
createdSessionInput = input
return { id: SessionID.make("ses_child") } as any
}) as any)
const messageSpy = spyOn(MessageV2, "get").mockResolvedValue({
info: {
role: "assistant",
modelID: "gpt-test",
providerID: "openai",
},
parts: [],
} as any)
const resolveSpy = spyOn(SessionPrompt, "resolvePromptParts").mockResolvedValue([
{ type: "text", text: "diagnose" },
] as any)
const promptSpy = spyOn(SessionPrompt, "prompt").mockImplementation((async (input: any) => {
promptInput = input
return {
parts: [{ type: "text", text: "done" }],
} as any
}) as any)

try {
const tool = await TaskTool.init()
await tool.execute(
{
description: "Diagnose cluster",
prompt: "Use todo tools if available",
subagent_type: subagent.name,
},
ctx as any,
)

expect(createdSessionInput?.permission?.some((rule: any) => rule.permission === "todowrite")).toBe(false)
expect(createdSessionInput?.permission?.some((rule: any) => rule.permission === "todoread")).toBe(false)
expect(promptInput?.tools?.todowrite).toBeUndefined()
expect(promptInput?.tools?.todoread).toBeUndefined()
expect(promptInput?.tools?.task).toBe(false)
} finally {
promptSpy.mockRestore()
resolveSpy.mockRestore()
messageSpy.mockRestore()
createSpy.mockRestore()
configSpy.mockRestore()
getSpy.mockRestore()
listSpy.mockRestore()
}
})
})
Loading