Skip to content

Commit 69910f3

Browse files
authored
fix(server): use persisted session directory for existing-session routes (anomalyco#29640)
1 parent 7bafbb3 commit 69910f3

2 files changed

Lines changed: 49 additions & 6 deletions

File tree

‎packages/opencode/src/server/routes/instance/httpapi/middleware/workspace-routing.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ function planWorkspaceRequest(
159159

160160
function planRequest(
161161
request: HttpServerRequest.HttpServerRequest,
162-
sessionWorkspaceID?: WorkspaceID,
162+
session?: Session.Info,
163163
): Effect.Effect<RequestPlan, never, Workspace.Service> {
164164
return Effect.gen(function* () {
165165
const url = requestURL(request)
166166
const envWorkspaceID = configuredWorkspaceID()
167167
const workspaceID = url.pathname.startsWith("/api/")
168-
? selectedV2WorkspaceID(url, sessionWorkspaceID)
169-
: selectedWorkspaceID(url, sessionWorkspaceID)
168+
? selectedV2WorkspaceID(url, session?.workspaceID)
169+
: selectedWorkspaceID(url, session?.workspaceID)
170170
if (workspaceID === InvalidWorkspaceID) return RequestPlan.InvalidWorkspace()
171171
const workspace = yield* resolveWorkspace(workspaceID, envWorkspaceID)
172172

@@ -178,7 +178,10 @@ function planRequest(
178178
return yield* planWorkspaceRequest(request, url, workspace)
179179
}
180180

181-
return RequestPlan.Local({ directory: defaultDirectory(request, url), workspaceID: envWorkspaceID ?? workspaceID })
181+
return RequestPlan.Local({
182+
directory: session?.directory || defaultDirectory(request, url),
183+
workspaceID: envWorkspaceID ?? workspaceID,
184+
})
182185
})
183186
}
184187

@@ -226,7 +229,7 @@ function routeHttpApiWorkspace<E>(
226229
Effect.catchDefect(() => Effect.succeed(undefined)),
227230
)
228231
: undefined
229-
const plan = yield* planRequest(request, session?.workspaceID)
232+
const plan = yield* planRequest(request, session)
230233
return yield* routeWorkspace(client, effect, plan)
231234
})
232235
}

‎packages/opencode/test/server/httpapi-session.test.ts‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { afterEach, describe, expect } from "bun:test"
22
import { mkdir } from "node:fs/promises"
33
import path from "node:path"
44
import { Cause, Effect, Exit, Layer } from "effect"
5+
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
56
import { Flag } from "@opencode-ai/core/flag/flag"
67
import { registerAdapter } from "../../src/control-plane/adapters"
78
import type { WorkspaceAdapter } from "../../src/control-plane/types"
@@ -27,7 +28,9 @@ import * as DateTime from "effect/DateTime"
2728
import * as Log from "@opencode-ai/core/util/log"
2829
import { eq } from "drizzle-orm"
2930
import { resetDatabase } from "../fixture/db"
30-
import { disposeAllInstances, TestInstance } from "../fixture/fixture"
31+
import { disposeAllInstances, provideInstanceEffect, TestInstance, tmpdirScoped } from "../fixture/fixture"
32+
import { TestLLMServer } from "../lib/llm-server"
33+
import { testProviderConfig } from "../lib/test-provider"
3134
import { testEffect } from "../lib/effect"
3235

3336
void Log.init({ print: false })
@@ -368,6 +371,43 @@ describe("session HttpApi", () => {
368371
{ git: true, config: { formatter: false, lsp: false } },
369372
)
370373

374+
it.live("uses the persisted session directory for prompt requests", () =>
375+
Effect.gen(function* () {
376+
const llm = yield* TestLLMServer
377+
yield* llm.text("ok", { usage: { input: 1, output: 1 } })
378+
379+
const config = testProviderConfig(llm.url)
380+
const sessionDirectory = yield* tmpdirScoped({ git: true, config })
381+
const requestDirectory = yield* tmpdirScoped({ git: true, config })
382+
const session = yield* createSession({ title: "directory regression" }).pipe(provideInstanceEffect(sessionDirectory))
383+
384+
const response = yield* request(
385+
`${pathFor(SessionPaths.prompt, { sessionID: session.id })}?directory=${encodeURIComponent(requestDirectory)}`,
386+
{
387+
method: "POST",
388+
headers: { "content-type": "application/json" },
389+
body: JSON.stringify({
390+
agent: "build",
391+
model: { providerID: "test", modelID: "test-model" },
392+
parts: [{ type: "text", text: "which directory?" }],
393+
}),
394+
},
395+
)
396+
397+
expect(response.status).toBe(200)
398+
yield* responseJson(response)
399+
400+
const messages = yield* Session.use
401+
.messages({ sessionID: session.id })
402+
.pipe(provideInstanceEffect(sessionDirectory), Effect.orDie)
403+
const assistant = messages.find((message) => message.info.role === "assistant")
404+
expect(assistant?.info.role === "assistant" ? assistant.info.path : undefined).toEqual({
405+
cwd: sessionDirectory,
406+
root: sessionDirectory,
407+
})
408+
}).pipe(Effect.provide(TestLLMServer.layer), Effect.provide(CrossSpawnSpawner.defaultLayer)),
409+
)
410+
371411
it.instance(
372412
"returns v2 public request errors for cursor and workspace query failures",
373413
() =>

0 commit comments

Comments
 (0)