From f1470c1a889e2db14353cbca429184fe42d11e00 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 1 May 2026 08:42:26 -0400
Subject: [PATCH] refactor: rename instance store service interface

---
 packages/opencode/src/project/instance.ts             |  4 ++--
 .../instance/httpapi/middleware/instance-context.ts   | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/project/instance.ts b/packages/opencode/src/project/instance.ts
index ac4243fa16..05eb776db5 100644
--- a/packages/opencode/src/project/instance.ts
+++ b/packages/opencode/src/project/instance.ts
@@ -24,14 +24,14 @@ export interface LoadInput {
   project?: Project.Info
 }
 
-export interface Store {
+export interface Interface {
   readonly load: (input: LoadInput) => Effect.Effect<InstanceContext>
   readonly reload: (input: LoadInput) => Effect.Effect<InstanceContext>
   readonly dispose: (ctx: InstanceContext) => Effect.Effect<void>
   readonly disposeAll: () => Effect.Effect<void>
 }
 
-export class InstanceStore extends Context.Service<InstanceStore, Store>()("@opencode/InstanceStore") {}
+export class InstanceStore extends Context.Service<InstanceStore, Interface>()("@opencode/InstanceStore") {}
 
 export const instanceStoreLayer: Layer.Layer<InstanceStore, never, Project.Service> = Layer.effect(
   InstanceStore,
diff --git a/packages/opencode/src/server/routes/instance/httpapi/middleware/instance-context.ts b/packages/opencode/src/server/routes/instance/httpapi/middleware/instance-context.ts
index 81de3d739d..6bd37c6304 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/middleware/instance-context.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/middleware/instance-context.ts
@@ -1,9 +1,9 @@
 import { InstanceRef, WorkspaceRef } from "@/effect/instance-ref"
 import { AppRuntime } from "@/effect/app-runtime"
 import { InstanceBootstrap } from "@/project/bootstrap"
-import { InstanceStore, type InstanceContext, type Store } from "@/project/instance"
+import { InstanceStore, type InstanceContext } from "@/project/instance"
 import { Filesystem } from "@/util/filesystem"
-import { Effect, Layer } from "effect"
+import { Context, Effect, Layer } from "effect"
 import { HttpRouter, HttpServerResponse } from "effect/unstable/http"
 import { HttpApiMiddleware } from "effect/unstable/httpapi"
 import { WorkspaceRouteContext } from "./workspace-routing"
@@ -23,7 +23,10 @@ function decode(input: string): string {
   }
 }
 
-function makeInstanceContext(store: Store, directory: string): Effect.Effect<InstanceContext> {
+function makeInstanceContext(
+  store: Context.Service.Shape<typeof InstanceStore>,
+  directory: string,
+): Effect.Effect<InstanceContext> {
   return store.load({
     directory: Filesystem.resolve(decode(directory)),
     init: () => AppRuntime.runPromise(InstanceBootstrap),
@@ -32,7 +35,7 @@ function makeInstanceContext(store: Store, directory: string): Effect.Effect<Ins
 
 function provideInstanceContext<E>(
   effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E>,
-  store: Store,
+  store: Context.Service.Shape<typeof InstanceStore>,
 ): Effect.Effect<HttpServerResponse.HttpServerResponse, E, WorkspaceRouteContext> {
   return Effect.gen(function* () {
     const route = yield* WorkspaceRouteContext