@opencode/core 2.1.2 → 2.1.4

package/dist/types/integration.d.ts

@@ -2383,8 +2383,8 @@ export declare const Ref: Schema.Struct<{
 }>;
 export type Ref = Integration.Ref;
 export type Editor = {
-    list: () => readonly Ref[];
-    get: (id: ID) => Ref | undefined;
+    list: () => readonly Types.DeepMutable<Ref>[];
+    get: (id: ID) => Types.DeepMutable<Ref> | undefined;
     update: (id: ID, update: (integration: Types.DeepMutable<Ref>) => void) => void;
     remove: (id: ID) => void;
     method: {

package/dist/types/job.d.ts

@@ -7,13 +7,12 @@ declare const Background: Schema.Struct<{
     readonly id: Schema.String;
     readonly notificationID: Schema.brand<Schema.String, "Session.Message.ID"> & {
         create: () => string & import("effect/Brand").Brand<"Session.Message.ID">;
-        fromEvent: (eventID: import("@opencode/schema/event").ID) => string & import("effect/Brand").Brand<"Session.Message.ID">;
+        fromEvent: (eventID: string) => string & import("effect/Brand").Brand<"Session.Message.ID">;
     };
     readonly recovery: Schema.Union<readonly [Schema.Struct<{
         readonly kind: Schema.Literal<"shell">;
         readonly sessionID: Schema.brand<Schema.String, "SessionID"> & {
             create: () => string & import("effect/Brand").Brand<"SessionID">;
-            descending: (id?: string) => string & import("effect/Brand").Brand<"SessionID">;
         };
         readonly shellID: Schema.String;
         readonly command: Schema.String;
@@ -21,11 +20,9 @@ declare const Background: Schema.Struct<{
         readonly kind: Schema.Literal<"subagent">;
         readonly parentSessionID: Schema.brand<Schema.String, "SessionID"> & {
             create: () => string & import("effect/Brand").Brand<"SessionID">;
-            descending: (id?: string) => string & import("effect/Brand").Brand<"SessionID">;
         };
         readonly childSessionID: Schema.brand<Schema.String, "SessionID"> & {
             create: () => string & import("effect/Brand").Brand<"SessionID">;
-            descending: (id?: string) => string & import("effect/Brand").Brand<"SessionID">;
         };
         readonly agent: Schema.String;
         readonly description: Schema.String;

package/dist/types/mcp/client.d.ts

@@ -1,5 +1,5 @@
 export * as McpClient from "./client.js";
-import { type ElicitRequestFormParams, type ElicitRequestParams, type ElicitRequestURLParams, type ElicitResult, type GetPromptResult, type OAuthClientProvider, type Prompt, type ReadResourceResult, type Resource, type ResourceTemplateType, type Tool } from "@modelcontextprotocol/client";
+import { type ElicitRequestFormParams, type ElicitRequestParams, type ElicitRequestURLParams, type ElicitResult, type GetPromptResult, type OAuthClientProvider, type Prompt, type ReadResourceResult, type Resource, type ResourceTemplateType, type Tool, type Transport } from "@modelcontextprotocol/client";
 import { Cause, Effect, Schema } from "effect";
 import type { Session } from "@opencode/schema/session";
 export type { GetPromptResult, Prompt, ReadResourceResult, Resource, Tool };
@@ -30,6 +30,7 @@ export type CallToolContent = {
     readonly type: "media";
     readonly data: string;
     readonly mimeType: string;
+    readonly uri?: string;
 };
 export interface CallToolResult {
     readonly isError: boolean;
@@ -83,12 +84,17 @@ export interface Connection {
     readonly onPromptsChanged: (callback: () => void) => void;
     readonly onResourcesChanged: (callback: () => void) => void;
 }
+/** An MCP server reached over a transport someone else already opened, such as a client socket. */
+export interface Attached {
+    readonly type: "attached";
+    readonly transport: Transport;
+}
 /**
  * Connects an MCP server; closing the calling scope tears down the transport and any spawned process.
  * A stdio server is spawned through the location's `Environment`, so it runs wherever the location's
  * shell commands run rather than always on the host.
  */
-export declare const connect: (server: string, config: import("@opencode/schema/mcp").LocalConfig | import("@opencode/schema/mcp").RemoteConfig, directory: string, authProvider?: OAuthClientProvider | undefined, elicitation?: ElicitationHandler | undefined, clientInfo?: {
+export declare const connect: (server: string, config: Attached | import("@opencode/schema/mcp").LocalConfig | import("@opencode/schema/mcp").RemoteConfig, directory: string, authProvider?: OAuthClientProvider | undefined, elicitation?: ElicitationHandler | undefined, clientInfo?: {
     version: string;
     websiteUrl?: string | undefined;
     description?: string | undefined;
@@ -100,282 +106,4 @@ export declare const connect: (server: string, config: import("@opencode/schema/
     }[] | undefined;
     name: string;
     title?: string | undefined;
-} | undefined) => Effect.Effect<{
-    modern: boolean;
-    instructions: string | undefined;
-    tools: () => Effect.Effect<{
-        description?: string | undefined;
-        inputSchema: {
-            [x: string]: unknown;
-            type: "object";
-            properties?: {
-                [x: string]: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
-                    [x: string]: string | number | boolean | /*elided*/ any | /*elided*/ any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null)[] | {
-                    [x: string]: string | number | boolean | any | any | null;
-                } | null;
-            } | undefined;
-            required?: string[] | undefined;
-        };
-        outputSchema?: {
-            [x: string]: unknown;
-            $schema?: string | undefined;
-        } | undefined;
-        annotations?: {
-            title?: string | undefined;
-            readOnlyHint?: boolean | undefined;
-            destructiveHint?: boolean | undefined;
-            idempotentHint?: boolean | undefined;
-            openWorldHint?: boolean | undefined;
-        } | undefined;
-        execution?: {
-            taskSupport?: "forbidden" | "optional" | "required" | undefined;
-        } | undefined;
-        _meta?: {
-            [x: string]: unknown;
-        } | undefined;
-        icons?: {
-            src: string;
-            mimeType?: string | undefined;
-            sizes?: string[] | undefined;
-            theme?: "dark" | "light" | undefined;
-        }[] | undefined;
-        name: string;
-        title?: string | undefined;
-    }[], Error | SessionExpiredError, never>;
-    prompts: () => Effect.Effect<{
-        description?: string | undefined;
-        arguments?: {
-            name: string;
-            description?: string | undefined;
-            required?: boolean | undefined;
-        }[] | undefined;
-        _meta?: {
-            [x: string]: unknown;
-        } | undefined;
-        icons?: {
-            src: string;
-            mimeType?: string | undefined;
-            sizes?: string[] | undefined;
-            theme?: "dark" | "light" | undefined;
-        }[] | undefined;
-        name: string;
-        title?: string | undefined;
-    }[], Error | SessionExpiredError, never>;
-    resources: () => Effect.Effect<{
-        uri: string;
-        description?: string | undefined;
-        mimeType?: string | undefined;
-        size?: number | undefined;
-        annotations?: {
-            audience?: ("assistant" | "user")[] | undefined;
-            priority?: number | undefined;
-            lastModified?: string | undefined;
-        } | undefined;
-        _meta?: {
-            [x: string]: unknown;
-        } | undefined;
-        icons?: {
-            src: string;
-            mimeType?: string | undefined;
-            sizes?: string[] | undefined;
-            theme?: "dark" | "light" | undefined;
-        }[] | undefined;
-        name: string;
-        title?: string | undefined;
-    }[], Error | SessionExpiredError, never>;
-    resourceTemplates: () => Effect.Effect<{
-        uriTemplate: string;
-        description?: string | undefined;
-        mimeType?: string | undefined;
-        annotations?: {
-            audience?: ("assistant" | "user")[] | undefined;
-            priority?: number | undefined;
-            lastModified?: string | undefined;
-        } | undefined;
-        _meta?: {
-            [x: string]: unknown;
-        } | undefined;
-        icons?: {
-            src: string;
-            mimeType?: string | undefined;
-            sizes?: string[] | undefined;
-            theme?: "dark" | "light" | undefined;
-        }[] | undefined;
-        name: string;
-        title?: string | undefined;
-    }[], Error | SessionExpiredError, never>;
-    readResource: (input: {
-        readonly uri: string;
-    }) => Effect.Effect<undefined, never, never> | Effect.Effect<{
-        [x: string]: unknown;
-        _meta?: {
-            [x: string]: unknown;
-            "io.modelcontextprotocol/serverInfo"?: {
-                version: string;
-                websiteUrl?: string | undefined;
-                description?: string | undefined;
-                icons?: {
-                    src: string;
-                    mimeType?: string | undefined;
-                    sizes?: string[] | undefined;
-                    theme?: "dark" | "light" | undefined;
-                }[] | undefined;
-                name: string;
-                title?: string | undefined;
-            } | undefined;
-        } | undefined;
-        contents: ({
-            uri: string;
-            mimeType?: string | undefined;
-            _meta?: {
-                [x: string]: unknown;
-            } | undefined;
-            text: string;
-        } | {
-            uri: string;
-            mimeType?: string | undefined;
-            _meta?: {
-                [x: string]: unknown;
-            } | undefined;
-            blob: string;
-        })[];
-    }, Error | SessionExpiredError, never>;
-    prompt: (input: {
-        readonly name: string;
-        readonly args?: Record<string, string>;
-    }) => Effect.Effect<{
-        [x: string]: unknown;
-        _meta?: {
-            [x: string]: unknown;
-            "io.modelcontextprotocol/serverInfo"?: {
-                version: string;
-                websiteUrl?: string | undefined;
-                description?: string | undefined;
-                icons?: {
-                    src: string;
-                    mimeType?: string | undefined;
-                    sizes?: string[] | undefined;
-                    theme?: "dark" | "light" | undefined;
-                }[] | undefined;
-                name: string;
-                title?: string | undefined;
-            } | undefined;
-        } | undefined;
-        description?: string | undefined;
-        messages: {
-            role: "assistant" | "user";
-            content: {
-                type: "text";
-                text: string;
-                annotations?: {
-                    audience?: ("assistant" | "user")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                } | undefined;
-                _meta?: {
-                    [x: string]: unknown;
-                } | undefined;
-            } | {
-                type: "image";
-                data: string;
-                mimeType: string;
-                annotations?: {
-                    audience?: ("assistant" | "user")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                } | undefined;
-                _meta?: {
-                    [x: string]: unknown;
-                } | undefined;
-            } | {
-                type: "audio";
-                data: string;
-                mimeType: string;
-                annotations?: {
-                    audience?: ("assistant" | "user")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                } | undefined;
-                _meta?: {
-                    [x: string]: unknown;
-                } | undefined;
-            } | {
-                uri: string;
-                description?: string | undefined;
-                mimeType?: string | undefined;
-                size?: number | undefined;
-                annotations?: {
-                    audience?: ("assistant" | "user")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                } | undefined;
-                _meta?: {
-                    [x: string]: unknown;
-                } | undefined;
-                icons?: {
-                    src: string;
-                    mimeType?: string | undefined;
-                    sizes?: string[] | undefined;
-                    theme?: "dark" | "light" | undefined;
-                }[] | undefined;
-                name: string;
-                title?: string | undefined;
-                type: "resource_link";
-            } | {
-                type: "resource";
-                resource: {
-                    uri: string;
-                    mimeType?: string | undefined;
-                    _meta?: {
-                        [x: string]: unknown;
-                    } | undefined;
-                    text: string;
-                } | {
-                    uri: string;
-                    mimeType?: string | undefined;
-                    _meta?: {
-                        [x: string]: unknown;
-                    } | undefined;
-                    blob: string;
-                };
-                annotations?: {
-                    audience?: ("assistant" | "user")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                } | undefined;
-                _meta?: {
-                    [x: string]: unknown;
-                } | undefined;
-            };
-        }[];
-    }, Error | SessionExpiredError, never>;
-    callTool: (input: {
-        readonly name: string;
-        readonly args?: Record<string, unknown>;
-        readonly sessionID?: Session.ID;
-    }) => Effect.Effect<CallToolResult, Error | SessionExpiredError, never>;
-    onClose: (callback: (reason: string) => void) => void;
-    onSessionExpired: (callback: () => void) => void;
-    onToolsChanged: (callback: () => void) => void;
-    onPromptsChanged: (callback: () => void) => void;
-    onResourcesChanged: (callback: () => void) => void;
-}, ConnectError | NeedsAuthError, import("effect/Scope").Scope | import("../environment/environment.js").Service>;
+} | undefined) => Effect.Effect<Connection, ConnectError | NeedsAuthError, import("effect/Scope").Scope | import("../environment/environment.js").Service>;

package/dist/types/mcp/index.d.ts

@@ -1,7 +1,8 @@
 export * as Mcp from "./index.js";
 import { Mcp } from "@opencode/schema/mcp";
 import type { Session } from "@opencode/schema/session";
-import { Cause, Context, Effect, Layer, Schema, Types } from "effect";
+import type { Transport } from "@modelcontextprotocol/client";
+import { Cause, Context, Effect, Layer, Schema, Scope, Types } from "effect";
 import { Credential } from "../credential.js";
 import { Bus } from "../bus.js";
 import { Environment } from "../environment/index.js";
@@ -160,6 +161,12 @@ export interface Interface extends State.Transformable<Editor> {
     readonly connect: (server: ServerName | string) => Effect.Effect<void, NotFoundError>;
     readonly disconnect: (server: ServerName | string) => Effect.Effect<void, NotFoundError>;
     readonly remove: (server: ServerName | string) => Effect.Effect<void, NotFoundError>;
+    /**
+     * Attaches a client-hosted MCP server for the lifetime of the calling scope. Its tools are named after
+     * `name` like any server's. Attaching a name again stacks the new connection on top: it serves the
+     * name until it closes, then the most recent remaining connection takes over.
+     */
+    readonly attach: (name: string, transport: Transport) => Effect.Effect<void, McpClient.ConnectError, Scope.Scope>;
     readonly tools: () => Effect.Effect<Tool[]>;
     readonly callTool: (input: {
         readonly server: ServerName | string;

package/dist/types/mcp/socket-client.d.ts

@@ -0,0 +1,28 @@
+export * as McpSocketClient from "./socket-client.js";
+import { type Transport } from "@modelcontextprotocol/client";
+/** The side of an incoming WebSocket the transport writes to. */
+export interface Socket {
+    readonly send: (text: string) => void;
+    readonly close: (code?: number, reason?: string) => void;
+}
+export interface SocketTransport extends Transport {
+    /** Feeds one inbound text frame. */
+    readonly deliver: (text: string) => void;
+    /** Reports that the socket closed; fires `onclose` once. */
+    readonly ended: () => void;
+}
+/**
+ * MCP client transport over a WebSocket that a client app opened to the server. The app runs the
+ * MCP server and opencode runs the MCP client, so only the connection direction is inverted: the
+ * transport is only ever made for an incoming socket and never dials out.
+ *
+ * Framing: one JSON-RPC 2.0 message per text frame, JSON-encoded, without batching. A frame that is
+ * not valid JSON or not a JSON-RPC message is reported through `onerror` and the connection stays
+ * open. Frames that arrive before `start()` are buffered and delivered on start.
+ *
+ * Closing: `close()` closes the socket with 1000 (normal). The transport learns that the socket
+ * closed for any other reason through `ended()`; which close codes the endpoint uses is its own
+ * concern. Either way `onclose` fires exactly once, and nothing is replayed after a disconnect: a
+ * reconnecting client starts a fresh MCP session.
+ */
+export declare function make(socket: Socket): SocketTransport;

package/dist/types/mime.d.ts

@@ -1,2 +1,3 @@
 export * as Mime from "./mime.js";
 export declare function detect(bytes: Uint8Array): "application/octet-stream" | "application/pdf" | "image/avif" | "image/bmp" | "image/gif" | "image/jpeg" | "image/png" | "image/webp" | "text/plain";
+export declare const isTextual: (mime: string) => boolean;

package/dist/types/permission/saved.d.ts

@@ -1,5 +1,6 @@
 export * as PermissionSaved from "./saved.js";
 import { Cause, Context, Effect, Schema } from "effect";
+import type { Project } from "@opencode/schema/project";
 export declare const ID: Schema.brand<Schema.String, "PermissionSaved.ID"> & {
     create: () => string & import("effect/Brand").Brand<"PermissionSaved.ID">;
 };
@@ -19,28 +20,19 @@ export declare const Info: Schema.Struct<{
     }>;
 }>;
 export type Info = typeof Info.Type;
-export declare const ListInput: Schema.Struct<{
-    readonly projectID: Schema.optional<Schema.brand<Schema.String, "Project.ID"> & {
-        global: string & import("effect/Brand").Brand<"Project.ID">;
-    }>;
-}>;
-export type ListInput = typeof ListInput.Type;
-export declare const AddInput: Schema.Struct<{
-    readonly projectID: Schema.brand<Schema.String, "Project.ID"> & {
-        global: string & import("effect/Brand").Brand<"Project.ID">;
-    };
-    readonly action: Schema.String;
-    readonly resources: Schema.$Array<Schema.String>;
-}>;
-export type AddInput = typeof AddInput.Type;
-export declare const UpdateInput: Schema.Struct<{
-    readonly id: Schema.brand<Schema.String, "PermissionSaved.ID"> & {
-        create: () => string & import("effect/Brand").Brand<"PermissionSaved.ID">;
-    };
-    readonly action: Schema.optional<Schema.String>;
-    readonly resource: Schema.optional<Schema.String>;
-}>;
-export type UpdateInput = typeof UpdateInput.Type;
+export interface ListInput {
+    readonly projectID?: Project.ID;
+}
+export interface AddInput {
+    readonly projectID: Project.ID;
+    readonly action: string;
+    readonly resources: readonly string[];
+}
+export interface UpdateInput {
+    readonly id: ID;
+    readonly action?: string;
+    readonly resource?: string;
+}
 declare const NotFoundError_base: Schema.Class<NotFoundError, Schema.TaggedStruct<"PermissionSaved.NotFoundError", {
     readonly id: Schema.brand<Schema.String, "PermissionSaved.ID"> & {
         create: () => string & import("effect/Brand").Brand<"PermissionSaved.ID">;

package/dist/types/permission.d.ts

@@ -1,6 +1,7 @@
 export * as Permission from "./permission.js";
 import { Context, Effect, Schema } from "effect";
 import { Permission } from "@opencode/schema/permission";
+import { Agent } from "./agent.js";
 import { SessionErrors } from "./session/error.js";
 import { SessionSchema } from "./session/schema.js";
 declare const PermissionEffect: Schema.Literals<readonly ["allow", "deny", "ask"]>;
@@ -19,7 +20,6 @@ export type Source = typeof Source.Type;
 export declare const Request: Schema.Struct<{
     readonly sessionID: Schema.brand<Schema.String, "SessionID"> & {
         create: () => string & import("effect/Brand").Brand<"SessionID">;
-        descending: (id?: string) => string & import("effect/Brand").Brand<"SessionID">;
     };
     readonly action: Schema.String;
     readonly resources: Schema.$Array<Schema.String>;
@@ -42,45 +42,19 @@ export declare const Request: Schema.Struct<{
 export type Request = typeof Request.Type;
 export declare const Reply: Schema.Literals<readonly ["once", "always", "reject"]>;
 export type Reply = typeof Reply.Type;
-export declare const AssertInput: Schema.Struct<{
-    readonly sessionID: Schema.brand<Schema.String, "SessionID"> & {
-        create: () => string & import("effect/Brand").Brand<"SessionID">;
-        descending: (id?: string) => string & import("effect/Brand").Brand<"SessionID">;
-    };
-    readonly action: Schema.String;
-    readonly resources: Schema.$Array<Schema.String>;
-    readonly save: Schema.decodeTo<Schema.optional<Schema.toType<Schema.$Array<Schema.String>>>, Schema.optionalKey<Schema.$Array<Schema.String>>, never, never>;
-    readonly metadata: Schema.decodeTo<Schema.optional<Schema.toType<Schema.$Record<Schema.String, Schema.Unknown>>>, Schema.optionalKey<Schema.$Record<Schema.String, Schema.Unknown>>, never, never>;
-    readonly source: Schema.decodeTo<Schema.optional<Schema.toType<Schema.Union<readonly [Schema.Struct<{
-        readonly type: Schema.Literal<"tool">;
-        readonly messageID: Schema.String;
-        readonly id: Schema.String;
-    }>]>>>, Schema.optionalKey<Schema.Union<readonly [Schema.Struct<{
-        readonly type: Schema.Literal<"tool">;
-        readonly messageID: Schema.String;
-        readonly id: Schema.String;
-    }>]>>, never, never>;
-    readonly id: Schema.optional<Schema.brand<Schema.String, "Permission.ID"> & {
-        create: (id?: string) => string & import("effect/Brand").Brand<"Permission.ID">;
-    }>;
-    readonly agent: Schema.optional<Schema.brand<Schema.String, "Agent.ID">>;
-}>;
-export type AssertInput = typeof AssertInput.Type;
-export declare const ReplyInput: Schema.Struct<{
-    readonly requestID: Schema.brand<Schema.String, "Permission.ID"> & {
-        create: (id?: string) => string & import("effect/Brand").Brand<"Permission.ID">;
-    };
-    readonly reply: Schema.Literals<readonly ["once", "always", "reject"]>;
-    readonly message: Schema.optional<Schema.String>;
-}>;
-export type ReplyInput = typeof ReplyInput.Type;
-export declare const AskResult: Schema.Struct<{
-    readonly id: Schema.brand<Schema.String, "Permission.ID"> & {
-        create: (id?: string) => string & import("effect/Brand").Brand<"Permission.ID">;
-    };
-    readonly effect: Schema.Literals<readonly ["allow", "deny", "ask"]>;
-}>;
-export type AskResult = typeof AskResult.Type;
+export interface AssertInput extends Omit<Request, "id" | "message"> {
+    readonly id?: ID;
+    readonly agent?: Agent.ID;
+}
+export interface ReplyInput {
+    readonly requestID: ID;
+    readonly reply: Reply;
+    readonly message?: string;
+}
+export interface AskResult {
+    readonly id: ID;
+    readonly effect: Permission.Effect;
+}
 export { Event } from "@opencode/schema/permission";
 declare const DeclinedError_base: Schema.Class<DeclinedError, Schema.TaggedStruct<"Permission.DeclinedError", {}>, import("effect/Cause").YieldableError>;
 export declare class DeclinedError extends DeclinedError_base {