From 3e1aa1e58c9e832608699eff33b78ba66233828b Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Fri, 2 Oct 2026 23:43:56 -0500 Subject: [PATCH] fix(server): return 404 when a location folder is missing (#52668) --- .../client/src/promise/generated/client.ts | 96 ++++++++++--------- .../client/src/promise/generated/types.ts | 8 ++ packages/core/src/instance.ts | 18 +++- packages/core/src/instance/service.ts | 4 +- packages/core/src/location-services.ts | 2 +- packages/core/src/session.ts | 20 +++- packages/core/src/session/generate.ts | 8 +- packages/core/src/session/move.ts | 9 +- packages/core/src/session/runner/index.ts | 2 + packages/core/src/worktree.ts | 2 + packages/core/test/fixture/prompt-location.ts | 3 +- packages/core/test/location-activity.test.ts | 3 +- packages/core/test/location-layer.test.ts | 3 +- packages/core/test/session-compact.test.ts | 3 +- packages/core/test/session-execution.test.ts | 3 +- packages/core/test/session-move.test.ts | 9 +- packages/core/test/session-prompt.test.ts | 3 +- packages/core/test/session-skill.test.ts | 3 +- packages/protocol/src/client.ts | 5 +- packages/protocol/src/errors.ts | 7 ++ packages/protocol/src/groups/generate.ts | 4 +- packages/protocol/src/groups/permission.ts | 4 +- packages/protocol/src/groups/session.ts | 17 ++-- packages/sdk/src/internal/instances.ts | 6 +- packages/server/src/handlers/generate.ts | 31 +++--- packages/server/src/handlers/location.ts | 2 +- packages/server/src/handlers/permission.ts | 4 +- packages/server/src/handlers/session.ts | 7 ++ packages/server/src/location.ts | 22 ++++- .../server/src/middleware/form-location.ts | 10 +- .../server/src/middleware/session-location.ts | 8 +- packages/server/test/fetch.test.ts | 59 +++++++++++- 32 files changed, 272 insertions(+), 113 deletions(-) diff --git a/packages/client/src/promise/generated/client.ts b/packages/client/src/promise/generated/client.ts index 0cec6eb32be..578f04995ce 100644 --- a/packages/client/src/promise/generated/client.ts +++ b/packages/client/src/promise/generated/client.ts @@ -449,7 +449,7 @@ export function make(options: ClientOptions) { path: `/api/location`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -474,7 +474,7 @@ export function make(options: ClientOptions) { path: `/api/agent`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -500,7 +500,7 @@ export function make(options: ClientOptions) { path: `/api/plugin`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -513,7 +513,7 @@ export function make(options: ClientOptions) { query: { location: input?.["location"] }, body: { target: input?.["target"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -526,7 +526,7 @@ export function make(options: ClientOptions) { query: { location: input["location"] }, body: { targets: input["targets"] }, successStatus: 204, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: true, }, requestOptions, @@ -1116,7 +1116,7 @@ export function make(options: ClientOptions) { path: `/api/model`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -1128,7 +1128,7 @@ export function make(options: ClientOptions) { path: `/api/model/default`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -1142,7 +1142,7 @@ export function make(options: ClientOptions) { path: `/api/experimental/generate`, body: { prompt: input["prompt"], model: input["model"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -1156,7 +1156,7 @@ export function make(options: ClientOptions) { path: `/api/provider`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -1182,7 +1182,7 @@ export function make(options: ClientOptions) { path: `/api/integration`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1208,7 +1208,7 @@ export function make(options: ClientOptions) { query: { location: input["location"] }, body: { url: input["url"] }, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, @@ -1238,7 +1238,7 @@ export function make(options: ClientOptions) { query: { location: input["location"] }, body: { methodID: input["methodID"], answer: input["answer"], label: input["label"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1275,7 +1275,7 @@ export function make(options: ClientOptions) { path: `/api/integration/${encodeURIComponent(input.integrationID)}/connect/oauth/${encodeURIComponent(input.attemptID)}`, query: { location: input["location"] }, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, @@ -1314,7 +1314,7 @@ export function make(options: ClientOptions) { path: `/api/integration/${encodeURIComponent(input.integrationID)}/connect/command/${encodeURIComponent(input.attemptID)}`, query: { location: input["location"] }, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, @@ -1329,7 +1329,7 @@ export function make(options: ClientOptions) { path: `/api/mcp`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1342,7 +1342,7 @@ export function make(options: ClientOptions) { query: { location: input["location"] }, body: { config: input["config"] }, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, @@ -1391,7 +1391,7 @@ export function make(options: ClientOptions) { path: `/api/mcp/resource`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1460,7 +1460,7 @@ export function make(options: ClientOptions) { project: { list: (requestOptions?: RequestOptions) => request( - { method: "GET", path: `/api/project`, successStatus: 200, declaredStatuses: [400, 401], empty: false }, + { method: "GET", path: `/api/project`, successStatus: 200, declaredStatuses: [400, 401, 404], empty: false }, requestOptions, ), update: (input: ProjectUpdateInput, requestOptions?: RequestOptions) => @@ -1489,7 +1489,7 @@ export function make(options: ClientOptions) { path: `/api/form`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1504,7 +1504,7 @@ export function make(options: ClientOptions) { path: `/api/permission/request`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1518,7 +1518,7 @@ export function make(options: ClientOptions) { path: `/api/permission/saved`, query: { projectID: input?.["projectID"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1529,7 +1529,7 @@ export function make(options: ClientOptions) { method: "DELETE", path: `/api/permission/saved/${encodeURIComponent(input.id)}`, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, @@ -1611,7 +1611,7 @@ export function make(options: ClientOptions) { path: `/api/fs/list`, query: { location: input?.["location"], path: input?.["path"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1623,7 +1623,7 @@ export function make(options: ClientOptions) { path: `/api/fs/find`, query: { location: input["location"], query: input["query"], type: input["type"], limit: input["limit"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1636,7 +1636,7 @@ export function make(options: ClientOptions) { query: { location: input["location"], path: input["path"] }, body: input["payload"], successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, binaryBody: true, }, @@ -1651,7 +1651,7 @@ export function make(options: ClientOptions) { path: `/api/command`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1665,7 +1665,7 @@ export function make(options: ClientOptions) { path: `/api/skill`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1680,7 +1680,7 @@ export function make(options: ClientOptions) { query: { location: input["location"] }, body: { input: input["input"] }, successStatus: 200, - declaredStatuses: [400, 401, 500], + declaredStatuses: [400, 401, 404, 500], empty: false, }, requestOptions, @@ -1701,7 +1701,7 @@ export function make(options: ClientOptions) { path: `/api/pty`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1720,7 +1720,7 @@ export function make(options: ClientOptions) { env: input?.["env"], }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1911,7 +1911,7 @@ export function make(options: ClientOptions) { path: `/api/shell`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1929,7 +1929,7 @@ export function make(options: ClientOptions) { metadata: input["metadata"], }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -1965,7 +1965,7 @@ export function make(options: ClientOptions) { path: `/api/shell/${encodeURIComponent(input.id)}`, query: { location: input["location"] }, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, @@ -1979,7 +1979,7 @@ export function make(options: ClientOptions) { path: `/api/reference`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -2049,7 +2049,7 @@ export function make(options: ClientOptions) { path: `/api/vcs/init`, query: { location: input?.["location"], provider: input?.["provider"] }, successStatus: 204, - declaredStatuses: [400, 401, 409, 501, 503], + declaredStatuses: [400, 401, 404, 409, 501, 503], empty: true, }, requestOptions, @@ -2061,7 +2061,7 @@ export function make(options: ClientOptions) { path: `/api/vcs`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -2073,7 +2073,7 @@ export function make(options: ClientOptions) { path: `/api/vcs/base`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -2085,7 +2085,7 @@ export function make(options: ClientOptions) { path: `/api/vcs/status`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -2098,7 +2098,7 @@ export function make(options: ClientOptions) { path: `/api/vcs/branch`, query: { location: input?.["location"], search: input?.["search"], limit: input?.["limit"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, @@ -2111,7 +2111,7 @@ export function make(options: ClientOptions) { path: `/api/vcs/diff`, query: { location: input["location"], mode: input["mode"], base: input["base"], context: input["context"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -2167,7 +2167,7 @@ export function make(options: ClientOptions) { path: `/api/websearch/provider`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -2180,7 +2180,7 @@ export function make(options: ClientOptions) { query: { location: input["location"] }, body: { query: input["query"], providerID: input["providerID"] }, successStatus: 200, - declaredStatuses: [400, 401, 503], + declaredStatuses: [400, 401, 404, 503], empty: false, }, requestOptions, @@ -2194,14 +2194,20 @@ export function make(options: ClientOptions) { path: `/api/config`, query: { location: input?.["location"] }, successStatus: 200, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: false, }, requestOptions, ), shells: (requestOptions?: RequestOptions) => request( - { method: "GET", path: `/api/config/shell`, successStatus: 200, declaredStatuses: [400, 401], empty: false }, + { + method: "GET", + path: `/api/config/shell`, + successStatus: 200, + declaredStatuses: [400, 401, 404], + empty: false, + }, requestOptions, ), update: (input: ConfigUpdateInput, requestOptions?: RequestOptions) => @@ -2211,7 +2217,7 @@ export function make(options: ClientOptions) { path: `/api/experimental/config`, body: { shell: input["shell"] }, successStatus: 204, - declaredStatuses: [400, 401], + declaredStatuses: [400, 401, 404], empty: true, }, requestOptions, diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts index 4333f7c65e1..62a6395c9d6 100644 --- a/packages/client/src/promise/generated/types.ts +++ b/packages/client/src/promise/generated/types.ts @@ -2531,6 +2531,14 @@ export type UnauthorizedError = { readonly _tag: "UnauthorizedError"; readonly m export const isUnauthorizedError = (value: unknown): value is UnauthorizedError => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "UnauthorizedError" +export type LocationNotFoundError = { + readonly _tag: "LocationNotFoundError" + readonly location: { readonly directory: string } + readonly message: string +} +export const isLocationNotFoundError = (value: unknown): value is LocationNotFoundError => + typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "LocationNotFoundError" + export type ServiceUnavailableError = { readonly _tag: "ServiceUnavailableError" readonly message: string diff --git a/packages/core/src/instance.ts b/packages/core/src/instance.ts index 0699bc2dfb2..0586fbaf9dc 100644 --- a/packages/core/src/instance.ts +++ b/packages/core/src/instance.ts @@ -114,7 +114,7 @@ const nodes = [ export const graph = LayerNode.group(nodes) export type Services = LayerNode.Output -export type Error = Layer.Error> +export type Error = FileSystem.DirectoryNotFoundError export interface Options { // Plugins this instance is born with; empty and absent are equivalent. @@ -145,7 +145,7 @@ const vanillaReplacements: LayerNode.Replacements = [ ] // One instance is one compiled, fresh copy of the graph standing on a directory. -export function layer(ref: Location.Ref, options: Options = {}): Layer.Layer { +export function layer(ref: Location.Ref, options: Options = {}): Layer.Layer { const startedAt = performance.now() // Ordered: vanilla defaults, then caller replacements (which win over the // defaults), then instance bindings (which win over everything). @@ -157,8 +157,18 @@ export function layer(ref: Location.Ref, options: Options = {}): Layer.Layer => + Layer.unwrap( + Effect.failCause(cause).pipe( + Effect.catch( + (error): Effect.Effect => + error instanceof FileSystem.DirectoryNotFoundError ? Effect.fail(error) : Effect.die(error), + ), + ), + ), + ), Layer.tap((context) => Effect.addFinalizer(() => Context.get(context, LocationLifecycle.Service).shutdown)), Layer.tap(() => Effect.logInfo("location services booted", { diff --git a/packages/core/src/instance/service.ts b/packages/core/src/instance/service.ts index dd6ef5892e4..f23d28f49f2 100644 --- a/packages/core/src/instance/service.ts +++ b/packages/core/src/instance/service.ts @@ -5,13 +5,13 @@ import { Context, type Effect } from "effect" import type { Session } from "@opencode/schema/session" import { Node } from "@opencode/util/effect/app-node" import { LayerNode } from "@opencode/util/effect/layer-node" -import type { Services } from "../instance.js" +import type { Services, Error } from "../instance.js" /** Selects Session capabilities; implementations own caching and lifetime. */ export interface Interface { readonly provide: ( session: Session.Info, - ) => (effect: Effect.Effect) => Effect.Effect> + ) => (effect: Effect.Effect) => Effect.Effect> } export class Service extends Context.Service()("@opencode/Instance") {} diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts index 893c4d215b7..8498df7f6f5 100644 --- a/packages/core/src/location-services.ts +++ b/packages/core/src/location-services.ts @@ -17,7 +17,7 @@ export function buildLocationServiceMap( Effect.gen(function* () { const owner = yield* Effect.scope const builds = MutableHashMap.empty }>() - const inner: LayerMap.LayerMap = yield* LayerMap.make( + const inner: LayerMap.LayerMap = yield* LayerMap.make( (ref: Location.Ref) => { const build: { close?: Effect.Effect } = {} MutableHashMap.set(builds, ref, build) diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts index 253661d087e..39f5f36d3a5 100644 --- a/packages/core/src/session.ts +++ b/packages/core/src/session.ts @@ -8,6 +8,7 @@ import { and, desc, eq } from "drizzle-orm" import { Project } from "./project.js" import { Model } from "@opencode/schema/model" import { Location } from "./location.js" +import type { FileSystem } from "./filesystem.js" import { SessionMessage } from "./session/message.js" import { PromptInput } from "@opencode/schema/prompt-input" import { Bus } from "./bus.js" @@ -145,7 +146,10 @@ export interface Interface { readonly from?: SessionMessage.ID readonly to?: SessionMessage.ID readonly context?: number - }) => Effect.Effect + }) => Effect.Effect< + readonly FileDiff.Info[], + NotFoundError | MessageNotFoundError | TurnRangeError | Snapshot.Error | FileSystem.DirectoryNotFoundError + > /** * Durable admitted session work not yet visible in projected history, * ordered by admission. Includes unpromoted user and synthetic inputs and @@ -195,7 +199,10 @@ export interface Interface { agents?: PromptInput.Prompt["agents"] skills?: PromptInput.Prompt["skills"] delivery?: SessionInbox.Delivery - }) => Effect.Effect + }) => Effect.Effect< + void, + NotFoundError | Command.NotFoundError | Command.ExecutionError | FileSystem.DirectoryNotFoundError + > readonly shell: ( input: Parameters[0] & { sessionID: SessionSchema.ID }, ) => ReturnType @@ -218,8 +225,13 @@ export interface Interface { sessionID: SessionSchema.ID messageID: SessionMessage.ID files?: boolean - }) => Effect.Effect - readonly clear: (sessionID: SessionSchema.ID) => Effect.Effect + }) => Effect.Effect< + SessionSchema.Revert, + NotFoundError | MessageNotFoundError | BusyError | Snapshot.Error | FileSystem.DirectoryNotFoundError + > + readonly clear: ( + sessionID: SessionSchema.ID, + ) => Effect.Effect readonly commit: (sessionID: SessionSchema.ID) => Effect.Effect } } diff --git a/packages/core/src/session/generate.ts b/packages/core/src/session/generate.ts index d8561d016e3..e2600badb83 100644 --- a/packages/core/src/session/generate.ts +++ b/packages/core/src/session/generate.ts @@ -1,5 +1,6 @@ export * as SessionGenerate from "./generate.js" +import type { FileSystem } from "../filesystem.js" import { LLMClient, Message, type AIError } from "@opencode/ai" import { Effect } from "effect" import { Database } from "../database/database.js" @@ -14,7 +15,12 @@ import { SessionModelRequest } from "./model-request.js" import type { SessionRunnerModel } from "./runner/model.js" import type { SessionSchema } from "./schema.js" -export type Error = AgentNotFoundError | Instructions.InitializationBlocked | SessionRunnerModel.Error | AIError +export type Error = + | AgentNotFoundError + | Instructions.InitializationBlocked + | SessionRunnerModel.Error + | AIError + | FileSystem.DirectoryNotFoundError /** Generates text from current Session context without mutating the Session. */ export const generate = Effect.fn("SessionGenerate.generate")(function* (input: { diff --git a/packages/core/src/session/move.ts b/packages/core/src/session/move.ts index f11e4990031..b466d0f0321 100644 --- a/packages/core/src/session/move.ts +++ b/packages/core/src/session/move.ts @@ -91,7 +91,8 @@ const layer = Layer.effect( yield* locations.contextEffect(destination.location).pipe( Effect.scoped, Effect.catchCause((cause) => { - if (Cause.hasInterruptsOnly(cause)) return Effect.failCause(cause) + if (Cause.hasInterruptsOnly(cause)) + return Effect.failCause(Cause.fromReasons(cause.reasons.filter(Cause.isInterruptReason))) return Effect.logWarning("session move destination unavailable", { directory, cause }).pipe( Effect.andThen(Effect.fail(new DestinationUnavailableError({ directory }))), ) @@ -106,7 +107,11 @@ const layer = Layer.effect( return yield* SessionRunner.Service.pipe( instances.provide(session), Effect.as(false), - Effect.catchCause((cause) => (Cause.hasInterrupts(cause) ? Effect.failCause(cause) : Effect.succeed(true))), + Effect.catchCause((cause) => + Cause.hasInterrupts(cause) + ? Effect.failCause(Cause.fromReasons(cause.reasons.filter(Cause.isInterruptReason))) + : Effect.succeed(true), + ), ) }) diff --git a/packages/core/src/session/runner/index.ts b/packages/core/src/session/runner/index.ts index 644983587d0..493713fa676 100644 --- a/packages/core/src/session/runner/index.ts +++ b/packages/core/src/session/runner/index.ts @@ -1,5 +1,6 @@ export * as SessionRunner from "./index.js" +import type { FileSystem } from "../../filesystem.js" import type { AIError } from "@opencode/ai" import { Context, Data, Effect } from "effect" import { SessionSchema } from "../schema.js" @@ -15,6 +16,7 @@ export type RunError = | AgentNotFoundError | StepFailedError | Instructions.InitializationBlocked + | FileSystem.DirectoryNotFoundError export type Continuation = { readonly step: number } diff --git a/packages/core/src/worktree.ts b/packages/core/src/worktree.ts index d1c17b47ed0..d6d2685e8cf 100644 --- a/packages/core/src/worktree.ts +++ b/packages/core/src/worktree.ts @@ -12,6 +12,7 @@ import { Slug } from "./util/slug.js" import { Bus } from "./bus.js" import { Database } from "./database/database.js" import { Location } from "./location.js" +import type { FileSystem } from "./filesystem.js" import { LocationServiceMap } from "./location-service-map.js" import { Project } from "./project.js" import { Worktree } from "@opencode/schema/worktree" @@ -67,6 +68,7 @@ export class StrategyUnavailableError extends Schema.TaggedError, + }) as unknown as Layer.Layer, ) }), ), diff --git a/packages/core/test/location-activity.test.ts b/packages/core/test/location-activity.test.ts index 4ca873afbc0..a71b0a82f45 100644 --- a/packages/core/test/location-activity.test.ts +++ b/packages/core/test/location-activity.test.ts @@ -1,3 +1,4 @@ +import type { FileSystem } from "@opencode/core/filesystem" import { describe, expect } from "bun:test" import { Context, Deferred, Duration, Effect, Fiber, Layer, LayerMap, RcMap, Schema } from "effect" import { TestClock } from "effect/testing" @@ -65,7 +66,7 @@ const locations = Layer.effect( Layer.provideMerge(Form.layer), Layer.provide(Layer.succeed(Bus.Service, bus)), Layer.fresh, - ) as unknown as Layer.Layer, + ) as unknown as Layer.Layer, { idleTimeToLive: Duration.infinity }, ) return { diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts index 718385c2ac3..4506d0fca4d 100644 --- a/packages/core/test/location-layer.test.ts +++ b/packages/core/test/location-layer.test.ts @@ -1,3 +1,4 @@ +import type { FileSystem } from "@opencode/core/filesystem" import fs from "fs/promises" import path from "path" import { describe, expect } from "bun:test" @@ -67,7 +68,7 @@ const activityLocations = Layer.effect( workspaceID: ref.workspaceID, project: { id: Project.ID.global, directory: ref.directory, canonical: ref.directory }, }), - ) as unknown as Layer.Layer, + ) as unknown as Layer.Layer, { idleTimeToLive: Duration.infinity }, ), ) diff --git a/packages/core/test/session-compact.test.ts b/packages/core/test/session-compact.test.ts index 496d599fbdb..cb9f7b25548 100644 --- a/packages/core/test/session-compact.test.ts +++ b/packages/core/test/session-compact.test.ts @@ -1,3 +1,4 @@ +import type { FileSystem } from "@opencode/core/filesystem" import { describe, expect } from "bun:test" import { LLMClient, LLMEvent, LanguageModel, type LLMRequest } from "@opencode/ai" import { OpenAIChat } from "@opencode/ai/protocols" @@ -58,7 +59,7 @@ const locations = Layer.effect( Layer.provide(client), Layer.provide(config), Layer.provide(models), - ) as unknown as Layer.Layer, + ) as unknown as Layer.Layer, ), ) const it = testEffect( diff --git a/packages/core/test/session-execution.test.ts b/packages/core/test/session-execution.test.ts index 063c5fedfbc..d6cafcf7b5b 100644 --- a/packages/core/test/session-execution.test.ts +++ b/packages/core/test/session-execution.test.ts @@ -1,3 +1,4 @@ +import type { FileSystem } from "@opencode/core/filesystem" import { describe, expect, test } from "bun:test" import { AIError, TransportError } from "@opencode/ai" import { Database } from "@opencode/core/database/database" @@ -1371,7 +1372,7 @@ function buildExecution( () => // The local execution test only needs the Session runner from the Location graph. // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion - runner as unknown as Layer.Layer, + runner as unknown as Layer.Layer, ), ) return yield* Layer.buildWithScope( diff --git a/packages/core/test/session-move.test.ts b/packages/core/test/session-move.test.ts index b3797515af0..5e7fb796748 100644 --- a/packages/core/test/session-move.test.ts +++ b/packages/core/test/session-move.test.ts @@ -1,3 +1,4 @@ +import type { FileSystem } from "@opencode/core/filesystem" import { describe, expect } from "bun:test" import path from "path" import { chmod, mkdir, readdir, rm } from "fs/promises" @@ -58,7 +59,7 @@ const itWithActiveExecution = testEffect( replacements: [Project.node.replace(globalProjectNode), offlineModels], }), Layer.succeed(SessionRunner.Service, { drain: () => Effect.never }), - ) as unknown as Layer.Layer, + ) as unknown as Layer.Layer, ), ), ), @@ -68,7 +69,11 @@ const itWithActiveExecution = testEffect( const unavailableLocations = Layer.effect( LocationServiceMap.Service, LayerMap.make( - () => Layer.effectDiscard(Effect.fail(new Error("broken location"))) as unknown as Layer.Layer, + () => + Layer.effectDiscard(Effect.die(new Error("broken location"))) as unknown as Layer.Layer< + LocationServices, + FileSystem.DirectoryNotFoundError + >, ), ) const itWithUnavailableDestination = testEffect( diff --git a/packages/core/test/session-prompt.test.ts b/packages/core/test/session-prompt.test.ts index 96a2cddcb56..d6a20188945 100644 --- a/packages/core/test/session-prompt.test.ts +++ b/packages/core/test/session-prompt.test.ts @@ -1,4 +1,5 @@ import { describe, expect } from "bun:test" +import type { FileSystem } from "@opencode/core/filesystem" import { DateTime, Effect, Fiber, Layer, LayerMap, Schema, Stream } from "effect" import path from "path" import { pathToFileURL } from "url" @@ -83,7 +84,7 @@ const locations = makeGlobalNode({ restore: () => Effect.void, }), Layer.mock(Plugin.Service, { awaitActivation: Effect.void }), - ).pipe(Layer.fresh) as unknown as Layer.Layer, + ).pipe(Layer.fresh) as unknown as Layer.Layer, ) }), ), diff --git a/packages/core/test/session-skill.test.ts b/packages/core/test/session-skill.test.ts index 61f43dc2493..8876a55a91a 100644 --- a/packages/core/test/session-skill.test.ts +++ b/packages/core/test/session-skill.test.ts @@ -1,3 +1,4 @@ +import type { FileSystem } from "@opencode/core/filesystem" import path from "path" import { describe, expect } from "bun:test" import { Effect, Layer, LayerMap } from "effect" @@ -49,7 +50,7 @@ const locations = makeGlobalNode({ list: () => Effect.succeed([info]), }), Layer.mock(Plugin.Service, { awaitActivation: Effect.void }), - ) as unknown as Layer.Layer, + ) as unknown as Layer.Layer, ), ), deps: [], diff --git a/packages/protocol/src/client.ts b/packages/protocol/src/client.ts index 2d6cdb9c50e..a01155ac666 100644 --- a/packages/protocol/src/client.ts +++ b/packages/protocol/src/client.ts @@ -1,4 +1,4 @@ -import { InvalidRequestError, SessionNotFoundError } from "./errors.js" +import { LocationNotFoundError, InvalidRequestError, SessionNotFoundError } from "./errors.js" import { makeDefaultApi } from "./api.js" import type { Api } from "./api.js" import type { Context } from "effect" @@ -7,11 +7,12 @@ import type { EventGroup } from "./groups/event.js" class LocationMiddleware extends HttpApiMiddleware.Service()( "@opencode/client/LocationMiddleware", + { error: [LocationNotFoundError] }, ) {} class SessionLocationMiddleware extends HttpApiMiddleware.Service()( "@opencode/client/SessionLocationMiddleware", - { error: [InvalidRequestError, SessionNotFoundError] }, + { error: [InvalidRequestError, SessionNotFoundError, LocationNotFoundError] }, ) {} type ClientApiShape = Api< diff --git a/packages/protocol/src/errors.ts b/packages/protocol/src/errors.ts index 5e2ee1705c8..e793d8d8f5d 100644 --- a/packages/protocol/src/errors.ts +++ b/packages/protocol/src/errors.ts @@ -1,5 +1,12 @@ import { Schema } from "effect" import { Skill } from "@opencode/schema/skill" +import { Location } from "@opencode/schema/location" + +export class LocationNotFoundError extends Schema.TaggedError()( + "LocationNotFoundError", + { location: Location.PublicRef, message: Schema.String }, + { httpApiStatus: 404 }, +) {} export class InvalidRequestError extends Schema.TaggedError()( "InvalidRequestError", diff --git a/packages/protocol/src/groups/generate.ts b/packages/protocol/src/groups/generate.ts index 6bef53bac02..ab44243578e 100644 --- a/packages/protocol/src/groups/generate.ts +++ b/packages/protocol/src/groups/generate.ts @@ -1,7 +1,7 @@ import { Model } from "@opencode/schema/model" import { Schema } from "effect" import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi" -import { InvalidRequestError, ServiceUnavailableError } from "../errors.js" +import { LocationNotFoundError, InvalidRequestError, ServiceUnavailableError } from "../errors.js" export const GenerateGroup = HttpApiGroup.make("server.generate") .add( @@ -13,7 +13,7 @@ export const GenerateGroup = HttpApiGroup.make("server.generate") success: Schema.Struct({ data: Schema.Struct({ text: Schema.String }), }).annotate({ identifier: "GenerateTextResponse" }), - error: [InvalidRequestError, ServiceUnavailableError], + error: [InvalidRequestError, ServiceUnavailableError, LocationNotFoundError], }).annotateMerge( OpenApi.annotations({ identifier: "experimental.generate.text", diff --git a/packages/protocol/src/groups/permission.ts b/packages/protocol/src/groups/permission.ts index b35a71c8f9c..9085a51f9f8 100644 --- a/packages/protocol/src/groups/permission.ts +++ b/packages/protocol/src/groups/permission.ts @@ -6,7 +6,7 @@ import { Project } from "@opencode/schema/project" import { Session } from "@opencode/schema/session" import { Context, Schema } from "effect" import { HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware, HttpApiSchema, OpenApi } from "effect/unstable/httpapi" -import { PermissionNotFoundError, SessionNotFoundError } from "../errors.js" +import { LocationNotFoundError, PermissionNotFoundError, SessionNotFoundError } from "../errors.js" import { LocationQuery, locationQueryOpenApi } from "./location.js" export const makePermissionGroup = < @@ -89,7 +89,7 @@ export const makePermissionGroup = < HttpApiEndpoint.get("session.permission.list", "/api/session/:sessionID/permission", { params: { sessionID: Session.ID }, success: Schema.Struct({ data: Schema.Array(Permission.Request) }), - error: SessionNotFoundError, + error: [SessionNotFoundError, LocationNotFoundError], }).annotateMerge( OpenApi.annotations({ identifier: "session.permission.list", diff --git a/packages/protocol/src/groups/session.ts b/packages/protocol/src/groups/session.ts index 32e4a9fdee0..d5bf2af1db1 100644 --- a/packages/protocol/src/groups/session.ts +++ b/packages/protocol/src/groups/session.ts @@ -18,6 +18,7 @@ import { Context, Effect, Encoding, Result, Schema, SchemaGetter, Struct } from import { HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware, HttpApiSchema, OpenApi } from "effect/unstable/httpapi" import { ConflictError, + LocationNotFoundError, CommandExecutionError, CommandNotFoundError, FormAlreadySettledError, @@ -170,12 +171,10 @@ export const SessionsQuery = Schema.Struct({ cursor: SessionsQueryCursor.pipe(Schema.optional), }).annotate({ identifier: "SessionsQuery" }) -export const makeSessionGroup = < - I extends HttpApiMiddleware.AnyId, - S, - FormI extends HttpApiMiddleware.AnyId, - FormS, ->(sessionLocationMiddleware: Context.Key, formLocationMiddleware: Context.Key) => +export const makeSessionGroup = ( + sessionLocationMiddleware: Context.Key, + formLocationMiddleware: Context.Key, +) => HttpApiGroup.make("server.session") .add( HttpApiEndpoint.get("session.list", "/api/session", { @@ -562,9 +561,7 @@ export const makeSessionGroup = < error: [SessionNotFoundError, SessionBusyError], }) .middleware(sessionLocationMiddleware) - .annotateMerge( - OpenApi.annotations({ identifier: "session.revert.commit", summary: "Commit staged revert" }), - ), + .annotateMerge(OpenApi.annotations({ identifier: "session.revert.commit", summary: "Commit staged revert" })), ) .add( HttpApiEndpoint.get("session.context", "/api/session/:sessionID/context", { @@ -594,7 +591,7 @@ export const makeSessionGroup = < }), }), success: Schema.Struct({ data: Schema.Array(FileDiff.Info) }), - error: [InvalidRequestError, MessageNotFoundError, SessionNotFoundError, UnknownError], + error: [InvalidRequestError, MessageNotFoundError, SessionNotFoundError, UnknownError, LocationNotFoundError], }).annotateMerge( OpenApi.annotations({ identifier: "session.diff", diff --git a/packages/sdk/src/internal/instances.ts b/packages/sdk/src/internal/instances.ts index bf0f468003d..1adecd3a4ea 100644 --- a/packages/sdk/src/internal/instances.ts +++ b/packages/sdk/src/internal/instances.ts @@ -57,7 +57,11 @@ export function layer(options: Options, replacements: () => LayerNode.Replacemen ...LocationServiceMap.canonical(session.location), }) const provide = (session: Session.Info) => Effect.provide(instances.get(key(session))) - const instances: LayerMap.LayerMap, Instance.Services> = yield* LayerMap.make( + const instances: LayerMap.LayerMap< + ReturnType, + Instance.Services, + Instance.Error + > = yield* LayerMap.make( (input: ReturnType) => Layer.unwrap( Effect.gen(function* () { diff --git a/packages/server/src/handlers/generate.ts b/packages/server/src/handlers/generate.ts index 57fefbe1249..9d1f4346edd 100644 --- a/packages/server/src/handlers/generate.ts +++ b/packages/server/src/handlers/generate.ts @@ -7,6 +7,7 @@ import { Global } from "@opencode/util/global" import { Effect } from "effect" import { HttpApiBuilder } from "effect/unstable/httpapi" import { Api } from "../api" +import { locationErrors } from "../location" export const GenerateHandler = HttpApiBuilder.group(Api, "server.generate", (handlers) => Effect.gen(function* () { @@ -15,19 +16,23 @@ export const GenerateHandler = HttpApiBuilder.group(Api, "server.generate", (han const services = locations.get(Location.Ref.make({ directory: AbsolutePath.make(global.config) })) return handlers.handle( "generate.text", - Effect.fn("server.generate.text")(function* (request) { - const generate = yield* Generate.Service - const text = yield* generate - .text(request.payload) - .pipe( - Effect.mapError((error) => - error._tag === "Generate.ModelSelectionError" - ? new InvalidRequestError({ message: error.message }) - : new ServiceUnavailableError({ message: error.message, service: error.service }), - ), - ) - return { data: { text } } - }, Effect.provide(services)), + Effect.fn("server.generate.text")( + function* (request) { + const generate = yield* Generate.Service + const text = yield* generate + .text(request.payload) + .pipe( + Effect.mapError((error) => + error._tag === "Generate.ModelSelectionError" + ? new InvalidRequestError({ message: error.message }) + : new ServiceUnavailableError({ message: error.message, service: error.service }), + ), + ) + return { data: { text } } + }, + Effect.provide(services), + locationErrors, + ), ) }), ) diff --git a/packages/server/src/handlers/location.ts b/packages/server/src/handlers/location.ts index bfd7eec2785..2d376f8755d 100644 --- a/packages/server/src/handlers/location.ts +++ b/packages/server/src/handlers/location.ts @@ -24,7 +24,7 @@ export const LocationHandler = HttpApiBuilder.group(Api, "server.location", (han Effect.provideService(LocationServiceMap.Service, locations), Effect.catchCause((cause) => Cause.hasInterruptsOnly(cause) - ? Effect.failCause(cause) + ? Effect.failCause(Cause.fromReasons(cause.reasons.filter(Cause.isInterruptReason))) : Effect.fail(new ServiceUnavailableError({ message: Cause.pretty(cause), service: "location" })), ), ), diff --git a/packages/server/src/handlers/permission.ts b/packages/server/src/handlers/permission.ts index cec7bdb9bd9..72b61c0fbd7 100644 --- a/packages/server/src/handlers/permission.ts +++ b/packages/server/src/handlers/permission.ts @@ -7,7 +7,7 @@ import { Effect } from "effect" import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi" import { Api } from "../api" import { PermissionNotFoundError } from "@opencode/protocol/errors" -import { response, sessionInfo } from "../location" +import { locationErrors, response, sessionInfo } from "../location" import { missingSession } from "./session-error" function missingRequest(id: Permission.ID) { @@ -62,7 +62,7 @@ export const PermissionHandler = HttpApiBuilder.group(Api, "server.permission", const session = yield* sessionInfo(sessions, ctx.params.sessionID) const requests = yield* Permission.Service.use((permission) => permission.forSession(ctx.params.sessionID), - ).pipe(instances.provide(session)) + ).pipe(instances.provide(session), locationErrors) return { data: requests } }), ) diff --git a/packages/server/src/handlers/session.ts b/packages/server/src/handlers/session.ts index 7a2586fb323..73a07633520 100644 --- a/packages/server/src/handlers/session.ts +++ b/packages/server/src/handlers/session.ts @@ -23,6 +23,7 @@ import { SkillNotFoundError, } from "@opencode/protocol/errors" import { AbsolutePath } from "@opencode/core/schema" +import { locationErrors } from "../location" import { failedMessageDecode, failedSnapshot, missingMessage, missingSession } from "./session-error" const DefaultSessionsLimit = 50 @@ -335,6 +336,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl Effect.catchTag("Session.SkillNotFoundError", (error) => Effect.fail(new InvalidRequestError({ message: `Skill not found: ${error.skill}`, field: "skills" })), ), + locationErrors, ), } }), @@ -370,6 +372,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl }), ), ), + locationErrors, ) return HttpApiSchema.NoContent.make() }), @@ -388,6 +391,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl Effect.catchTag("Session.SkillNotFoundError", (error) => Effect.fail(new SkillNotFoundError({ skill: error.skill, message: `Skill not found: ${error.skill}` })), ), + locationErrors, ) return HttpApiSchema.NoContent.make() }), @@ -471,6 +475,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl Effect.catchTag("Session.MessageNotFoundError", missingMessage), Effect.catchTag("Session.BusyError", busySession), Effect.catchTag("Snapshot.Error", failedSnapshot("stage session revert", ctx.params.sessionID)), + locationErrors, ), } }), @@ -485,6 +490,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl Effect.catchTag("Session.NotFoundError", missingSession), Effect.catchTag("Session.BusyError", busySession), Effect.catchTag("Snapshot.Error", failedSnapshot("clear session revert", ctx.params.sessionID)), + locationErrors, ) return HttpApiSchema.NoContent.make() }), @@ -527,6 +533,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl (error) => new InvalidRequestError({ message: error.message, field: error.field }), ), Effect.catchTag("Snapshot.Error", failedSnapshot("diff session turn", ctx.params.sessionID)), + locationErrors, ), } }), diff --git a/packages/server/src/location.ts b/packages/server/src/location.ts index 83e66df301d..7553fa9adc6 100644 --- a/packages/server/src/location.ts +++ b/packages/server/src/location.ts @@ -1,8 +1,9 @@ +import { FileSystem } from "@opencode/core/filesystem" import { Location } from "@opencode/core/location" import { LocationServiceMap } from "@opencode/core/location-services" import { AbsolutePath } from "@opencode/core/schema" import { Session } from "@opencode/core/session" -import { InvalidRequestError } from "@opencode/protocol/errors" +import { LocationNotFoundError, InvalidRequestError } from "@opencode/protocol/errors" import { Effect, Layer, Schema } from "effect" import { HttpServerRequest } from "effect/unstable/http" import { HttpApiMiddleware } from "effect/unstable/httpapi" @@ -12,8 +13,25 @@ export type LocationServices = Layer.Success()( "@opencode/HttpApiLocation", + { error: [LocationNotFoundError] }, ) {} +export function locationErrors(effect: Effect.Effect) { + return effect.pipe( + Effect.catchIf( + (error): error is Extract => + error instanceof FileSystem.DirectoryNotFoundError, + (error) => + Effect.fail( + new LocationNotFoundError({ + location: { directory: error.directory }, + message: `Location not found: ${error.directory}`, + }), + ), + ), + ) +} + export function response(data: Effect.Effect) { return Effect.gen(function* () { const location = yield* Location.Service @@ -61,7 +79,7 @@ export const layer = Layer.effect( return LocationMiddleware.of((effect) => Effect.gen(function* () { const request = yield* HttpServerRequest.HttpServerRequest - return yield* effect.pipe(Effect.provide(locations.get(requestRef(request)))) + return yield* effect.pipe(Effect.provide(locations.get(requestRef(request))), locationErrors) }), ) }), diff --git a/packages/server/src/middleware/form-location.ts b/packages/server/src/middleware/form-location.ts index dc18de75fbd..f622c9317da 100644 --- a/packages/server/src/middleware/form-location.ts +++ b/packages/server/src/middleware/form-location.ts @@ -1,17 +1,17 @@ import { Instance } from "@opencode/core/instance/service" import { LocationServiceMap } from "@opencode/core/location-services" import { Session } from "@opencode/core/session" -import { InvalidRequestError, SessionNotFoundError } from "@opencode/protocol/errors" +import { LocationNotFoundError, InvalidRequestError, SessionNotFoundError } from "@opencode/protocol/errors" import { Effect, Layer } from "effect" import { HttpRouter, HttpServerRequest } from "effect/unstable/http" import { HttpApiMiddleware } from "effect/unstable/httpapi" -import { requestRef, sessionInfo, type LocationServices } from "../location" +import { locationErrors, requestRef, sessionInfo, type LocationServices } from "../location" export class FormLocationMiddleware extends HttpApiMiddleware.Service< FormLocationMiddleware, { provides: LocationServices } >()("@opencode/HttpApiFormLocation", { - error: [InvalidRequestError, SessionNotFoundError], + error: [InvalidRequestError, SessionNotFoundError, LocationNotFoundError], }) {} export const formLocationLayer = Layer.effect( @@ -29,11 +29,11 @@ export const formLocationLayer = Layer.effect( // the session row lookup because some MCP elicitations cannot currently be attributed to // a real session. Keep this undocumented and remove once elicitations carry session ownership. const request = yield* HttpServerRequest.HttpServerRequest - return yield* effect.pipe(Effect.provide(locations.get(requestRef(request)))) + return yield* effect.pipe(Effect.provide(locations.get(requestRef(request))), locationErrors) } const session = yield* sessionInfo(sessions, route.params.sessionID) - return yield* effect.pipe(instances.provide(session)) + return yield* effect.pipe(instances.provide(session), locationErrors) }), ) }), diff --git a/packages/server/src/middleware/session-location.ts b/packages/server/src/middleware/session-location.ts index f3a9a223448..341ff73e606 100644 --- a/packages/server/src/middleware/session-location.ts +++ b/packages/server/src/middleware/session-location.ts @@ -3,14 +3,14 @@ import { Session } from "@opencode/core/session" import { Effect, Layer } from "effect" import { HttpRouter } from "effect/unstable/http" import { HttpApiMiddleware } from "effect/unstable/httpapi" -import { InvalidRequestError, SessionNotFoundError } from "@opencode/protocol/errors" -import { sessionInfo, type LocationServices } from "../location" +import { LocationNotFoundError, InvalidRequestError, SessionNotFoundError } from "@opencode/protocol/errors" +import { locationErrors, sessionInfo, type LocationServices } from "../location" export class SessionLocationMiddleware extends HttpApiMiddleware.Service< SessionLocationMiddleware, { provides: LocationServices } >()("@opencode/HttpApiSessionLocation", { - error: [InvalidRequestError, SessionNotFoundError], + error: [InvalidRequestError, SessionNotFoundError, LocationNotFoundError], }) {} export const sessionLocationLayer = Layer.effect( @@ -23,7 +23,7 @@ export const sessionLocationLayer = Layer.effect( Effect.gen(function* () { const route = yield* HttpRouter.RouteContext const session = yield* sessionInfo(sessions, route.params.sessionID) - return yield* effect.pipe(instances.provide(session)) + return yield* effect.pipe(instances.provide(session), locationErrors) }), ) }), diff --git a/packages/server/test/fetch.test.ts b/packages/server/test/fetch.test.ts index d2181dc978c..9a59cd2afc9 100644 --- a/packages/server/test/fetch.test.ts +++ b/packages/server/test/fetch.test.ts @@ -6,6 +6,7 @@ import { Agent } from "@opencode/schema/agent" import { Integration } from "@opencode/schema/integration" import { ServerInfo } from "@opencode/protocol/groups/server" import { Effect, Schedule, Schema } from "effect" +import { Session } from "@opencode/schema/session" import { tmpdir } from "../../core/test/fixture/tmpdir" import { it } from "../../core/test/lib/effect" import { ServerFetch } from "../src/fetch" @@ -18,6 +19,60 @@ const options = { fs: { filewatcher: false }, } as const +it.live("returns LocationNotFoundError for a missing folder and recovers once it exists", () => + Effect.gen(function* () { + const config = yield* Effect.acquireDisposable(Effect.promise(() => tmpdir("opencode-directory-errors-"))) + const directory = path.join(config.path, "project") + const handler = yield* ServerFetch.make({ ...options, config: { directory: config.path } }) + // Session creation only resolves its placement; it does not boot the Location graph. + const created = yield* Effect.promise(() => + handler( + new Request("http://opencode.local/api/session", { + method: "POST", + headers: { "content-type": "application/json", "x-opencode-directory": encodeURIComponent(directory) }, + body: JSON.stringify({ location: { directory } }), + }), + ), + ) + expect(created.status).toBe(200) + const session = Schema.decodeUnknownSync(Schema.Struct({ data: Session.Info }))( + yield* Effect.promise(() => created.json()), + ).data + const endpoints = [ + "/api/model", + "/api/integration", + `/api/session/${session.id}/permission`, + `/api/experimental/session/${session.id}/instructions/entries`, + `/api/session/${session.id}/form`, + "/api/session/global/form", + ] + for (const endpoint of endpoints) { + const response = yield* Effect.promise(() => + handler( + new Request(`http://opencode.local${endpoint}`, { + headers: { "x-opencode-directory": encodeURIComponent(directory) }, + }), + ), + ) + expect({ endpoint, status: response.status }).toEqual({ endpoint, status: 404 }) + expect(yield* Effect.promise(() => response.json())).toEqual({ + _tag: "LocationNotFoundError", + location: { directory }, + message: `Location not found: ${directory}`, + }) + } + yield* Effect.promise(() => fs.mkdir(directory)) + const recovered = yield* Effect.promise(() => + handler( + new Request("http://opencode.local/api/model", { + headers: { "x-opencode-directory": encodeURIComponent(directory) }, + }), + ), + ) + expect(recovered.status).toBe(200) + }), +) + type Handler = (request: Request) => Promise function occupy(port: number, cancel = false) { @@ -105,7 +160,9 @@ it.live("serves the HttpApi and enforces Basic auth like the Node server", () => ), ) expect(response.status).toBe(200) - const body = yield* Effect.promise(() => response.json()).pipe(Effect.flatMap(Schema.decodeUnknownEffect(ServerInfo))) + const body = yield* Effect.promise(() => response.json()).pipe( + Effect.flatMap(Schema.decodeUnknownEffect(ServerInfo)), + ) expect(body.version).toBe("test-version") expect(body.paths.tmp).toEndWith("opencode") expect(body.capabilities?.persistentPty).toBe(process.platform !== "win32")