@wenrwa/marketplace-cli 0.7.7 → 0.8.1

package/dist/bridge/opencodeConfig.js

@@ -0,0 +1,107 @@
+"use strict";
+/**
+ * oc-08 — the CANONICAL OpenCode launch config (docs/prd/opencode-engine.md,
+ * ADR-0013, shape verified in oc-04). Pure: no I/O, no process.env.
+ *
+ * The hosted lane (infra/terminal-image/opencode/build-config.js, oc-05) must
+ * emit the SAME JSON for the same inputs; a parity test on each side should pin
+ * it. The OpenRouter key is NEVER an input here: the only credential OpenCode
+ * ever holds is the per-agent gateway token, and it is passed by reference
+ * (`{env:HIVEOP_GATEWAY_TOKEN}`) so it never appears inside the JSON.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCapturedOpencodeSessionId = exports.OPENCODE_GATEWAY_TOKEN_ENV = exports.OPENCODE_PROVIDER_ID = exports.OPENCODE_QUIET_ENV = exports.OPENCODE_INSTALL_HINT = exports.OPENCODE_MIN_VERSION = void 0;
+exports.buildOpencodeConfig = buildOpencodeConfig;
+exports.opencodeVersionOk = opencodeVersionOk;
+/** Oldest OpenCode the local lane accepts. 1.18.35 is the version oc-04 verified
+ *  (`permission.asked` / `session.idle` events, `-s <id>` resume, quiet env). */
+exports.OPENCODE_MIN_VERSION = '1.18.35';
+exports.OPENCODE_INSTALL_HINT = `Install OpenCode: npm i -g opencode-ai@>=${exports.OPENCODE_MIN_VERSION}`;
+/** Every outbound call OpenCode makes at startup besides the gateway (oc-04 s5). */
+exports.OPENCODE_QUIET_ENV = Object.freeze({
+    OPENCODE_DISABLE_MODELS_FETCH: '1',
+    OPENCODE_DISABLE_AUTOUPDATE: '1',
+    OPENCODE_DISABLE_SHARE: '1',
+    OPENCODE_DISABLE_LSP_DOWNLOAD: '1',
+    // oc-17: the HiveOp plugin sets the pane title itself (a bare "OpenCode" would clobber the auto-title).
+    OPENCODE_DISABLE_TERMINAL_TITLE: '1',
+    npm_config_offline: 'true',
+});
+exports.OPENCODE_PROVIDER_ID = 'hiveop';
+exports.OPENCODE_GATEWAY_TOKEN_ENV = 'HIVEOP_GATEWAY_TOKEN';
+function buildOpencodeConfig(input) {
+    const { model } = input;
+    const config = {
+        $schema: 'https://opencode.ai/config.json',
+        autoupdate: false,
+        share: 'disabled',
+        enabled_providers: [exports.OPENCODE_PROVIDER_ID],
+        model: `${exports.OPENCODE_PROVIDER_ID}/${model}`,
+        // OpenCode makes a second, billed "title" call on the small model.
+        small_model: `${exports.OPENCODE_PROVIDER_ID}/${model}`,
+        provider: {
+            [exports.OPENCODE_PROVIDER_ID]: {
+                npm: '@ai-sdk/openai-compatible',
+                name: 'HiveOp',
+                options: {
+                    baseURL: input.gatewayBaseUrl,
+                    apiKey: `{env:${exports.OPENCODE_GATEWAY_TOKEN_ENV}}`,
+                },
+                whitelist: [model],
+                models: {
+                    [model]: {
+                        name: model,
+                        attachment: true,
+                        tool_call: true,
+                        modalities: { input: ['text', 'image'], output: ['text'] },
+                        limit: { context: 200000, output: 8192 },
+                    },
+                },
+            },
+        },
+    };
+    if (input.instructions && input.instructions.length > 0)
+        config.instructions = [...input.instructions];
+    if (input.autonomous)
+        config.permission = 'allow';
+    if (input.withMcp) {
+        // oc-07: OPENCODE_QUIET_ENV sets npm_config_offline=true for the pane; a bare
+        // npx MCP server inherits it and cannot fetch itself on a cold npm cache
+        // ("MCP error -32000: Connection closed"). Override it for npx only.
+        const cmd = input.mcpCommand ?? ['npx', '@wenrwa/marketplace-mcp'];
+        const usesNpx = /(^|[\\/])npx(\.cmd)?$/.test(cmd[0] ?? '');
+        config.mcp = {
+            'wenrwa-marketplace': {
+                type: 'local',
+                command: cmd,
+                environment: {
+                    WENRWA_CONNECT_TOKEN: '{env:WENRWA_CONNECT_TOKEN}',
+                    ...Object.fromEntries((input.mcpEnvPassthrough ?? []).map((n) => [n, `{env:${n}}`])),
+                    ...(usesNpx ? { npm_config_offline: 'false' } : {}),
+                },
+                enabled: true,
+            },
+        };
+    }
+    return config;
+}
+/** OpenCode session ids are generated by OpenCode (`ses_...`); anything else
+ *  (e.g. the uuid oc-01 pre-mints on the row) would fail "Session not found". */
+const isCapturedOpencodeSessionId = (id) => typeof id === 'string' && /^ses_[A-Za-z0-9]+$/.test(id);
+exports.isCapturedOpencodeSessionId = isCapturedOpencodeSessionId;
+const parseVersion = (v) => {
+    const m = /(\d+)\.(\d+)\.(\d+)/.exec(v);
+    return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null;
+};
+/** True iff `versionOutput` (from `opencode --version`) is >= the minimum. */
+function opencodeVersionOk(versionOutput, min = exports.OPENCODE_MIN_VERSION) {
+    const got = parseVersion(versionOutput ?? '');
+    const want = parseVersion(min);
+    if (!got)
+        return false;
+    for (let i = 0; i < 3; i++) {
+        if (got[i] !== want[i])
+            return got[i] > want[i];
+    }
+    return true;
+}

