@openma/cli 0.4.0 → 0.5.0

package/LICENSE

@@ -1,21 +1,201 @@
-MIT License
-
-Copyright (c) 2025 Open Managed Agents Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for describing the origin of the Work and
+      reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Support. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or support.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2025 Open Managed Agents Contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/index.js

@@ -94,13 +94,59 @@ import { mkdir, readFile, writeFile, chmod } from "node:fs/promises";
 import { dirname } from "node:path";
 import { randomUUID } from "node:crypto";
 async function readCreds() {
+  let text;
   try {
-    const text = await readFile(paths().credsFile, "utf-8");
-    return JSON.parse(text);
+    text = await readFile(paths().credsFile, "utf-8");
   } catch (e) {
     if (e.code === "ENOENT") return null;
     throw e;
   }
+  const parsed = JSON.parse(text);
+  if (parsed.v === 2 && Array.isArray(parsed.tenants)) {
+    return parsed;
+  }
+  const v1 = parsed;
+  const v2 = await migrateV1ToV2(v1);
+  try {
+    await writeCreds(v2);
+  } catch {
+  }
+  return v2;
+}
+async function migrateV1ToV2(v1) {
+  const stubKey = v1.agentApiKey ?? "";
+  let tenants;
+  try {
+    const url2 = `${v1.serverUrl.replace(/\/$/, "")}/agents/runtime/me`;
+    const res = await fetch(url2, {
+      headers: { Authorization: `Bearer ${v1.token}` }
+    });
+    if (!res.ok) {
+      throw new Error(`HTTP ${res.status}`);
+    }
+    const body = await res.json();
+    if (!Array.isArray(body.tenants) || body.tenants.length === 0) {
+      throw new Error("server returned no tenants");
+    }
+    tenants = body.tenants.map((t) => ({
+      id: t.id,
+      name: t.name,
+      agentApiKey: stubKey
+    }));
+  } catch {
+    tenants = [
+      { id: UNKNOWN_TENANT_ID, name: "Unknown workspace", agentApiKey: stubKey }
+    ];
+  }
+  return {
+    v: 2,
+    serverUrl: v1.serverUrl,
+    runtimeId: v1.runtimeId,
+    token: v1.token,
+    tenants,
+    machineId: v1.machineId,
+    createdAt: v1.createdAt
+  };
 }
 async function writeCreds(creds) {
   const file2 = paths().credsFile;
@@ -129,10 +175,12 @@ async function getOrCreateMachineId() {
   await writeFile(file2, id + "\n", { mode: 384 });
   return id;
 }
+var UNKNOWN_TENANT_ID;
 var init_config = __esm({
   "src/bridge/lib/config.ts"() {
     "use strict";
     init_platform();
+    UNKNOWN_TENANT_ID = "__unknown__";
   }
 });
 
@@ -7103,6 +7151,33 @@ function serviceInstallOpts() {
   };
 }
 async function runSetup(opts) {
+  if (process.env.OMA_DEBUG_HANDLES) {
+    let tick = 0;
+    const probe = setInterval(() => {
+      tick += 1;
+      const handles = process._getActiveHandles();
+      const requests = process._getActiveRequests();
+      const hsum = handles.map((h) => h?.constructor?.name ?? "?").reduce((a, k) => {
+        a[k] = (a[k] ?? 0) + 1;
+        return a;
+      }, {});
+      const rsum = requests.map((r) => r?.constructor?.name ?? "?").reduce((a, k) => {
+        a[k] = (a[k] ?? 0) + 1;
+        return a;
+      }, {});
+      process.stderr.write(`
+[debug t=${tick * 2}s] handles: ${JSON.stringify(hsum)} requests: ${JSON.stringify(rsum)}
+`);
+    }, 2e3);
+    probe.unref();
+  }
+  try {
+    await runSetupInner(opts);
+  } finally {
+    setImmediate(() => process.exit(0));
+  }
+}
+async function runSetupInner(opts) {
   const profile = currentProfile();
   const profileTag = profile ? `  [profile=${profile}]` : "";
   printBanner(`setup \u2014 register this machine with ${opts.serverUrl}${profileTag}`, PKG_VERSION);
@@ -7145,14 +7220,22 @@ ${c.bold("Up to date.")}
     machine_id: machineId,
     hostname: hostname(),
     os: osTag(),
-    version: PKG_VERSION
+    version: PKG_VERSION,
+    // Opt into the v2 multi-tenant response — server returns one entry
+    // per (runtime, tenant) pair instead of a single legacy agent_api_key.
+    multi_tenant: true
   });
