more rebase fix

Author: e-n-0

bun.lock

@@ -43,6 +43,7 @@ import { ConfigSkills } from "./skills"
 import { ConfigVariable } from "./variable"
 import { Npm } from "@/npm"
 import { SandboxPreset } from "@/sandbox/preset"
+import { makeRuntime } from "@/effect/run-service"
 
 const log = Log.create({ service: "config" })
 
@@ -898,3 +899,37 @@ export const defaultLayer = layer.pipe(
   Layer.provide(Account.defaultLayer),
   Layer.provide(Npm.defaultLayer),
 )
+
+const { runPromise } = makeRuntime(Service, defaultLayer)
+
+export async function get() {
+  return runPromise((svc) => svc.get())
+}
+
+export async function getGlobal() {
+  return runPromise((svc) => svc.getGlobal())
+}
+
+export async function getConsoleState() {
+  return runPromise((svc) => svc.getConsoleState())
+}
+
+export async function update(config: Info) {
+  return runPromise((svc) => svc.update(config))
+}
+
+export async function updateGlobal(config: Info) {
+  return runPromise((svc) => svc.updateGlobal(config))
+}
+
+export async function invalidate(wait = false) {
+  return runPromise((svc) => svc.invalidate(wait))
+}
+
+export async function directories() {
+  return runPromise((svc) => svc.directories())
+}
+
+export async function waitForDependencies() {
+  return runPromise((svc) => svc.waitForDependencies())
+}

packages/opencode/src/config/config.ts

