Merge branch 'dev' into kit/effectify-command

Constrain BusEvent.define to ZodObject instead of ZodType so TS knows
event properties are always a record. Type GlobalBus payload as
{ type: string; properties: Record<string, unknown> } instead of any.

Refactor watcher test to use Bus.subscribe instead of raw GlobalBus
listener, removing hand-rolled event types and unnecessary casts.

packages/opencode/specs/effect-migration.md

@@ -129,10 +129,10 @@ Still open and likely worth migrating:
 - [ ] `Plugin`
 - [ ] `ToolRegistry`
 - [ ] `Pty`
-- [x] `Worktree`
+- [ ] `Worktree`
 - [ ] `Installation`
 - [ ] `Bus`
-- [ ] `Command`
+- [x] `Command`
 - [ ] `Config`
 - [ ] `Session`
 - [ ] `SessionProcessor`

packages/opencode/src/bus/bus-event.ts

@@ -1,5 +1,5 @@
 import z from "zod"
-import type { ZodType } from "zod"
+import type { ZodObject, ZodRawShape } from "zod"
 import { Log } from "../util/log"
 
 export namespace BusEvent {
@@ -9,7 +9,7 @@ export namespace BusEvent {
 
   const registry = new Map<string, Definition>()
 
-  export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
+  export function define<Type extends string, Properties extends ZodObject<ZodRawShape>>(type: Type, properties: Properties) {
     const result = {
       type,
       properties,

packages/opencode/src/bus/global.ts

@@ -4,7 +4,7 @@ export const GlobalBus = new EventEmitter<{
   event: [
     {
       directory?: string
-      payload: any
+      payload: { type: string; properties: Record<string, unknown> }
     },
   ]
 }>()

packages/opencode/src/command/index.ts

@@ -1,15 +1,18 @@
 import { BusEvent } from "@/bus/bus-event"
+import { InstanceContext } from "@/effect/instance-context"
+import { runPromiseInstance } from "@/effect/runtime"
 import { SessionID, MessageID } from "@/session/schema"
+import { Effect, Fiber, Layer, ServiceMap } from "effect"
 import z from "zod"
 import { Config } from "../config/config"
-import { Instance } from "../project/instance"
-import { Identifier } from "../id/id"
 import PROMPT_INITIALIZE from "./template/initialize.txt"
 import PROMPT_REVIEW from "./template/review.txt"
 import { MCP } from "../mcp"
 import { Skill } from "../skill"
+import { Log } from "../util/log"
 
 export namespace Command {
+  const log = Log.create({ service: "command" })
   export const Event = {
     Executed: BusEvent.define(
       "command.executed",
@@ -57,95 +60,126 @@ export namespace Command {
     REVIEW: "review",
   } as const
 
-  const state = Instance.state(async () => {
-    const cfg = await Config.get()
+  export interface Interface {
+    readonly get: (name: string) => Effect.Effect<Info | undefined>
+    readonly list: () => Effect.Effect<Info[]>
+  }
 
-    const result: Record<string, Info> = {
-      [Default.INIT]: {
-        name: Default.INIT,
-        description: "create/update AGENTS.md",
-        source: "command",
-        get template() {
-          return PROMPT_INITIALIZE.replace("${path}", Instance.worktree)
-        },
-        hints: hints(PROMPT_INITIALIZE),
-      },
-      [Default.REVIEW]: {
-        name: Default.REVIEW,
-        description: "review changes [commit|branch|pr], defaults to uncommitted",
-        source: "command",
-        get template() {
-          return PROMPT_REVIEW.replace("${path}", Instance.worktree)
-        },
-        subtask: true,
-        hints: hints(PROMPT_REVIEW),
-      },
-    }
+  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Command") {}
 
-    for (const [name, command] of Object.entries(cfg.command ?? {})) {
-      result[name] = {
-        name,
-        agent: command.agent,
-        model: command.model,
-        description: command.description,
-        source: "command",
-        get template() {
-          return command.template
-        },
-        subtask: command.subtask,
-        hints: hints(command.template),
-      }
-    }
-    for (const [name, prompt] of Object.entries(await MCP.prompts())) {
-      result[name] = {
-        name,
-        source: "mcp",
-        description: prompt.description,
-        get template() {
-          // since a getter can't be async we need to manually return a promise here
-          return new Promise<string>(async (resolve, reject) => {
-            const template = await MCP.getPrompt(
-              prompt.client,
-              prompt.name,
-              prompt.arguments
-                ? // substitute each argument with $1, $2, etc.
-                  Object.fromEntries(prompt.arguments?.map((argument, i) => [argument.name, `$${i + 1}`]))
-                : {},
-            ).catch(reject)
-            resolve(
-              template?.messages
-                .map((message) => (message.content.type === "text" ? message.content.text : ""))
-                .join("\n") || "",
-            )
-          })
-        },
-        hints: prompt.arguments?.map((_, i) => `$${i + 1}`) ?? [],
-      }
-    }
+  export const layer = Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const instance = yield* InstanceContext
 
-    // Add skills as invokable commands
-    for (const skill of await Skill.all()) {
-      // Skip if a command with this name already exists
-      if (result[skill.name]) continue
-      result[skill.name] = {
-        name: skill.name,
-        description: skill.description,
-        source: "skill",
-        get template() {
-          return skill.content
-        },
-        hints: [],
-      }
-    }
+      const commands: Record<string, Info> = {}
 
-    return result
-  })
+      const load = Effect.fn("Command.load")(function* () {
+        yield* Effect.promise(async () => {
+          const cfg = await Config.get()
+
+          commands[Default.INIT] = {
+            name: Default.INIT,
+            description: "create/update AGENTS.md",
+            source: "command",
+            get template() {
+              return PROMPT_INITIALIZE.replace("${path}", instance.worktree)
+            },
+            hints: hints(PROMPT_INITIALIZE),
+          }
+          commands[Default.REVIEW] = {
+            name: Default.REVIEW,
+            description: "review changes [commit|branch|pr], defaults to uncommitted",
+            source: "command",
+            get template() {
+              return PROMPT_REVIEW.replace("${path}", instance.worktree)
+            },
+            subtask: true,
+            hints: hints(PROMPT_REVIEW),
+          }
+
+          for (const [name, command] of Object.entries(cfg.command ?? {})) {
+            commands[name] = {
+              name,
+              agent: command.agent,
+              model: command.model,
+              description: command.description,
+              source: "command",
+              get template() {
+                return command.template
+              },
+              subtask: command.subtask,
+              hints: hints(command.template),
+            }
+          }
+          for (const [name, prompt] of Object.entries(await MCP.prompts())) {
+            commands[name] = {
+              name,
+              source: "mcp",
+              description: prompt.description,
+              get template() {
+                // since a getter can't be async we need to manually return a promise here
+                return new Promise<string>(async (resolve, reject) => {
+                  const template = await MCP.getPrompt(
+                    prompt.client,
+                    prompt.name,
+                    prompt.arguments
+                      ? // substitute each argument with $1, $2, etc.
+                        Object.fromEntries(prompt.arguments?.map((argument, i) => [argument.name, `$${i + 1}`]))
+                      : {},
+                  ).catch(reject)
+                  resolve(
+                    template?.messages
+                      .map((message) => (message.content.type === "text" ? message.content.text : ""))
+                      .join("\n") || "",
+                  )
+                })
+              },
+              hints: prompt.arguments?.map((_, i) => `$${i + 1}`) ?? [],
+            }
+          }
+
+          // Add skills as invokable commands
+          for (const skill of await Skill.all()) {
+            // Skip if a command with this name already exists
+            if (commands[skill.name]) continue
+            commands[skill.name] = {
+              name: skill.name,
+              description: skill.description,
+              source: "skill",
+              get template() {
+                return skill.content
+              },
+              hints: [],
+            }
+          }
+        })
+      })
+
+      const loadFiber = yield* load().pipe(
+        Effect.catchCause((cause) => Effect.sync(() => log.error("init failed", { cause }))),
+        Effect.forkScoped,
+      )
+
+      const get = Effect.fn("Command.get")(function* (name: string) {
+        yield* Fiber.join(loadFiber)
+        return commands[name]
+      })
+
+      const list = Effect.fn("Command.list")(function* () {
+        yield* Fiber.join(loadFiber)
+        return Object.values(commands)
+      })
+
+      return Service.of({ get, list })
+    }),
+  )
 
   export async function get(name: string) {
-    return state().then((x) => x[name])
+    return runPromiseInstance(Service.use((svc) => svc.get(name)))
   }
 
   export async function list() {
-    return state().then((x) => Object.values(x))
+    return runPromiseInstance(Service.use((svc) => svc.list()))
   }
 }

packages/opencode/src/control-plane/workspace.ts

@@ -124,7 +124,7 @@ export namespace Workspace {
       await parseSSE(res.body, stop, (event) => {
         GlobalBus.emit("event", {
           directory: space.id,
-          payload: event,
+          payload: event as { type: string; properties: Record<string, unknown> },
         })
       })
       // Wait 250ms and retry if SSE connection fails

packages/opencode/src/effect/instances.ts

@@ -1,4 +1,5 @@
 import { Effect, Layer, LayerMap, ServiceMap } from "effect"
+import { Command } from "@/command"
 import { File } from "@/file/service"
 import { FileTime } from "@/file/time-service"
 import { FileWatcher } from "@/file/watcher"
@@ -10,13 +11,13 @@ import { ProviderAuth } from "@/provider/auth-service"
 import { Question } from "@/question/service"
 import { Skill } from "@/skill/service"
 import { Snapshot } from "@/snapshot/service"
-import { Worktree } from "@/worktree"
 import { InstanceContext } from "./instance-context"
 import { registerDisposer } from "./instance-registry"
 
 export { InstanceContext } from "./instance-context"
 
 export type InstanceServices =
+  | Command.Service
   | Question.Service
   | Permission.Service
   | ProviderAuth.Service
@@ -27,7 +28,6 @@ export type InstanceServices =
   | File.Service
   | Skill.Service
   | Snapshot.Service
-  | Worktree.Service
 
 // NOTE: LayerMap only passes the key (directory string) to lookup, but we need
 // the full instance context (directory, worktree, project). We read from the
@@ -38,6 +38,7 @@ export type InstanceServices =
 function lookup(_key: string) {
   const ctx = Layer.sync(InstanceContext, () => InstanceContext.of(Instance.current))
   return Layer.mergeAll(
+    Command.layer,
     Question.layer,
     Permission.layer,
     ProviderAuth.defaultLayer,
@@ -48,7 +49,6 @@ function lookup(_key: string) {
     File.layer,
     Skill.defaultLayer,
     Snapshot.defaultLayer,
-    Worktree.layer,
   ).pipe(Layer.provide(ctx))
 }
 

packages/opencode/src/session/prompt.ts

@@ -1782,6 +1782,9 @@ NOTE: At any point in time through this workflow you should feel free to ask the
   export async function command(input: CommandInput) {
     log.info("command", input)
     const command = await Command.get(input.command)
+    if (!command) {
+      throw new NamedError.Unknown({ message: `Command not found: "${input.command}"` })
+    }
     const agentName = command.agent ?? input.agent ?? (await Agent.defaultAgent())
 
     const raw = input.arguments.match(argsRegex) ?? []

packages/opencode/src/worktree/index.ts

@@ -4,17 +4,17 @@ import z from "zod"
 import { NamedError } from "@opencode-ai/util/error"
 import { Global } from "../global"
 import { Instance } from "../project/instance"
+import { InstanceBootstrap } from "../project/bootstrap"
 import { Project } from "../project/project"
 import { Database, eq } from "../storage/db"
 import { ProjectTable } from "../project/project.sql"
 import type { ProjectID } from "../project/schema"
+import { fn } from "../util/fn"
 import { Log } from "../util/log"
 import { Process } from "../util/process"
 import { git } from "../util/git"
 import { BusEvent } from "@/bus/bus-event"
 import { GlobalBus } from "@/bus/global"
-import { InstanceContext } from "@/effect/instance-context"
-import { Effect, Layer, ServiceMap } from "effect"
 
 export namespace Worktree {
   const log = Log.create({ service: "worktree" })
@@ -267,7 +267,7 @@ export namespace Worktree {
     return process.platform === "win32" ? normalized.toLowerCase() : normalized
   }
 
-  async function candidateName(worktreeDir: string, root: string, base?: string) {
+  async function candidate(root: string, base?: string) {
     for (const attempt of Array.from({ length: 26 }, (_, i) => i)) {
       const name = base ? (attempt === 0 ? base : `${base}-${randomName()}`) : randomName()
       const branch = `opencode/${name}`
@@ -277,7 +277,7 @@ export namespace Worktree {
 
       const ref = `refs/heads/${branch}`
       const branchCheck = await git(["show-ref", "--verify", "--quiet", ref], {
-        cwd: worktreeDir,
+        cwd: Instance.worktree,
       })
       if (branchCheck.exitCode === 0) continue
 
@@ -335,424 +335,338 @@ export namespace Worktree {
     }, 0)
   }
 
-  // ---------------------------------------------------------------------------
-  // Effect service
-  // ---------------------------------------------------------------------------
-
-  export interface Interface {
-    readonly makeWorktreeInfo: (name?: string) => Effect.Effect<Info>
-    readonly createFromInfo: (info: Info, startCommand?: string) => Effect.Effect<() => Promise<void>>
-    readonly create: (input?: CreateInput) => Effect.Effect<Info>
-    readonly remove: (input: RemoveInput) => Effect.Effect<boolean>
-    readonly reset: (input: ResetInput) => Effect.Effect<boolean>
-  }
-
-  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Worktree") {}
-
-  export const layer = Layer.effect(
-    Service,
-    Effect.gen(function* () {
-      const instance = yield* InstanceContext
-
-      const makeWorktreeInfoEffect = Effect.fn("Worktree.makeWorktreeInfo")(function* (name?: string) {
-        return yield* Effect.promise(async () => {
-          if (instance.project.vcs !== "git") {
-            throw new NotGitError({ message: "Worktrees are only supported for git projects" })
-          }
-
-          const root = path.join(Global.Path.data, "worktree", instance.project.id)
-          await fs.mkdir(root, { recursive: true })
-
-          const base = name ? slug(name) : ""
-          return candidateName(instance.worktree, root, base || undefined)
-        })
-      })
-
-      const createFromInfoEffect = Effect.fn("Worktree.createFromInfo")(function* (info: Info, startCommand?: string) {
-        return yield* Effect.promise(async (): Promise<() => Promise<void>> => {
-          const created = await git(["worktree", "add", "--no-checkout", "-b", info.branch, info.directory], {
-            cwd: instance.worktree,
-          })
-          if (created.exitCode !== 0) {
-            throw new CreateFailedError({ message: errorText(created) || "Failed to create git worktree" })
-          }
-
-          await Project.addSandbox(instance.project.id, info.directory).catch(() => undefined)
-
-          const projectID = instance.project.id
-          const extra = startCommand?.trim()
-
-          return () => {
-            const start = async () => {
-              const populated = await git(["reset", "--hard"], { cwd: info.directory })
-              if (populated.exitCode !== 0) {
-                const message = errorText(populated) || "Failed to populate worktree"
-                log.error("worktree checkout failed", { directory: info.directory, message })
-                GlobalBus.emit("event", {
-                  directory: info.directory,
-                  payload: {
-                    type: Event.Failed.type,
-                    properties: {
-                      message,
-                    },
-                  },
-                })
-                return
-              }
-
-              const booted = await Instance.provide({
-                directory: info.directory,
-                init: async () => {
-                  const { InstanceBootstrap } = await import("../project/bootstrap")
-                  return InstanceBootstrap()
-                },
-                fn: () => undefined,
-              })
-                .then(() => true)
-                .catch((error) => {
-                  const message = error instanceof Error ? error.message : String(error)
-                  log.error("worktree bootstrap failed", { directory: info.directory, message })
-                  GlobalBus.emit("event", {
-                    directory: info.directory,
-                    payload: {
-                      type: Event.Failed.type,
-                      properties: {
-                        message,
-                      },
-                    },
-                  })
-                  return false
-                })
-              if (!booted) return
-
-              GlobalBus.emit("event", {
-                directory: info.directory,
-                payload: {
-                  type: Event.Ready.type,
-                  properties: {
-                    name: info.name,
-                    branch: info.branch,
-                  },
-                },
-              })
-
-              await runStartScripts(info.directory, { projectID, extra })
-            }
-
-            return start().catch((error) => {
-              log.error("worktree start task failed", { directory: info.directory, error })
-            })
-          }
-        })
-      })
-
-      const createEffect = Effect.fn("Worktree.create")(function* (input?: CreateInput) {
-        const parsed = input ? CreateInput.optional().parse(input) : undefined
-        const info = yield* makeWorktreeInfoEffect(parsed?.name)
-        const bootstrap = yield* createFromInfoEffect(info, parsed?.startCommand)
-        // This is needed due to how worktrees currently work in the
-        // desktop app
-        setTimeout(() => {
-          bootstrap()
-        }, 0)
-        return info
-      })
-
-      const removeEffect = Effect.fn("Worktree.remove")(function* (input: RemoveInput) {
-        return yield* Effect.promise(async () => {
-          const parsed = RemoveInput.parse(input)
-          if (instance.project.vcs !== "git") {
-            throw new NotGitError({ message: "Worktrees are only supported for git projects" })
-          }
-
-          const directory = await canonical(parsed.directory)
-          const locate = async (stdout: Uint8Array | undefined) => {
-            const lines = outputText(stdout)
-              .split("\n")
-              .map((line) => line.trim())
-            const entries = lines.reduce<{ path?: string; branch?: string }[]>((acc, line) => {
-              if (!line) return acc
-              if (line.startsWith("worktree ")) {
-                acc.push({ path: line.slice("worktree ".length).trim() })
-                return acc
-              }
-              const current = acc[acc.length - 1]
-              if (!current) return acc
-              if (line.startsWith("branch ")) {
-                current.branch = line.slice("branch ".length).trim()
-              }
-              return acc
-            }, [])
-
-            return (async () => {
-              for (const item of entries) {
-                if (!item.path) continue
-                const key = await canonical(item.path)
-                if (key === directory) return item
-              }
-            })()
-          }
-
-          const clean = (target: string) =>
-            fs
-              .rm(target, {
-                recursive: true,
-                force: true,
-                maxRetries: 5,
-                retryDelay: 100,
-              })
-              .catch((error) => {
-                const message = error instanceof Error ? error.message : String(error)
-                throw new RemoveFailedError({ message: message || "Failed to remove git worktree directory" })
-              })
-
-          const stop = async (target: string) => {
-            if (!(await exists(target))) return
-            await git(["fsmonitor--daemon", "stop"], { cwd: target })
-          }
-
-          const list = await git(["worktree", "list", "--porcelain"], { cwd: instance.worktree })
-          if (list.exitCode !== 0) {
-            throw new RemoveFailedError({ message: errorText(list) || "Failed to read git worktrees" })
-          }
-
-          const entry = await locate(list.stdout)
-
-          if (!entry?.path) {
-            const directoryExists = await exists(directory)
-            if (directoryExists) {
-              await stop(directory)
-              await clean(directory)
-            }
-            return true
-          }
-
-          await stop(entry.path)
-          const removed = await git(["worktree", "remove", "--force", entry.path], {
-            cwd: instance.worktree,
-          })
-          if (removed.exitCode !== 0) {
-            const next = await git(["worktree", "list", "--porcelain"], { cwd: instance.worktree })
-            if (next.exitCode !== 0) {
-              throw new RemoveFailedError({
-                message: errorText(removed) || errorText(next) || "Failed to remove git worktree",
-              })
-            }
-
-            const stale = await locate(next.stdout)
-            if (stale?.path) {
-              throw new RemoveFailedError({ message: errorText(removed) || "Failed to remove git worktree" })
-            }
-          }
-
-          await clean(entry.path)
-
-          const branch = entry.branch?.replace(/^refs\/heads\//, "")
-          if (branch) {
-            const deleted = await git(["branch", "-D", branch], { cwd: instance.worktree })
-            if (deleted.exitCode !== 0) {
-              throw new RemoveFailedError({ message: errorText(deleted) || "Failed to delete worktree branch" })
-            }
-          }
-
-          return true
-        })
-      })
-
-      const resetEffect = Effect.fn("Worktree.reset")(function* (input: ResetInput) {
-        return yield* Effect.promise(async () => {
-          const parsed = ResetInput.parse(input)
-          if (instance.project.vcs !== "git") {
-            throw new NotGitError({ message: "Worktrees are only supported for git projects" })
-          }
-
-          const directory = await canonical(parsed.directory)
-          const primary = await canonical(instance.worktree)
-          if (directory === primary) {
-            throw new ResetFailedError({ message: "Cannot reset the primary workspace" })
-          }
-
-          const list = await git(["worktree", "list", "--porcelain"], { cwd: instance.worktree })
-          if (list.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(list) || "Failed to read git worktrees" })
-          }
-
-          const lines = outputText(list.stdout)
-            .split("\n")
-            .map((line) => line.trim())
-          const entries = lines.reduce<{ path?: string; branch?: string }[]>((acc, line) => {
-            if (!line) return acc
-            if (line.startsWith("worktree ")) {
-              acc.push({ path: line.slice("worktree ".length).trim() })
-              return acc
-            }
-            const current = acc[acc.length - 1]
-            if (!current) return acc
-            if (line.startsWith("branch ")) {
-              current.branch = line.slice("branch ".length).trim()
-            }
-            return acc
-          }, [])
-
-          const entry = await (async () => {
-            for (const item of entries) {
-              if (!item.path) continue
-              const key = await canonical(item.path)
-              if (key === directory) return item
-            }
-          })()
-          if (!entry?.path) {
-            throw new ResetFailedError({ message: "Worktree not found" })
-          }
-
-          const remoteList = await git(["remote"], { cwd: instance.worktree })
-          if (remoteList.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(remoteList) || "Failed to list git remotes" })
-          }
-
-          const remotes = outputText(remoteList.stdout)
-            .split("\n")
-            .map((line) => line.trim())
-            .filter(Boolean)
-
-          const remote = remotes.includes("origin")
-            ? "origin"
-            : remotes.length === 1
-              ? remotes[0]
-              : remotes.includes("upstream")
-                ? "upstream"
-                : ""
-
-          const remoteHead = remote
-            ? await git(["symbolic-ref", `refs/remotes/${remote}/HEAD`], { cwd: instance.worktree })
-            : { exitCode: 1, stdout: undefined, stderr: undefined }
-
-          const remoteRef = remoteHead.exitCode === 0 ? outputText(remoteHead.stdout) : ""
-          const remoteTarget = remoteRef ? remoteRef.replace(/^refs\/remotes\//, "") : ""
-          const remoteBranch =
-            remote && remoteTarget.startsWith(`${remote}/`) ? remoteTarget.slice(`${remote}/`.length) : ""
-
-          const mainCheck = await git(["show-ref", "--verify", "--quiet", "refs/heads/main"], {
-            cwd: instance.worktree,
-          })
-          const masterCheck = await git(["show-ref", "--verify", "--quiet", "refs/heads/master"], {
-            cwd: instance.worktree,
-          })
-          const localBranch = mainCheck.exitCode === 0 ? "main" : masterCheck.exitCode === 0 ? "master" : ""
-
-          const target = remoteBranch ? `${remote}/${remoteBranch}` : localBranch
-          if (!target) {
-            throw new ResetFailedError({ message: "Default branch not found" })
-          }
-
-          if (remoteBranch) {
-            const fetch = await git(["fetch", remote, remoteBranch], { cwd: instance.worktree })
-            if (fetch.exitCode !== 0) {
-              throw new ResetFailedError({ message: errorText(fetch) || `Failed to fetch ${target}` })
-            }
-          }
-
-          if (!entry.path) {
-            throw new ResetFailedError({ message: "Worktree path not found" })
-          }
-
-          const worktreePath = entry.path
-
-          const resetToTarget = await git(["reset", "--hard", target], { cwd: worktreePath })
-          if (resetToTarget.exitCode !== 0) {
-            throw new ResetFailedError({
-              message: errorText(resetToTarget) || "Failed to reset worktree to target",
-            })
-          }
-
-          const cleanResult = await sweep(worktreePath)
-          if (cleanResult.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(cleanResult) || "Failed to clean worktree" })
-          }
-
-          const update = await git(["submodule", "update", "--init", "--recursive", "--force"], {
-            cwd: worktreePath,
-          })
-          if (update.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(update) || "Failed to update submodules" })
-          }
-
-          const subReset = await git(["submodule", "foreach", "--recursive", "git", "reset", "--hard"], {
-            cwd: worktreePath,
-          })
-          if (subReset.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(subReset) || "Failed to reset submodules" })
-          }
-
-          const subClean = await git(["submodule", "foreach", "--recursive", "git", "clean", "-fdx"], {
-            cwd: worktreePath,
-          })
-          if (subClean.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(subClean) || "Failed to clean submodules" })
-          }
-
-          const status = await git(["-c", "core.fsmonitor=false", "status", "--porcelain=v1"], { cwd: worktreePath })
-          if (status.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(status) || "Failed to read git status" })
-          }
-
-          const dirty = outputText(status.stdout)
-          if (dirty) {
-            throw new ResetFailedError({ message: `Worktree reset left local changes:\n${dirty}` })
-          }
-
-          const projectID = instance.project.id
-          queueStartScripts(worktreePath, { projectID })
-
-          return true
-        })
-      })
-
-      return Service.of({
-        makeWorktreeInfo: makeWorktreeInfoEffect,
-        createFromInfo: createFromInfoEffect,
-        create: createEffect,
-        remove: removeEffect,
-        reset: resetEffect,
-      })
-    }),
-  ).pipe(Layer.fresh)
-
-  async function run<A, E>(effect: Effect.Effect<A, E, Service>) {
-    const { runPromiseInstance } = await import("@/effect/runtime")
-    return runPromiseInstance(effect)
-  }
-
-  // ---------------------------------------------------------------------------
-  // Promise facades
-  // ---------------------------------------------------------------------------
-
   export async function makeWorktreeInfo(name?: string): Promise<Info> {
-    return run(Service.use((svc) => svc.makeWorktreeInfo(name)))
+    if (Instance.project.vcs !== "git") {
+      throw new NotGitError({ message: "Worktrees are only supported for git projects" })
+    }
+
+    const root = path.join(Global.Path.data, "worktree", Instance.project.id)
+    await fs.mkdir(root, { recursive: true })
+
+    const base = name ? slug(name) : ""
+    return candidate(root, base || undefined)
   }
 
   export async function createFromInfo(info: Info, startCommand?: string) {
-    return run(Service.use((svc) => svc.createFromInfo(info, startCommand)))
+    const created = await git(["worktree", "add", "--no-checkout", "-b", info.branch, info.directory], {
+      cwd: Instance.worktree,
+    })
+    if (created.exitCode !== 0) {
+      throw new CreateFailedError({ message: errorText(created) || "Failed to create git worktree" })
+    }
+
+    await Project.addSandbox(Instance.project.id, info.directory).catch(() => undefined)
+
+    const projectID = Instance.project.id
+    const extra = startCommand?.trim()
+
+    return () => {
+      const start = async () => {
+        const populated = await git(["reset", "--hard"], { cwd: info.directory })
+        if (populated.exitCode !== 0) {
+          const message = errorText(populated) || "Failed to populate worktree"
+          log.error("worktree checkout failed", { directory: info.directory, message })
+          GlobalBus.emit("event", {
+            directory: info.directory,
+            payload: {
+              type: Event.Failed.type,
+              properties: {
+                message,
+              },
+            },
+          })
+          return
+        }
+
+        const booted = await Instance.provide({
+          directory: info.directory,
+          init: InstanceBootstrap,
+          fn: () => undefined,
+        })
+          .then(() => true)
+          .catch((error) => {
+            const message = error instanceof Error ? error.message : String(error)
+            log.error("worktree bootstrap failed", { directory: info.directory, message })
+            GlobalBus.emit("event", {
+              directory: info.directory,
+              payload: {
+                type: Event.Failed.type,
+                properties: {
+                  message,
+                },
+              },
+            })
+            return false
+          })
+        if (!booted) return
+
+        GlobalBus.emit("event", {
+          directory: info.directory,
+          payload: {
+            type: Event.Ready.type,
+            properties: {
+              name: info.name,
+              branch: info.branch,
+            },
+          },
+        })
+
+        await runStartScripts(info.directory, { projectID, extra })
+      }
+
+      return start().catch((error) => {
+        log.error("worktree start task failed", { directory: info.directory, error })
+      })
+    }
   }
 
