Merge branch 'dev' into kit/effectify-pty

packages/opencode/specs/effect-migration.md

@@ -128,8 +128,8 @@ Still open and likely worth migrating:
 
 - [ ] `Plugin`
 - [ ] `ToolRegistry`
-- [ ] `Pty`
+- [x] `Pty`
-- [x] `Worktree`
+- [ ] `Worktree`
 - [ ] `Installation`
 - [ ] `Bus`
 - [ ] `Command`

packages/opencode/src/effect/instances.ts

@@ -4,13 +4,13 @@ import { FileTime } from "@/file/time-service"
 import { FileWatcher } from "@/file/watcher"
 import { Format } from "@/format/service"
 import { Permission } from "@/permission/service"
+import { Pty } from "@/pty"
 import { Instance } from "@/project/instance"
 import { Vcs } from "@/project/vcs"
 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"
 
@@ -25,9 +25,9 @@ export type InstanceServices =
   | FileTime.Service
   | Format.Service
   | File.Service
+  | Pty.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
@@ -46,9 +46,9 @@ function lookup(_key: string) {
     FileTime.layer,
     Format.layer,
     File.layer,
+    Pty.layer,
     Skill.defaultLayer,
     Snapshot.defaultLayer,
-    Worktree.layer,
   ).pipe(Layer.provide(ctx))
 }
 

packages/opencode/src/effect/runtime.ts

@@ -20,6 +20,10 @@ export function runPromiseInstance<A, E>(effect: Effect.Effect<A, E, InstanceSer
   return runtime.runPromise(effect.pipe(Effect.provide(Instances.get(Instance.directory))))
 }
 
+export function runSyncInstance<A, E>(effect: Effect.Effect<A, E, InstanceServices>) {
+  return runtime.runSync(effect.pipe(Effect.provide(Instances.get(Instance.directory))))
+}
+
 export function disposeRuntime() {
   return runtime.dispose()
 }

packages/opencode/src/pty/index.ts

@@ -1,13 +1,12 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
+import { InstanceContext } from "@/effect/instance-context"
 import { type IPty } from "bun-pty"
 import z from "zod"
 import { Log } from "../util/log"
-import { Instance } from "../project/instance"
 import { lazy } from "@opencode-ai/util/lazy"
-import { Shell } from "@/shell/shell"
-import { Plugin } from "@/plugin"
 import { PtyID } from "./schema"
+import { Effect, Layer, ServiceMap } from "effect"
 
 export namespace Pty {
   const log = Log.create({ service: "pty" })
@@ -90,9 +89,31 @@ export namespace Pty {
     subscribers: Map<unknown, Socket>
   }
 
-  const state = Instance.state(
+  export interface Interface {
-    () => new Map<PtyID, ActiveSession>(),
+    readonly list: () => Effect.Effect<Info[]>
-    async (sessions) => {
+    readonly get: (id: PtyID) => Effect.Effect<Info | undefined>
+    readonly create: (input: CreateInput) => Effect.Effect<Info>
+    readonly update: (id: PtyID, input: UpdateInput) => Effect.Effect<Info | undefined>
+    readonly remove: (id: PtyID) => Effect.Effect<void>
+    readonly resize: (id: PtyID, cols: number, rows: number) => Effect.Effect<void>
+    readonly write: (id: PtyID, data: string) => Effect.Effect<void>
+    readonly connect: (
+      id: PtyID,
+      ws: Socket,
+      cursor?: number,
+    ) => Effect.Effect<{ onMessage: (message: string | ArrayBuffer) => void; onClose: () => void } | undefined>
+  }
+
+  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Pty") {}
+
+  export const layer = Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const instance = yield* InstanceContext
+      const sessions = new Map<PtyID, ActiveSession>()
+
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
           for (const session of sessions.values()) {
             try {
               session.process.kill()
@@ -100,24 +121,41 @@ export namespace Pty {
             for (const [key, ws] of session.subscribers.entries()) {
               try {
                 if (ws.data === key) ws.close()
-          } catch {
+              } catch {}
-            // ignore
-          }
             }
           }
           sessions.clear()
-    },
+        }),
       )
 
