@opencode/client 2.0.3 → 2.0.5

package/dist/promise/generated/types.js

@@ -15,12 +15,15 @@ export const isInstructionEntryValueTooLargeError = (value) => typeof value ===
     value !== null &&
     "_tag" in value &&
     value["_tag"] === "InstructionEntryValueTooLargeError";
-export const isProviderNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ProviderNotFoundError";
-export const isMcpServerNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "McpServerNotFoundError";
-export const isProjectNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ProjectNotFoundError";
 export const isFormNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "FormNotFoundError";
 export const isFormInvalidAnswerError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "FormInvalidAnswerError";
 export const isFormAlreadySettledError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "FormAlreadySettledError";
+export const isProviderNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ProviderNotFoundError";
+export const isIntegrationNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "IntegrationNotFoundError";
+export const isIntegrationAttemptNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "IntegrationAttemptNotFoundError";
+export const isIntegrationMethodNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "IntegrationMethodNotFoundError";
+export const isMcpServerNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "McpServerNotFoundError";
+export const isProjectNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ProjectNotFoundError";
 export const isPermissionNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "PermissionNotFoundError";
 export const isFileNotFoundError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "FileNotFoundError";
 export const isRpcError = (value) => typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "RpcError";

package/dist/promise/index.d.ts

@@ -1,6 +1,6 @@
 import type { OpenCode } from "./client.js";
 export * from "./generated/index.js";
 export { OpenCode } from "./client.js";
-export type { AgentApi, CatalogApi, CommandApi, ConfigApi, EventApi, IntegrationApi, ModelApi, PluginApi, ProviderApi, ReferenceApi, RpcApi, RpcCallOptions, RpcClient, RpcEventPayload, WebSearchApi, SessionApi, SkillApi, } from "./api.js";
+export type { AgentApi, CommandApi, ConfigApi, EventApi, IntegrationApi, ModelApi, PluginApi, ProviderApi, ReferenceApi, RpcApi, RpcCallOptions, RpcClient, RpcEventPayload, WebSearchApi, SessionApi, SkillApi, } from "./api.js";
 export type { EventSubscribeOutput as OpenCodeEvent } from "./generated/types.js";
 export type OpenCodeClient = ReturnType<typeof OpenCode.make>;

package/dist/promise/service.js

