@openma/cli 0.3.0-beta.5 → 0.3.0

package/dist/index.js

@@ -127,6 +127,9 @@ import { dirname as dirname2 } from "node:path";
 import { spawn } from "node:child_process";
 function buildPlist(opts) {
   const p = paths();
+  const nodeDir = dirname2(opts.nodePath);
+  const setupPath = process.env.PATH ?? "";
+  const envPath = opts.envPath ?? dedupPath(setupPath ? `${nodeDir}:${setupPath}` : nodeDir);
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -135,7 +138,9 @@ function buildPlist(opts) {
   <string>${p.serviceLabel}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>${opts.binaryPath}</string>
+    <string>${opts.nodePath}</string>
+    <string>${opts.cliEntry}</string>
+    <string>bridge</string>
     <string>daemon</string>
   </array>
   <key>RunAtLoad</key>
@@ -151,12 +156,23 @@ function buildPlist(opts) {
   <key>EnvironmentVariables</key>
   <dict>
     <key>PATH</key>
-    <string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+    <string>${escapeXml(envPath)}</string>
   </dict>
 </dict>
 </plist>
 `;
 }
+function escapeXml(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function dedupPath(p) {
+  const seen = /* @__PURE__ */ new Set();
+  return p.split(":").filter((part) => {
+    if (!part || seen.has(part)) return false;
+    seen.add(part);
+    return true;
+  }).join(":");
+}
 async function install(opts) {
   if (currentPlatform() !== "darwin") {
     throw new Error(
@@ -230,11 +246,11 @@ var init_registry = __esm({
     "use strict";
     KNOWN_ACP_AGENTS = [
       {
-        id: "claude-code-acp",
+        id: "claude-agent-acp",
         label: "Claude Code",
-        spec: { command: "claude-code-acp" },
-        installHint: "npm install -g @zed-industries/claude-code-acp",
-        homepage: "https://github.com/zed-industries/claude-code-acp"
+        spec: { command: "claude-agent-acp" },
+        installHint: "npm install -g @agentclientprotocol/claude-agent-acp",
+        homepage: "https://github.com/agentclientprotocol/claude-agent-acp"
       },
       {
         id: "codex-cli",
@@ -377,6 +393,13 @@ import { createServer } from "node:http";
 import { spawn as spawn3 } from "node:child_process";
 import { hostname } from "node:os";
 import { randomBytes } from "node:crypto";
+import { realpathSync } from "node:fs";
+function launchdInstallOpts() {
+  return {
+    nodePath: process.execPath,
+    cliEntry: realpathSync(process.argv[1])
+  };
+}
 async function runSetup(opts) {
   printBanner(`setup \u2014 register this machine with ${opts.serverUrl}`, PKG_VERSION);
   if (!opts.force) {
@@ -385,7 +408,7 @@ async function runSetup(opts) {
       log.ok(`existing credentials found  ${c.dim(paths().credsFile)}`);
       log.hint(`runtime ${existing.runtimeId.slice(0, 8)}\u2026 (use --force to re-register)`);
       if (!opts.noService && currentPlatform() === "darwin") {
-        await install({ binaryPath: process.argv[1] });
+        await install(launchdInstallOpts());
         log.ok(`launchd plist refreshed  ${c.dim(paths().serviceFile ?? "")}`);
         log.ok(`daemon restarted  ${c.dim("logs: " + paths().logFile)}`);
       } else {
@@ -422,22 +445,22 @@ ${c.bold("Up to date.")}
   });
   log.ok(`credentials written  ${c.dim(paths().credsFile)}`);
   let agents = await detectAll();
-  const hasClaudeAcp = agents.some((a) => a.id === "claude-code-acp");
+  const hasClaudeAcp = agents.some((a) => a.id === "claude-agent-acp");
   if (!hasClaudeAcp && await isOnPath2("claude")) {
-    log.step("found `claude` on PATH \u2014 installing ACP wrapper @zed-industries/claude-code-acp");
-    const ok = await npmInstallGlobal("@zed-industries/claude-code-acp");
+    log.step("found `claude` on PATH \u2014 installing ACP wrapper @agentclientprotocol/claude-agent-acp");
+    const ok = await npmInstallGlobal("@agentclientprotocol/claude-agent-acp");
     if (ok) {
-      log.ok("claude-code-acp installed");
+      log.ok("claude-agent-acp installed");
       agents = await detectAll();
     } else {
-      log.warn("auto-install failed \u2014 install manually: npm i -g @zed-industries/claude-code-acp");
+      log.warn("auto-install failed \u2014 install manually: npm i -g @agentclientprotocol/claude-agent-acp");
     }
   }
   if (agents.length > 0) {
     log.ok(`agents detected  ${c.dim(agents.map((a) => a.id).join(", "))}`);
   } else {
     log.warn("no ACP agents on PATH yet");
-    log.hint("install one, e.g. `npm i -g @zed-industries/claude-code-acp`");
+    log.hint("install one, e.g. `npm i -g @agentclientprotocol/claude-agent-acp`");
   }
   if (opts.noService || currentPlatform() !== "darwin") {
     process.stderr.write("\n");
@@ -445,7 +468,7 @@ ${c.bold("Up to date.")}
     log.hint("run `oma bridge daemon` to start the bridge in the foreground");
     return;
   }
-  await install({ binaryPath: process.argv[1] });
+  await install(launchdInstallOpts());
   log.ok(`launchd plist installed  ${c.dim(paths().serviceFile ?? "")}`);
   log.ok(`daemon started  ${c.dim("logs: " + paths().logFile)}`);
   process.stderr.write("\n");
@@ -14545,7 +14568,7 @@ var init_session = __esm({
             await this.#agent.loadSession?.({
               sessionId: wantsResume,
               cwd: this.options.agent.cwd ?? process.cwd(),
-              mcpServers: []
+              mcpServers: this.options.mcpServers ?? []
             });
             this.#sessionId = wantsResume;
             return;
@@ -14555,7 +14578,7 @@ var init_session = __esm({
         }
         const newSession = await this.#agent.newSession({
           cwd: this.options.agent.cwd ?? process.cwd(),
-          mcpServers: []
+          mcpServers: this.options.mcpServers ?? []
         });
         this.#sessionId = newSession.sessionId;
       }
@@ -14890,18 +14913,22 @@ var init_session_manager = __esm({
         }
         const sessionCwd = await ensureSessionCwd(p.session_id);
         let blocklist = [];
+        let bundleMcpServers = [];
+        let bundleEnv = [];
         try {
           const bundle = await this.#fetchBundle(p.session_id, p.agent_id);
           if (bundle) {
             await writeBundle(sessionCwd, bundle.files);
             blocklist = bundle.local_skill_blocklist ?? [];
+            bundleMcpServers = bundle.mcp_servers ?? [];
+            bundleEnv = bundle.env ?? [];
           }
         } catch (e) {
           process.stderr.write(`  ! bundle fetch failed (non-fatal): ${e.message}
 `);
         }
         const extraEnv = {};
-        if (p.agent_id === "claude-code-acp") {
+        if (p.agent_id === "claude-agent-acp") {
           try {
             const cfgDir = await setupClaudeConfigDir(sessionCwd, new Set(blocklist));
             extraEnv.CLAUDE_CONFIG_DIR = cfgDir;
@@ -14912,16 +14939,28 @@ var init_session_manager = __esm({
             );
           }
         }
+        const envFromBundle = {};
+        for (const v of bundleEnv) envFromBundle[v.name] = v.value;
+        const mcpServersForAcp = bundleMcpServers.map((s) => ({
+          type: s.type,
+          name: s.name,
+          url: s.url,
+          headers: this.#env.apiKey ? [{ name: "Authorization", value: `Bearer ${this.#env.apiKey}` }] : []
+        }));
         process.stderr.write(
-          `  \u2192 SessionManager.start ${agent.spec.command} cwd=${sessionCwd}` + (extraEnv.CLAUDE_CONFIG_DIR ? ` cfg=${extraEnv.CLAUDE_CONFIG_DIR}` : "") + (blocklist.length ? ` blocklist=${blocklist.length}` : "") + "\n"
+          `  \u2192 SessionManager.start ${agent.spec.command} cwd=${sessionCwd}` + (extraEnv.CLAUDE_CONFIG_DIR ? ` cfg=${extraEnv.CLAUDE_CONFIG_DIR}` : "") + (blocklist.length ? ` blocklist=${blocklist.length}` : "") + (mcpServersForAcp.length ? ` mcp=${mcpServersForAcp.length}` : "") + (bundleEnv.length ? ` env=${bundleEnv.length}` : "") + // Intentionally NOT logging env names or values — these come from
+          // user-supplied session resources and may be sensitive even if not
+          // formally encrypted. Only the count is observable.
+          "\n"
         );
         try {
           const session = await this.#runtime.start({
             agent: {
               ...agent.spec,
               cwd: sessionCwd,
-              env: scrubAcpSpawnEnv({ ...agent.spec.env ?? {}, ...extraEnv })
+              env: scrubAcpSpawnEnv({ ...agent.spec.env ?? {}, ...envFromBundle, ...extraEnv })
             },
+            mcpServers: mcpServersForAcp,
             resumeAcpSessionId: p.resume?.acp_session_id
           });
           this.#sessions.set(p.session_id, {
@@ -15043,7 +15082,7 @@ import { join as join4 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 async function detectLocalSkills() {
   return {
-    "claude-code-acp": await detectClaudeCodeSkills()
+    "claude-agent-acp": await detectClaudeCodeSkills()
   };
 }
 async function detectClaudeCodeSkills() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openma/cli",
-  "version": "0.3.0-beta.5",
+  "version": "0.3.0",
   "description": "CLI for the openma managed agents platform",
   "type": "module",
   "bin": {