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,33 +60,46 @@ export namespace Command {
     REVIEW: "review",
   } as const
 
-  const state = Instance.state(async () => {
+  export interface Interface {
+    readonly get: (name: string) => Effect.Effect<Info | undefined>
+    readonly list: () => Effect.Effect<Info[]>
+  }
+
+  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Command") {}
+
+  export const layer = Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const instance = yield* InstanceContext
+
+      const commands: Record<string, Info> = {}
+
+      const load = Effect.fn("Command.load")(function* () {
+        yield* Effect.promise(async () => {
           const cfg = await Config.get()
 
-    const result: Record<string, Info> = {
+          commands[Default.INIT] = {
-      [Default.INIT]: {
             name: Default.INIT,
             description: "create/update AGENTS.md",
             source: "command",
             get template() {
-          return PROMPT_INITIALIZE.replace("${path}", Instance.worktree)
+              return PROMPT_INITIALIZE.replace("${path}", instance.worktree)
             },
             hints: hints(PROMPT_INITIALIZE),
-      },
+          }
-      [Default.REVIEW]: {
+          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)
+              return PROMPT_REVIEW.replace("${path}", instance.worktree)
             },
             subtask: true,
             hints: hints(PROMPT_REVIEW),
-      },
           }
 
           for (const [name, command] of Object.entries(cfg.command ?? {})) {
-      result[name] = {
+            commands[name] = {
               name,
               agent: command.agent,
               model: command.model,
@@ -97,7 +113,7 @@ export namespace Command {
             }
           }
           for (const [name, prompt] of Object.entries(await MCP.prompts())) {
-      result[name] = {
+            commands[name] = {
               name,
               source: "mcp",
               description: prompt.description,
@@ -126,8 +142,8 @@ export namespace Command {
           // 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
+            if (commands[skill.name]) continue
-      result[skill.name] = {
+            commands[skill.name] = {
               name: skill.name,
               description: skill.description,
               source: "skill",
@@ -137,15 +153,33 @@ export namespace Command {
               hints: [],
             }
           }
-
+        })
-    return result
       })
 
+      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,51 +335,29 @@ export namespace Worktree {
     }, 0)
   }
 
-  // ---------------------------------------------------------------------------
+  export async function makeWorktreeInfo(name?: string): Promise<Info> {
-  // Effect service
+    if (Instance.project.vcs !== "git") {
-  // ---------------------------------------------------------------------------
-
-  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)
+    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)
+    return candidate(root, base || undefined)
-        })
+  }
-      })
 
-      const createFromInfoEffect = Effect.fn("Worktree.createFromInfo")(function* (info: Info, startCommand?: string) {
+  export async function createFromInfo(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,
+      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)
+    await Project.addSandbox(Instance.project.id, info.directory).catch(() => undefined)
 
-          const projectID = instance.project.id
+    const projectID = Instance.project.id
     const extra = startCommand?.trim()
 
     return () => {
@@ -402,10 +380,7 @@ export namespace Worktree {
 
         const booted = await Instance.provide({
           directory: info.directory,
-                init: async () => {
+          init: InstanceBootstrap,
-                  const { InstanceBootstrap } = await import("../project/bootstrap")
-                  return InstanceBootstrap()
-                },
           fn: () => undefined,
         })
           .then(() => true)
@@ -443,13 +418,11 @@ export namespace Worktree {
         log.error("worktree start task failed", { directory: info.directory, error })
       })
     }
-        })
+  }
-      })
 