package/dist/bridge/opencodePlugin.d.ts

@@ -0,0 +1,13 @@
+/**
+ * oc-06 — the HiveOp OpenCode activity plugin (cli/hooks/opencode-plugin.mjs,
+ * shipped in the npm package beside the Claude hooks). The local launch
+ * resolver (oc-08) merges `buildOpenCodePluginConfig()` into the agent's
+ * OPENCODE_CONFIG_CONTENT; OpenCode loads plugins from `plugin: [file URL]`
+ * (the path the oc-04 spike verified). Hosted uses the copy under
+ * /opt/hiveop/opencode/ via the same key.
+ */
+export declare function resolveOpenCodePluginPath(hooksDir?: string): string;
+/** Config fragment to merge into OpenCode's config. pathToFileURL encodes spaces. */
+export declare function buildOpenCodePluginConfig(pluginPath?: string): {
+    plugin: string[];
+};

package/dist/bridge/opencodePlugin.js

@@ -0,0 +1,54 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveOpenCodePluginPath = resolveOpenCodePluginPath;
+exports.buildOpenCodePluginConfig = buildOpenCodePluginConfig;
+const path = __importStar(require("path"));
+const url_1 = require("url");
+/**
+ * oc-06 — the HiveOp OpenCode activity plugin (cli/hooks/opencode-plugin.mjs,
+ * shipped in the npm package beside the Claude hooks). The local launch
+ * resolver (oc-08) merges `buildOpenCodePluginConfig()` into the agent's
+ * OPENCODE_CONFIG_CONTENT; OpenCode loads plugins from `plugin: [file URL]`
+ * (the path the oc-04 spike verified). Hosted uses the copy under
+ * /opt/hiveop/opencode/ via the same key.
+ */
+function resolveOpenCodePluginPath(hooksDir = path.join(__dirname, '..', '..', 'hooks')) {
+    return path.join(hooksDir, 'opencode-plugin.mjs');
+}
+/** Config fragment to merge into OpenCode's config. pathToFileURL encodes spaces. */
+function buildOpenCodePluginConfig(pluginPath = resolveOpenCodePluginPath()) {
+    return { plugin: [(0, url_1.pathToFileURL)(pluginPath).href] };
+}

package/dist/bridge/opencodeTranscriptReader.d.ts