-  export function list() {
+      const removeSession = (id: PtyID) => {
-    return Array.from(state().values()).map((s) => s.info)
+        const session = sessions.get(id)
+        if (!session) return
+        sessions.delete(id)
+        log.info("removing session", { id })
+        try {
+          session.process.kill()
+        } catch {}
+        for (const [key, ws] of session.subscribers.entries()) {
+          try {
+            if (ws.data === key) ws.close()
+          } catch {}
+        }
+        session.subscribers.clear()
+        Bus.publish(Event.Deleted, { id: session.info.id })
       }
 
-  export function get(id: PtyID) {
+      const list = Effect.fn("Pty.list")(function* () {
-    return state().get(id)?.info
+        return Array.from(sessions.values()).map((s) => s.info)
-  }
+      })
 
-  export async function create(input: CreateInput) {
+      const get = Effect.fn("Pty.get")(function* (id: PtyID) {
+        return sessions.get(id)?.info
+      })
+
+      const create = Effect.fn("Pty.create")(function* (input: CreateInput) {
+        return yield* Effect.promise(async () => {
+          const [{ Shell }, { Plugin }] = await Promise.all([import("@/shell/shell"), import("@/plugin")])
           const id = PtyID.ascending()
           const command = input.command || Shell.preferred()
           const args = input.args || []
@@ -125,7 +163,7 @@ export namespace Pty {
             args.push("-l")
           }
 
-    const cwd = input.cwd || Instance.directory
+          const cwd = input.cwd || instance.directory
           const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
           const env = {
             ...process.env,
@@ -166,9 +204,8 @@ export namespace Pty {
             cursor: 0,
             subscribers: new Map(),
           }
-    state().set(id, session)
+          sessions.set(id, session)
-    ptyProcess.onData(
+          ptyProcess.onData((chunk) => {
-      Instance.bind((chunk) => {
             session.cursor += chunk.length
 
             for (const [key, ws] of session.subscribers.entries()) {
@@ -176,12 +213,10 @@ export namespace Pty {
                 session.subscribers.delete(key)
                 continue
               }
-
               if (ws.data !== key) {
                 session.subscribers.delete(key)
                 continue
               }
-
               try {
                 ws.send(chunk)
               } catch {
@@ -194,23 +229,21 @@ export namespace Pty {
             const excess = session.buffer.length - BUFFER_LIMIT
             session.buffer = session.buffer.slice(excess)
             session.bufferCursor += excess
-      }),
+          })
-    )
+          ptyProcess.onExit(({ exitCode }) => {
-    ptyProcess.onExit(
-      Instance.bind(({ exitCode }) => {
             if (session.info.status === "exited") return
             log.info("session exited", { id, exitCode })
             session.info.status = "exited"
             Bus.publish(Event.Exited, { id, exitCode })
-        remove(id)
+            removeSession(id)
-      }),
+          })
-    )
           Bus.publish(Event.Created, { info })
           return info
-  }
+        })
+      })
 
-  export async function update(id: PtyID, input: UpdateInput) {
+      const update = Effect.fn("Pty.update")(function* (id: PtyID, input: UpdateInput) {
-    const session = state().get(id)
+        const session = sessions.get(id)
         if (!session) return
         if (input.title) {
           session.info.title = input.title
@@ -220,54 +253,35 @@ export namespace Pty {
         }
         Bus.publish(Event.Updated, { info: session.info })
         return session.info
-  }
+      })
 
-  export async function remove(id: PtyID) {
+      const remove = Effect.fn("Pty.remove")(function* (id: PtyID) {
-    const session = state().get(id)
+        removeSession(id)
-    if (!session) return
+      })
-    state().delete(id)
-    log.info("removing session", { id })
-    try {
-      session.process.kill()
-    } catch {}
-    for (const [key, ws] of session.subscribers.entries()) {
-      try {
-        if (ws.data === key) ws.close()
-      } catch {
-        // ignore
-      }
-    }
-    session.subscribers.clear()
-    Bus.publish(Event.Deleted, { id: session.info.id })
-  }
 
-  export function resize(id: PtyID, cols: number, rows: number) {
+      const resize = Effect.fn("Pty.resize")(function* (id: PtyID, cols: number, rows: number) {
-    const session = state().get(id)
+        const session = sessions.get(id)
         if (session && session.info.status === "running") {
           session.process.resize(cols, rows)
         }
-  }
+      })
 
-  export function write(id: PtyID, data: string) {
+      const write = Effect.fn("Pty.write")(function* (id: PtyID, data: string) {
-    const session = state().get(id)
+        const session = sessions.get(id)
         if (session && session.info.status === "running") {
           session.process.write(data)
         }
-  }
+      })
 
-  export function connect(id: PtyID, ws: Socket, cursor?: number) {
+      const connect = Effect.fn("Pty.connect")(function* (id: PtyID, ws: Socket, cursor?: number) {
-    const session = state().get(id)
+        const session = sessions.get(id)
         if (!session) {
           ws.close()
           return
         }
         log.info("client connected to session", { id })
 
-    // Use ws.data as the unique key for this connection lifecycle.
-    // If ws.data is undefined, fallback to ws object.
         const connectionKey = ws.data && typeof ws.data === "object" ? ws.data : ws
-
-    // Optionally cleanup if the key somehow exists
         session.subscribers.delete(connectionKey)
         session.subscribers.set(connectionKey, ws)
 
@@ -317,5 +331,55 @@ export namespace Pty {
             cleanup()
           },
         }
+      })
+
+      return Service.of({ list, get, create, update, remove, resize, write, connect })
+    }),
+  )
+
+  function runtime() {
+    return require("@/effect/runtime") as typeof import("@/effect/runtime")
+  }
+
+  function run<A, E>(effect: Effect.Effect<A, E, Service>) {
+    return runtime().runPromiseInstance(effect)
+  }
+
+  function runSync<A, E>(effect: Effect.Effect<A, E, Service>) {
+    return runtime().runSyncInstance(effect)
+  }
+
+  // Sync facades
+  export function list() {
+    return runSync(Service.use((svc) => svc.list()))
+  }
+
+  export function get(id: PtyID) {
+    return runSync(Service.use((svc) => svc.get(id)))
+  }
+
+  export function resize(id: PtyID, cols: number, rows: number) {
+    runSync(Service.use((svc) => svc.resize(id, cols, rows)))
+  }
+
+  export function write(id: PtyID, data: string) {
+    runSync(Service.use((svc) => svc.write(id, data)))
+  }
+
+  export function connect(id: PtyID, ws: Socket, cursor?: number) {
+    return runSync(Service.use((svc) => svc.connect(id, ws, cursor)))
+  }
+
+  // Async facades
+  export async function create(input: CreateInput) {
+    return run(Service.use((svc) => svc.create(input)))
+  }
+
+  export async function update(id: PtyID, input: UpdateInput) {
+    return run(Service.use((svc) => svc.update(id, input)))
+  }
+
+  export async function remove(id: PtyID) {
+    return run(Service.use((svc) => svc.remove(id)))
   }
 }

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 },
-  )
 }