@@ -16,6 +16,8 @@ export async function discover(options = {}) {
     const found = (await registered(options.file)).service;
     if (found?.state !== "ready")
         return undefined;
+    if (!found.compatible)
+        return undefined;
     if (!matchesVersion(found.version, options))
         return undefined;
     return found.endpoint;
@@ -50,7 +52,7 @@ export async function ensure(options = {}) {
         while (true) {
             if (Date.now() >= deadline)
                 throw new Error("Timed out waiting for the background service to start");
-            const registration = await registered(options.file, true, timing.requestTimeout);
+            const registration = await registered(options.file, timing.requestTimeout);
             if (registration.timedOut && registration.info !== undefined) {
                 timeouts = {
                     info: registration.info,
@@ -70,7 +72,7 @@ export async function ensure(options = {}) {
             if (registration.service !== undefined) {
                 spawnDelay = timing.spawnDelay;
                 const service = registration.service;
-                const compatible = !service.legacy && matchesVersion(service.version, options);
+                const compatible = service.compatible && matchesVersion(service.version, options);
                 if (compatible && service.state === "ready") {
                     await PtyHandoff.complete(options.file ?? fallback(), service.info);
                     return service.endpoint;
@@ -79,11 +81,11 @@ export async function ensure(options = {}) {
                     throw new Error("Background service failed to start");
                 if (!compatible) {
                     announce("version-mismatch", service.version);
-                    if (!service.legacy && service.state !== "ready")
+                    if (service.state !== "ready")
                         console.warn("Background service is not ready; replacement cannot preserve persistent terminals");
                     await stop({
                         file: options.file,
-                        pty: !service.legacy && service.state === "ready" ? "handoff" : "clear",
+                        pty: service.state === "ready" ? "handoff" : "clear",
                     }).catch(() => undefined);
                     lastSpawn = 0;
                 }
@@ -145,7 +147,7 @@ async function read(file) {
         return undefined;
     }
 }
-async function probeResult(info, allowLegacy = false, timeout = defaultEnsureTiming.requestTimeout) {
+async function probeResult(info, timeout = defaultEnsureTiming.requestTimeout) {
     const endpoint = {
         url: info.url,
         auth: info.password === undefined
@@ -153,47 +155,61 @@ async function probeResult(info, allowLegacy = false, timeout = defaultEnsureTim
             : { type: "basic", username: "opencode", password: info.password },
     };
     const signal = AbortSignal.timeout(timeout);
-    const result = await fetch(new URL("/api/health", info.url), {
-        headers: headers(endpoint),
-        signal,
-    })
+    const result = await fetch(new URL("/api/status", info.url), { headers: headers(endpoint), signal })
         .then(async (response) => ({
         response,
-        body: (await response.json()),
+        body: response.status === 404 ? undefined : (await response.json()),
     }))
         .then((value) => ({ value }), (cause) => ({ cause }));
     if ("cause" in result)
         return { service: undefined, timedOut: signal.aborted };
     const response = result.value.response;
-    const body = result.value.body;
-    if (body !== undefined && "version" in body && "pid" in body) {
-        if (body.pid !== info.pid)
+    // The previous V2 service exposes /api/health instead. Its authenticated 404 is enough
+    // to recognize the registered daemon as incompatible and route it through replacement.
+    if (response.status === 404)
+        return {
+            service: {
+                info,
+                endpoint,
+                version: info.version,
+                state: "ready",
+                compatible: false,
+            },
+            timedOut: false,
+        };
+    const status = decodeStatus(result.value.body);
+    if (status !== undefined) {
+        if (status.pid !== info.pid)
             return { service: undefined, timedOut: false };
-        if (info.version !== undefined && body.version !== info.version)
+        if (info.version !== undefined && status.version !== info.version)
             return { service: undefined, timedOut: false };
         return {
             service: {
                 info,
                 endpoint,
-                version: body.version,
+                version: status.version,
                 state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
-                legacy: false,
+                compatible: true,
             },
             timedOut: false,
         };
     }
-    if (!allowLegacy || body?.healthy !== true)
-        return { service: undefined, timedOut: false };
-    return {
-        service: { info, endpoint, state: "ready", legacy: true },
-        timedOut: false,
-    };
+    return { service: undefined, timedOut: false };
+}
+function decodeStatus(input) {
+    if (typeof input !== "object" || input === null)
+        return;
+    if (!("version" in input) || typeof input.version !== "string")
+        return;
+    if (!("pid" in input) || typeof input.pid !== "number" || !Number.isInteger(input.pid) || input.pid < 0)
+        return;
+    return { version: input.version, pid: input.pid };
 }
-async function registered(file, allowLegacy = false, timeout) {
+async function registered(file, timeout) {
     const info = await read(file);
     if (info === undefined)
         return { info: undefined, service: undefined, timedOut: false };
-    return { info, ...(await probeResult(info, allowLegacy, timeout)) };
+    return { info, ...(await probeResult(info, timeout)) };
 }
 function signal(pid, name) {
     try {

package/dist/rpc-runtime.d.ts

@@ -7,7 +7,6 @@ export declare const event: <D extends Rpc.Definition, Name extends keyof D["eve
     readonly id: string & import("effect/Brand").Brand<"Event.ID">;
     readonly location: {
         readonly directory: string & import("effect/Brand").Brand<"AbsolutePath">;
-        readonly workspaceID?: (string & import("effect/Brand").Brand<"Workspace.ID">) | undefined;
     };
     readonly data: {
         readonly [x: string]: unknown;

package/dist/solid/data.d.ts

@@ -1,4 +1,4 @@
-import type { AgentInfo, CommandInfo, ConfigEntry, FormCancelInput, FormInfo, FormReplyInput, IntegrationInfo, LocationRef, LocationGetOutput, McpResource, McpServer, ModelInfo, ModelRef, PermissionSavedInfo, PermissionRequest, PermissionReplyInput, Project, ProviderInfo, ReferenceInfo, SessionMessageInfo, SessionInfo, SessionInboxInfo, SessionInboxCompaction, ShellInfo, SkillInfo, VcsInfo, OpenCodeEvent, OpenCodeClient, WebSearchProvider } from "../promise";
+import type { AgentInfo, CommandInfo, ConfigEntry, SessionFormCancelInput, FormInfo, SessionFormReplyInput, IntegrationInfo, LocationRef, McpResource, McpServer, ModelInfo, ModelRef, PermissionSavedInfo, PermissionRequest, PermissionReplyInput, Project, ProviderInfo, ReferenceInfo, SessionMessageInfo, SessionInfo, SessionInboxInfo, SessionInboxCompaction, ShellInfo, SkillInfo, VcsInfo, OpenCodeEvent, OpenCodeClient, WebSearchProvider } from "../promise";
 import { type SessionPromptInput } from "../promise";
 export type DataSessionStatus = "idle" | "running";
 type OpenCodeEventMap = {
@@ -106,8 +106,8 @@ export declare function createData(config: CreateDataInput): {
             list(sessionID: string, ref?: LocationRef): FormWithLocation[] | undefined;
             sync(sessionID: string, ref?: LocationRef): Promise<void>;
             invalidate(sessionID: string, ref?: LocationRef): void;
-            reply(input: FormReplyInput, ref?: LocationRef): Promise<void>;
-            cancel(input: FormCancelInput, ref?: LocationRef): Promise<void>;
+            reply(input: SessionFormReplyInput, ref?: LocationRef): Promise<void>;
+            cancel(input: SessionFormCancelInput, ref?: LocationRef): Promise<void>;
         };
     };
     project: {
@@ -129,7 +129,7 @@ export declare function createData(config: CreateDataInput): {
         invalidate: (ref?: LocationRef) => void;
     };
     location: {
-        info(ref?: LocationRef): LocationGetOutput | undefined;
+        info(ref?: LocationRef): import("../promise").LocationPublicInfo | undefined;
         default(): LocationRef;
         syncInfo(ref?: LocationRef): Promise<void>;
         sync(ref?: LocationRef): Promise<void>;

package/dist/solid/data.js

@@ -16,7 +16,7 @@ export function locationKey(location) {
     return JSON.stringify([location.directory, location.workspaceID]);
 }
 function locationQuery(ref) {
-    return { directory: ref.directory, workspace: ref.workspaceID };
+    return { directory: ref.directory };
 }
 function formRequestOptions(sessionID, ref) {
     if (sessionID !== "global" || !ref)
@@ -24,7 +24,6 @@ function formRequestOptions(sessionID, ref) {
     return {
         headers: {
             "x-opencode-directory": encodeURIComponent(ref.directory),
-            ...(ref.workspaceID ? { "x-opencode-workspace": ref.workspaceID } : {}),
         },
     };
 }
@@ -137,6 +136,7 @@ export function createData(config) {
     const messageIndex = new Map();
     const sync = createSync();
     let activeUpdates;
+    const pendingUpdates = new Map();
     function setSessionActive(sessionID, status) {
         activeUpdates?.set(sessionID, status);
         setStore("session", "active", sessionID, status);
@@ -144,6 +144,7 @@ export function createData(config) {
     function removePending(sessionID, inboxID) {
         if (!inboxID)
             return;
+        pendingUpdates.get(sessionID)?.set(inboxID, undefined);
         if (store.session.pending[sessionID]?.some((item) => item.id === inboxID))
             setStore("session", "pending", sessionID, (store.session.pending[sessionID] ?? []).filter((item) => item.id !== inboxID));
     }
@@ -186,6 +187,7 @@ export function createData(config) {
     function updatePending(sessionID, inboxID, delivery) {
         const index = store.session.pending[sessionID]?.findIndex((item) => item.id === inboxID) ?? -1;
         const item = store.session.pending[sessionID]?.[index];
+        pendingUpdates.get(sessionID)?.set(inboxID, item ? { ...item, delivery } : delivery);
         if (index < 0 || !item || item.delivery === delivery)
             return;
         setStore("session", "pending", sessionID, index, { ...item, delivery });
@@ -252,8 +254,8 @@ export function createData(config) {
             return;
         message.update(item.sessionID, (draft, index) => {
             const row = item.type === "user"
-                ? { id: item.id, type: "user", ...item.payload, time: { created: item.timeCreated } }
-                : { id: item.id, type: "synthetic", ...item.payload, time: { created: item.timeCreated } };
+                ? { id: item.id, type: "user", ...item.payload, time: { created: item.time.created } }
+                : { id: item.id, type: "synthetic", ...item.payload, time: { created: item.time.created } };
             const position = index.get(item.id);
             if (position === undefined)
                 return message.append(draft, index, row);
@@ -527,7 +529,7 @@ export function createData(config) {
                     time: { created: event.created },
                 });
                 refresh(() => api()
-                    .session.message({ sessionID: event.data.sessionID, messageID: messageIDFromEvent(event.id) })
+                    .session.message.get({ sessionID: event.data.sessionID, messageID: messageIDFromEvent(event.id) })
                     .then((item) => {
                     message.update(event.data.sessionID, (draft, index) => {
                         const position = index.get(item.id);
@@ -550,7 +552,7 @@ export function createData(config) {
                 });
                 return;
             }
-            case "session.permissions.updated":
+            case "session.permissions":
                 if (store.session.info[event.data.sessionID])
                     setStore("session", "info", event.data.sessionID, "permissions", event.data.permissions);
                 return;
@@ -583,8 +585,6 @@ export function createData(config) {
                     const explicit = event.data.adopted?.includes(info.projectID);
                     const directory = explicit ? store.project.info[info.projectID]?.canonical : info.location.directory;
                     if (!directory) {
-                        if (info.location.workspaceID)
-                            continue;
                         result.session.invalidate(sessionID);
                         refresh(() => result.session.sync(sessionID));
                         continue;
@@ -592,7 +592,6 @@ export function createData(config) {
                     const adopted = Worktree.adopt({
                         projectID: info.projectID,
                         directory,
-                        workspaceID: info.location.workspaceID,
                     }, event.data);
                     if (!adopted)
                         continue;
@@ -629,12 +628,14 @@ export function createData(config) {
             }
             case "session.inbox.enqueued": {
                 outbox.delete(event.data.inboxID);
-                admitLocal({
+                const item = {
                     id: event.data.inboxID,
                     sessionID: event.data.sessionID,
-                    timeCreated: event.created,
+                    time: { created: event.created },
                     ...event.data.item,
-                });
+                };
+                pendingUpdates.get(item.sessionID)?.set(item.id, item);
+                admitLocal(item);
                 if (event.data.item.type === "compaction") {
                     const active = compacting.get(event.data.sessionID);
                     active?.observed.add(event.data.inboxID);
@@ -1061,10 +1062,13 @@ export function createData(config) {
             return;
         const location = event.location;
         switch (event.type) {
-            case "catalog.updated":
-                result.location.model.invalidate(location);
+            case "provider.updated":
                 result.location.provider.invalidate(location);
-                refresh(() => Promise.all([result.location.model.sync(location), result.location.provider.sync(location)]));
+                refresh(() => result.location.provider.sync(location));
+                break;
+            case "model.updated":
+                result.location.model.invalidate(location);
+                refresh(() => result.location.model.sync(location));
                 break;
             case "agent.updated":
                 result.location.agent.invalidate(location);
@@ -1170,7 +1174,7 @@ export function createData(config) {
     const vcs = locationResource("vcs", (location) => api().vcs.get({ location }));
     const shells = locationResource("shell", async (location) => {
         const response = await api().shell.list({ location });
-        const ref = { directory: response.location.directory, workspaceID: response.location.workspaceID };
+        const ref = { directory: response.location.directory };
         return {
             location: response.location,
             data: Object.fromEntries(response.data.map((info) => [info.id, { ...info, location: ref }])),
@@ -1239,23 +1243,46 @@ export function createData(config) {
                 },
                 sync(sessionID) {
                     return sync.run(`session.pending:${sessionID}`, async () => {
-                        const pending = await api().session.inbox.list({ sessionID });
-                        // A positive read acknowledges admission even when its SSE echo is delayed.
-                        pending.forEach((item) => outbox.delete(item.id));
-                        // Compactions also coalesce by Session, not just by the proposed ID.
-                        if (pending.some((item) => item.type === "compaction"))
-                            store.session.pending[sessionID]
-                                ?.filter((item) => item.type === "compaction")
-                                .forEach((item) => outbox.delete(item.id));
-                        // Keep optimistic rows still awaiting their echo: this fetch may
-                        // have raced ahead of an in-flight admission the server does not
-                        // know about yet.
-                        const inflight = (store.session.pending[sessionID] ?? []).filter((item) => outbox.has(item.id));
-                        const merged = inflight.length === 0 ? pending : [...pending, ...inflight];
-                        batch(() => {
-                            setStore("session", "pending", sessionID, reconcile(merged));
-                            merged.forEach(materializeInboxMessage);
-                        });
+                        const updates = new Map();
+                        pendingUpdates.set(sessionID, updates);
+                        try {
+                            const snapshot = await api().session.inbox.list({ sessionID });
+                            // Events can overtake this HTTP response on a remote connection.
+                            // Reconcile them before an older snapshot can resurrect delivered input.
+                            const current = new Map(snapshot.map((item) => [item.id, item]));
+                            updates.forEach((item, id) => {
+                                if (item === undefined)
+                                    current.delete(id);
+                                else if (typeof item === "string") {
+                                    const existing = current.get(id);
+                                    if (existing)
+                                        current.set(id, { ...existing, delivery: item });
+                                }
+                                else
+                                    current.set(id, item);
+                            });
+                            const pending = [...current.values()];
+                            // A positive read acknowledges admission even when its SSE echo is delayed.
+                            pending.forEach((item) => outbox.delete(item.id));
+                            // Compactions also coalesce by Session, not just by the proposed ID.
+                            if (pending.some((item) => item.type === "compaction"))
+                                store.session.pending[sessionID]
+                                    ?.filter((item) => item.type === "compaction")
+                                    .forEach((item) => outbox.delete(item.id));
+                            // Keep optimistic rows still awaiting their echo: this fetch may
+                            // have raced ahead of an in-flight admission the server does not
+                            // know about yet.
+                            const inflight = (store.session.pending[sessionID] ?? []).filter((item) => outbox.has(item.id));
+                            const merged = inflight.length === 0 ? pending : [...pending, ...inflight];
+                            batch(() => {
+                                setStore("session", "pending", sessionID, reconcile(merged));
+                                merged.forEach(materializeInboxMessage);
+                            });
+                        }
+                        finally {
+                            if (pendingUpdates.get(sessionID) === updates)
+                                pendingUpdates.delete(sessionID);
+                        }
                     });
                 },
                 invalidate(sessionID) {
@@ -1325,7 +1352,7 @@ export function createData(config) {
                     admitLocal({
                         id,
                         sessionID: input.sessionID,
-                        timeCreated: Date.now(),
+                        time: { created: Date.now() },
                         type: "compaction",
                         delivery: "steer",
                         payload: {},
@@ -1380,7 +1407,7 @@ export function createData(config) {
                     admitLocal({
                         id,
                         sessionID: request.sessionID,
-                        timeCreated: Date.now(),
+                        time: { created: Date.now() },
                         type: "user",
                         delivery: request.delivery ?? "steer",
                         // Files and skills stay off the optimistic row: their durable
@@ -1568,12 +1595,11 @@ export function createData(config) {
                     const key = `session.form:${sessionID}:${sessionID === "global" ? locationKey(ref ?? defaultLocation()) : ""}`;
                     return sync.run(key, async () => {
                         if (sessionID === "global") {
-                            const response = await api().form.request.list({
+                            const response = await api().form.list({
                                 location: locationQuery(ref ?? defaultLocation()),
                             });
                             const location = {
                                 directory: response.location.directory,
-                                workspaceID: response.location.workspaceID,
                             };
                             const locationID = locationKey(location);
                             setStore("session", "form", sessionID, [
@@ -1582,17 +1608,17 @@ export function createData(config) {
                             ]);
                             return;
                         }
-                        setStore("session", "form", sessionID, await api().form.list({ sessionID }));
+                        setStore("session", "form", sessionID, await api().session.form.list({ sessionID }));
                     });
                 },
                 invalidate(sessionID, ref) {
                     sync.invalidate(`session.form:${sessionID}:${sessionID === "global" ? locationKey(ref ?? defaultLocation()) : ""}`);
                 },
                 reply(input, ref) {
-                    return settleForm(input, ref, api().form.reply(input, formRequestOptions(input.sessionID, ref)));
+                    return settleForm(input, ref, api().session.form.reply(input, formRequestOptions(input.sessionID, ref)));
                 },
                 cancel(input, ref) {
-                    return settleForm(input, ref, api().form.cancel(input, formRequestOptions(input.sessionID, ref)));
+                    return settleForm(input, ref, api().session.form.cancel(input, formRequestOptions(input.sessionID, ref)));
                 },
             },
         },
@@ -1659,7 +1685,7 @@ export function createData(config) {
                         setStore("location", key, {});
                     setStore("location", key, "info", location);
                     if (!ref) {
-                        setDefaultLocation({ directory: location.directory, workspaceID: location.workspaceID });
+                        setDefaultLocation({ directory: location.directory });
                     }
                 });
             },
@@ -1702,7 +1728,7 @@ export function createData(config) {
             agent: locationResource("agent", (location) => api().agent.list({ location })),
             command: locationResource("command", (location) => api().command.list({ location })),
             config: locationResource("config", async (location) => ({
-                location: { directory: location.directory, workspaceID: location.workspace },
+                location: { directory: location.directory },
                 data: await api().config.get({ location }),
             })),
             integration: locationResource("integration", (location) => api().integration.list({ location })),

package/dist/solid/pty.js

@@ -9,8 +9,6 @@ export function createPtyClient(api, options) {
             const url = new URL(`/api/pty/${encodeURIComponent(input.ptyID)}/connect`, options.url);
             if (input.location?.directory)
                 url.searchParams.set("location[directory]", input.location.directory);
-            if (input.location?.workspace)
-                url.searchParams.set("location[workspace]", input.location.workspace);
             if (input.cursor !== undefined)
                 url.searchParams.set("cursor", String(input.cursor));
             url.searchParams.set("ticket", result.data.ticket);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/client",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -57,8 +57,8 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@opencode/schema": "2.0.3",
-    "@opencode/protocol": "2.0.3"
+    "@opencode/schema": "2.0.5",
+    "@opencode/protocol": "2.0.5"
   },
   "peerDependencies": {
     "effect": "4.0.0-rc.112",
@@ -74,7 +74,7 @@
   },
   "devDependencies": {
     "@effect/platform-node": "4.0.0-rc.112",
-    "@opencode/httpapi-codegen": "2.0.3",
+    "@opencode/httpapi-codegen": "2.0.5",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.4.0",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",