From c8d27ab9c42801b68662d24170e23f79cbbecd5b Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Thu, 2 Apr 2026 22:28:18 -0400
Subject: [PATCH] fix(effect): keep built question tool resolved in registry

---
 packages/opencode/src/tool/registry.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 8b5b126644..8e21c43e3c 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -120,6 +120,7 @@ export namespace ToolRegistry {
       )
 
       const invalid = yield* build(InvalidTool)
+      const ask = yield* build(QuestionTool)
       const bash = yield* build(BashTool)
       const read = yield* build(ReadTool)
       const glob = yield* build(GlobTool)
@@ -140,11 +141,10 @@ export namespace ToolRegistry {
       const all = Effect.fn("ToolRegistry.all")(function* (custom: Tool.Info[]) {
         const cfg = yield* config.get()
         const question = ["app", "cli", "desktop"].includes(Flag.OPENCODE_CLIENT) || Flag.OPENCODE_ENABLE_QUESTION_TOOL
-        const ask = question ? yield* build(QuestionTool) : undefined
 
         return [
           invalid,
-          ...(ask ? [ask] : []),
+          ...(question ? [ask] : []),
           bash,
           read,
           glob,