@opencode/server 0.0.0-dev-19653 → 0.0.0-dev-19656

package/dist/handlers/form.d.ts

@@ -1,4 +1 @@
-import { Instance } from "@opencode/core/instance/service";
-import { LocationServiceMap } from "@opencode/core/location-services";
-import { Session } from "@opencode/core/session";
-export declare const FormHandler: import("effect/Layer").Layer<import("effect/unstable/httpapi/HttpApiGroup").Service<"server", "server.form">, never, LocationServiceMap.Service | Session.Service | Instance.Service | import("../location").LocationMiddleware | (import("@opencode/protocol/middleware/schema-error").SchemaErrorMiddleware | import("@opencode/protocol/middleware/authorization").Authorization | import("../middleware/form-location").FormLocationMiddleware)>;
+export declare const FormHandler: import("effect/Layer").Layer<import("effect/unstable/httpapi/HttpApiGroup").Service<"server", "server.form">, never, import("@opencode/protocol/middleware/schema-error").SchemaErrorMiddleware | import("@opencode/protocol/middleware/authorization").Authorization | import("../location").LocationMiddleware>;

package/dist/handlers/form.js

@@ -1,61 +1,9 @@
 import { Form } from "@opencode/core/form";
-import { Instance } from "@opencode/core/instance/service";
-import { LocationServiceMap } from "@opencode/core/location-services";
-import { Session } from "@opencode/core/session";
-import {
-  ConflictError,
-  FormAlreadySettledError,
-  FormInvalidAnswerError,
-  FormNotFoundError,
-  InvalidRequestError
-} from "@opencode/protocol/errors";
 import { Effect } from "effect";
-import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi";
+import { HttpApiBuilder } from "effect/unstable/httpapi";
 import { Api } from "../api";
-import { requestRef, response, sessionInfo } from "../location";
-function missingForm(id) {
-  return new FormNotFoundError({ id, message: `Form not found: ${id}` });
-}
-export const FormHandler = HttpApiBuilder.group(Api, "server.form", (handlers) => Effect.gen(function* () {
-  const locations = yield* LocationServiceMap.Service, instances = yield* Instance.Service, sessions = yield* Session.Service, requireOwnedForm = Effect.fnUntraced(function* (sessionID, formID) {
-    const form = yield* Form.Service, info = yield* form.get(formID).pipe(Effect.catchTag("Form.NotFoundError", () => missingForm(formID)));
-    if (info.sessionID !== sessionID)
-      return yield* missingForm(formID);
-    return { form, info };
-  });
-  return handlers.handle("form.request.list", Effect.fn(function* () {
-    const form = yield* Form.Service;
-    return yield* response(form.list());
-  })).handle("session.form.list", Effect.fn(function* (ctx) {
-    const session = ctx.params.sessionID === "global" ? void 0 : yield* sessionInfo(sessions, ctx.params.sessionID), read = Form.Service.use((form) => form.list({ sessionID: ctx.params.sessionID }));
-    return { data: yield* session ? read.pipe(instances.provide(session)) : read.pipe(Effect.provide(locations.get(requestRef(ctx.request)))) };
-  })).handle("session.form.create", Effect.fn(function* (ctx) {
-    return { data: yield* (yield* Form.Service).create({
-      id: ctx.payload.id,
-      sessionID: ctx.params.sessionID,
-      title: ctx.payload.title,
-      metadata: ctx.payload.metadata,
-      fields: ctx.payload.fields
-    }).pipe(Effect.catchTags({
-      "Form.AlreadyExistsError": (error) => new ConflictError({ resource: error.id, message: error.message }),
-      "Form.InvalidFormError": (error) => new InvalidRequestError({ message: error.message, field: "fields" })
-    })) };
-  })).handle("session.form.get", Effect.fn(function* (ctx) {
-    return { data: (yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)).info };
-  })).handle("session.form.state", Effect.fn(function* (ctx) {
-    return { data: yield* (yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)).form.state(ctx.params.formID).pipe(Effect.catchTag("Form.NotFoundError", () => missingForm(ctx.params.formID))) };
-  })).handle("session.form.reply", Effect.fn(function* (ctx) {
-    yield* (yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)).form.reply({ id: ctx.params.formID, answer: ctx.payload.answer }).pipe(Effect.catchTags({
-      "Form.AlreadySettledError": (error) => new FormAlreadySettledError({ id: error.id, message: error.message }),
-      "Form.InvalidAnswerError": (error) => new FormInvalidAnswerError({ id: error.id, message: error.message }),
-      "Form.NotFoundError": () => missingForm(ctx.params.formID)
-    }));
-    return HttpApiSchema.NoContent.make();
-  })).handle("session.form.cancel", Effect.fn(function* (ctx) {
-    yield* (yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)).form.cancel(ctx.params.formID).pipe(Effect.catchTags({
-      "Form.AlreadySettledError": (error) => new FormAlreadySettledError({ id: error.id, message: error.message }),
-      "Form.NotFoundError": () => missingForm(ctx.params.formID)
-    }));
-    return HttpApiSchema.NoContent.make();
-  }));
-}));
+import { response } from "../location";
+export const FormHandler = HttpApiBuilder.group(Api, "server.form", (handlers) => handlers.handle("form.list", Effect.fn(function* () {
+  const form = yield* Form.Service;
+  return yield* response(form.list());
+})));

