infer workspace from context when creating session

Author: jlongster

packages/opencode/src/cli/cmd/tui/component/dialog-workspace-create.tsx

@@ -44,15 +44,13 @@ export async function openWorkspaceSession(input: {
   console.log("opening!")
   while (true) {
     console.log("creating")
-    const result = await client.session
-      .create({ workspaceID: input.workspaceID, workspace: input.workspaceID })
-      .catch((err) => {
-        log.error("workspace session create request failed", {
-          workspaceID: input.workspaceID,
-          error: errorData(err),
-        })
-        return undefined
+    const result = await client.session.create({ workspace: input.workspaceID }).catch((err) => {
+      log.error("workspace session create request failed", {
+        workspaceID: input.workspaceID,
+        error: errorData(err),
       })
+      return undefined
+    })
     if (!result) {
       input.toast.show({
         message: "Failed to create workspace session",

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

@@ -615,10 +615,7 @@ export function Prompt(props: PromptProps) {
 
     let sessionID = props.sessionID
     if (sessionID == null) {
-      const res = await sdk.client.session.create({
-        workspace: props.workspaceID,
-        workspaceID: props.workspaceID,
-      })
+      const res = await sdk.client.session.create({ workspace: props.workspaceID })
 
       if (res.error) {
         console.log("Creating a session failed:", res.error)

packages/opencode/src/control-plane/workspace-context.ts

@@ -2,17 +2,17 @@ import { LocalContext } from "../util/local-context"
 import type { WorkspaceID } from "../control-plane/schema"
 
 export interface WorkspaceContext {
-  workspaceID: string
+  workspaceID: WorkspaceID
 }
 
 const context = LocalContext.create<WorkspaceContext>("instance")
 
 export const WorkspaceContext = {
   async provide<R>(input: { workspaceID: WorkspaceID; fn: () => R }): Promise<R> {
-    return context.provide({ workspaceID: input.workspaceID as string }, () => input.fn())
+    return context.provide({ workspaceID: input.workspaceID }, () => input.fn())
   },
 
-  restore<R>(workspaceID: string, fn: () => R): R {
+  restore<R>(workspaceID: WorkspaceID, fn: () => R): R {
     return context.provide({ workspaceID }, fn)
   },
 

packages/opencode/src/effect/bridge.ts

@@ -2,6 +2,7 @@ import { Effect, Fiber } from "effect"
 import { WorkspaceContext } from "@/control-plane/workspace-context"
 import { Instance, type InstanceContext } from "@/project/instance"
 import { LocalContext } from "@/util/local-context"
+import type { WorkspaceID } from "@/control-plane/schema"
 import { InstanceRef, WorkspaceRef } from "./instance-ref"
 import { attachWith } from "./run-service"
 
@@ -11,7 +12,7 @@ export namespace EffectBridge {
     readonly fork: <A, E, R>(effect: Effect.Effect<A, E, R>) => Fiber.Fiber<A, E>
   }
 
-  function restore<R>(instance: InstanceContext | undefined, workspace: string | undefined, fn: () => R): R {
+  function restore<R>(instance: InstanceContext | undefined, workspace: WorkspaceID | undefined, fn: () => R): R {
     if (instance && workspace !== undefined) {
       return WorkspaceContext.restore(workspace, () => Instance.restore(instance, fn))
     }

packages/opencode/src/effect/instance-ref.ts

@@ -1,10 +1,11 @@
 import { Context } from "effect"
 import type { InstanceContext } from "@/project/instance"
+import type { WorkspaceID } from "@/control-plane/schema"
 
 export const InstanceRef = Context.Reference<InstanceContext | undefined>("~opencode/InstanceRef", {
   defaultValue: () => undefined,
 })
 
-export const WorkspaceRef = Context.Reference<string | undefined>("~opencode/WorkspaceRef", {
+export const WorkspaceRef = Context.Reference<WorkspaceID | undefined>("~opencode/WorkspaceRef", {
   defaultValue: () => undefined,
 })

packages/opencode/src/session/index.ts

@@ -527,12 +527,14 @@ export namespace Session {
         workspaceID?: WorkspaceID
       }) {
         const directory = yield* InstanceState.directory
+        const workspace = yield* InstanceState.workspaceID
+
         return yield* createNext({
           parentID: input?.parentID,
           directory,
           title: input?.title,
           permission: input?.permission,
-          workspaceID: input?.workspaceID,
+          workspaceID: workspace,
         })
       })