@@ -189,7 +189,7 @@ export const layer = Layer.effect(
       const id = PtyID.ascending()
       const command = input.command || Shell.preferred()
       const cwd = input.cwd || s.dir
-      const cfg = yield* Effect.promise(() => SandboxSpawn.settings())
+      const cfg = yield* Effect.promise(Instance.bind(() => SandboxSpawn.settings()))
       const blocked = SandboxSpawn.excluded([command, ...(input.args ?? [])], cfg.excluded_commands)
       if (blocked) {
         throw new SandboxSpawn.CommandError(blocked.command, blocked.rule)

packages/opencode/src/pty/index.ts

@@ -1,10 +1,9 @@
-import { Config } from "@/config/config"
+import { Config } from "@/config"
 import { Protected } from "@/file/protected"
 import { Flag } from "@/flag/flag"
 import { Global } from "@/global"
 import { BashArity } from "@/permission/arity"
-import { Log } from "@/util/log"
-import { Filesystem } from "@/util/filesystem"
+import { Filesystem, Log } from "@/util"
 import os from "os"
 import path from "path"
 import { SandboxPolicy } from "./policy"

packages/opencode/src/sandbox/spawn.ts

@@ -32,6 +32,22 @@ const pick = (log: Array<{ type: "created" | "exited" | "deleted"; id: PtyID }>,
   return log.filter((evt) => evt.id === id).map((evt) => evt.type)
 }
 
+function createPty(input: Pty.CreateInput) {
+  return AppRuntime.runPromise(Pty.Service.use((svc) => svc.create(input)))
+}
+
+function removePty(id: PtyID) {
+  return AppRuntime.runPromise(Pty.Service.use((svc) => svc.remove(id)))
+}
+
+function connectPty(id: PtyID, ws: Parameters<Pty.Interface["connect"]>[1]) {
+  return AppRuntime.runPromise(Pty.Service.use((svc) => svc.connect(id, ws)))
+}
+
+function writePty(id: PtyID, data: string) {
+  return AppRuntime.runPromise(Pty.Service.use((svc) => svc.write(id, data)))
+}
+
 describe("pty", () => {
   test("publishes created, exited, deleted in order for a short-lived process", async () => {
     if (process.platform === "win32") return
@@ -127,10 +143,10 @@ describe("pty", () => {
     await Instance.provide({
       directory: dir.path,
       fn: async () => {
-        const info = await Pty.create({ command: "cat", title: "cat" })
+        const info = await createPty({ command: "cat", title: "cat" })
         try {
           const out: string[] = []
-          const ws: Parameters<typeof Pty.connect>[1] = {
+          const ws: Parameters<Pty.Interface["connect"]>[1] = {
             readyState: 1,
             data: { id: info.id },
             send: (data: unknown) => {
@@ -139,12 +155,12 @@ describe("pty", () => {
             close: () => {},
           }
 
-          await Pty.connect(info.id, ws)
+          await connectPty(info.id, ws)
           out.length = 0
-          await Pty.write(info.id, "AAA\n")
+          await writePty(info.id, "AAA\n")
           await wait(() => out.join("").includes("AAA"))
         } finally {
-          await Pty.remove(info.id)
+          await removePty(info.id)
         }
       },
     })
@@ -172,7 +188,7 @@ describe("pty", () => {
     await Instance.provide({
       directory: dir.path,
       fn: async () => {
-        const info = await Pty.create({ command: "/bin/bash", title: "bash" })
+        const info = await createPty({ command: "/bin/bash", title: "bash" })
         try {
           await sleep(150)
           const hit = await fs
@@ -181,7 +197,7 @@ describe("pty", () => {
             .catch(() => false)
           expect(hit).toBe(false)
         } finally {
-          await Pty.remove(info.id)
+          await removePty(info.id)
         }
       },
     })
@@ -202,11 +218,11 @@ describe("pty", () => {
     await Instance.provide({
       directory: dir.path,
       fn: async () => {
-        await expect(Pty.create({ command: "python", title: "py" })).rejects.toThrow("python")
+        await expect(createPty({ command: "python", title: "py" })).rejects.toThrow("python")
         await expect(
-          Pty.create({ command: "env", args: ["FOO=1", "python", "-c", "print(1)"], title: "env" }),
+          createPty({ command: "env", args: ["FOO=1", "python", "-c", "print(1)"], title: "env" }),
         ).rejects.toThrow("python")
-        await expect(Pty.create({ command: "sh", args: ["-c", "python -c 'print(1)'"], title: "sh" })).rejects.toThrow(
+        await expect(createPty({ command: "sh", args: ["-c", "python -c 'print(1)'"], title: "sh" })).rejects.toThrow(
           "python",
         )
       },

packages/opencode/test/pty/pty-session.test.ts

@@ -1,4 +1,5 @@
 import { afterEach, describe, expect, test } from "bun:test"
+import { AppRuntime } from "../../src/effect/app-runtime"
 import { Agent } from "../../src/agent/agent"
 import { Instance } from "../../src/project/instance"
 import { Permission } from "../../src/permission"
@@ -8,6 +9,10 @@ afterEach(async () => {
   await Instance.disposeAll()
 })
 
+function getAgent(name: string) {
+  return AppRuntime.runPromise(Agent.Service.use((svc) => svc.get(name)))
+}
+
 describe("sandbox preset permission overlay", () => {
   test("applies the preset overlay when no explicit override exists", async () => {
     await using tmp = await tmpdir({
@@ -24,7 +29,7 @@ describe("sandbox preset permission overlay", () => {
     await Instance.provide({
       directory: tmp.path,
       fn: async () => {
-        const build = await Agent.get("build")
+        const build = await getAgent("build")
         expect(Permission.evaluate("bash", "echo hello", build!.permission).action).toBe("ask")
       },
     })
@@ -52,7 +57,7 @@ describe("sandbox preset permission overlay", () => {
     await Instance.provide({
       directory: tmp.path,
       fn: async () => {
-        const build = await Agent.get("build")
+        const build = await getAgent("build")
         expect(Permission.evaluate("bash", "echo hello", build!.permission).action).toBe("allow")
       },
     })
@@ -76,7 +81,7 @@ describe("sandbox preset permission overlay", () => {
     await Instance.provide({
       directory: tmp.path,
       fn: async () => {
-        const build = await Agent.get("build")
+        const build = await getAgent("build")
         expect(Permission.evaluate("bash", "echo hello", build!.permission).action).toBe("deny")
       },
     })
@@ -97,7 +102,7 @@ describe("sandbox preset permission overlay", () => {
     await Instance.provide({
       directory: tmp.path,
       fn: async () => {
-        const general = await Agent.get("general")
+        const general = await getAgent("general")
         expect(Permission.evaluate("bash", "ls", general!.permission).action).toBe("ask")
       },
     })
@@ -109,7 +114,7 @@ describe("sandbox preset permission overlay", () => {
     await Instance.provide({
       directory: tmp.path,
       fn: async () => {
-        const build = await Agent.get("build")
+        const build = await getAgent("build")
         expect(Permission.evaluate("bash", "echo hello", build!.permission).action).toBe("allow")
       },
     })

packages/opencode/test/sandbox/preset-permission.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, test } from "bun:test"
-import { Config } from "../../src/config/config"
+import { Config } from "../../src/config"
 import { Instance } from "../../src/project/instance"
 import { SandboxPreset } from "../../src/sandbox/preset"
 import { tmpdir } from "../fixture/fixture"