-  export const create = Object.assign(
-    async (input?: CreateInput) => {
-      return run(Service.use((svc) => svc.create(input)))
-    },
-    { schema: CreateInput.optional() },
-  )
+  export const create = fn(CreateInput.optional(), async (input) => {
+    const info = await makeWorktreeInfo(input?.name)
+    const bootstrap = await createFromInfo(info, input?.startCommand)
+    // This is needed due to how worktrees currently work in the
+    // desktop app
+    setTimeout(() => {
+      bootstrap()
+    }, 0)
+    return info
+  })
 
-  export const remove = Object.assign(
-    async (input: RemoveInput) => {
-      return run(Service.use((svc) => svc.remove(input)))
-    },
-    { schema: RemoveInput },
-  )
+  export const remove = fn(RemoveInput, async (input) => {
+    if (Instance.project.vcs !== "git") {
+      throw new NotGitError({ message: "Worktrees are only supported for git projects" })
+    }
 
-  export const reset = Object.assign(
-    async (input: ResetInput) => {
-      return run(Service.use((svc) => svc.reset(input)))
-    },
-    { schema: ResetInput },
-  )
+    const directory = await canonical(input.directory)
+    const locate = async (stdout: Uint8Array | undefined) => {
+      const lines = outputText(stdout)
+        .split("\n")
+        .map((line) => line.trim())
+      const entries = lines.reduce<{ path?: string; branch?: string }[]>((acc, line) => {
+        if (!line) return acc
+        if (line.startsWith("worktree ")) {
+          acc.push({ path: line.slice("worktree ".length).trim() })
+          return acc
+        }
+        const current = acc[acc.length - 1]
+        if (!current) return acc
+        if (line.startsWith("branch ")) {
+          current.branch = line.slice("branch ".length).trim()
+        }
+        return acc
+      }, [])
+
+      return (async () => {
+        for (const item of entries) {
+          if (!item.path) continue
+          const key = await canonical(item.path)
+          if (key === directory) return item
+        }
+      })()
+    }
+
+    const clean = (target: string) =>
+      fs
+        .rm(target, {
+          recursive: true,
+          force: true,
+          maxRetries: 5,
+          retryDelay: 100,
+        })
+        .catch((error) => {
+          const message = error instanceof Error ? error.message : String(error)
+          throw new RemoveFailedError({ message: message || "Failed to remove git worktree directory" })
+        })
+
+    const stop = async (target: string) => {
+      if (!(await exists(target))) return
+      await git(["fsmonitor--daemon", "stop"], { cwd: target })
+    }
+
+    const list = await git(["worktree", "list", "--porcelain"], { cwd: Instance.worktree })
+    if (list.exitCode !== 0) {
+      throw new RemoveFailedError({ message: errorText(list) || "Failed to read git worktrees" })
+    }
+
+    const entry = await locate(list.stdout)
+
+    if (!entry?.path) {
+      const directoryExists = await exists(directory)
+      if (directoryExists) {
+        await stop(directory)
+        await clean(directory)
+      }
+      return true
+    }
+
+    await stop(entry.path)
+    const removed = await git(["worktree", "remove", "--force", entry.path], {
+      cwd: Instance.worktree,
+    })
+    if (removed.exitCode !== 0) {
+      const next = await git(["worktree", "list", "--porcelain"], { cwd: Instance.worktree })
+      if (next.exitCode !== 0) {
+        throw new RemoveFailedError({
+          message: errorText(removed) || errorText(next) || "Failed to remove git worktree",
+        })
+      }
+
+      const stale = await locate(next.stdout)
+      if (stale?.path) {
+        throw new RemoveFailedError({ message: errorText(removed) || "Failed to remove git worktree" })
+      }
+    }
+
+    await clean(entry.path)
+
+    const branch = entry.branch?.replace(/^refs\/heads\//, "")
+    if (branch) {
+      const deleted = await git(["branch", "-D", branch], { cwd: Instance.worktree })
+      if (deleted.exitCode !== 0) {
+        throw new RemoveFailedError({ message: errorText(deleted) || "Failed to delete worktree branch" })
+      }
+    }
+
+    return true
+  })
+
+  export const reset = fn(ResetInput, async (input) => {
+    if (Instance.project.vcs !== "git") {
+      throw new NotGitError({ message: "Worktrees are only supported for git projects" })
+    }
+
+    const directory = await canonical(input.directory)
+    const primary = await canonical(Instance.worktree)
+    if (directory === primary) {
+      throw new ResetFailedError({ message: "Cannot reset the primary workspace" })
+    }
+
+    const list = await git(["worktree", "list", "--porcelain"], { cwd: Instance.worktree })
+    if (list.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(list) || "Failed to read git worktrees" })
+    }
+
+    const lines = outputText(list.stdout)
+      .split("\n")
+      .map((line) => line.trim())
+    const entries = lines.reduce<{ path?: string; branch?: string }[]>((acc, line) => {
+      if (!line) return acc
+      if (line.startsWith("worktree ")) {
+        acc.push({ path: line.slice("worktree ".length).trim() })
+        return acc
+      }
+      const current = acc[acc.length - 1]
+      if (!current) return acc
+      if (line.startsWith("branch ")) {
+        current.branch = line.slice("branch ".length).trim()
+      }
+      return acc
+    }, [])
+
+    const entry = await (async () => {
+      for (const item of entries) {
+        if (!item.path) continue
+        const key = await canonical(item.path)
+        if (key === directory) return item
+      }
+    })()
+    if (!entry?.path) {
+      throw new ResetFailedError({ message: "Worktree not found" })
+    }
+
+    const remoteList = await git(["remote"], { cwd: Instance.worktree })
+    if (remoteList.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(remoteList) || "Failed to list git remotes" })
+    }
+
+    const remotes = outputText(remoteList.stdout)
+      .split("\n")
+      .map((line) => line.trim())
+      .filter(Boolean)
+
+    const remote = remotes.includes("origin")
+      ? "origin"
+      : remotes.length === 1
+        ? remotes[0]
+        : remotes.includes("upstream")
+          ? "upstream"
+          : ""
+
+    const remoteHead = remote
+      ? await git(["symbolic-ref", `refs/remotes/${remote}/HEAD`], { cwd: Instance.worktree })
+      : { exitCode: 1, stdout: undefined, stderr: undefined }
+
+    const remoteRef = remoteHead.exitCode === 0 ? outputText(remoteHead.stdout) : ""
+    const remoteTarget = remoteRef ? remoteRef.replace(/^refs\/remotes\//, "") : ""
+    const remoteBranch = remote && remoteTarget.startsWith(`${remote}/`) ? remoteTarget.slice(`${remote}/`.length) : ""
+
+    const mainCheck = await git(["show-ref", "--verify", "--quiet", "refs/heads/main"], {
+      cwd: Instance.worktree,
+    })
+    const masterCheck = await git(["show-ref", "--verify", "--quiet", "refs/heads/master"], {
+      cwd: Instance.worktree,
+    })
+    const localBranch = mainCheck.exitCode === 0 ? "main" : masterCheck.exitCode === 0 ? "master" : ""
+
+    const target = remoteBranch ? `${remote}/${remoteBranch}` : localBranch
+    if (!target) {
+      throw new ResetFailedError({ message: "Default branch not found" })
+    }
+
+    if (remoteBranch) {
+      const fetch = await git(["fetch", remote, remoteBranch], { cwd: Instance.worktree })
+      if (fetch.exitCode !== 0) {
+        throw new ResetFailedError({ message: errorText(fetch) || `Failed to fetch ${target}` })
+      }
+    }
+
+    if (!entry.path) {
+      throw new ResetFailedError({ message: "Worktree path not found" })
+    }
+
+    const worktreePath = entry.path
+
+    const resetToTarget = await git(["reset", "--hard", target], { cwd: worktreePath })
+    if (resetToTarget.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(resetToTarget) || "Failed to reset worktree to target" })
+    }
+
+    const clean = await sweep(worktreePath)
+    if (clean.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(clean) || "Failed to clean worktree" })
+    }
+
+    const update = await git(["submodule", "update", "--init", "--recursive", "--force"], { cwd: worktreePath })
+    if (update.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(update) || "Failed to update submodules" })
+    }
+
+    const subReset = await git(["submodule", "foreach", "--recursive", "git", "reset", "--hard"], {
+      cwd: worktreePath,
+    })
+    if (subReset.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(subReset) || "Failed to reset submodules" })
+    }
+
+    const subClean = await git(["submodule", "foreach", "--recursive", "git", "clean", "-fdx"], {
+      cwd: worktreePath,
+    })
+    if (subClean.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(subClean) || "Failed to clean submodules" })
+    }
+
+    const status = await git(["-c", "core.fsmonitor=false", "status", "--porcelain=v1"], { cwd: worktreePath })
+    if (status.exitCode !== 0) {
+      throw new ResetFailedError({ message: errorText(status) || "Failed to read git status" })
+    }
+
+    const dirty = outputText(status.stdout)
+    if (dirty) {
+      throw new ResetFailedError({ message: `Worktree reset left local changes:\n${dirty}` })
+    }
+
+    const projectID = Instance.project.id
+    queueStartScripts(worktreePath, { projectID })
+
+    return true
+  })
 }

