feat(client): add embedded V2 host

Author: kitlangton

CONTEXT.md

@@ -123,8 +123,8 @@ _Avoid_: Response envelope
 - The public `HttpApi` is authoritative for shared **OpenCode Client** capabilities: the server hosts those exact endpoint declarations and code generation consumes them directly. Public endpoints are not duplicated or projected from a separately named internal contract.
 - SDK generation reflects the public `HttpApi` once into an **SDK Contract IR**. Promise and Effect emitters share endpoint structure and transport metadata without being required to expose identical public values: an emitter may select encoded wire types, decoded domain types, compile-time brands, runtime validation, and its own execution abstraction independently.
 - The first Effect emitter is the rich projection: it exposes decoded Effect-native values, preserves brands and schema transformations, performs runtime schema decoding, and delegates transport interpretation to `HttpApiClient`. Lighter wire-shaped Effect output remains possible through another emitter policy rather than constraining the shared IR.
-- The rich Effect emitter regenerates private executable schemas when the **SDK Contract IR** proves that their transport semantics can be reproduced exactly. Contracts with authoritative custom transformations use the import-based Effect emitter against the dependency-leaf `@opencode-ai/api` package instead; the Promise emitter still derives zero-Effect structural wire types from the same IR.
-- `@opencode-ai/api` owns the lightweight authoritative public `HttpApi` and its runtime schemas. It depends only on Effect, does not import Core or server implementation packages, and is hosted by the server with server-only middleware added during composition.
+- The rich Effect emitter regenerates private executable schemas when the **SDK Contract IR** proves that their transport semantics can be reproduced exactly. Contracts with authoritative custom transformations use the import-based Effect emitter against the canonical V2 server `HttpApi`; the Promise emitter still derives zero-Effect structural wire types from the same IR.
+- `@opencode-ai/server` owns the authoritative V2 `HttpApi`. The real server and client generation consume that same API value; generator selection controls emitted capabilities without redefining their contracts.
 - The first Promise emitter targets the same clean domain-oriented method organization rather than Hey API source compatibility. It returns unwrapped values directly, rejects declared and infrastructure failures, and begins with minimal client-level transport configuration; result wrappers, interceptors, and legacy generated signatures are outside the initial surface.
 - The first Promise emitter parses response syntax and trusts its generated structural types; it does not perform runtime structural validation. Malformed payload syntax fails, while a syntactically valid shape mismatch is not detected at the SDK boundary. Standalone validator generation remains an optional future emitter policy.
 - Declared Promise-client failures retain their tagged structural wire values and have generated type guards. Consumers do not depend on generated `Error` subclass identity, preserving discrimination across package copies and realms while remaining structurally aligned with Effect domain errors.

bun.lock

@@ -8,6 +8,15 @@ Private generation target for clients derived directly from OpenCode's authorita
 - `@opencode-ai/client/effect`: rich Effect network client using an environment-provided `HttpClient`.
 - `@opencode-ai/client/effect/embedded`: scoped embedded OpenCode host backed by Core and the in-memory HTTP router.
 
-The initial generated surface contains `sessions.list`, `create`, `get`, `switchAgent`, `switchModel`, and `prompt`, sourced from the public `HttpApi` in `@opencode-ai/api` and hosted by `@opencode-ai/server`. Run `bun run generate` after changing that contract and `bun run check:generated` to detect committed-output drift.
+The initial generated surface contains `sessions.list`, `create`, `get`, `switchAgent`, `switchModel`, and `prompt`, sourced directly from the V2 `HttpApi` hosted by `@opencode-ai/server`. Run `bun run generate` after changing that contract and `bun run check:generated` to detect committed-output drift.
 
-The embedded entrypoint remains intentionally empty until the scoped in-memory host is implemented.
+The embedded entrypoint exposes a scoped host backed by the same server router, middleware, handlers, and HTTP codecs as the network client:
+
+```ts
+import { OpenCode } from "@opencode-ai/client/effect/embedded"
+
+const opencode = yield * OpenCode.create()
+const session = yield * opencode.sessions.get({ sessionID })
+```
+
+It also exposes embedded-only `tools.register(...)`. Closing the owning Effect Scope releases the router resources, location services, fibers, and scoped tool registrations.