package/dist/handlers/permission.js

@@ -41,7 +41,7 @@ export const PermissionHandler = HttpApiBuilder.group(Api, "server.permission",
   })).handle("session.permission.get", Effect.fn(function* (ctx) {
     return { data: (yield* requireOwnedRequest(ctx.params.sessionID, ctx.params.requestID)).request };
   })).handle("session.permission.reply", Effect.fn(function* (ctx) {
-    yield* (yield* requireOwnedRequest(ctx.params.sessionID, ctx.params.requestID)).permission.reply({ requestID: ctx.params.requestID, reply: ctx.payload.reply, message: ctx.payload.message }).pipe(Effect.catchTag("Permission.NotFoundError", () => missingRequest(ctx.params.requestID)));
+    yield* (yield* requireOwnedRequest(ctx.params.sessionID, ctx.params.requestID)).permission.reply({ requestID: ctx.params.requestID, reply: ctx.payload.decision, message: ctx.payload.message }).pipe(Effect.catchTag("Permission.NotFoundError", () => missingRequest(ctx.params.requestID)));
     return HttpApiSchema.NoContent.make();
   })).handle("session.permission.rules", Effect.fn(function* (ctx) {
     yield* sessions.setPermissions({ sessionID: ctx.params.sessionID, permissions: ctx.payload.permissions }).pipe(Effect.catchTag("Session.NotFoundError", missingSession));

package/dist/handlers/session.d.ts

@@ -1,3 +1,3 @@
 import { Session } from "@opencode/core/session";
 import { SessionTransfer } from "@opencode/core/session/transfer";
-export declare const SessionHandler: import("effect/Layer").Layer<import("effect/unstable/httpapi/HttpApiGroup").Service<"server", "server.session">, never, Session.Service | import("../middleware/session-location").SessionLocationMiddleware | SessionTransfer.Service | import("effect/unstable/http/HttpRouter").Request<"Requires", import("@opencode/core/database/database").Service> | (import("@opencode/protocol/middleware/schema-error").SchemaErrorMiddleware | import("@opencode/protocol/middleware/authorization").Authorization)>;
+export declare const SessionHandler: import("effect/Layer").Layer<import("effect/unstable/httpapi/HttpApiGroup").Service<"server", "server.session">, never, Session.Service | import("../middleware/session-location").SessionLocationMiddleware | SessionTransfer.Service | import("effect/unstable/http/HttpRouter").Request<"Requires", import("@opencode/core/database/database").Service> | (import("@opencode/protocol/middleware/schema-error").SchemaErrorMiddleware | import("@opencode/protocol/middleware/authorization").Authorization | import("../middleware/form-location").FormLocationMiddleware)>;

package/dist/handlers/session.js

@@ -3,6 +3,7 @@ import { SessionStats } from "@opencode/core/session/stats";
 import { SessionTitle } from "@opencode/core/session/title";
 import { SessionTransfer } from "@opencode/core/session/transfer";
 import { InstructionEntry } from "@opencode/core/session/instruction-entry";
+import { Form } from "@opencode/core/form";
 import { DateTime, Effect, Stream } from "effect";
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi";
 import { Api } from "../api";
@@ -11,6 +12,9 @@ import {
   ConflictError,
   CommandExecutionError,
   CommandNotFoundError,
+  FormAlreadySettledError,
+  FormInvalidAnswerError,
+  FormNotFoundError,
   InvalidRequestError,
   InvalidCursorError,
   MessageNotFoundError,
@@ -21,8 +25,16 @@ import {
 import { AbsolutePath } from "@opencode/core/schema";
 import { failedMessageDecode, failedSnapshot, missingMessage, missingSession } from "./session-error";
 const DefaultSessionsLimit = 50;
+function missingForm(id) {
+  return new FormNotFoundError({ id, message: `Form not found: ${id}` });
+}
 export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handlers) => Effect.gen(function* () {
-  const session = yield* Session.Service, transfer = yield* SessionTransfer.Service, busySession = (error) => new SessionBusyError({
+  const session = yield* Session.Service, transfer = yield* SessionTransfer.Service, requireOwnedForm = Effect.fnUntraced(function* (sessionID, formID) {
+    const form = yield* Form.Service, info = yield* form.get(formID).pipe(Effect.catchTag("Form.NotFoundError", () => missingForm(formID)));
+    if (info.sessionID !== sessionID)
+      return yield* missingForm(formID);
+    return { form, info };
+  }), busySession = (error) => new SessionBusyError({
     sessionID: error.sessionID,
     message: `Session is busy: ${error.sessionID}`
   }), pendingMutation = (effect, conflict) => effect.pipe(Effect.catchTag("Session.NotFoundError", missingSession), Effect.catchTag("Session.InboxConflictError", (error) => new ConflictError({ resource: error.inboxID, message: `${conflict}: ${error.inboxID}` })), Effect.as(HttpApiSchema.NoContent.make()));
@@ -232,11 +244,10 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
       data: yield* session.inbox(ctx.params.sessionID).pipe(Effect.catchTag("Session.NotFoundError", missingSession))
     };
   })).handle("session.inbox.cancel", Effect.fn(function* (ctx) {
-    return yield* pendingMutation(session.cancelInbox({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID }), "Pending input can no longer be cancelled");
-  })).handle("session.inbox.steer", Effect.fn(function* (ctx) {
-    return yield* pendingMutation(session.steerInbox({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID }), "Pending input is no longer queued");
-  })).handle("session.inbox.queue", Effect.fn(function* (ctx) {
-    return yield* pendingMutation(session.queueInbox({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID }), "Pending input is no longer a steer");
+    yield* session.cancelInbox({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID }).pipe(Effect.catchTag("Session.NotFoundError", missingSession), Effect.catchTag("Session.InboxConflictError", () => Effect.void));
+    return HttpApiSchema.NoContent.make();
+  })).handle("session.inbox.update", Effect.fn(function* (ctx) {
+    return yield* pendingMutation(ctx.payload.delivery === "steer" ? session.steerInbox({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID }) : session.queueInbox({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID }), `Pending input cannot change to ${ctx.payload.delivery}`);
   })).handle("session.instructions.entry.list", Effect.fn(function* (ctx) {
     return { data: yield* (yield* InstructionEntry.Service).list(ctx.params.sessionID) };
   })).handle("session.instructions.entry.put", Effect.fn(function* (ctx) {
@@ -265,5 +276,34 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
       messageID: ctx.params.messageID,
       message: `Message not found: ${ctx.params.messageID}`
     });
+  })).handle("session.form.list", Effect.fn(function* (ctx) {
+    return { data: yield* (yield* Form.Service).list({ sessionID: ctx.params.sessionID }) };
+  })).handle("session.form.create", Effect.fn(function* (ctx) {
+    return { data: yield* (yield* Form.Service).create({
+      id: ctx.payload.id,
+      sessionID: ctx.params.sessionID,
+      title: ctx.payload.title,
+      metadata: ctx.payload.metadata,
+      fields: ctx.payload.fields
+    }).pipe(Effect.catchTags({
+      "Form.AlreadyExistsError": (error) => new ConflictError({ resource: error.id, message: error.message }),
+      "Form.InvalidFormError": (error) => new InvalidRequestError({ message: error.message, field: "fields" })
+    })) };
+  })).handle("session.form.get", Effect.fn(function* (ctx) {
+    const owned = yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID), state = yield* owned.form.state(ctx.params.formID).pipe(Effect.catchTag("Form.NotFoundError", () => missingForm(ctx.params.formID)));
+    return { data: { ...owned.info, state } };
+  })).handle("session.form.reply", Effect.fn(function* (ctx) {
+    yield* (yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)).form.reply({ id: ctx.params.formID, answer: ctx.payload.answer }).pipe(Effect.catchTags({
+      "Form.AlreadySettledError": (error) => new FormAlreadySettledError({ id: error.id, message: error.message }),
+      "Form.InvalidAnswerError": (error) => new FormInvalidAnswerError({ id: error.id, message: error.message }),
+      "Form.NotFoundError": () => missingForm(ctx.params.formID)
+    }));
+    return HttpApiSchema.NoContent.make();
+  })).handle("session.form.cancel", Effect.fn(function* (ctx) {
+    yield* (yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)).form.cancel(ctx.params.formID).pipe(Effect.catchTags({
+      "Form.AlreadySettledError": (error) => new FormAlreadySettledError({ id: error.id, message: error.message }),
+      "Form.NotFoundError": () => missingForm(ctx.params.formID)
+    }));
+    return HttpApiSchema.NoContent.make();
   }));
 }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/server",