packages/opencode/test/file/watcher.test.ts

@@ -16,7 +16,7 @@ const describeWatcher = FileWatcher.hasNativeBinding() && !process.env.CI ? desc
 // Helpers
 // ---------------------------------------------------------------------------
 
-type BusUpdate = { directory?: string; payload: { type: string; properties: WatcherEvent } }
+type BusUpdate = { directory?: string; payload: { type: string; properties: Record<string, unknown> } }
 type WatcherEvent = { file: string; event: "add" | "change" | "unlink" }
 
 /** Run `body` with a live FileWatcher service. */
@@ -40,18 +40,18 @@ function listen(directory: string, check: (evt: WatcherEvent) => boolean, hit: (
     if (done) return
     if (evt.directory !== directory) return
     if (evt.payload.type !== FileWatcher.Event.Updated.type) return
-    if (!check(evt.payload.properties)) return
-    hit(evt.payload.properties)
+    const props = evt.payload.properties as WatcherEvent
+    if (!check(props)) return
+    hit(props)
   }
 
-  function cleanup() {
+  GlobalBus.on("event", on)
+
+  return () => {
     if (done) return
     done = true
     GlobalBus.off("event", on)
   }
-
-  GlobalBus.on("event", on)
-  return cleanup
 }
 
 function wait(directory: string, check: (evt: WatcherEvent) => boolean) {