lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 97 Packages Projects Releases Wiki Activity

refactor(tool): use Session.Service directly in TaskTool (#21975)

Browse Source
This commit is contained in:
Kit Langton
2026-04-10 23:18:30 -04:00
committed by GitHub
parent cd004cf0b2
commit 4341ab838e
1 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/opencode/src/tool/task.ts
+33 -35
View File
@@ -36,6 +36,7 @@ export const TaskTool = Tool.define(
Effect.gen(function* () { Effect.gen(function* () {
const agent = yield* Agent.Service const agent = yield* Agent.Service
const config = yield* Config.Service const config = yield* Config.Service
const sessions = yield* Session.Service
const run = Effect.fn("TaskTool.execute")(function* (params: z.infer<typeof parameters>, ctx: Tool.Context) { const run = Effect.fn("TaskTool.execute")(function* (params: z.infer<typeof parameters>, ctx: Tool.Context) {
const cfg = yield* config.get() const cfg = yield* config.get()
@@ -62,44 +63,41 @@ export const TaskTool = Tool.define(
const taskID = params.task_id const taskID = params.task_id
const session = taskID const session = taskID
? yield* Effect.promise(() => { ? yield* sessions.get(SessionID.make(taskID)).pipe(
const id = SessionID.make(taskID) Effect.catchCause(() => Effect.succeed(undefined)),
return Session.get(id).catch(() => undefined) )
})
: undefined : undefined
const nextSession = const nextSession =
session ?? session ??
(yield* Effect.promise(() => (yield* sessions.create({
Session.create({ parentID: ctx.sessionID,
parentID: ctx.sessionID, title: params.description + ` (@${next.name} subagent)`,
title: params.description + ` (@${next.name} subagent)`, permission: [
permission: [ ...(canTodo
...(canTodo ? []
? [] : [
: [ {
{ permission: "todowrite" as const,
permission: "todowrite" as const, pattern: "*" as const,
pattern: "*" as const, action: "deny" as const,
action: "deny" as const, },
}, ]),
]), ...(canTask
...(canTask ? []
? [] : [
: [ {
{ permission: id,
permission: id, pattern: "*" as const,
pattern: "*" as const, action: "deny" as const,
action: "deny" as const, },
}, ]),
]), ...(cfg.experimental?.primary_tools?.map((item) => ({
...(cfg.experimental?.primary_tools?.map((item) => ({ pattern: "*",
pattern: "*", action: "allow" as const,
action: "allow" as const, permission: item,
permission: item, })) ?? []),
})) ?? []), ],
], }))
}),
))
const msg = yield* Effect.sync(() => MessageV2.get({ sessionID: ctx.sessionID, messageID: ctx.messageID })) const msg = yield* Effect.sync(() => MessageV2.get({ sessionID: ctx.sessionID, messageID: ctx.messageID }))
if (msg.info.role !== "assistant") return yield* Effect.fail(new Error("Not an assistant message")) if (msg.info.role !== "assistant") return yield* Effect.fail(new Error("Not an assistant message"))