-  log.ok(`runtime registered  ${c.dim(exchange.runtime_id.slice(0, 8) + "\u2026")}`);
+  log.ok(`runtime registered  ${c.dim(exchange.runtime_id.slice(0, 8) + "\u2026")}  (${exchange.tenants.length} workspaces authorized)`);
   await writeCreds({
+    v: 2,
     serverUrl: opts.serverUrl,
     runtimeId: exchange.runtime_id,
     token: exchange.token,
-    agentApiKey: exchange.agent_api_key,
+    tenants: exchange.tenants.map((t) => ({
+      id: t.id,
+      name: t.name,
+      agentApiKey: t.agent_api_key
+    })),
     machineId,
     createdAt: Math.floor(Date.now() / 1e3)
   });
@@ -7238,8 +7321,12 @@ async function installAndReport(opts) {
   }
   process.stderr.write("\n");
   process.stderr.write(`${c.bold("Done.")} the runtime should appear online at ${c.cyan(opts.browserOrigin)}
-
 `);
+  process.stderr.write(
+    `${c.dim("  After joining new workspaces, run `oma bridge refresh` to authorize them on this daemon.")}
+
+`
+  );
 }
 function execIntoDaemon() {
   const profile = currentProfile();
@@ -21641,7 +21728,14 @@ var init_session_manager = __esm({
       #spawner = new NodeSpawner();
       #runtime = new AcpRuntimeImpl(this.#spawner);
       #sessions = /* @__PURE__ */ new Map();
-      #env = { apiKey: "", apiUrl: "", runtimeToken: "" };
+      #env = { apiUrl: "", runtimeToken: "" };
+      /**
+       * Per-tenant `oma_*` keys, keyed by tenant_id. Populated by the daemon
+       * at startup from CredentialsV2.tenants and refreshed on SIGHUP after
+       * `oma bridge refresh` rotates them server-side. Empty until the
+       * daemon calls `setTenantKeys()`.
+       */
+      #tenantKeys = /* @__PURE__ */ new Map();
       /** Set by `drain()` to refuse new session.start while in-flight turns
        *  finish. Existing sessions keep accepting prompts so a user mid-turn
        *  doesn't hit "session not ready" mid-stream just because the daemon
@@ -21653,6 +21747,21 @@ var init_session_manager = __esm({
       setSpawnEnv(env) {
         this.#env = env;
       }
+      /**
+       * Replace the in-memory map of tenant_id → `oma_*` PAT. Called once at
+       * daemon startup from CredentialsV2.tenants, and again on SIGHUP after
+       * the user runs `oma bridge refresh` (so newly-added tenants become
+       * sessionable without a daemon restart, and revoked tenants stop being
+       * accepted).
+       *
+       * Existing sessions are NOT torn down — a session pinned to a tenant
+       * that was just removed keeps running until the harness disposes it.
+       * The lookup is consulted per session.start, not per turn.
+       */
+      setTenantKeys(tenants) {
+        this.#tenantKeys.clear();
+        for (const t of tenants) this.#tenantKeys.set(t.id, t.agentApiKey);
+      }
       setSender(send) {
         this.#send = send;
       }
@@ -21674,7 +21783,7 @@ var init_session_manager = __esm({
       /** Re-announce alive sessions to the server (used after WS reconnect). */
       announceAll() {
         for (const [session_id, sess] of this.#sessions) {
-          this.#send({ type: "session.ready", session_id, acp_session_id: sess.acpSessionId });
+          this.#send({ type: "session.ready", session_id, tenant_id: sess.tenantId, acp_session_id: sess.acpSessionId });
         }
       }
       async start(p) {
@@ -21687,11 +21796,38 @@ var init_session_manager = __esm({
           });
           return;
         }
+        let tenantId = p.tenant_id ?? "";
+        let tenantKey = tenantId ? this.#tenantKeys.get(tenantId) : void 0;
+        if (!tenantId) {
+          const fallback = this.#tenantKeys.keys().next();
+          if (!fallback.done) {
+            tenantId = fallback.value;
+            tenantKey = this.#tenantKeys.get(tenantId);
+            process.stderr.write(
+              `  ! session.start missing tenant_id; falling back to first tenant ${tenantId.slice(0, 8)}\u2026
+`
+            );
+          }
+        }
+        if (!tenantKey) {
+          this.#send({
+            type: "session.error",
+            session_id: p.session_id,
+            tenant_id: p.tenant_id,
+            message: `Tenant ${p.tenant_id ?? "(unspecified)"} not authorized for this runtime \u2014 run 'oma bridge refresh'`
+          });
+          return;
+        }
+        process.stderr.write(
+          `  \u2192 tenant-key selected sid=${p.session_id.slice(0, 8)} tenant=${tenantId.slice(0, 14)}
+`
+        );
         const existing = this.#sessions.get(p.session_id);
         if (existing) {
           this.#send({
             type: "session.ready",
             session_id: p.session_id,
+            tenant_id: existing.tenantId,
             acp_session_id: existing.acpSessionId
           });
           return;
@@ -21759,7 +21895,7 @@ var init_session_manager = __esm({
           type: s.type,
           name: s.name,
           url: s.url,
-          headers: this.#env.apiKey ? [{ name: "Authorization", value: `Bearer ${this.#env.apiKey}` }] : []
+          headers: tenantKey ? [{ name: "Authorization", value: `Bearer ${tenantKey}` }] : []
         }));
         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}` : "") + (mcpServersForAcp.length ? ` mcp=${mcpServersForAcp.length}` : "") + (bundleEnv.length ? ` env=${bundleEnv.length}` : "") + // Intentionally NOT logging env names or values — these come from
@@ -21780,17 +21916,20 @@ var init_session_manager = __esm({
           this.#sessions.set(p.session_id, {
             acp: session,
             acpSessionId: session.acpSessionId,
+            tenantId,
             turns: /* @__PURE__ */ new Map()
           });
           this.#send({
             type: "session.ready",
             session_id: p.session_id,
+            tenant_id: tenantId,
             acp_session_id: session.acpSessionId
           });
         } catch (e) {
           this.#send({
             type: "session.error",
             session_id: p.session_id,
+            tenant_id: tenantId,
             message: e instanceof Error ? e.message : String(e)
           });
         }
@@ -21801,6 +21940,7 @@ var init_session_manager = __esm({
           this.#send({
             type: "session.error",
             session_id: p.session_id,
+            tenant_id: p.tenant_id,
             turn_id: p.turn_id,
             message: "no such session"
           });
@@ -21821,6 +21961,7 @@ var init_session_manager = __esm({
             this.#send({
               type: "session.event",
               session_id: p.session_id,
+              tenant_id: sess.tenantId,
               turn_id: p.turn_id,
               event: ev
             });
@@ -21829,16 +21970,18 @@ var init_session_manager = __esm({
             this.#send({
               type: "session.error",
               session_id: p.session_id,
+              tenant_id: sess.tenantId,
               turn_id: p.turn_id,
               message: promptErr
             });
           } else {
-            this.#send({ type: "session.complete", session_id: p.session_id, turn_id: p.turn_id });
+            this.#send({ type: "session.complete", session_id: p.session_id, tenant_id: sess.tenantId, turn_id: p.turn_id });
           }
         } catch (e) {
           this.#send({
             type: "session.error",
             session_id: p.session_id,
+            tenant_id: sess.tenantId,
             turn_id: p.turn_id,
             message: e instanceof Error ? e.message : String(e)
           });
@@ -21852,9 +21995,11 @@ var init_session_manager = __esm({
         sess.turns.get(turn_id)?.abort();
       }
       async dispose(session_id) {
+        const sess = this.#sessions.get(session_id);
+        const tenantId = sess?.tenantId ?? "";
         await this.#killChild(session_id);
         await removeSessionCwd(session_id);
-        this.#send({ type: "session.disposed", session_id });
+        this.#send({ type: "session.disposed", session_id, tenant_id: tenantId });
       }
       /** Best-effort cleanup on daemon shutdown. KEEPS spawn cwds — sessions are
        *  still live at the platform; the daemon coming back tomorrow needs the
@@ -22218,8 +22363,15 @@ async function runDaemon() {
   }
   process.on("SIGHUP", () => {
     void (async () => {
-      log.step("SIGHUP \u2014 refreshing agent detection");
+      log.step("SIGHUP \u2014 refreshing agent detection + credentials");
       try {
+        const freshCreds = await readCreds();
+        if (freshCreds) {
+          sessions.setTenantKeys(freshCreds.tenants);
+          log.ok(`re-loaded credentials  (${freshCreds.tenants.length} tenants)`);
+        } else {
+          log.warn("credentials file disappeared mid-SIGHUP; tenant keys unchanged");
+        }
         await loadRegistry({ cachePath, forceRefresh: true });
         const agents = (await detectAll()).map((a) => ({ id: a.id, binary: a.spec.command }));
         const localSkillsDetailed = await detectLocalSkills();
@@ -22251,10 +22403,10 @@ async function runDaemon() {
   const sessions = new SessionManager(() => {
   });
   sessions.setSpawnEnv({
-    apiKey: creds.agentApiKey ?? "",
     apiUrl: creds.serverUrl,
     runtimeToken: creds.token
   });
+  sessions.setTenantKeys(creds.tenants);
   while (!stopping) {
     try {
       const ws = new wrapper_default(wsUrl, {
@@ -22569,22 +22721,221 @@ var init_agents = __esm({
   }
 });
 
+// src/bridge/commands/refresh.ts
+var refresh_exports = {};
+__export(refresh_exports, {
+  runRefresh: () => runRefresh
+});
+import { readFileSync as readFileSync2 } from "node:fs";
+import { join as join10 } from "node:path";
+async function runRefresh() {
+  const profile = currentProfile();
+  const profileTag = profile ? `  [profile=${profile}]` : "";
+  printBanner(`refresh \u2014 reconcile tenants${profileTag}`, PKG_VERSION);
+  const creds = await readCreds();
+  if (!creds) {
+    log.err("not set up \u2014 run `oma bridge setup` first");
+    log.hint(`looked for ${paths().credsFile}`);
+    process.exit(2);
+  }
+  const url2 = `${creds.serverUrl.replace(/\/$/, "")}/agents/runtime/${encodeURIComponent(creds.runtimeId)}/refresh`;
+  let response;
+  try {
+    const res = await fetch(url2, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${creds.token}`,
+        "content-type": "application/json"
+      },
+      body: "{}"
+    });
+    const text = await res.text();
+    if (!res.ok) {
+      log.err(`refresh failed: HTTP ${res.status}: ${text.slice(0, 200)}`);
+      process.exit(1);
+    }
+    response = JSON.parse(text);
+  } catch (e) {
+    log.err(`refresh request failed: ${e.message}`);
+    process.exit(1);
+  }
+  const prevIds = new Set(creds.tenants.map((t) => t.id));
+  const nextIds = new Set(response.tenants.map((t) => t.id));
+  const added = response.tenants.filter((t) => !prevIds.has(t.id));
+  const removed = creds.tenants.filter((t) => !nextIds.has(t.id));
+  const existing = response.tenants.filter((t) => prevIds.has(t.id));
+  const updated = {
+    ...creds,
+    tenants: response.tenants.map((t) => ({
+      id: t.id,
+      name: t.name,
+      agentApiKey: t.agent_api_key
+    }))
+  };
+  await writeCreds(updated);
+  log.ok(`credentials written  ${c.dim(paths().credsFile)}`);
+  const fmtList = (xs) => xs.length === 0 ? "\u2014" : xs.map((t) => `${t.name} (${t.id.slice(0, 8)}\u2026)`).join(", ");
+  process.stderr.write(
+    `
+  Updated: +${added.length} added, -${removed.length} removed, =${existing.length} existing
+`
+  );
+  if (added.length > 0) process.stderr.write(`  ${c.dim("added   :")} ${fmtList(added)}
+`);
+  if (removed.length > 0) process.stderr.write(`  ${c.dim("removed :")} ${fmtList(removed)}
+`);
+  if (existing.length > 0) process.stderr.write(`  ${c.dim("kept    :")} ${fmtList(existing)}
+`);
+  process.stderr.write("\n");
+  const pidFile = join10(paths().configDir, "daemon.pid");
+  let pid = 0;
+  try {
+    pid = parseInt(readFileSync2(pidFile, "utf-8").trim(), 10);
+    if (!Number.isFinite(pid) || pid <= 0) pid = 0;
+    if (pid) process.kill(pid, 0);
+  } catch {
+    pid = 0;
+  }
+  if (pid === 0) {
+    log.hint(`no running daemon${profileTag}; new tenants will load on next \`oma bridge daemon\` start`);
+    return;
+  }
+  try {
+    process.kill(pid, "SIGHUP");
+    log.ok(`daemon${profileTag} reloading credentials (pid ${pid})`);
+  } catch (e) {
+    log.warn(`SIGHUP to pid ${pid} failed: ${e.message}`);
+    log.hint(`creds file is still updated; restart the daemon to apply`);
+    process.exit(2);
+  }
+}
+var init_refresh = __esm({
+  "src/bridge/commands/refresh.ts"() {
+    "use strict";
+    init_config();
+    init_platform();
+    init_style();
+    init_version();
+  }
+});
+
+// src/bridge/commands/profiles.ts
+var profiles_exports = {};
+__export(profiles_exports, {
+  runProfilesList: () => runProfilesList
+});
+import { readdir as readdir3, readFile as readFile7 } from "node:fs/promises";
+import { homedir as homedir5 } from "node:os";
+import { join as join11 } from "node:path";
+async function runProfilesList() {
+  printBanner("bridge profiles \u2014 installed daemon profiles", PKG_VERSION);
+  const omaRoot = join11(homedir5(), ".oma");
+  let entries;
+  try {
+    entries = await readdir3(omaRoot);
+  } catch {
+    process.stderr.write(c.dim(`  (no profiles installed \u2014 ${omaRoot} doesn't exist)
+`));
+    return;
+  }
+  const profiles = [];
+  for (const name of entries.sort()) {
+    if (name !== "bridge" && !name.startsWith("bridge-")) continue;
+    const profile = name === "bridge" ? "" : name.slice("bridge-".length);
+    profiles.push(await readProfile(profile, join11(omaRoot, name)));
+  }
+  if (profiles.length === 0) {
+    process.stderr.write(c.dim("  (no profiles installed)\n"));
+    process.stderr.write(`  Run ${c.cyan("oma bridge setup")} to create one.
+`);
+    return;
+  }
+  process.stderr.write(
+    `  ${c.dim("PROFILE")}	${c.dim("SERVER")}	${c.dim("RUNTIME")}	${c.dim("TENANTS")}	${c.dim("DAEMON")}
+`
+  );
+  for (const p of profiles) {
+    const profileLabel = p.profile === "" ? c.bold("(default)") : c.bold(p.profile);
+    const server = p.serverUrl ?? c.dim("\u2014");
+    const runtime = p.runtimeId ? p.runtimeId.slice(0, 8) + "\u2026" : c.dim("\u2014");
+    const tenants = p.tenantCount === null ? c.dim("\u2014") : p.credsVersion === 1 ? `1 ${c.dim("(v1 creds \u2014 pre-multi-tenant)")}` : String(p.tenantCount);
+    const daemon = p.daemonPid ? p.daemonAlive ? `${c.green("\u25CF")} pid ${p.daemonPid}` : `${c.yellow("\u25CB")} pid ${p.daemonPid} ${c.dim("(stale)")}` : c.dim("\u2014");
+    process.stderr.write(`  ${profileLabel}	${server}	${runtime}	${tenants}	${daemon}
+`);
+  }
+  process.stderr.write(
+    `
+  ${c.dim(
+      "Switch active profile with `OMA_PROFILE=<name> oma bridge <cmd>` (or --profile=<name>)."
+    )}
+`
+  );
+}
+async function readProfile(profile, configDir) {
+  const info = {
+    profile,
+    configDir,
+    serverUrl: null,
+    runtimeId: null,
+    tenantCount: null,
+    credsVersion: "unknown",
+    daemonPid: null,
+    daemonAlive: false
+  };
+  try {
+    const raw = await readFile7(join11(configDir, "credentials.json"), "utf-8");
+    const parsed = JSON.parse(raw);
+    info.serverUrl = parsed.serverUrl ?? null;
+    info.runtimeId = parsed.runtimeId ?? null;
+    if (parsed.v === 2 && Array.isArray(parsed.tenants)) {
+      info.credsVersion = 2;
+      info.tenantCount = parsed.tenants.length;
+    } else if (parsed.agentApiKey) {
+      info.credsVersion = 1;
+      info.tenantCount = 1;
+    }
+  } catch {
+  }
+  try {
+    const pidStr = (await readFile7(join11(configDir, "daemon.pid"), "utf-8")).trim();
+    const pid = parseInt(pidStr, 10);
+    if (Number.isFinite(pid) && pid > 0) {
+      info.daemonPid = pid;
+      try {
+        process.kill(pid, 0);
+        info.daemonAlive = true;
+      } catch {
+        info.daemonAlive = false;
+      }
+    }
+  } catch {
+  }
+  return info;
+}
+var init_profiles = __esm({
+  "src/bridge/commands/profiles.ts"() {
+    "use strict";
+    init_style();
+    init_version();
+  }
+});
+
 // src/index.ts
 init_platform();
 import { createServer as createServer2 } from "node:http";
 import { execSync } from "node:child_process";
