@wenrwa/marketplace-cli 0.8.2 → 0.8.4

package/dist/__tests__/bridge-session-supersede-exit.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/bridge-session-supersede-exit.test.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * A re-open on a live id (SessionManager#open supersedes) kills the OLD PTY.
+ * That process exits asynchronously, AFTER the new session is registered
+ * under the same id. Its exit must not drop the NEW session: before this
+ * guard, the old onExit ran `sessions.delete(id)` unconditionally, so the
+ * fresh PTY kept running but untracked (input dropped, attach answered
+ * "Unknown session", nothing could close it) and onSessionExit announced the
+ * agent as ended while it was alive.
+ *
+ * Hit by an explicit restart on either lane: the hosted oc-21 relaunch
+ * (relay `open` on a live id) and the browser's local restart after an
+ * engine/model change (close → open).
+ */
+const sessionManager_1 = require("../bridge/sessionManager");
+class ExitablePty {
+    killed = false;
+    exitCbs = [];
+    write() { }
+    resize() { }
+    kill() { this.killed = true; }
+    onData() { }
+    onExit(cb) { this.exitCbs.push(cb); }
+    exit(code) { for (const cb of this.exitCbs)
+        cb(code); }
+}
+const make = () => {
+    const ptys = [];
+    const factory = { spawn: () => { const p = new ExitablePty(); ptys.push(p); return p; } };
+    const sm = new sessionManager_1.SessionManager(factory);
+    const exits = [];
+    sm.setOnSessionExit((id) => exits.push(id));
+    return { sm, ptys, exits };
+};
+describe('supersede: the old process exiting late never drops the new session', () => {
+    it('re-open, then the OLD pty exits → the new session is still tracked and attachable', async () => {
+        const { sm, ptys, exits } = make();
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' });
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' }); // supersede
+        expect(ptys[0].killed).toBe(true);
+        ptys[0].exit(129); // SIGHUP lands ~600ms later in real life
+        expect(sm.list()).toEqual(['agent-1']);
+        expect(exits).toEqual([]); // the agent did NOT end
+        await expect(sm.attach('agent-1', () => { })).resolves.toBeDefined();
+    });
+    it('close, re-open, then the OLD pty exits → same', () => {
+        const { sm, ptys, exits } = make();
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' });
+        sm.close('agent-1');
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' });
+        ptys[0].exit(129);
+        expect(sm.list()).toEqual(['agent-1']);
+        expect(exits).toEqual([]);
+    });
+    it('the CURRENT pty exiting still ends the session and notifies (unchanged)', () => {
+        const { sm, ptys, exits } = make();
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' });
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' });
+        ptys[1].exit(0);
+        expect(sm.list()).toEqual([]);
+        expect(exits).toEqual(['agent-1']);
+    });
+});
+describe('a plain close still reports the exit (unchanged)', () => {
+    it('close with nothing reopened → onSessionExit fires', () => {
+        const { sm, ptys, exits } = make();
+        sm.open({ cols: 80, rows: 24, id: 'agent-1' });
+        sm.close('agent-1');
+        ptys[0].exit(129);
+        expect(sm.list()).toEqual([]);
+        expect(exits).toEqual(['agent-1']);
+    });
+});

package/dist/__tests__/opencode-local-launch-parity.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/opencode-local-launch-parity.test.js

@@ -0,0 +1,129 @@
+"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;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * oc-27 — the ACTUAL local launch must carry the same keys the hosted config does:
+ * `plugin` (activity, titles, Needs-you, session-id capture), `mcp.wenrwa-marketplace`
+ * (when a connect token exists) and `theme`. A builder-only test missed this: the
+ * builder was fine, the local call sites never fed it a plugin or a token.
+ */
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const url_1 = require("url");
+const ws_1 = __importDefault(require("ws"));
+const agentLaunch_1 = require("../bridge/agentLaunch");
+const server_1 = require("../bridge/server");
+const sessionManager_1 = require("../bridge/sessionManager");
+const hosted = require(path.join(__dirname, '..', '..', '..', 'infra', 'terminal-image', 'opencode', 'build-config.js'));
+const GW = 'https://api.example.test/api/v1/opencode/v1';
+const oc = { engine: 'opencode', model: 'moonshotai/kimi-k2', gatewayUrl: GW, gatewayToken: 'hgw_abc' };
+const cfgOf = (l) => JSON.parse(l.env.OPENCODE_CONFIG_CONTENT);
+// The shape cli/src/commands/bridge.ts hands resolveAgentLaunch (mcpInstall + bridgeApiUrl).
+const realDeps = {
+    mcpServer: { command: '/usr/bin/node', args: ['/h/.wen-market/mcp/dist/index.js'] },
+    apiUrl: 'https://api.example.test/api/v1',
+    activity: { settingsPath: '/h/.wen-market/hiveop-settings.json', sessionId: 'a1', activityFile: '/h/.wen-market/activity.jsonl' },
+    sessionPin: { agentId: 'a1', exists: false },
+};
+describe('local OpenCode launch carries the hosted keys', () => {
+    const hostedCfg = hosted.buildConfig({
+        WENRWA_AGENT_MODEL: oc.model, HIVEOP_GATEWAY_URL: GW, HIVEOP_GATEWAY_TOKEN: 't', WENRWA_CONNECT_TOKEN: 'c',
+    });
+    it('plugin is a file:// URL to a file that exists in the installed package', () => {
+        const cfg = cfgOf((0, agentLaunch_1.resolveAgentLaunch)({ opencode: oc, connectToken: 'c', ...realDeps }));
+        expect(cfg.plugin).toHaveLength(1);
+        expect(cfg.plugin[0]).toMatch(/^file:\/\//);
+        expect(fs.existsSync((0, url_1.fileURLToPath)(cfg.plugin[0]))).toBe(true);
+        expect(path.basename((0, url_1.fileURLToPath)(cfg.plugin[0]))).toBe('opencode-plugin.mjs');
+    });
+    it('mcp.wenrwa-marketplace is present with the token by reference only', () => {
+        const l = (0, agentLaunch_1.resolveAgentLaunch)({ opencode: oc, connectToken: 'secret-conn-token', ...realDeps });
+        expect(cfgOf(l).mcp['wenrwa-marketplace'].environment.WENRWA_CONNECT_TOKEN).toBe('{env:WENRWA_CONNECT_TOKEN}');
+        expect(l.env.OPENCODE_CONFIG_CONTENT).not.toContain('secret-conn-token');
+        expect(l.env.WENRWA_CONNECT_TOKEN).toBe('secret-conn-token');
+    });
+    it('env carries HIVEOP_GATEWAY_URL so the plugin can report the session id (resume)', () => {
+        const l = (0, agentLaunch_1.resolveAgentLaunch)({ opencode: oc, connectToken: 'c', ...realDeps });
+        expect(l.env.HIVEOP_GATEWAY_URL).toBe(GW);
+        expect(l.env.HIVEOP_GATEWAY_TOKEN).toBe('hgw_abc');
+    });
+    it('theme matches the hosted config (terminal palette, no own background)', () => {
+        const cfg = cfgOf((0, agentLaunch_1.resolveAgentLaunch)({ opencode: oc, ...realDeps }));
+        expect(cfg.theme).toBe('system');
+        expect(cfg.theme).toBe(hostedCfg.theme);
+    });
+    it('the same top-level keys as hosted (modulo the hosted-only plugin path)', () => {
+        const local = cfgOf((0, agentLaunch_1.resolveAgentLaunch)({ opencode: oc, connectToken: 'c', ...realDeps }));
+        const keys = (o) => Object.keys(o).filter((k) => k !== 'instructions').sort();
+        expect(keys(local)).toEqual(keys(hostedCfg));
+    });
+});
+describe('loopback open (real bridge wiring) falls back to the bridge-config connect token', () => {
+    let handle;
+    let spawns;
+    beforeEach(async () => {
+        spawns = [];
+        const pty = { write() { }, resize() { }, kill() { }, onData() { }, onExit() { } };
+        handle = await (0, server_1.startBridgeServer)({
+            sessionToken: 'tok', allowedOrigin: 'https://app.hiveop.io',
+            sessions: new sessionManager_1.SessionManager({ spawn: (o) => { spawns.push(o); return pty; } }),
+            resolveLocalAgentCwd: () => '/tmp/proj',
+            commandExists: () => true,
+            activityFile: '/h/activity.jsonl', hiveOpSettingsPath: '/h/settings.json',
+            mcpServer: realDeps.mcpServer, mcpApiUrl: realDeps.apiUrl,
+            connectToken: 'bridge-cfg-token',
+        });
+    });
+    afterEach(async () => { await handle.close(); });
+    it('open frame without connectToken still yields plugin + mcp + theme', async () => {
+        const ws = new ws_1.default(`ws://127.0.0.1:${handle.port}`, { headers: { origin: 'https://app.hiveop.io' } });
+        await new Promise((r) => ws.on('open', r));
+        ws.send(JSON.stringify({ v: 1, token: 'tok' }));
+        const opened = new Promise((r) => ws.on('message', (m) => { if (JSON.parse(String(m)).t === 'opened')
+            r(null); }));
+        ws.send(JSON.stringify({ t: 'open', cols: 80, rows: 24, agentId: 'a1', workspaceId: 'w1', opencode: oc }));
+        await opened;
+        ws.close();
+        const cfg = cfgOf({ env: spawns[0].env });
+        expect(cfg.plugin[0]).toMatch(/^file:\/\//);
+        expect(cfg.mcp['wenrwa-marketplace']).toBeDefined();
+        expect(cfg.theme).toBe('system');
+        expect(spawns[0].env.WENRWA_CONNECT_TOKEN).toBe('bridge-cfg-token');
+        expect(spawns[0].env.OPENCODE_CONFIG_CONTENT).not.toContain('bridge-cfg-token');
+    });
+});

package/dist/bridge/agentLaunch.js

@@ -4,6 +4,7 @@ exports.HIVEOP_CONTEXT_ENV_VALUE = exports.HIVEOP_CONTEXT_ENV_VAR = void 0;
 exports.missingCommandMessage = missingCommandMessage;
 exports.resolveAgentLaunch = resolveAgentLaunch;
 const localContextWriter_1 = require("./localContextWriter");
+const opencodePlugin_1 = require("./opencodePlugin");
 const opencodeConfig_1 = require("./opencodeConfig");
 /** lws-08 — env var name a spawned `claude` (or any tooling inspecting its
  *  own environment) can read to find the pushed context manifest. */
@@ -46,21 +47,27 @@ function resolveOpencodeLaunch(opts, oc) {
     const args = [];
     if ((0, opencodeConfig_1.isCapturedOpencodeSessionId)(oc.sessionId))
         args.push('-s', oc.sessionId);
-    const config = (0, opencodeConfig_1.buildOpencodeConfig)({
-        model: oc.model,
-        gatewayBaseUrl: oc.gatewayUrl,
-        autonomous: !!opts.autonomous,
-        withMcp: !!opts.connectToken,
-        // oc-23: Claude loads .hiveop/context.md via its SessionStart hook; OpenCode has none, so it reads it as instructions.
-        instructions: [exports.HIVEOP_CONTEXT_ENV_VALUE],
-        ...(opts.mcpServer ? { mcpCommand: [opts.mcpServer.command, ...opts.mcpServer.args] } : {}),
-        ...(opts.apiUrl ? { mcpEnvPassthrough: ['MARKETPLACE_API_URL'] } : {}),
-    });
+    const config = {
+        ...(0, opencodeConfig_1.buildOpencodeConfig)({
+            model: oc.model,
+            gatewayBaseUrl: oc.gatewayUrl,
+            autonomous: !!opts.autonomous,
+            withMcp: !!opts.connectToken,
+            // oc-23: Claude loads .hiveop/context.md via its SessionStart hook; OpenCode has none, so it reads it as instructions.
+            instructions: [exports.HIVEOP_CONTEXT_ENV_VALUE],
+            ...(opts.mcpServer ? { mcpCommand: [opts.mcpServer.command, ...opts.mcpServer.args] } : {}),
+            ...(opts.apiUrl ? { mcpEnvPassthrough: ['MARKETPLACE_API_URL'] } : {}),
+        }),
+        // oc-27: the HiveOp plugin (activity, titles, Needs-you, session-id capture) — as hosted does.
+        ...(0, opencodePlugin_1.buildOpenCodePluginConfig)(),
+    };
     const env = {
         [exports.HIVEOP_CONTEXT_ENV_VAR]: exports.HIVEOP_CONTEXT_ENV_VALUE,
         ...opencodeConfig_1.OPENCODE_QUIET_ENV,
         OPENCODE_CONFIG_CONTENT: JSON.stringify(config),
         [opencodeConfig_1.OPENCODE_GATEWAY_TOKEN_ENV]: oc.gatewayToken,
+        // oc-27: the plugin POSTs the captured session id to <gateway>/hiveop/session (resume).
+        HIVEOP_GATEWAY_URL: oc.gatewayUrl,
     };
     if (opts.connectToken)
         env.WENRWA_CONNECT_TOKEN = opts.connectToken;

package/dist/bridge/opencodeConfig.d.ts

@@ -16,6 +16,7 @@ export declare const OPENCODE_MIN_VERSION = "1.18.35";
 export declare const OPENCODE_INSTALL_HINT = "Install OpenCode: npm i -g opencode-ai@>=1.18.35";
 /** Every outbound call OpenCode makes at startup besides the gateway (oc-04 s5). */
 export declare const OPENCODE_QUIET_ENV: Readonly<Record<string, string>>;
+export declare const OPENCODE_THEME = "system";
 export declare const OPENCODE_PROVIDER_ID = "hiveop";
 export declare const OPENCODE_GATEWAY_TOKEN_ENV = "HIVEOP_GATEWAY_TOKEN";
 export interface OpencodeConfigInput {

package/dist/bridge/opencodeConfig.js

@@ -10,7 +10,7 @@
  * (`{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 = exports.OPENCODE_PINNED_VERSION = void 0;
+exports.isCapturedOpencodeSessionId = exports.OPENCODE_GATEWAY_TOKEN_ENV = exports.OPENCODE_PROVIDER_ID = exports.OPENCODE_THEME = exports.OPENCODE_QUIET_ENV = exports.OPENCODE_INSTALL_HINT = exports.OPENCODE_MIN_VERSION = exports.OPENCODE_PINNED_VERSION = void 0;
 exports.buildOpencodeConfig = buildOpencodeConfig;
 exports.opencodeVersionOk = opencodeVersionOk;
 /** Oldest OpenCode the local lane accepts. 1.18.35 is the version oc-04 verified
@@ -29,6 +29,7 @@ exports.OPENCODE_QUIET_ENV = Object.freeze({
     OPENCODE_DISABLE_TERMINAL_TITLE: '1',
     npm_config_offline: 'true',
 });
+exports.OPENCODE_THEME = 'system';
 exports.OPENCODE_PROVIDER_ID = 'hiveop';
 exports.OPENCODE_GATEWAY_TOKEN_ENV = 'HIVEOP_GATEWAY_TOKEN';
 function buildOpencodeConfig(input) {
@@ -41,6 +42,9 @@ function buildOpencodeConfig(input) {
         model: `${exports.OPENCODE_PROVIDER_ID}/${model}`,
         // OpenCode makes a second, billed "title" call on the small model.
         small_model: `${exports.OPENCODE_PROVIDER_ID}/${model}`,
+        // oc-27: OpenCode's built-in "system" theme derives its palette from the terminal and
+        // leaves the background transparent, so the pane blends with the canvas like Claude's.
+        theme: exports.OPENCODE_THEME,
         provider: {
             [exports.OPENCODE_PROVIDER_ID]: {
                 npm: '@ai-sdk/openai-compatible',

package/dist/bridge/server.d.ts

@@ -244,6 +244,9 @@ export interface BridgeServerOpts {
         args: string[];
     };
     mcpApiUrl?: string;
+    /** oc-27 — the bridge's own stored Connect Token: the fallback for an `open` frame that carries none
+     *  (loopback frames from the browser never do), so local OpenCode agents get the same MCP as Claude. */
+    connectToken?: string;
     /**
      * rival-10 — every file touch of a LOCAL WORKSPACE AGENT (an `open` with
      * agentId + workspaceId), handed on for the ranked rival feed. The hook

package/dist/bridge/server.js

@@ -736,7 +736,7 @@ function startBridgeServer(opts) {
                             let launch = (0, agentLaunch_1.resolveAgentLaunch)({
                                 autonomous: !!frame.autonomous,
                                 ...(frame.opencode ? { opencode: frame.opencode } : {}),
-                                ...(frame.connectToken ? { connectToken: frame.connectToken } : {}),
+                                ...((frame.connectToken || opts.connectToken) ? { connectToken: (frame.connectToken || opts.connectToken) } : {}),
                                 ...(opts.mcpServer ? { mcpServer: opts.mcpServer } : {}),
                                 ...(opts.mcpApiUrl ? { apiUrl: opts.mcpApiUrl } : {}),
                                 ...(cwd ? { sessionPin: { agentId, exists: agentSessionExists } } : {}),

package/dist/bridge/sessionManager.js

@@ -188,6 +188,14 @@ class SessionManager {
             session.exited = true;
             session.sink = null;
             session.snapshot.dispose();
+            // A superseded (or closed-then-reopened) PTY exits AFTER its successor
+            // registered under the same id. That late exit is not this id ending:
+            // dropping the map entry here orphaned the live successor (untracked,
+            // input dropped, unclosable) and announced a running agent as ended.
+            // A plain close (nothing reopened) still notifies, as before.
+            const current = this.sessions.get(id);
+            if (current && current !== session)
+                return;
             this.sessions.delete(id);
             // fcct-26 — tell anyone listening that this session ENDED. Without an
             // outward signal the only way to know a crew member finished its turn is

package/dist/commands/bridge.js

@@ -1127,6 +1127,8 @@ exports.bridgeCommand = new commander_1.Command('bridge')
         hiveOpSettingsPath,
         ...(mcpInstall.ok ? { mcpServer: { command: mcpInstall.command, args: mcpInstall.args } } : {}),
         mcpApiUrl: bridgeApiUrl(),
+        // oc-27: local OpenCode panes get the HiveOp MCP with the same token Claude's registration uses.
+        connectToken: config.connectToken,
         // tchp-18: the loopback changes reporter is opt-in; without this the
         // tchp-12 machinery never constructs on a laptop and local panels sit
         // on "Waiting for changes…" forever.
@@ -1353,7 +1355,7 @@ exports.bridgeCommand = new commander_1.Command('bridge')
             resolveLaunch: ({ sessionId, opencode, connectToken }) => (0, agentLaunch_1.resolveAgentLaunch)({
                 autonomous: true,
                 ...(opencode ? { opencode } : {}),
-                ...(connectToken ? { connectToken } : {}),
+                ...((connectToken || config.connectToken) ? { connectToken: (connectToken || config.connectToken) } : {}),
                 ...(mcpInstall.ok ? { mcpServer: { command: mcpInstall.command, args: mcpInstall.args } } : {}),
                 apiUrl: bridgeApiUrl(),
                 ...(activityFile && hiveOpSettingsPath && sessionId

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenrwa/marketplace-cli",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "CLI tool for the Wenrwa Agent Marketplace — monitor bounties, agents, workspaces, and treasury from your terminal",
   "author": "Wenrwa <dev@wenrwa.com>",
   "license": "MIT",