mercury-agent 0.5.13 → 0.5.15

package/README.md

@@ -403,6 +403,9 @@ Supported OAuth providers: Anthropic, GitHub Copilot, Google Gemini CLI, Antigra
 | `MERCURY_CONTAINER_TIMEOUT_MS` | `300000` | Container timeout (5 min) |
 | `MERCURY_CONTAINER_RUNTIME` | `runc` | `runc` (default) or `runsc` ([gVisor](https://gvisor.dev)) |
 | `MERCURY_CONTAINER_BWRAP_DOCKER_COMPAT` | `false` | Set `true` on Linux Docker Engine (see note below) |
+| `MERCURY_AGENT_ID` | — | Unique ID for this assistant (required when running multiple assistants on the same Docker daemon) |
+
+> **Multiple assistants on the same machine:** Mercury builds a derived Docker image (`mercury-agent-ext:<hash>`) from the base image plus your extensions. When a new image is built, older tags in the same repo are pruned. If two assistants share a Docker daemon without distinct `MERCURY_AGENT_ID` values, they share the same image repo and **one will silently prune the other's image**, causing container launch failures. Set `MERCURY_AGENT_ID` to a unique value per project (e.g. in `.env`). Cloud console deployments set this automatically.
 
 > **Linux Docker Engine:** Mercury uses [bubblewrap](https://github.com/containers/bubblewrap) for in-container sandboxing. On Linux Docker Engine (not Docker Desktop), bwrap cannot mount `/proc` without extra privileges. Either set `container_bwrap_docker_compat: true` in `mercury.yaml` (adds `--privileged` to `docker run`), or install [gVisor](https://gvisor.dev/docs/user_guide/install/) and set `MERCURY_CONTAINER_RUNTIME=runsc` to skip bwrap entirely.
 
@@ -440,7 +443,7 @@ runtime:
 
 `admin_ids` values are platform-specific identifiers — check the dashboard Conversations page to see the format (e.g. WhatsApp LID digits, Telegram numeric user ID).
 
-Auto-created spaces are seeded with `trigger.match=always`, `context.mode=context`, and the configured member permissions. Per-space rate limits are manageable from the dashboard.
+Auto-created spaces are seeded with `trigger.match=always`, `context.mode=context`, and the configured member permissions. Changing `rate_limit_daily_member` in `mercury.yaml` propagates to all auto-created spaces immediately — no per-space update needed. Explicit per-space overrides (set via dashboard or API) still take precedence.
 
 ### Per-space Config
 

package/docs/rate-limiting.md

@@ -198,6 +198,16 @@ curl -X PUT http://localhost:8787/api/config \
 | Not set | No daily limit for this role (burst limiter still applies) |
 | Invalid (NaN) | Treated as "not set" |
 
+### Daily limit precedence
+
+When resolving the effective daily limit for a role, Mercury uses this order:
+
+1. **Explicit per-space override** (set via dashboard, `mrctl`, or API) — always wins
+2. **Global config** (`rate_limit_daily_member` / `rate_limit_daily_admin` from `mercury.yaml` or env) — applies to all spaces without an explicit override
+3. **No limit** (0) — if the global config is 0 or unset, no daily cap is enforced
+
+Auto-created DM spaces (from `dm_auto_space`) seed a `rate_limit.member` value on first contact, but this seed is treated as a deployment default, not an admin override. Changing `rate_limit_daily_member` in `mercury.yaml` takes effect immediately across all auto-created spaces — no DB migration or per-space update needed. If you explicitly set a per-space limit via the dashboard or API, that override takes precedence over the global config.
+
 ### How the two layers interact
 
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercury-agent",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "description": "Personal AI assistant for chat platforms (WhatsApp, Slack, Discord, Telegram)",
   "license": "MIT",
   "author": "Avishai Tsabari",

package/src/core/routes/dashboard.ts

@@ -531,16 +531,26 @@ export function createDashboardRoutes(ctx: DashboardContext) {
     const memberRaw = core.db.getSpaceConfig(spaceId, "rate_limit.member");
     const adminRaw = core.db.getSpaceConfig(spaceId, "rate_limit.admin");
 
+    const isSeeded = (key: string) =>
+      core.db.getSpaceConfig(spaceId, key) !== null &&
+      core.db.getSpaceConfigUpdatedBy(spaceId, key) === "dm-auto-space";
+
     const effectiveBurst = burstRaw ?? String(cfg.rateLimitPerUser);
     const effectiveMember =
-      memberRaw ??
-      (cfg.rateLimitDailyMember > 0 ? String(cfg.rateLimitDailyMember) : "0");
+      memberRaw && !isSeeded("rate_limit.member")
+        ? memberRaw
+        : cfg.rateLimitDailyMember > 0
+          ? String(cfg.rateLimitDailyMember)
+          : "0";
     const effectiveAdmin =
-      adminRaw ??
-      (cfg.rateLimitDailyAdmin > 0 ? String(cfg.rateLimitDailyAdmin) : "0");
+      adminRaw && !isSeeded("rate_limit.admin")
+        ? adminRaw
+        : cfg.rateLimitDailyAdmin > 0
+          ? String(cfg.rateLimitDailyAdmin)
+          : "0";
 
     const hasOverride = (key: string) =>
-      core.db.getSpaceConfig(spaceId, key) !== null;
+      core.db.getSpaceConfig(spaceId, key) !== null && !isSeeded(key);
 
     const resetBtn = (key: string) =>
       hasOverride(key)
@@ -1970,15 +1980,33 @@ export function createDashboardRoutes(ctx: DashboardContext) {
 
     const modelSelectorPanel = (() => {
       if (isMultiLeg) {
+        const chainFromEnv = !!process.env.MERCURY_MODEL_CHAIN;
+        const chainYaml = cfg.resolvedModelChain
+          .map(
+            (leg) =>
+              `    - provider: ${leg.provider}\n      model: ${leg.model}`,
+          )
+          .join("\n");
+        const configSnippet = chainFromEnv
+          ? `MERCURY_MODEL_CHAIN='${JSON.stringify(cfg.resolvedModelChain.map((l) => ({ provider: l.provider, model: l.model })))}'`
+          : `model:\n  chain:\n${chainYaml}`;
+        const sourceLabel = chainFromEnv
+          ? `<span class="mono">MERCURY_MODEL_CHAIN</span> env var in <span class="mono">.env</span>`
+          : `<span class="mono">model.chain</span> in <span class="mono">mercury.yaml</span>`;
+
         return `
           <div class="panel" style="margin-bottom:16px">
             <div class="panel-header" style="font-weight:600;font-size:13px">Active model</div>
             <div class="panel-body">
               ${renderModelBlock(cfg)}
               <p class="muted" style="font-size:12px;margin:8px 0 0">
-                Model chain is configured via <span class="mono">mercury.yaml</span> or
-                <span class="mono">MERCURY_MODEL_CHAIN</span> — edit those to change.
+                Configured via ${sourceLabel}. Edit that file to change.
               </p>
+              <details style="margin-top:8px">
+                <summary class="muted" style="font-size:12px;cursor:pointer">Copy config</summary>
+                <pre style="margin:6px 0 0;padding:8px 10px;background:var(--bg);border:1px solid var(--border);border-radius:var(--radius,4px);font-size:12px;overflow-x:auto;cursor:pointer;position:relative"
+                     onclick="navigator.clipboard.writeText(this.textContent.trim());var s=this.querySelector('.copy-hint');if(s){s.textContent='Copied!';setTimeout(function(){s.textContent='Click to copy'},1500)}">${escapeHtml(configSnippet)}<span class="copy-hint muted" style="position:absolute;top:4px;right:8px;font-size:11px">Click to copy</span></pre>
+              </details>
             </div>
           </div>`;
       }

package/src/core/runtime.ts

@@ -405,9 +405,16 @@ export class MercuryCoreRuntime {
             : route.role === "admin"
               ? this.config.rateLimitDailyAdmin
               : 0;
-        const effectiveDailyRaw =
-          roleLimitRaw ??
-          (globalDailyLimit > 0 ? String(globalDailyLimit) : null);
+        const isSeededDefault =
+          roleLimitRaw !== null &&
+          this.db.getSpaceConfigUpdatedBy(message.spaceId, roleKey) ===
+            "dm-auto-space";
+        const effectiveDailyRaw = isSeededDefault
+          ? globalDailyLimit > 0
+            ? String(globalDailyLimit)
+            : null
+          : (roleLimitRaw ??
+            (globalDailyLimit > 0 ? String(globalDailyLimit) : null));
         if (effectiveDailyRaw !== null) {
           const roleLimit = Number.parseInt(effectiveDailyRaw, 10);
           if (!Number.isNaN(roleLimit) && roleLimit > 0) {