-import { homedir as homedir5, hostname as hostname4 } from "node:os";
-import { join as join10, dirname as dirname9 } from "node:path";
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync3, existsSync as existsSync2, chmodSync as chmodSync2 } from "node:fs";
+import { homedir as homedir6, hostname as hostname4 } from "node:os";
+import { join as join12, dirname as dirname9 } from "node:path";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2, unlinkSync as unlinkSync3, existsSync as existsSync2, chmodSync as chmodSync2 } from "node:fs";
 import { randomBytes as randomBytes3 } from "node:crypto";
 function credentialsPath() {
   const xdg = process.env.XDG_CONFIG_HOME;
-  const base = xdg && xdg.length > 0 ? xdg : join10(homedir5(), ".config");
+  const base = xdg && xdg.length > 0 ? xdg : join12(homedir6(), ".config");
   const profile = currentProfile();
   const file2 = profile ? `credentials.${profile}.json` : "credentials.json";
-  return join10(base, "oma", file2);
+  return join12(base, "oma", file2);
 }
-function migrateV1ToV2(v1) {
+function migrateV1ToV22(v1) {
   return {
     version: 2,
     base_url: v1.base_url,
@@ -22605,11 +22956,11 @@ function readCredentials() {
   const path2 = credentialsPath();
   try {
     if (!existsSync2(path2)) return null;
-    const raw = readFileSync2(path2, "utf8");
+    const raw = readFileSync3(path2, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed.version === 2) return parsed;
     if (parsed.version === 1) {
-      const v2 = migrateV1ToV2(parsed);
+      const v2 = migrateV1ToV22(parsed);
       try {
         writeCredentials(v2);
       } catch {
@@ -22826,9 +23177,11 @@ async function streamChat(config2, sessionId, text) {
   }
 }
 async function tailSession(config2, sessionId) {
-  const res = await rawStream(config2, `/v1/sessions/${sessionId}/events/stream`, {
-    headers: { accept: "text/event-stream" }
-  });
+  const res = await rawStream(
+    config2,
+    `/v1/sessions/${sessionId}/events/stream?include=chunks&replay=1`,
+    { headers: { accept: "text/event-stream" } }
+  );
   for await (const ev of parseSSE(res)) {
     process.stdout.write(JSON.stringify(ev) + "\n");
   }
@@ -23177,7 +23530,7 @@ var commands = [
     match: ["agents", "create"],
     usage: "oma agents create <name> [--model <id>]",
     desc: "Create agent",
-    http: "POST   /v1/agents {name, model, system, tools, skills?, mcp_servers?, callable_agents?, runtime_binding?}",
+    http: "POST   /v1/agents {name, model, system, tools, skills?, mcp_servers?, multiagent?, _oma?:{runtime_binding,harness,...}}",
     async run(config2, args) {
       const name = flag(args, "--name") || args.find((a) => !a.startsWith("--"));
       const model = flag(args, "--model") || "claude-sonnet-4-6";
@@ -23196,8 +23549,10 @@ var commands = [
         tools: [{ type: "agent_toolset_20260401" }]
       };
       if (useAcpProxy) {
-        body.harness = "acp-proxy";
-        body.runtime_binding = { runtime_id: runtimeId, acp_agent_id: acpAgentId };
+        body._oma = {
+          harness: "acp-proxy",
+          runtime_binding: { runtime_id: runtimeId, acp_agent_id: acpAgentId }
+        };
       }
       const agent = await apiFetch(config2, "/v1/agents", { method: "POST", body: JSON.stringify(body) });
       console.log(`Agent created: ${agent.name} (${agent.id})${useAcpProxy ? `  [acp-proxy \u2192 ${acpAgentId} on ${runtimeId.slice(0, 8)}\u2026]` : ""}`);
@@ -23407,27 +23762,27 @@ Version: v${a.version}`);
         console.log("No model cards. Create one with: oma models create");
         return;
       }
-      table([["NAME", "PROVIDER", "MODEL", "KEY", "DEFAULT"], ...data.map((c3) => [c3.name, c3.provider, c3.model_id, `****${c3.api_key_preview || ""}`, c3.is_default ? "yes" : ""])]);
+      table([["MODEL_ID", "PROVIDER", "WIRE MODEL", "KEY", "DEFAULT"], ...data.map((c3) => [c3.model_id, c3.provider, c3.model === c3.model_id ? "(same)" : c3.model, `****${c3.api_key_preview || ""}`, c3.is_default ? "yes" : ""])]);
     }
   },
   {
     group: "Model Cards",
     match: ["models", "create"],
-    usage: "oma models create --name <n> --model-id <id> --api-key <key> [--provider <p>]",
+    usage: "oma models create --model-id <id> --api-key <key> [--model <wire>] [--provider <p>]",
     desc: "Create model card",
-    http: "POST   /v1/model_cards {name, provider, model_id, api_key, base_url?, is_default?}",
+    http: "POST   /v1/model_cards {model_id, provider, model?, api_key, base_url?, is_default?}",
     async run(config2, args) {
-      const name = flag(args, "--name");
-      const provider = flag(args, "--provider") || "ant";
       const modelId = flag(args, "--model-id");
+      const provider = flag(args, "--provider") || "ant";
+      const model = flag(args, "--model");
       const apiKey = flag(args, "--api-key");
       const baseUrl = flag(args, "--base-url");
-      if (!name || !modelId || !apiKey) {
-        console.error("Usage: oma models create --name <name> --model-id <id> --api-key <key> [--provider ant|oai|ant-compatible|oai-compatible] [--base-url <url>]");
+      if (!modelId || !apiKey) {
+        console.error("Usage: oma models create --model-id <id> --api-key <key> [--model <wire>] [--provider ant|oai|ant-compatible|oai-compatible] [--base-url <url>]");
         process.exit(1);
       }
-      const card = await apiFetch(config2, "/v1/model_cards", { method: "POST", body: JSON.stringify({ name, provider, model_id: modelId, api_key: apiKey, base_url: baseUrl }) });
-      console.log(`Model card created: ${card.name} (${card.id})`);
+      const card = await apiFetch(config2, "/v1/model_cards", { method: "POST", body: JSON.stringify({ model_id: modelId, provider, model, api_key: apiKey, base_url: baseUrl }) });
+      console.log(`Model card created: ${card.model_id} (${card.id})`);
     }
   },
   // API Keys
@@ -23514,27 +23869,26 @@ Save this key \u2014 it won't be shown again.`);
         console.log("No credentials in this vault.");
         return;
       }
-      table([["NAME", "TYPE", "DETAIL"], ...data.map((c3) => [c3.display_name, c3.auth.type, c3.auth.mcp_server_url || c3.auth.command_prefixes?.join(", ") || ""])]);
+      table([["NAME", "TYPE", "DETAIL"], ...data.map((c3) => [c3.display_name, c3.auth.type, c3.auth.mcp_server_url || c3.auth.cli_id || ""])]);
     }
   },
   {
     group: "Vaults",
-    match: ["secret", "add"],
-    usage: "oma secret add --vault <id> --name <n> --cmd <pfx> --env <var> --token <t>",
-    desc: "Add secret credential",
-    http: "POST   /v1/vaults/:id/credentials {display_name, auth:{type, command_prefixes, env_var, token}}",
+    match: ["cli", "add"],
+    usage: "oma cli add --vault <id> --name <n> --cli-id <gh|aws|...> --token <t>",
+    desc: "Add cap CLI credential",
+    http: "POST   /v1/vaults/:id/credentials {display_name, auth:{type:cap_cli, cli_id, token}}",
     async run(config2, args) {
       const vaultId = flag(args, "--vault");
       const name = flag(args, "--name");
-      const cmd = flag(args, "--cmd");
-      const envVar = flag(args, "--env");
+      const cliId = flag(args, "--cli-id");
       const token = flag(args, "--token");
-      if (!vaultId || !name || !cmd || !envVar || !token) {
-        console.error("Usage: oma secret add --vault <id> --name <name> --cmd <prefixes> --env <var> --token <token>");
+      if (!vaultId || !name || !cliId || !token) {
+        console.error("Usage: oma cli add --vault <id> --name <name> --cli-id <gh|aws|kubectl|...> --token <token>");
         process.exit(1);
       }
-      const cred = await apiFetch(config2, `/v1/vaults/${vaultId}/credentials`, { method: "POST", body: JSON.stringify({ display_name: name, auth: { type: "command_secret", command_prefixes: cmd.split(",").map((s) => s.trim()), env_var: envVar, token } }) });
-      console.log(`Secret added: ${name} (${cred.id})`);
+      const cred = await apiFetch(config2, `/v1/vaults/${vaultId}/credentials`, { method: "POST", body: JSON.stringify({ display_name: name, auth: { type: "cap_cli", cli_id: cliId, token } }) });
+      console.log(`CLI credential added: ${name} (${cred.id})`);
     }
   },
   // Skills
@@ -25050,6 +25404,7 @@ Usage:`);
   Bridge (local runtime):
     oma bridge setup [--force] [--no-service]    Pair this machine with OMA + start daemon
     oma bridge status                            Show creds + probe server reachability
+    oma bridge refresh                           Reconcile authorized tenants + reload daemon
     oma bridge agents refresh                    Re-detect agents + offer wrapper installs
     oma bridge uninstall                         Stop service + remove creds
     (oma bridge daemon                           Internal: launched by service mgr / debugging)
@@ -25136,9 +25491,25 @@ async function main() {
         await runAgents2(args.slice(2));
         return;
       }
+      case "refresh": {
+        const { runRefresh: runRefresh2 } = await Promise.resolve().then(() => (init_refresh(), refresh_exports));
+        await runRefresh2();
+        return;
+      }
+      case "profiles": {
+        const sub2 = args[2] ?? "list";
+        if (sub2 !== "list" && sub2 !== "ls") {
+          console.error(`Unknown subcommand: oma bridge profiles ${sub2}
+  Try: oma bridge profiles list`);
+          process.exit(1);
+        }
+        const { runProfilesList: runProfilesList2 } = await Promise.resolve().then(() => (init_profiles(), profiles_exports));
+        await runProfilesList2();
+        return;
+      }
       default:
         console.error(
-          "oma bridge \u2014 pair a local ACP agent with OMA\n\n  oma bridge setup [--server-url=\u2026] [--no-service] [--force] [--yes]\n                                       Pair + install service + start daemon\n  oma bridge status                    Creds + service kind + probe server\n  oma bridge agents refresh [--yes]    Re-scan + offer-install wrappers + reload\n  oma bridge uninstall                 Stop service + remove creds\n  oma bridge daemon                    (internal \u2014 launched by service mgr / for debug)\n\n  Use --profile <name> (or OMA_PROFILE=<name>) to run multiple\n  daemons side-by-side (e.g. prod in launchd + staging foreground).\n"
+          "oma bridge \u2014 pair a local ACP agent with OMA\n\n  oma bridge setup [--server-url=\u2026] [--no-service] [--force] [--yes]\n                                       Pair + install service + start daemon\n  oma bridge status                    Creds + service kind + probe server\n  oma bridge refresh                   Reconcile authorized tenants + reload daemon\n  oma bridge profiles list             List all installed daemon profiles on this machine\n  oma bridge agents refresh [--yes]    Re-scan + offer-install wrappers + reload\n  oma bridge uninstall                 Stop service + remove creds\n  oma bridge daemon                    (internal \u2014 launched by service mgr / for debug)\n\n  Use --profile <name> (or OMA_PROFILE=<name>) to run multiple\n  daemons side-by-side (e.g. prod in launchd + staging foreground).\n"
         );
         process.exit(sub ? 1 : 0);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openma/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "CLI for the openma managed agents platform",
   "type": "module",
   "bin": {
@@ -24,7 +24,7 @@
     "cli",
     "llm"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "homepage": "https://openma.dev",
   "repository": {
     "type": "git",