@@ -0,0 +1,24 @@
+export type SqliteRow = Record<string, unknown>;
+/** Run one read-only SELECT. Throws 'sqlite-unavailable' when no driver exists. */
+export type SqliteQuery = (dbPath: string, sql: string) => SqliteRow[];
+export type OpencodeTranscriptResult = {
+    ok: true;
+    content: string;
+} | {
+    ok: false;
+    reason: 'not-found' | 'too-large' | 'transcript-unavailable';
+};
+export interface OpencodeTranscriptDeps {
+    /** Root holding one dir per agent (default $WENRWA_OPENCODE_DATA_ROOT or /data/.opencode). */
+    dataRoot?: string;
+    existsSync?: (p: string) => boolean;
+    query?: SqliteQuery;
+}
+/** Where the hosted launch put this agent's OpenCode database. */
+export declare function opencodeDbPath(agentId: string, deps?: OpencodeTranscriptDeps): string;
+/** Default driver: node:sqlite (Node >= 22.5, the image runs 24), else the sqlite3 CLI. */
+export declare const defaultSqliteQuery: SqliteQuery;
+/** Pure: OpenCode message/part rows -> Claude-shaped jsonl lines. */
+export declare function opencodeRowsToJsonl(sessionId: string, messages: SqliteRow[], parts: SqliteRow[]): string;
+/** Read ONE agent's OpenCode transcript. `sessionId` pins a session; absent -> the newest root session. */
+export declare function readOpencodeTranscript(agentId: string, sessionId: string | undefined, deps?: OpencodeTranscriptDeps): OpencodeTranscriptResult;

package/dist/bridge/opencodeTranscriptReader.js