-      const createEffect = Effect.fn("Worktree.create")(function* (input?: CreateInput) {
+  export const create = fn(CreateInput.optional(), async (input) => {
-        const parsed = input ? CreateInput.optional().parse(input) : undefined
+    const info = await makeWorktreeInfo(input?.name)
-        const info = yield* makeWorktreeInfoEffect(parsed?.name)
+    const bootstrap = await createFromInfo(info, input?.startCommand)
-        const bootstrap = yield* createFromInfoEffect(info, parsed?.startCommand)
     // This is needed due to how worktrees currently work in the
     // desktop app
     setTimeout(() => {
@@ -458,14 +431,12 @@ export namespace Worktree {
     return info
   })
 
-      const removeEffect = Effect.fn("Worktree.remove")(function* (input: RemoveInput) {
+  export const remove = fn(RemoveInput, async (input) => {
-        return yield* Effect.promise(async () => {
+    if (Instance.project.vcs !== "git") {
-          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 directory = await canonical(input.directory)
     const locate = async (stdout: Uint8Array | undefined) => {
       const lines = outputText(stdout)
         .split("\n")
@@ -511,7 +482,7 @@ export namespace Worktree {
       await git(["fsmonitor--daemon", "stop"], { cwd: target })
     }
 
-          const list = await git(["worktree", "list", "--porcelain"], { cwd: instance.worktree })
+    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" })
     }
@@ -529,10 +500,10 @@ export namespace Worktree {
 
     await stop(entry.path)
     const removed = await git(["worktree", "remove", "--force", entry.path], {
-            cwd: instance.worktree,
+      cwd: Instance.worktree,
     })
     if (removed.exitCode !== 0) {
-            const next = await git(["worktree", "list", "--porcelain"], { cwd: instance.worktree })
+      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",
@@ -549,7 +520,7 @@ export namespace Worktree {
 
     const branch = entry.branch?.replace(/^refs\/heads\//, "")
     if (branch) {
-            const deleted = await git(["branch", "-D", branch], { cwd: instance.worktree })
+      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" })
       }
@@ -557,22 +528,19 @@ export namespace Worktree {
 
     return true
   })
-      })
 
-      const resetEffect = Effect.fn("Worktree.reset")(function* (input: ResetInput) {
+  export const reset = fn(ResetInput, async (input) => {
-        return yield* Effect.promise(async () => {
+    if (Instance.project.vcs !== "git") {
-          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 directory = await canonical(input.directory)
-          const primary = await canonical(instance.worktree)
+    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 })
+    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" })
     }
@@ -605,7 +573,7 @@ export namespace Worktree {
       throw new ResetFailedError({ message: "Worktree not found" })
     }
 
-          const remoteList = await git(["remote"], { cwd: instance.worktree })
+    const remoteList = await git(["remote"], { cwd: Instance.worktree })
     if (remoteList.exitCode !== 0) {
       throw new ResetFailedError({ message: errorText(remoteList) || "Failed to list git remotes" })
     }
@@ -624,19 +592,18 @@ export namespace Worktree {
           : ""
 
     const remoteHead = remote
-            ? await git(["symbolic-ref", `refs/remotes/${remote}/HEAD`], { cwd: instance.worktree })
+      ? 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 =
+    const remoteBranch = remote && remoteTarget.startsWith(`${remote}/`) ? remoteTarget.slice(`${remote}/`.length) : ""
-            remote && remoteTarget.startsWith(`${remote}/`) ? remoteTarget.slice(`${remote}/`.length) : ""
 
     const mainCheck = await git(["show-ref", "--verify", "--quiet", "refs/heads/main"], {
-            cwd: instance.worktree,
+      cwd: Instance.worktree,
     })
     const masterCheck = await git(["show-ref", "--verify", "--quiet", "refs/heads/master"], {
-            cwd: instance.worktree,
+      cwd: Instance.worktree,
     })
     const localBranch = mainCheck.exitCode === 0 ? "main" : masterCheck.exitCode === 0 ? "master" : ""
 
@@ -646,7 +613,7 @@ export namespace Worktree {
     }
 
     if (remoteBranch) {
-            const fetch = await git(["fetch", remote, remoteBranch], { cwd: instance.worktree })
+      const fetch = await git(["fetch", remote, remoteBranch], { cwd: Instance.worktree })
       if (fetch.exitCode !== 0) {
         throw new ResetFailedError({ message: errorText(fetch) || `Failed to fetch ${target}` })
       }
@@ -660,19 +627,15 @@ export namespace Worktree {
 
     const resetToTarget = await git(["reset", "--hard", target], { cwd: worktreePath })
     if (resetToTarget.exitCode !== 0) {
-            throw new ResetFailedError({
+      throw new ResetFailedError({ message: errorText(resetToTarget) || "Failed to reset worktree to target" })
-              message: errorText(resetToTarget) || "Failed to reset worktree to target",
-            })
     }
 
-          const cleanResult = await sweep(worktreePath)
+    const clean = await sweep(worktreePath)
-          if (cleanResult.exitCode !== 0) {
+    if (clean.exitCode !== 0) {
-            throw new ResetFailedError({ message: errorText(cleanResult) || "Failed to clean worktree" })
+      throw new ResetFailedError({ message: errorText(clean) || "Failed to clean worktree" })
     }
 
-          const update = await git(["submodule", "update", "--init", "--recursive", "--force"], {
+    const update = await git(["submodule", "update", "--init", "--recursive", "--force"], { cwd: worktreePath })
-            cwd: worktreePath,
-          })
     if (update.exitCode !== 0) {
       throw new ResetFailedError({ message: errorText(update) || "Failed to update submodules" })
     }
@@ -701,58 +664,9 @@ export namespace Worktree {
       throw new ResetFailedError({ message: `Worktree reset left local changes:\n${dirty}` })
     }
 
-          const projectID = instance.project.id
+    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)))
-  }
-
-  export async function createFromInfo(info: Info, startCommand?: string) {
-    return run(Service.use((svc) => svc.createFromInfo(info, startCommand)))
-  }
-
-  export const create = Object.assign(
-    async (input?: CreateInput) => {
-      return run(Service.use((svc) => svc.create(input)))
-    },
-    { schema: CreateInput.optional() },
-  )
-
-  export const remove = Object.assign(
-    async (input: RemoveInput) => {
-      return run(Service.use((svc) => svc.remove(input)))
-    },
-    { schema: RemoveInput },
-  )
-
-  export const reset = Object.assign(
-    async (input: ResetInput) => {
-      return run(Service.use((svc) => svc.reset(input)))
-    },
-    { schema: ResetInput },
-  )
 }

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
+    const props = evt.payload.properties as WatcherEvent
-    hit(evt.payload.properties)
+    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) {