-  "version": "0.0.0-dev-19653",
+  "version": "0.0.0-dev-19656",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -30,17 +30,17 @@
   "dependencies": {
     "@effect/platform-node": "4.0.0-rc.112",
     "@effect/platform-node-shared": "4.0.0-rc.112",
-    "@opencode/core": "0.0.0-dev-19653",
-    "@opencode/protocol": "0.0.0-dev-19653",
-    "@opencode/schema": "0.0.0-dev-19653",
-    "@opencode/simulation": "0.0.0-dev-19653",
-    "@opencode/util": "0.0.0-dev-19653",
+    "@opencode/core": "0.0.0-dev-19656",
+    "@opencode/protocol": "0.0.0-dev-19656",
+    "@opencode/schema": "0.0.0-dev-19656",
+    "@opencode/simulation": "0.0.0-dev-19656",
+    "@opencode/util": "0.0.0-dev-19656",
     "drizzle-orm": "1.0.0-rc.5-169397b",
     "effect": "4.0.0-rc.112"
   },
   "devDependencies": {
-    "@opencode/client": "0.0.0-dev-19653",
-    "@opencode/plugin": "0.0.0-dev-19653",
+    "@opencode/client": "0.0.0-dev-19656",
+    "@opencode/plugin": "0.0.0-dev-19656",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.4.0",
     "@typescript/native-preview": "7.0.0-dev.20251207.1"