@@ -0,0 +1,178 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultSqliteQuery = void 0;
+exports.opencodeDbPath = opencodeDbPath;
+exports.opencodeRowsToJsonl = opencodeRowsToJsonl;
+exports.readOpencodeTranscript = readOpencodeTranscript;
+/**
+ * oc-17 — the OpenCode half of the wte-10 transcript read. Claude Code keeps
+ * one jsonl per agent; OpenCode (1.18.x, oc-04 findings) keeps every session
+ * in ONE SQLite file, `$XDG_DATA_HOME/opencode/opencode.db`, tables
+ *   session(id 'ses_…', parent_id, title, time_created, time_updated, …)
+ *   message(id, session_id, time_created, data JSON {role, time, …})
+ *   part(id, message_id, session_id, data JSON {type: text|tool|reasoning|…})
+ * Hosted lane: XDG_DATA_HOME is per AGENT (autolaunch.sh):
+ *   <WENRWA_OPENCODE_DATA_ROOT or /data/.opencode>/<agentId>/share/opencode/opencode.db
+ *
+ * The result is re-serialised as Claude-shaped jsonl (user / assistant lines,
+ * tool_use + tool_result blocks) so every consumer of the Claude transcript
+ * reads an OpenCode agent's without knowing the engine. Read-only: the DB is
+ * opened read-only (node:sqlite, else the `sqlite3` CLI); nothing is written,
+ * cached or kept. With neither available the answer is the typed
+ * 'transcript-unavailable' refusal, never a crash.
+ */
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const claudeTranscriptReader_1 = require("./claudeTranscriptReader");
+const SESSION_ID = /^ses_[A-Za-z0-9]+$/;
+/** Where the hosted launch put this agent's OpenCode database. */
+function opencodeDbPath(agentId, deps = {}) {
+    const root = deps.dataRoot ?? process.env.WENRWA_OPENCODE_DATA_ROOT ?? '/data/.opencode';
+    return path.join(root, agentId, 'share', 'opencode', 'opencode.db');
+}
+/** Default driver: node:sqlite (Node >= 22.5, the image runs 24), else the sqlite3 CLI. */
+const defaultSqliteQuery = (dbPath, sql) => {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const { DatabaseSync } = require('node:sqlite');
+        const db = new DatabaseSync(dbPath, { readOnly: true });
+        try {
+            return db.prepare(sql).all();
+        }
+        finally {
+            db.close();
+        }
+    }
+    catch (e) {
+        const code = e?.code;
+        if (code !== 'MODULE_NOT_FOUND' && code !== 'ERR_UNKNOWN_BUILTIN_MODULE')
+            throw e;
+    }
+    try {
+        const out = (0, child_process_1.execFileSync)('sqlite3', ['-readonly', '-json', dbPath, sql], {
+            encoding: 'utf-8',
+            maxBuffer: 4 * claudeTranscriptReader_1.MAX_TRANSCRIPT_BYTES,
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        return out.trim() ? JSON.parse(out) : [];
+    }
+    catch (e) {
+        if (e?.code === 'ENOENT')
+            throw new Error('sqlite-unavailable');
+        throw e;
+    }
+};
+exports.defaultSqliteQuery = defaultSqliteQuery;
+function parseJson(v) {
+    try {
+        const o = JSON.parse(String(v));
+        return o && typeof o === 'object' ? o : {};
+    }
+    catch {
+        return {};
+    }
+}
+const iso = (ms) => (typeof ms === 'number' ? new Date(ms).toISOString() : undefined);
+/** Pure: OpenCode message/part rows -> Claude-shaped jsonl lines. */
+function opencodeRowsToJsonl(sessionId, messages, parts) {
+    const byMessage = new Map();
+    for (const p of parts) {
+        const list = byMessage.get(String(p.message_id)) ?? [];
+        list.push(parseJson(p.data));
+        byMessage.set(String(p.message_id), list);
+    }
+    const lines = [];
+    const emit = (type, content, ts) => {
+        if (!content.length)
+            return;
+        lines.push(JSON.stringify({ type, sessionId, timestamp: iso(ts), message: { role: type, content } }));
+    };
+    for (const m of messages) {
+        const info = parseJson(m.data);
+        const role = info.role === 'assistant' ? 'assistant' : 'user';
+        const content = [];
+        const results = [];
+        for (const part of byMessage.get(String(m.id)) ?? []) {
+            if (part.type === 'text' && typeof part.text === 'string' && part.text) {
+                content.push({ type: 'text', text: part.text });
+            }
+            else if (part.type === 'file') {
+                content.push({ type: 'text', text: `[file: ${part.filename ?? part.mime ?? 'attachment'}]` });
+            }
+            else if (part.type === 'tool' && role === 'assistant') {
+                const st = part.state ?? {};
+                content.push({ type: 'tool_use', id: part.callID, name: part.tool, input: st.input ?? {} });
+                if (st.status === 'completed') {
+                    results.push({ type: 'tool_result', tool_use_id: part.callID, content: String(st.output ?? '') });
+                }
+                else if (st.status === 'error') {
+                    results.push({ type: 'tool_result', tool_use_id: part.callID, is_error: true, content: String(st.error ?? '') });
+                }
+            }
+        }
+        emit(role, content, m.time_created);
+        emit('user', results, m.time_created);
+    }
+    return lines.length ? lines.join('\n') + '\n' : '';
+}
+/** Read ONE agent's OpenCode transcript. `sessionId` pins a session; absent -> the newest root session. */
+function readOpencodeTranscript(agentId, sessionId, deps = {}) {
+    const existsSync = deps.existsSync ?? fs.existsSync;
+    const query = deps.query ?? exports.defaultSqliteQuery;
+    if (sessionId !== undefined && !SESSION_ID.test(sessionId))
+        return { ok: false, reason: 'not-found' };
+    const db = opencodeDbPath(agentId, deps);
+    if (!existsSync(db))
+        return { ok: false, reason: 'not-found' };
+    try {
+        const sessions = sessionId
+            ? query(db, `SELECT id FROM session WHERE id = '${sessionId}'`)
+            : query(db, 'SELECT id FROM session WHERE parent_id IS NULL ORDER BY time_updated DESC LIMIT 1');
+        const id = sessions[0]?.id;
+        if (typeof id !== 'string' || !SESSION_ID.test(id))
+            return { ok: false, reason: 'not-found' };
+        const messages = query(db, `SELECT id, time_created, data FROM message WHERE session_id = '${id}' ORDER BY time_created, id`);
+        const parts = query(db, `SELECT message_id, data FROM part WHERE session_id = '${id}' ORDER BY message_id, id`);
+        const content = opencodeRowsToJsonl(id, messages, parts);
+        if (Buffer.byteLength(content) > claudeTranscriptReader_1.MAX_TRANSCRIPT_BYTES)
+            return { ok: false, reason: 'too-large' };
+        return { ok: true, content };
+    }
+    catch {
+        return { ok: false, reason: 'transcript-unavailable' };
+    }
+}

package/dist/bridge/relayClient.d.ts

@@ -1,3 +1,22 @@
+/**
+ * ht-05 — Terminal Bridge relay mode (dial-out).
+ *
+ * Instead of listening on localhost for browser connections (server.ts),
+ * this DIALS OUT to the platform relay over a single outbound wss
+ * connection, authenticates with a per-container relay token, and serves
+ * the same v1 frame protocol (see PROTOCOL.md) through the existing
+ * SessionManager. Multi-session multiplexing is unchanged: every frame
+ * already carries a sessionId, so one outbound socket serves every session
+ * exactly like the local server serves them over N inbound sockets.
+ *
+ * PTYs live in the SessionManager, not the socket — a relay drop never
+ * kills a session. This module owns only: dialing out, the auth frame,
+ * frame routing through SessionManager, and reconnect-with-backoff. It
+ * does no scrollback bookkeeping of its own (SessionManager already does
+ * that) — on re-pair the pane sends `attach` again and gets a fresh
+ * `replay`, exactly as it would against the local server.
+ */
+import { type OpencodeLaunchInput } from './agentLaunch';
 import { SessionManager } from './sessionManager';
 import { MemInfo } from './containerMemory';
 import { BrowserDriver } from './browserDriver';
@@ -163,6 +182,8 @@ export interface RelayClientOpts {
         workspaceId?: string;
         sessionId?: string;
         autonomous?: boolean;
+        opencode?: OpencodeLaunchInput;
+        connectToken?: string;
     }) => {
         command: string;
         args: string[];
@@ -214,6 +235,7 @@ export interface RelayClientOpts {
     installBundle?: (bundle: {
         workspaceId: string;
         files: Record<string, string>;
+        engine?: string;
     }) => {
         written: string[];
         skipped: Array<{
@@ -237,10 +259,12 @@ export interface RelayClientOpts {
      */
     refreshContextPointers?: (args: {
         workspaceId: string;
+        engine?: string;
     }) => void | Promise<void>;
     writeContext?: (manifest: {
         workspaceId: string;
         content: string;
+        engine?: string;
     }) => {
         action: string;
         claudeMdPath: string | null;
@@ -307,12 +331,14 @@ export interface RelayClientOpts {
     readTranscript?: (args: {
         workspaceId: string;
         agentId: string;
+        engine?: 'claude_code' | 'opencode';
+        opencodeSessionId?: string;
     }) => {
         ok: true;
         content: string;
     } | {
         ok: false;
-        reason: 'not-found' | 'invalid-agent-id' | 'too-large';
+        reason: 'not-found' | 'invalid-agent-id' | 'too-large' | 'transcript-unavailable';
     };
     /** Injectable for tests: defaults to `new WebSocket(url)` from `ws`. */
     wsFactory?: (url: string) => WebSocketLike;

package/dist/bridge/relayClient.js

@@ -56,6 +56,7 @@ exports.startRelayClient = startRelayClient;
  * that) — on re-pair the pane sends `attach` again and gets a fresh
  * `replay`, exactly as it would against the local server.
  */
+const agentLaunch_1 = require("./agentLaunch");
 const resumeDetector_1 = require("./resumeDetector");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -976,7 +977,7 @@ function startRelayClient(opts) {
                     case 'open': {
                         // Capture into locals so the async .then closures below keep the
                         // discriminated-union narrowing TS would otherwise drop.
-                        const { cols, rows, workspaceId, repoUrl, autonomous, connectToken, gitCredential, gitIdentity } = frame;
+                        const { cols, rows, workspaceId, repoUrl, autonomous, connectToken, gitCredential, gitIdentity, opencode } = frame;
                         // pucc-14 multiplex: the RELAY owns the session id (== agentId) and
                         // stamps it on the open + every later frame. Honor it so the PTY is
                         // registered under exactly that id and container→pane frames demux
@@ -1059,9 +1060,9 @@ function startRelayClient(opts) {
                             // no override, so realPty spawns $SHELL and autolaunch.sh turns it
                             // into claude. Present (laptop) → `claude` explicitly, since
                             // nothing on a user's machine does that for us.
-                            const launch = opts.resolveLaunch?.({ workspaceId, sessionId: relaySessionId, autonomous }) ?? null;
+                            const launch = opts.resolveLaunch?.({ workspaceId, sessionId: relaySessionId, autonomous, opencode, connectToken }) ?? null;
                             if (launch && opts.commandExists && !opts.commandExists(launch.command)) {
-                                const message = `${launch.command} not found on PATH — install Claude Code CLI on this machine`;
+                                const message = (0, agentLaunch_1.missingCommandMessage)(launch.command);
                                 console.error(`[bridge] refusing PTY spawn — ${message}`);
                                 send(socket, {
                                     t: 'error',
@@ -1116,7 +1117,11 @@ function startRelayClient(opts) {
                               delay or fail an `opened`.
                             */
                             if (workspaceId && opts.refreshContextPointers) {
-                                void Promise.resolve(opts.refreshContextPointers({ workspaceId })).catch((err) => {
+                                void Promise.resolve(opts.refreshContextPointers({
+                                    workspaceId,
+                                    // oc-23: the relay-injected env names the agent's engine; absent = Claude.
+                                    ...(injectedEnv?.WENRWA_AGENT_ENGINE ? { engine: injectedEnv.WENRWA_AGENT_ENGINE } : {}),
+                                })).catch((err) => {
                                     console.error('[bridge] context pointer refresh failed (non-fatal):', err);
                                 });
                             }
@@ -1294,7 +1299,12 @@ function startRelayClient(opts) {
                             });
                             break;
                         }
-                        const result = opts.installBundle({ workspaceId: frame.workspaceId, files: frame.files ?? {} });
+                        const result = opts.installBundle({
+                            workspaceId: frame.workspaceId,
+                            files: frame.files ?? {},
+                            // oc-18: the arena names the target agent's engine; absent = Claude.
+                            ...(frame.engine ? { engine: frame.engine } : {}),
+                        });
                         send(socket, {
                             t: 'bundle-installed',
                             workspaceId: frame.workspaceId,
@@ -1401,7 +1411,11 @@ function startRelayClient(opts) {
                         // rejection can only come from a bug in the writer, never from the
                         // brief fetch (which resolves null on any failure, PRD D2), so it
                         // is answered rather than thrown into an unhandled rejection.
-                        Promise.resolve(opts.writeContext({ workspaceId: frame.workspaceId, content: frame.content ?? '' }))
+                        Promise.resolve(opts.writeContext({
+                            workspaceId: frame.workspaceId,
+                            content: frame.content ?? '',
+                            ...(frame.engine ? { engine: frame.engine } : {}),
+                        }))
                             .then((result) => {
                             send(socket, {
                                 t: 'context-written',
@@ -1568,7 +1582,7 @@ function startRelayClient(opts) {
                             });
                             break;
                         }
-                        const result = opts.readTranscript({ workspaceId, agentId: frame.agentId });
+                        const result = opts.readTranscript({ workspaceId, agentId: frame.agentId, engine: frame.engine, opencodeSessionId: frame.opencodeSessionId });
                         send(socket, {
                             t: 'transcript-content',
                             requestId,
@@ -1975,6 +1989,9 @@ function startRelayClient(opts) {
                         sessionId: rec.sessionId,
                         ...(Array.isArray(rec.filePaths) && rec.filePaths.length ? { filePaths: rec.filePaths } : {}),
                         ...(typeof rec.thinking === 'string' ? { thinking: rec.thinking } : {}),
+                        // oc-22 — carry ONLY 'needs_you' (the OpenCode plugin's prompt signal);
+                        // Claude's 'tool'/'stop' kinds stay dropped so its frames are unchanged.
+                        ...(rec.kind === 'needs_you' ? { kind: 'needs_you' } : {}),
                     });
                 }
                 catch { /* skip a malformed line, keep tailing */ }

package/dist/bridge/screenshotAttach.d.ts

@@ -0,0 +1,35 @@
+import { AttachmentDeps } from './attachmentWriter';
+export declare const SCREENSHOT_POLL_MS = 6000;
+export declare const SCREENSHOT_POLL_INTERVAL_MS = 250;
+export type ScreenshotReason = 'not-supported' | 'bad-name' | 'not-found' | 'not-image' | 'too-large' | 'no-session' | 'error';
+export interface ScreenshotDeps {
+    platform: NodeJS.Platform;
+    homedir: () => string;
+    /** Raw output of `defaults read com.apple.screencapture location`, or null when unset/failed. */
+    readScreencaptureLocation: () => Promise<string | null>;
+    /** lstat-style: null when absent. Never follows a symlink. */
+    stat: (p: string) => {
+        isFile: boolean;
+        size: number;
+    } | null;
+    readFile: (p: string) => Buffer;
+    sleep: (ms: number) => Promise<void>;
+    now: () => number;
+    attachment: AttachmentDeps;
+}
+export declare const realScreenshotDeps: ScreenshotDeps;
+/** `~` expansion + absolute check; anything odd falls back to ~/Desktop (macOS's own default). */
+export declare function resolveScreenshotFolder(raw: string | null, home: string): string;
+/** A plain image basename: no path separators, no traversal, no NUL, image extension. */
+export declare function isSafeScreenshotName(name: unknown): name is string;
+/** The `attach-screenshot` frame → `file-attached` reply. */
+export declare function handleScreenshotFrame(frame: {
+    rid?: unknown;
+    sessionId?: unknown;
+    name?: unknown;
+}, sessions: {
+    list(): string[];
+    cwdOf(id: string): string | undefined;
+    engineOf?(id: string): string | undefined;
+    writeTo?(id: string, data: string): boolean;
+}, deps?: ScreenshotDeps): Promise<Record<string, unknown>>;