fix(effect): preserve tool deps in task init

Author: kitlangton

packages/opencode/src/tool/registry.ts

@@ -80,8 +80,9 @@ export namespace ToolRegistry {
       const config = yield* Config.Service
       const plugin = yield* Plugin.Service
 
-      const build = <T extends Tool.Info>(tool: T | Effect.Effect<T, never, any>) =>
-        Effect.isEffect(tool) ? tool : Effect.succeed(tool)
+      const build = <T extends Tool.Info, R = never>(
+        tool: T | Effect.Effect<T, never, R>,
+      ): Effect.Effect<T, never, R> => (Effect.isEffect(tool) ? tool : Effect.succeed(tool))
 
       const state = yield* InstanceState.make<State>(
         Effect.fn("ToolRegistry.state")(function* (ctx) {

packages/opencode/src/tool/task.ts

@@ -29,27 +29,6 @@ export const TaskTool = Tool.defineEffect(
     const agent = yield* Agent.Service
     const config = yield* Config.Service
 
-    const list = Effect.fn("TaskTool.list")(function* (caller?: Tool.InitContext["agent"]) {
-      const items = yield* agent.list().pipe(Effect.map((items) => items.filter((item) => item.mode !== "primary")))
-      const filtered = caller
-        ? items.filter((item) => Permission.evaluate("task", item.name, caller.permission).action !== "deny")
-        : items
-      return filtered.toSorted((a, b) => a.name.localeCompare(b.name))
-    })
-
-    const desc = Effect.fn("TaskTool.desc")(function* (caller?: Tool.InitContext["agent"]) {
-      const items = yield* list(caller)
-      return DESCRIPTION.replace(
-        "{agents}",
-        items
-          .map(
-            (item) =>
-              `- ${item.name}: ${item.description ?? "This subagent should only be called manually by the user."}`,
-          )
-          .join("\n"),
-      )
-    })
-
     const run = Effect.fn("TaskTool.execute")(function* (params: z.infer<typeof parameters>, ctx: Tool.Context) {
       const cfg = yield* config.get()
 
@@ -184,7 +163,26 @@ export const TaskTool = Tool.defineEffect(
     })
 
     return async (ctx) => {
-      const description = await Effect.runPromise(desc(ctx?.agent))
+      const caller = ctx?.agent
+      const description = await Effect.runPromise(
+        Effect.gen(function* () {
+          const items = yield* agent.list().pipe(Effect.map((items) => items.filter((item) => item.mode !== "primary")))
+          const filtered = caller
+            ? items.filter((item) => Permission.evaluate("task", item.name, caller.permission).action !== "deny")
+            : items
+
+          return DESCRIPTION.replace(
+            "{agents}",
+            filtered
+              .toSorted((a, b) => a.name.localeCompare(b.name))
+              .map(
+                (item) =>
+                  `- ${item.name}: ${item.description ?? "This subagent should only be called manually by the user."}`,
+              )
+              .join("\n"),
+          )
+        }),
+      )
 
       return {
         description,