packages/api/package.json

@@ -16,7 +16,8 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@opencode-ai/api": "workspace:*"
+    "@opencode-ai/core": "workspace:*",
+    "@opencode-ai/server": "workspace:*"
   },
   "peerDependencies": {
     "effect": "4.0.0-beta.83"

packages/api/tsconfig.json

@@ -1,16 +1,43 @@
 import { NodeFileSystem } from "@effect/platform-node"
-import { Api } from "@opencode-ai/api"
+import {
+  SessionsCreate,
+  SessionsGet,
+  SessionsList,
+  SessionsPrompt,
+  SessionsSwitchAgent,
+  SessionsSwitchModel,
+} from "@opencode-ai/server/groups/session-endpoints"
 import { compile, emitEffectImported, emitPromise, write } from "@opencode-ai/httpapi-codegen"
 import { Effect } from "effect"
+import { HttpApi, HttpApiGroup } from "effect/unstable/httpapi"
 
+const Api = HttpApi.make("opencode-client").add(
+  HttpApiGroup.make("sessions")
+    .add(SessionsList)
+    .add(SessionsCreate)
+    .add(SessionsGet)
+    .add(SessionsSwitchAgent)
+    .add(SessionsSwitchModel)
+    .add(SessionsPrompt),
+)
 const contract = compile(Api)
 
 await Effect.runPromise(
   Effect.all(
     [
       write(emitPromise(contract), new URL("../src/generated", import.meta.url).pathname),
       write(
-        emitEffectImported(contract, { module: "@opencode-ai/api", api: "Api" }),
+        emitEffectImported(contract, {
+          module: "@opencode-ai/server/groups/session-endpoints",
+          endpoints: {
+            "sessions.list": "SessionsList",
+            "sessions.create": "SessionsCreate",
+            "sessions.get": "SessionsGet",
+            "sessions.switchAgent": "SessionsSwitchAgent",
+            "sessions.switchModel": "SessionsSwitchModel",
+            "sessions.prompt": "SessionsPrompt",
+          },
+        }),
         new URL("../src/generated-effect", import.meta.url).pathname,
       ),
     ],

packages/client/README.md

@@ -1,2 +1,37 @@
-// Embedded Effect host target. Intentionally empty until the public HttpApi is available.
-export {}
+export * as OpenCode from "./effect-embedded"
+
+import { ApplicationTools } from "@opencode-ai/core/tool/application-tools"
+import { createEmbeddedRoutes } from "@opencode-ai/server/routes"
+import { Context, Effect, Layer } from "effect"
+import { HttpClient, HttpRouter, HttpServer, HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
+import { OpenCode as Generated } from "./generated-effect/index"
+
+export const create = Effect.fn("OpenCode.create")(function* () {
+  const context = yield* Layer.build(
+    Layer.merge(
+      createEmbeddedRoutes().pipe(Layer.provide(HttpServer.layerServices), Layer.provideMerge(HttpRouter.layer)),
+      ApplicationTools.layer,
+    ),
+  )
+  const handler = Context.get(context, HttpRouter.HttpRouter).asHttpEffect()
+  const httpClient = HttpClient.make(
+    Effect.fnUntraced(function* (request) {
+      const response = yield* handler.pipe(
+        Effect.provideService(HttpServerRequest.HttpServerRequest, HttpServerRequest.fromClientRequest(request)),
+        Effect.orDie,
+      )
+      return HttpServerResponse.toClientResponse(response)
+    }, Effect.scoped),
+  )
+  const client = yield* Generated.make({ baseUrl: "http://opencode.local" }).pipe(
+    Effect.provideService(HttpClient.HttpClient, httpClient),
+  )
+  const tools = Context.get(context, ApplicationTools.Service)
+  return {
+    ...client,
+    tools: { register: tools.register },
+  }
+})
+
+export { ClientError } from "./generated-effect/index"
+export { Tool } from "@opencode-ai/core/public/tool"

packages/client/package.json

@@ -2,10 +2,27 @@
 import { Effect, Schema } from "effect"
 import { Sse } from "effect/unstable/encoding"
 import { HttpClientError } from "effect/unstable/http"
-import { HttpApiClient } from "effect/unstable/httpapi"
-import { Api } from "@opencode-ai/api"
+import { HttpApi, HttpApiClient, HttpApiGroup } from "effect/unstable/httpapi"
+import {
+  SessionsList,
+  SessionsCreate,
+  SessionsGet,
+  SessionsSwitchAgent,
+  SessionsSwitchModel,
+  SessionsPrompt,
+} from "@opencode-ai/server/groups/session-endpoints"
 import { ClientError } from "./client-error"
 
+const Api = HttpApi.make("generated").add(
+  HttpApiGroup.make("sessions")
+    .add(SessionsList)
+    .add(SessionsCreate)
+    .add(SessionsGet)
+    .add(SessionsSwitchAgent)
+    .add(SessionsSwitchModel)
+    .add(SessionsPrompt),
+)
+
 type RawClient = HttpApiClient.ForApi<typeof Api>
 
 const mapClientError = <E,>(error: E) =>

packages/client/script/build.ts

@@ -113,7 +113,7 @@ export type SessionsListInput = {
 export type SessionsListOutput = {
   readonly data: ReadonlyArray<{
     readonly id: string
-    readonly parentID?: string
+    readonly parentID?: string | null
     readonly projectID: string
     readonly agent?: string | null
     readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string | null } | null
@@ -124,7 +124,11 @@ export type SessionsListOutput = {
       readonly reasoning: number
       readonly cache: { readonly read: number; readonly write: number }
     }
-    readonly time: { readonly created: number; readonly updated: number; readonly archived?: number | null }
+    readonly time: {
+      readonly created: number | "Infinity" | "-Infinity" | "NaN"
+      readonly updated: number | "Infinity" | "-Infinity" | "NaN"
+      readonly archived?: number | "Infinity" | "-Infinity" | "NaN" | null
+    }
     readonly title: string
     readonly location: { readonly directory: string; readonly workspaceID?: string | null }
     readonly subpath?: string | null
@@ -170,7 +174,7 @@ export type SessionsCreateInput = {
 export type SessionsCreateOutput = {
   readonly data: {
     readonly id: string
-    readonly parentID?: string
+    readonly parentID?: string | null
     readonly projectID: string
     readonly agent?: string | null
     readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string | null } | null
@@ -181,7 +185,11 @@ export type SessionsCreateOutput = {
       readonly reasoning: number
       readonly cache: { readonly read: number; readonly write: number }
     }
-    readonly time: { readonly created: number; readonly updated: number; readonly archived?: number | null }
+    readonly time: {
+      readonly created: number | "Infinity" | "-Infinity" | "NaN"
+      readonly updated: number | "Infinity" | "-Infinity" | "NaN"
+      readonly archived?: number | "Infinity" | "-Infinity" | "NaN" | null
+    }
     readonly title: string
     readonly location: { readonly directory: string; readonly workspaceID?: string | null }
     readonly subpath?: string | null
@@ -193,7 +201,7 @@ export type SessionsGetInput = { readonly sessionID: { readonly sessionID: strin
 export type SessionsGetOutput = {
   readonly data: {
     readonly id: string
-    readonly parentID?: string
+    readonly parentID?: string | null
     readonly projectID: string
     readonly agent?: string | null
     readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string | null } | null
@@ -204,7 +212,11 @@ export type SessionsGetOutput = {
       readonly reasoning: number
       readonly cache: { readonly read: number; readonly write: number }
     }
-    readonly time: { readonly created: number; readonly updated: number; readonly archived?: number | null }
+    readonly time: {
+      readonly created: number | "Infinity" | "-Infinity" | "NaN"
+      readonly updated: number | "Infinity" | "-Infinity" | "NaN"
+      readonly archived?: number | "Infinity" | "-Infinity" | "NaN" | null
+    }
     readonly title: string
     readonly location: { readonly directory: string; readonly workspaceID?: string | null }
     readonly subpath?: string | null
@@ -343,7 +355,7 @@ export type SessionsPromptOutput = {
       }> | null
     }
     readonly delivery: "steer" | "queue"
-    readonly timeCreated: number
+    readonly timeCreated: number | "Infinity" | "-Infinity" | "NaN"
     readonly promotedSeq?: number | null
   }
 }["data"]