ds-harness-remote 0.5.10 → 0.5.12

package/dist/acp/gateway.d.ts

@@ -47,6 +47,8 @@ export declare class AcpRemoteGateway {
     private readonly startingClients;
     /** Desired configuration is saved immediately; unfinished cleanup must remain retryable. */
     private readonly pendingReconfiguration;
+    private readonly archivingSessions;
+    private readonly opencodeOperations;
     constructor(config: ResolvedAcpConfig, logger: SafeLogger, createAcp?: AcpFactory, restartDelaysMs?: readonly number[], terminalEnabled?: () => boolean, terminalSpawner?: RemoteTerminalSpawner | undefined);
     /** Only implemented adapters are advertised; registry entries never select an adapter by executable name. */
     enabledBackends(): string[];
@@ -65,6 +67,8 @@ export declare class AcpRemoteGateway {
     };
     createPeer(context: PeerConnectionContext, publish: PublishAcpFrame): AcpPeerBridge | undefined;
     call(connectionId: string, input: unknown): Promise<unknown>;
+    private captureCallScope;
+    private callInternal;
     private runPromptInBackground;
     respond(connectionId: string, input: unknown): Promise<{
         resolved: true;
@@ -102,7 +106,6 @@ export declare class AcpRemoteGateway {
     private requireSessionOwner;
     private captureCatalogClient;
     private listCatalogSessions;
-    private piSessionCwd;
     private catalogSessionCwd;
     private requireExistingDirectory;
     private listDirectory;

package/dist/acp/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/acp/gateway.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/acp/gateway.ts"],"names":[],"mappings":"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"}

package/dist/acp/gateway.js

@@ -1,3 +1,4 @@
+import { IsolatedAcpClient } from './adapters/isolated-process.js';
 import { WorkspaceBridge, WorkspaceBridgeState } from '../workspace-bridge.js';
 import { TerminalPolicy } from '../terminal-policy.js';
 import { AcpWorkspaceTools } from './workspace-tools.js';
@@ -7,7 +8,7 @@ import { homedir } from 'node:os';
 import { basename, isAbsolute, join, relative, resolve } from 'node:path';
 import { RpcError } from '../safe-error.js';
 import { PLUGIN_VERSION } from '../version.js';
-import { CursorAcpClient, CursorAcpError, } from './adapters/cursor-process.js';
+import { CursorAcpError, } from './adapters/cursor-process.js';
 import { ClaudeAcpClient } from './adapters/claude-process.js';
 import { PiAcpClient } from './adapters/pi-process.js';
 import { AntigravityAcpClient } from './adapters/antigravity-process.js';
@@ -63,7 +64,7 @@ export class AcpRemoteGateway {
     /** Catch-up buffer for turns that finish while the Client is reconnecting. */
     recentFrames = new Map();
     /** Per-prompt live updates; attached to prompt_completed when streaming was lossy. */
-    promptsInProgress = new Set();
+    promptsInProgress = new Map();
     cancelledSessions = new Set();
     /** Identity fences asynchronous Pi preparation from a later retry of the same session. */
     preparingPrompts = new Map();
@@ -72,6 +73,8 @@ export class AcpRemoteGateway {
     startingClients = new Map();
     /** Desired configuration is saved immediately; unfinished cleanup must remain retryable. */
     pendingReconfiguration = new Set();
+    archivingSessions = new Set();
+    opencodeOperations = new Map();
     constructor(config, logger, createAcp = (binary, targetLogger, backend) => {
         if (backend.id === 'antigravity') {
             return new AntigravityAcpClient(binary, targetLogger, undefined, { args: backend.args, cwd: backend.cwd });
@@ -83,7 +86,7 @@ export class AcpRemoteGateway {
         if (backend.id === 'opencode') {
             return new OpencodeAcpClient(binary, targetLogger, undefined, { args: backend.args, cwd: backend.cwd });
         }
-        return new CursorAcpClient(binary, targetLogger, undefined, { args: backend.args, cwd: backend.cwd });
+        return new IsolatedAcpClient(binary, targetLogger, { args: backend.args, cwd: backend.cwd, backend: 'cursor' });
     }, restartDelaysMs = DEFAULT_RESTART_DELAYS_MS, terminalEnabled = () => false, terminalSpawner) {
         this.config = config;
         this.logger = logger;
@@ -169,12 +172,51 @@ export class AcpRemoteGateway {
     async call(connectionId, input) {
         const envelope = parseCallEnvelope(input);
         const call = parseAcpCall(envelope.method, envelope.params);
+        const sessionId = sessionIdFromParams(call.method, call.params);
+        const backend = call.params.backend ?? (sessionId ? this.sessionBackends.get(sessionId) ?? this.defaultBackend() : undefined);
+        const assertCurrent = this.captureCallScope(connectionId, typeof backend === 'string' ? backend : this.defaultBackend());
+        const reserve = backend === 'opencode' && sessionId !== undefined && ['session/load', 'session/prompt', 'dsh/selectModel'].includes(call.method);
+        if (reserve) {
+            if (this.archivingSessions.has(sessionId))
+                throw new RpcError('ACP_SESSION_BUSY', 'The OpenCode session is being archived.');
+            this.opencodeOperations.set(sessionId, (this.opencodeOperations.get(sessionId) ?? 0) + 1);
+        }
+        try {
+            const result = await this.callInternal(connectionId, call, assertCurrent);
+            assertCurrent();
+            return result;
+        }
+        finally {
+            if (reserve) {
+                const remaining = (this.opencodeOperations.get(sessionId) ?? 1) - 1;
+                if (remaining)
+                    this.opencodeOperations.set(sessionId, remaining);
+                else
+                    this.opencodeOperations.delete(sessionId);
+            }
+        }
+    }
+    captureCallScope(connectionId, backend) {
+        const peer = this.peers.get(connectionId);
+        const instance = this.backendInstances.get(backend);
+        return () => {
+            if (this.closed || this.backendInstances.get(backend) !== instance
+                || (instance !== undefined && this.requireAcp(backend) !== instance.client)) {
+                throw new RpcError('CURSOR_UNAVAILABLE', 'The ACP backend changed while handling the request.');
+            }
+            if (peer !== undefined && this.peers.get(connectionId) !== peer) {
+                throw new RpcError('ACP_CONNECTION_CLOSED', 'The ACP connection is closed.');
+            }
+        };
+    }
+    async callInternal(connectionId, call, assertCurrent) {
+        assertCurrent();
         this.logger.info('ACP call received', {
             method: call.method,
             sessionId: typeof call.params?.sessionId === 'string' ? shortSessionId(call.params.sessionId) : undefined,
         });
         if (typeof call.params.backend === 'string') {
-            const prefix = typeof call.params.sessionId === 'string' ? /^(acp|cursor|pi|claude):/.exec(call.params.sessionId)?.[1] : undefined;
+            const prefix = typeof call.params.sessionId === 'string' ? /^(acp|cursor|pi|claude|opencode):/.exec(call.params.sessionId)?.[1] : undefined;
             if (prefix && (prefix === 'acp' ? 'antigravity' : prefix) !== call.params.backend) {
                 throw new RpcError('INVALID_MESSAGE', 'The ACP session backend does not match.');
             }
@@ -192,14 +234,83 @@ export class AcpRemoteGateway {
             this.requireAcp(requestedBackend);
             return this.initializeResult(call.params, requestedBackend);
         }
+        if (call.method === 'dsh/sessionArchive') {
+            const sessionId = String(call.params.sessionId);
+            if (this.archivingSessions.has(sessionId) || this.opencodeOperations.has(sessionId))
+                throw new RpcError('ACP_SESSION_BUSY', 'The OpenCode session is busy.');
+            this.archivingSessions.add(sessionId);
+            try {
+                const backend = 'opencode';
+                const client = this.requireAcp(backend);
+                const instance = this.backendInstances.get(backend);
+                const cwd = await this.catalogSessionCwd(backend, sessionId);
+                assertCurrent();
+                if (this.closed || this.requireAcp(backend) !== client || this.backendInstances.get(backend) !== instance)
+                    throw new RpcError('OPENCODE_ARCHIVE_UNAVAILABLE', 'The OpenCode backend changed. Refresh the session list.');
+                if (this.promptsInProgress.has(sessionId) || [...this.approvals.values()].some(item => item.sessionId === sessionId))
+                    throw new RpcError('ACP_SESSION_BUSY', 'Stop the OpenCode reply and resolve its approvals before archiving.');
+                if (!client.archiveSession)
+                    throw new RpcError('OPENCODE_ARCHIVE_UNAVAILABLE', 'The Host OpenCode adapter does not support native archiving.');
+                await client.archiveSession(sessionId, cwd);
+                if (this.closed || this.requireAcp(backend) !== client || this.backendInstances.get(backend) !== instance)
+                    throw new RpcError('OPENCODE_ARCHIVE_UNAVAILABLE', 'The OpenCode backend changed. Refresh the session list to confirm the archive state.');
+                const result = { backend, sessionId, archived: true };
+                this.inboundChain = this.inboundChain.then(async () => {
+                    if (!this.closed && this.backendInstances.get(backend) === instance) {
+                        await Promise.allSettled([...this.peers.values()].map(peer => peer.publishArchived(result)));
+                    }
+                });
+                await this.inboundChain;
+                if (this.closed || this.backendInstances.get(backend) !== instance)
+                    throw new RpcError('OPENCODE_ARCHIVE_UNAVAILABLE', 'The OpenCode backend changed. Refresh the session list to confirm the archive state.');
+                return result;
+            }
+            finally {
+                this.archivingSessions.delete(sessionId);
+            }
+        }
+        if (typeof call.params.sessionId === 'string' && this.archivingSessions.has(call.params.sessionId)
+            && ['session/load', 'session/prompt', 'dsh/selectModel'].includes(call.method))
+            throw new RpcError('ACP_SESSION_BUSY', 'The OpenCode session is being archived.');
+        const controlId = sessionIdFromParams(call.method, call.params);
+        if (controlId && (call.params.backend ?? this.sessionBackends.get(controlId) ?? this.defaultBackend()) === 'opencode'
+            && ['session/load', 'session/prompt', 'dsh/selectModel'].includes(call.method)) {
+            const client = this.requireAcp('opencode');
+            if (client.isSessionArchived) {
+                const cwd = await this.catalogSessionCwd('opencode', controlId);
+                const archived = await client.isSessionArchived(controlId, cwd);
+                if (this.closed || this.requireAcp('opencode') !== client)
+                    throw new RpcError('OPENCODE_ARCHIVE_UNAVAILABLE', 'The OpenCode backend changed.');
+                if (archived)
+                    throw new RpcError('ACP_SESSION_ARCHIVED', 'This OpenCode session is archived.');
+            }
+        }
+        assertCurrent();
         if (call.method === 'dsh/directoryList') {
             return this.listDirectory(String(call.params.path));
         }
         if (call.method === 'dsh/workspaceList') {
             const requestedBackend = typeof call.params.backend === 'string' ? call.params.backend : this.defaultBackend();
-            if (requestedBackend === 'pi' || requestedBackend === 'claude') {
+            if (requestedBackend === 'pi' || requestedBackend === 'claude' || requestedBackend === 'opencode') {
                 const sessions = await this.listCatalogSessions(requestedBackend);
-                return [...new Set(sessions.map(item => item.cwd))].map(path => ({ path, title: basename(path) || 'workspace' }));
+                const discovered = [...new Set(sessions.map(item => item.cwd))].map(path => ({ path, title: basename(path) || 'workspace' }));
+                if (discovered.length > 0 || requestedBackend !== 'opencode')
+                    return discovered;
+                const defaultCandidates = new Set();
+                const cwd = process.cwd();
+                if (cwd)
+                    defaultCandidates.add(cwd);
+                for (const candidate of ['/var/lib/dsh/workspace/ds-harness-remote', '/srv/dsh-workspace', '/var/lib/dsh/local']) {
+                    try {
+                        const s = await stat(candidate);
+                        if (s.isDirectory())
+                            defaultCandidates.add(candidate);
+                    }
+                    catch {
+                        // ignore
+                    }
+                }
+                return [...defaultCandidates].map(path => ({ path, title: basename(path) || 'workspace' }));
             }
             const candidates = new Set();
             const cwd = process.cwd();
@@ -255,20 +366,24 @@ export class AcpRemoteGateway {
                 // Prepare one idle process in that directory without awaiting startup.
                 if (path.trim() !== '' && call.params.prewarm !== false) {
                     const cwd = await this.requireExistingDirectory(path);
+                    assertCurrent();
                     this.requireAcp('antigravity').prewarmSession?.(cwd);
                 }
                 const items = await discoverAntigravitySessions(path, limit);
                 if (path) {
                     const cwd = await this.requireExistingDirectory(path);
+                    assertCurrent();
                     for (const item of items)
                         this.sessionCwds.set(item.conversationId, { backend, cwd });
                 }
                 this.logger.info('ACP session list fetched', { count: items.length });
                 return { items };
             }
-            if (backend === 'pi' || backend === 'claude') {
+            if (backend === 'pi' || backend === 'claude' || backend === 'opencode') {
                 const cwd = path ? await this.requireExistingDirectory(path) : undefined;
                 const sessions = await this.listCatalogSessions(backend, cwd);
+                sessions.sort((a, b) => (Date.parse(b.updatedAt ?? '') || 0) - (Date.parse(a.updatedAt ?? '') || 0)
+                    || a.sessionId.localeCompare(b.sessionId));
                 return { items: sessions.slice(0, limit).map(item => ({ conversationId: item.sessionId, title: item.title ?? 'Untitled Session', createdAt: Date.parse(item.updatedAt ?? '') || 0, updatedAt: Date.parse(item.updatedAt ?? '') || 0, cwd: item.cwd })) };
             }
             return { items: [] };
@@ -293,9 +408,10 @@ export class AcpRemoteGateway {
                 throw new RpcError('INVALID_MESSAGE', 'The ACP session backend does not match.');
             }
             this.requireAcp(backend);
-            if (backend === 'pi' || backend === 'claude') {
+            if (backend === 'pi' || backend === 'claude' || backend === 'opencode') {
                 const cwd = await this.catalogSessionCwd(backend, conversationId);
-                this.requireSessionOwner(connectionId, conversationId);
+                // History uses an isolated reader and must neither require nor claim
+                // the live session's control ownership.
                 const client = this.requireAcp(backend);
                 if (!client.history)
                     throw new RpcError('METHOD_NOT_ALLOWED', 'The ACP backend does not support history.');
@@ -312,6 +428,7 @@ export class AcpRemoteGateway {
         }
         if (call.method === 'session/new') {
             const cwd = await this.requireExistingDirectory(String(call.params.cwd));
+            assertCurrent();
             const requestedBackend = typeof call.params.backend === 'string'
                 ? call.params.backend
                 : this.defaultBackend();
@@ -321,6 +438,7 @@ export class AcpRemoteGateway {
                 mcpServers: [],
                 ...(typeof call.params.mode === 'string' ? { mode: call.params.mode } : {}),
             });
+            assertCurrent();
             const sessionId = readSessionId(result);
             if (sessionId !== undefined) {
                 const bound = this.sessionBackends.get(sessionId);
@@ -360,11 +478,16 @@ export class AcpRemoteGateway {
             if (boundBackend !== undefined && targetBackend !== boundBackend) {
                 throw new RpcError('INVALID_MESSAGE', 'The ACP session backend does not match.');
             }
-            if (targetBackend === 'pi' || targetBackend === 'claude')
+            if (targetBackend === 'pi' || targetBackend === 'claude' || targetBackend === 'opencode')
                 await this.catalogSessionCwd(targetBackend, sessionId);
+            assertCurrent();
             this.requireSessionOwner(connectionId, sessionId);
             const acp = this.requireAcp(targetBackend);
+            // Track pending loads too, so reconfiguration revokes their ownership
+            // before an upstream result can arrive.
+            this.sessionBackends.set(sessionId, targetBackend);
             const result = await acp.call(call.method, { ...call.params, ...(sessionId && this.sessionCwds.get(sessionId) ? { cwd: this.sessionCwds.get(sessionId).cwd, mcpServers: [] } : {}) });
+            assertCurrent();
             const loadedId = readSessionId(result) ?? sessionId;
             if (loadedId !== undefined) {
                 if (loadedId !== sessionId || (this.sessionBackends.has(loadedId) && targetBackend !== undefined && this.sessionBackends.get(loadedId) !== targetBackend)) {
@@ -379,12 +502,17 @@ export class AcpRemoteGateway {
         if (isSessionMutation(call.method) && sessionId !== undefined) {
             this.requireSessionOwner(connectionId, sessionId);
         }
-        if ((call.method === 'dsh/sessionModels' || call.method === 'dsh/selectModel') && call.params.backend === 'pi') {
+        if ((call.method === 'dsh/sessionModels' || call.method === 'dsh/selectModel') && (call.params.backend === 'pi' || call.params.backend === 'claude' || call.params.backend === 'opencode')) {
             this.requireSessionOwner(connectionId, sessionId);
-            const cwd = await this.piSessionCwd(sessionId);
-            await this.requireAcp('pi').call('session/load', { sessionId, cwd, mcpServers: [] });
+            const backend = call.params.backend;
+            const cwd = await this.catalogSessionCwd(backend, sessionId);
+            assertCurrent();
+            await this.requireAcp(backend).call('session/load', { sessionId, cwd, mcpServers: [] });
+            assertCurrent();
         }
         if (call.method === 'dsh/selectModel') {
+            if (this.promptsInProgress.has(sessionId))
+                throw new RpcError('PROMPT_IN_PROGRESS', 'Stop the ACP reply before changing its model.');
             const session = this.sessionCwds.get(sessionId);
             if (!session || session.backend !== call.params.backend) {
                 throw new RpcError('ACP_WORKSPACE_UNAVAILABLE', 'The ACP session has no trusted workspace.');
@@ -392,6 +520,7 @@ export class AcpRemoteGateway {
             // Resume straight into the target model. Loading the old model first
             // starts a second CLI process that would immediately be discarded.
             const result = await this.requireAcp(session.backend).call(call.method, { ...call.params, cwd: session.cwd });
+            assertCurrent();
             this.sessionBackends.set(sessionId, session.backend);
             return sanitizeSessionResult(result);
         }
@@ -402,29 +531,35 @@ export class AcpRemoteGateway {
         if (call.method === 'session/prompt' && sessionId !== undefined) {
             if (this.promptsInProgress.has(sessionId))
                 throw new RpcError('PROMPT_IN_PROGRESS', 'An ACP reply is already in progress.');
-            this.promptsInProgress.add(sessionId);
+            const backend = this.sessionBackends.get(sessionId) ?? this.defaultBackend();
+            const task = { backend, client: this.requireAcp(backend) };
+            this.promptsInProgress.set(sessionId, task);
             this.cancelledSessions.delete(sessionId);
-            if (this.sessionBackends.get(sessionId) === 'pi') {
+            const preparationBackend = this.sessionBackends.get(sessionId);
+            if (preparationBackend === 'pi' || preparationBackend === 'claude') {
                 const preparation = { cancelled: false };
                 this.preparingPrompts.set(sessionId, preparation);
                 try {
-                    const cwd = await this.piSessionCwd(sessionId);
+                    const cwd = await this.catalogSessionCwd(preparationBackend, sessionId);
                     if (preparation.cancelled)
                         return { accepted: false, stopReason: 'cancelled' };
-                    await this.requireAcp('pi').call('session/load', { sessionId, cwd, mcpServers: [] });
+                    assertCurrent();
+                    await task.client.call('session/load', { sessionId, cwd, mcpServers: [] });
                     if (preparation.cancelled)
                         return { accepted: false, stopReason: 'cancelled' };
+                    assertCurrent();
                 }
                 catch (error) {
                     if (preparation.cancelled)
                         return { accepted: false, stopReason: 'cancelled' };
-                    this.promptsInProgress.delete(sessionId);
+                    if (this.promptsInProgress.get(sessionId) === task)
+                        this.promptsInProgress.delete(sessionId);
                     throw error;
                 }
                 finally {
                     if (this.preparingPrompts.get(sessionId) === preparation) {
                         this.preparingPrompts.delete(sessionId);
-                        if (preparation.cancelled)
+                        if (preparation.cancelled && this.promptsInProgress.get(sessionId) === task)
                             this.promptsInProgress.delete(sessionId);
                     }
                 }
@@ -436,7 +571,7 @@ export class AcpRemoteGateway {
                 });
             }
             this.turnCatchUp.set(sessionId, []);
-            void this.runPromptInBackground(sessionId, call.params);
+            void this.runPromptInBackground(sessionId, call.params, task);
             return { accepted: true, stopReason: 'in_progress' };
         }
         if (call.method === 'session/cancel' && sessionId !== undefined) {
@@ -465,15 +600,17 @@ export class AcpRemoteGateway {
         const sessionBackend = sessionId !== undefined ? this.sessionBackends.get(sessionId) : undefined;
         return sanitizeSessionResult(await this.requireAcp(typeof call.params.backend === 'string' ? call.params.backend : sessionBackend).call(call.method, call.params));
     }
-    async runPromptInBackground(sessionId, params) {
+    async runPromptInBackground(sessionId, params, task) {
+        const current = () => !this.closed && this.promptsInProgress.get(sessionId) === task
+            && !this.pendingReconfiguration.has(task.backend) && this.backendInstances.get(task.backend)?.client === task.client;
         try {
-            const sessionBackend = this.sessionBackends.get(sessionId);
-            const acp = this.requireAcp(sessionBackend);
-            const result = await acp.call('session/prompt', params);
+            const result = await task.client.call('session/prompt', params);
             // Cursor emits final session/update lines before the JSON-RPC result.
             // Those notifications are queued on inboundChain; drain it before we
             // snapshot catch-up or the Client only sees an empty prompt_completed.
             await this.inboundChain;
+            if (!current())
+                return;
             const stopReason = isRecord(result) && typeof result.stopReason === 'string'
                 ? result.stopReason
                 : 'end_turn';
@@ -496,8 +633,12 @@ export class AcpRemoteGateway {
             });
         }
         catch (error) {
+            if (!current())
+                return;
             this.logger?.warn('ACP session/prompt failed', { code: errorCode(error) });
             await this.inboundChain.catch(() => undefined);
+            if (!current())
+                return;
             const catchUp = takeTurnCatchUp(this.turnCatchUp, sessionId);
             await this.publishToSession(sessionId, {
                 method: 'session/update',
@@ -512,7 +653,8 @@ export class AcpRemoteGateway {
             }).catch(() => undefined);
         }
         finally {
-            this.promptsInProgress.delete(sessionId);
+            if (this.promptsInProgress.get(sessionId) === task)
+                this.promptsInProgress.delete(sessionId);
         }
     }
     async respond(connectionId, input) {
@@ -585,7 +727,7 @@ export class AcpRemoteGateway {
             return;
         }
         if (owner !== connectionId) {
-            throw new RpcError('CURSOR_SESSION_OWNED', 'Another Remote connection owns this Cursor session.');
+            throw new RpcError('CURSOR_SESSION_OWNED', 'Another Remote connection owns this session.');
         }
     }
     /** Replay frames buffered while no healthy peer could receive them. */
@@ -636,6 +778,11 @@ export class AcpRemoteGateway {
             .then(() => undefined, () => new RpcError('TERMINAL_CLEANUP_FAILED', 'Some ACP terminal processes could not be stopped. Save the backend settings again to retry.'));
         for (const id of sessions) {
             this.sessionOwners.delete(id);
+            this.promptsInProgress.delete(id);
+            const preparation = this.preparingPrompts.get(id);
+            if (preparation)
+                preparation.cancelled = true;
+            this.preparingPrompts.delete(id);
             this.sessionBackends.delete(id);
             this.recentFrames.delete(id);
             this.turnCatchUp.delete(id);
@@ -683,6 +830,10 @@ export class AcpRemoteGateway {
         this.sessionBackends.clear();
         this.recentFrames.clear();
         this.turnCatchUp.clear();
+        this.promptsInProgress.clear();
+        for (const preparation of this.preparingPrompts.values())
+            preparation.cancelled = true;
+        this.preparingPrompts.clear();
         this.approvals.clear();
         const processes = await Promise.allSettled([...this.startingClients.keys()].map(client => client.close()).concat(this.disposeAllInstances()));
         const terminalError = await terminals;
@@ -998,7 +1149,7 @@ export class AcpRemoteGateway {
             return;
         }
         if (owner !== connectionId && isSessionMutation(method)) {
-            throw new RpcError('CURSOR_SESSION_OWNED', 'Another Remote connection owns this Cursor session.');
+            throw new RpcError('CURSOR_SESSION_OWNED', 'Another Remote connection owns this session.');
         }
     }
     requireSessionOwner(connectionId, sessionId) {
@@ -1041,6 +1192,8 @@ export class AcpRemoteGateway {
                     continue;
                 this.sessionCwds.set(item.sessionId, { backend, cwd: canonical });
                 this.sessionBackends.set(item.sessionId, backend);
+                if (backend === 'opencode' && item.archived === true)
+                    continue;
                 items.push({ sessionId: item.sessionId, cwd: canonical,
                     ...(typeof item.title === 'string' ? { title: item.title } : {}),
                     ...(typeof item.updatedAt === 'string' ? { updatedAt: item.updatedAt } : {}) });
@@ -1055,7 +1208,6 @@ export class AcpRemoteGateway {
         }
         return items;
     }
-    piSessionCwd(sessionId) { return this.catalogSessionCwd('pi', sessionId); }
     async catalogSessionCwd(backend, sessionId) {
         const { assertCurrent } = this.captureCatalogClient(backend);
         if (!this.sessionCwds.has(sessionId))
@@ -1256,6 +1408,8 @@ export function cursorBinaryCandidates(configured) {
     }
     if (configured === 'opencode') {
         return [
+            // Official installer location (curl -fsSL https://opencode.ai/install | bash).
+            join(userHome, '.opencode', 'bin', 'opencode'),
             join(userHome, '.local', 'bin', 'opencode'),
             'opencode',
         ];