@volter/supercode-orchestrator 0.5.52 → 0.5.54

package/bin/runtime.mjs

@@ -70,7 +70,7 @@ import {
   TICK_MS, accessPolicy, applyOperator, performRemoveProfileDir, OPERATOR_OPS,
 } from '../index.mjs';
 import * as events from '../events.mjs';
-import { appView, installAgent, installApp, installedAgentRecord, installedApps, removeApp, rh2AgentEnv } from '../installed-apps.mjs';
+import { appView, installAgent, installApp, installedAgentRecord, installedApps, removeApp, rh2AgentEnv, rh2Program } from '../installed-apps.mjs';
 import { httpJobExecutor } from '../hosted.mjs';
 import { SupercodeHarnessClient } from '@volter/supercode-harness-sdk';
 
@@ -460,18 +460,17 @@ const ACCESS_OPS = {
  * `apps remove NAME`. */
 async function appsMain(argv) {
   const [verb, ...rest] = argv;
-  // `apps exec rh2-agent --profile <agent> [--root R] -- <command…>`: the command run as the installed agent, its
-  // credential in the command's environment (rh2AgentEnv) and nowhere else: no config file carries the token. It is
-  // how an agent's session mounts `rh2 mcp` (mcp/mount.mjs).
-  if (verb === 'exec') {
-    const cut = rest.indexOf('--');
-    const own = cut < 0 ? rest : rest.slice(0, cut);
-    const command = cut < 0 ? [] : rest.slice(cut + 1);
+  // `apps mcp rh2-agent --profile <agent> [--root R]`: `rh2 mcp` as the installed agent, its credential in that one
+  // process's environment (rh2AgentEnv) and nowhere else: no config file carries the token, and the command is fixed,
+  // so nothing can be run in its place to print the token. It is how an agent's session mounts RH2 (mcp/mount.mjs).
+  if (verb === 'mcp') {
     const opts = {};
-    for (let i = 0; i < own.length; i += 1) if (own[i].startsWith('--')) { opts[own[i].slice(2)] = own[i + 1]; i += 1; }
-    const app = own.find((word, i) => !word.startsWith('--') && !own[i - 1]?.startsWith('--'));
-    if (app !== 'rh2-agent' || !opts.profile || !command.length) {
-      process.stderr.write('apps exec rh2-agent --profile <agent> [--root R] -- <command…>\n');
+    const words = [];
+    for (let i = 0; i < rest.length; i += 1) {
+      if (rest[i].startsWith('--')) { opts[rest[i].slice(2)] = rest[i + 1]; i += 1; } else words.push(rest[i]);
+    }
+    if (words[0] !== 'rh2-agent' || words.length !== 1 || !opts.profile) {
+      process.stderr.write('apps mcp rh2-agent --profile <agent> [--root R]\n');
       process.exit(2);
     }
     const record = installedAgentRecord(resolve(opts.root ?? defaultRoot()), opts.profile);
@@ -479,9 +478,14 @@ async function appsMain(argv) {
       process.stderr.write(`no rh2-agent is installed for ${opts.profile}: install it with apps install rh2-agent --profile ${opts.profile}\n`);
       process.exit(1);
     }
-    const child = spawn(command[0], command.slice(1), { stdio: 'inherit', env: { ...process.env, ...rh2AgentEnv(record) } });
+    const program = rh2Program();
+    if (!program) {
+      process.stderr.write('apps mcp: no rh2 CLI in an absolute PATH folder or ~/.local/bin\n');
+      process.exit(127);
+    }
+    const child = spawn(program, ['mcp'], { stdio: 'inherit', env: { ...process.env, ...rh2AgentEnv(record) } });
     for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP']) process.on(signal, () => child.kill(signal));
-    child.on('error', (error) => { process.stderr.write(`apps exec: ${error.message}\n`); process.exit(127); });
+    child.on('error', (error) => { process.stderr.write(`apps mcp: ${error.message}\n`); process.exit(127); });
     child.on('exit', (code, signal) => process.exit(code ?? (signal ? 1 : 0)));
     return;
   }

package/installed-apps.mjs

@@ -4,7 +4,8 @@
 // `apps/` folder (owner-only); no `platforms:` block attaches an integration. Uninstalling on the other side revokes the
 // token, and the channel stops; `remove` forgets the record here.
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { delimiter, isAbsolute, join } from 'node:path';
+import { homedir } from 'node:os';
 
 export const APPS_DIR = 'apps';
 /** The apps this orchestrator can host, by name: what each installs and which adapter it attaches. */
@@ -31,7 +32,7 @@ export function installedApps(root) {
 export async function installAgent({ root, origin, organization, principal, token, profile, fetchImpl = globalThis.fetch }) {
   if (!profile) throw new Error('an RH2 agent is installed for a profile (--profile <agent>)');
   if (!/^prn_/.test(String(principal))) throw new Error('--principal is the RH2 agent\'s principal id (prn_…)');
-  if (!/^https:\/\/|^http:\/\/(localhost|127\.0\.0\.1)(:|\/|$)/.test(String(origin))) throw new Error('the RH2 origin is an https URL');
+  if (!rh2Origin(origin)) throw new Error('the RH2 origin is an https URL');
   const base = new URL(origin).origin;
   const response = await fetchImpl(`${base}/api/v3/rooms`, { headers: { authorization: `Bearer ${token}`, 'x-rh2-organization': organization, origin: base, accept: 'application/json' } });
   if (!response.ok) throw new Error(`RH2 refused the agent's token in ${organization}: HTTP ${response.status}`);
@@ -52,12 +53,27 @@ export function installedAgentRecord(root, agent) {
   if (!existsSync(path)) return null;
   try {
     const record = JSON.parse(readFileSync(path, 'utf8'));
-    return record?.app === 'rh2-agent' && record.token ? record : null;
+    // the origin install accepted (https, or a loopback for a local RH2), held again wherever the record is used
+    return record?.app === 'rh2-agent' && record.token && rh2Origin(record.origin) ? record : null;
   } catch {
     return null;
   }
 }
 
+/** Whether `origin` is one an RH2 app may be installed for: https, or a loopback for a local RH2. */
+function rh2Origin(origin) {
+  return /^https:\/\/|^http:\/\/(localhost|127\.0\.0\.1)(:|\/|$)/.test(String(origin ?? ''));
+}
+
+/** The `rh2` CLI, by absolute path: in an absolute folder on this process's PATH, else where RH2's installer puts it
+ * (`~/.local/bin`); null when neither has it. A relative PATH entry is never searched (a session's working directory
+ * may be a checkout that carries its own `rh2`, which would then run with the agent's token), and neither is a bare
+ * name, which the OS would look up the same way. */
+export function rh2Program() {
+  const folders = [...String(process.env.PATH ?? '').split(delimiter), join(homedir(), '.local', 'bin')].filter((folder) => folder && isAbsolute(folder));
+  return folders.map((folder) => join(folder, 'rh2')).find((file) => existsSync(file)) ?? null;
+}
+
 /** The environment the `rh2` CLI reads to act as an installed agent: its RH2 origin, its organization and its token. */
 export function rh2AgentEnv(record) {
   return { RH2_BASE_URL: record.origin, RH2_ORGANIZATION: record.organizationId, RH2_SESSION_TOKEN: record.token };
@@ -67,7 +83,7 @@ export function rh2AgentEnv(record) {
 export async function installApp({ root, name, origin, clientId, clientSecret, code, profile = 'default', fetchImpl = globalThis.fetch }) {
   const app = INSTALLABLE_APPS[name];
   if (!app) throw new Error(`no installable app named ${name} (${Object.keys(INSTALLABLE_APPS).join(', ')})`);
-  if (!/^https:\/\/|^http:\/\/(localhost|127\.0\.0\.1)(:|\/|$)/.test(String(origin))) throw new Error('the RH2 origin is an https URL');
+  if (!rh2Origin(origin)) throw new Error('the RH2 origin is an https URL');
   const base = new URL(origin).origin;
   const response = await fetchImpl(`${base}/api/v3/automation/apps/oauth/access`, { method: 'POST', redirect: 'manual', headers: { 'content-type': 'application/json', accept: 'application/json' }, body: JSON.stringify({ clientId, clientSecret, code }) });
   const payload = await response.json().catch(() => ({}));

package/loop.mjs

@@ -452,7 +452,9 @@ export class Orchestrator {
     // this conversation, mounted through whatever door this harness publishes.
     const mount = mountOrchestratorMcp({
       root: this.state.root, profile, harness: worker.harness, surfaceKey: keyString, launch,
-      socketPath: this.bridge?.path ?? socketPathFor(this.state.root), vault: this.vault, agent: agent?.identity?.name ?? null,
+      socketPath: this.bridge?.path ?? socketPathFor(this.state.root), vault: this.vault,
+      // the agent's own sessions speak in RH2 as it; a worker launched to act for it (agent_as) does not
+      agent: agent_as ? null : agent?.identity?.name ?? null,
     });
     this.log('info', `mcp mount (${worker.harness}, ${mount.door}): ${mount.ran}`);
     if (resume_runtime_id) resume_runtime_id = await this.continueFromHermes(profile, keyString, worker, resume_runtime_id, cwd,agentHome);

package/mcp/mount.mjs

@@ -13,8 +13,7 @@
 // worker's own environment, which `activationEnv` already set per session.
 
 import { mkdirSync, readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { delimiter, dirname, join, resolve } from 'node:path';
-import { homedir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import {
   acpEntry, doorFor, opencodeEntry, readOpencodeConfig, removeTomlBlock, serverToml, tomlString, upsertTomlBlock, withMcpConfigFlag, writeMcpConfigFile,
@@ -30,24 +29,17 @@ export { MCP_DOORS, doorFor } from '@volter/supercode-harness-sdk/mcp-doors';
 
 /** The stdio server this module mounts. */
 export const SERVER_PATH = resolve(dirname(fileURLToPath(import.meta.url)), 'server.mjs');
-/** The orchestrator's CLI, whose `apps exec` runs a command as an installed agent. */
+/** The orchestrator's CLI, whose `apps mcp` runs `rh2 mcp` as an installed agent. */
 const ORCHESTRATOR_BIN = resolve(dirname(fileURLToPath(import.meta.url)), '../bin/orchestrator.mjs');
 /** The MCP server an agent with an installed rh2-agent gets: `rh2 mcp` as that agent (its own name, so the user's own
  * `rh2` server, whatever it holds, is neither replaced nor relied on). */
 export const RH2_AGENT_SERVER = 'rh2-agent';
 
-/** `rh2 mcp` run as `agent`'s installed RH2 principal: `apps exec` puts the record's origin, organization and token
- * in its environment, so no config file carries the token. Null when no rh2-agent is installed for it. */
+/** `rh2 mcp` run as `agent`'s installed RH2 principal: `apps mcp` puts the record's origin, organization and token in
+ * its environment, so no config file carries the token. Null when no rh2-agent is installed for it. */
 function rh2AgentServer(root, agent, program) {
   if (!installedAgentRecord(root, agent)) return null;
-  return { command: program, args: [ORCHESTRATOR_BIN, 'apps', 'exec', 'rh2-agent', '--root', root, '--profile', agent, '--', rh2Program(), 'mcp'] };
-}
-
-/** The `rh2` CLI: on this process's PATH, else where RH2's installer puts it (`~/.local/bin`), else the bare name. A
- * session's own PATH may lack the folder, so the server names the file. */
-function rh2Program() {
-  const folders = [...String(process.env.PATH ?? '').split(delimiter), join(homedir(), '.local', 'bin')].filter(Boolean);
-  return folders.map((folder) => join(folder, 'rh2')).find((file) => existsSync(file)) ?? 'rh2';
+  return { command: program, args: [ORCHESTRATOR_BIN, 'apps', 'mcp', 'rh2-agent', '--root', root, '--profile', agent] };
 }
 
 const slug = (surfaceKey) => (surfaceKey ? String(surfaceKey).replace(/[^A-Za-z0-9_-]+/g, '-').replace(/^-+|-+$/g, '') || 'session' : 'session');
@@ -64,7 +56,8 @@ const slug = (surfaceKey) => (surfaceKey ? String(surfaceKey).replace(/[^A-Za-z0
  * @param {string} [o.socketPath]   defaults to `<root>/orchestrator.sock`
  * @param {string} [o.serverPath]   defaults to this package's `mcp/server.mjs`
  * @param {string} [o.program]      the interpreter, defaults to this node
- * @param {string|null} [o.agent]   the agent the session is (its name), whose installed rh2-agent is mounted beside
+ * @param {string|null} [o.agent]   the agent whose own session this is (its name), whose installed rh2-agent is mounted
+ *                                  beside; null for a worker acting for an agent
  * @returns {{door: string, ran: string, launch: object|undefined, mcp_servers: object[]|null, path: string|null}}
  */
 export function mountOrchestratorMcp({ root, profile, harness, surfaceKey = null, launch, socketPath, serverPath = SERVER_PATH, program = process.execPath, vault = new Map(), task = null, agent = null }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.5.52",
+  "version": "0.5.54",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {