@securecoms/agent-bridge 0.33.1 → 0.34.0

package/dist/bin.js

@@ -19331,6 +19331,8 @@ function isEpochConflict(e) {
 var LABEL = "agentvault-connect-v1";
 var DEFAULT_STUCK_THRESHOLD = 2;
 var DEFAULT_QUARANTINE_THRESHOLD = 8;
+var KEPT_WELCOME_COMMIT_DEFER_MS = 24 * 60 * 60 * 1e3;
+var KEPT_WELCOME_COMMIT_DEFER_MAX_ROWS = 32;
 var DELIVERY_PULL_PAGE = 100;
 var DELIVERY_MAX_RETRIES = 5;
 var DrainPageFullError = class extends Error {
@@ -19535,6 +19537,15 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
    * {@link errorStats}; mutated only through {@link recordDecryptError} /
    * {@link recordDecryptSuccess}.
    */
+  /** {@link KEPT_WELCOME_COMMIT_DEFER_MS}: channel -> when its first commit was
+   *  deferred behind the kept Welcome `welcomeId`. Restarted for a different
+   *  Welcome; cleared when the channel decrypts, or when a pass that saw the
+   *  whole queue kept no Welcome for it (fix round 1, L2: the Welcome
+   *  resolved, so a later re-Welcome gets a fresh, bounded window). An entry
+   *  past its bound stays (expired) until then, so the bound cannot restart
+   *  itself pass after pass. In memory: a reload restarts it, and the
+   *  per-pass row cap is what bounds the page cost across reloads. */
+  keptWelcomeDeferSince = /* @__PURE__ */ new Map();
   errors = /* @__PURE__ */ new Map();
   stuckThreshold;
   /** Consecutive-error threshold at which a wedged channel's row is quarantined
@@ -19753,8 +19764,33 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
    * channel resumes normal processing and can quarantine again later if it
    * re-wedges (the onWedged guard is reset so the hook can fire again).
    */
+  /** See {@link MlsGroupKeyProviderOpts.deferCommitsWhileWelcomePending}. The
+   *  caller has already established that this pass KEPT a no-state Welcome
+   *  for `channelId`. True: defer the commit row. Never throws. */
+  deferKeptWelcomeCommit(channelId, welcomeId) {
+    const pred = this.o.deferCommitsWhileWelcomePending;
+    if (!pred)
+      return false;
+    let boundMs = 0;
+    try {
+      const v = pred(channelId);
+      boundMs = v === true ? KEPT_WELCOME_COMMIT_DEFER_MS : typeof v === "number" && Number.isFinite(v) && v > 0 ? Math.min(v, KEPT_WELCOME_COMMIT_DEFER_MS) : 0;
+    } catch {
+      boundMs = 0;
+    }
+    if (boundMs <= 0)
+      return false;
+    const now = this.nowMs();
+    const entry = this.keptWelcomeDeferSince.get(channelId);
+    if (entry === void 0 || entry.welcomeId !== welcomeId) {
+      this.keptWelcomeDeferSince.set(channelId, { since: now, welcomeId });
+      return true;
+    }
+    return now - entry.since < boundMs;
+  }
   recordDecryptSuccess(channelId) {
     this.lastDecryptAt.set(channelId, Date.now());
+    this.keptWelcomeDeferSince.delete(channelId);
     const e = this.errors.get(channelId);
     if (!e)
       return;
@@ -20150,6 +20186,12 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
    * server's REJOIN_THRESHOLD, there was nothing to apply, or a commit would
    * not apply (which means the state is genuinely FORKED, not merely behind,
    * and replay cannot fix a fork).
+   *
+   * THROWS (retryable, never `false`, #1290): CustodyPersistError when the
+   * channel is under the custody hold (nothing applied), and the C2 classes
+   * (PendingCommitUnresolvedError from the guarded MAIN write) after evicting
+   * the advanced cache, so the persisted state is unchanged. A /sync request
+   * that fails also throws, before anything is applied.
    */
   async resyncByReplay(channelId, groupId) {
     if (!await this.hasPersistedChannelState(channelId))
@@ -20169,12 +20211,26 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
     let applied = 0;
     try {
       await this.locks.run(channelId, async () => {
+        if (await this.custodyHeld(channelId))
+          throw new CustodyPersistError(channelId);
         const mgr = await this.manager(channelId);
         try {
           for (const c of commits) {
             if (c.epoch <= Number(mgr.epoch))
               continue;
-            await mgr.decrypt(hexToBytes22(c.payload));
+            const commitBytes = hexToBytes22(c.payload);
+            try {
+              await mgr.decrypt(commitBytes);
+            } catch (e) {
+              if (await probeOwnRemoval(mgr, commitBytes) !== null) {
+                this.noteOwnLeafRemoved(channelId, {
+                  group_id: groupId,
+                  epoch: c.epoch,
+                  message_id: c.id
+                });
+              }
+              throw e;
+            }
             applied++;
           }
           if (applied > 0)
@@ -20186,6 +20242,10 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
         }
       });
     } catch (e) {
+      if (isSdkError(e, "CustodyPersistError") || e instanceof CustodyPersistError || e instanceof PendingCommitUnresolvedError || e instanceof GroupSupersededError || e instanceof AttestedOrphanRefusedError) {
+        writeServiceLog2("warn", "resync.replay_held", { applied }, e);
+        throw e;
+      }
       writeServiceLog2("warn", "resync.replay_commit_failed", { applied }, e);
       return false;
     }
@@ -22886,6 +22946,8 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
         out.push({
           queueId: `replay-${m.id}`,
           messageId: envelope.message_id,
+          // #1246 C-1: the group-messages row id is the same mls_messages key.
+          ...typeof m.id === "string" && m.id ? { serverMessageId: m.id } : {},
           channelId,
           plaintext,
           envelope,
@@ -23786,6 +23848,8 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
     const heldBundleRefs = () => heldBundleRefsMemo ??= this.readHeldBundleRefs();
     const w2Acked = /* @__PURE__ */ new Map();
     const w2Kept = /* @__PURE__ */ new Set();
+    const keptWelcomeId = /* @__PURE__ */ new Map();
+    const deferredThisPass = /* @__PURE__ */ new Map();
     const unpinnedRefusals = /* @__PURE__ */ new Map();
     const welcomes = rows.filter((r) => r.message_type === "welcome");
     const nonWelcomes = rows.filter((r) => r.message_type !== "welcome");
@@ -23944,6 +24008,8 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
                 writeServiceLog2("warn", "welcome.unopenable");
               } else {
                 w2Kept.add(wcid);
+                if (!keptWelcomeId.has(wcid))
+                  keptWelcomeId.set(wcid, row.queue_id);
                 if (typeof process !== "undefined" && process.env?.SECURECOMS_TRACE_DELIVERY) {
                   writeServiceLog2("debug", "delivery.welcome_no_local_state");
                 }
@@ -23954,6 +24020,10 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
           const cid = row.connect_channel_id;
           if (!cid)
             continue;
+          if (w2Kept.has(cid) && (deferredThisPass.get(cid) ?? 0) < KEPT_WELCOME_COMMIT_DEFER_MAX_ROWS && this.deferKeptWelcomeCommit(cid, keptWelcomeId.get(cid) ?? "")) {
+            deferredThisPass.set(cid, (deferredThisPass.get(cid) ?? 0) + 1);
+            continue;
+          }
           let advancedEpoch;
           let custodyHeld = false;
           await this.locks.run(cid, async () => {
@@ -24110,6 +24180,12 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
         this.leftStreak.set(cid, { pulls: 1, since: pullNow });
       this.scheduleAutoResolve(cid);
     }
+    if (rows.length < DELIVERY_PULL_PAGE) {
+      for (const cid of [...this.keptWelcomeDeferSince.keys()]) {
+        if (!w2Kept.has(cid))
+          this.keptWelcomeDeferSince.delete(cid);
+      }
+    }
     for (const [cid, gid] of w2Acked) {
       if (w2Kept.has(cid))
         continue;
@@ -24389,7 +24465,9 @@ var MlsGroupKeyProvider = class _MlsGroupKeyProvider {
         voiceDefaultResponder: row.voice_default_responder ?? void 0,
         ...typeof row.identity_signature === "string" && row.identity_signature ? { identitySignature: row.identity_signature } : {},
         payloadHex: row.payload,
-        openedAt
+        openedAt,
+        // #1246 C-1: the server row id, beside the sender-chosen envelope id.
+        ...typeof row.message_id === "string" && row.message_id ? { serverMessageId: row.message_id } : {}
       };
       const custodiedAt = this.nowMs();
       this.custody.set(row.queue_id, entry);
@@ -26911,6 +26989,11 @@ var FakeConnectBackend = class _FakeConnectBackend {
   // Owner-signed tool grants (spec §7.0): like Plan 0's backend, each row carries
   // the envelope's `identity_proof.signature` as `identity_signature` beside the
   // unsigned canonical payload. `omitSignature` models a pre-Plan-0 row.
+  /** `rowMessageId` (#1246 C-1): the server row id to deliver, when it is NOT
+   *  the envelope's id. The REST send path keys the row by the envelope id
+   *  (connect_messages.py, `MLSMessage(id=message_id)`); the WS `message_mls`
+   *  path stores through `store_mls_message`, whose row id is server-generated,
+   *  so there the two differ and the envelope id is the sender's free choice. */
   async ingestApplication(envelope, opts) {
     const channelId = envelope.channel_id;
     const canonical = await canonicalEnvelopeBytes(envelope);
@@ -26922,7 +27005,7 @@ var FakeConnectBackend = class _FakeConnectBackend {
         continue;
       this.q(dev).push({
         queue_id: "q-" + this._seq++,
-        message_id: envelope.message_id,
+        message_id: opts?.rowMessageId ?? envelope.message_id,
         group_id: groupId,
         message_type: "application",
         sender_device_id: senderDeviceId ?? "",
@@ -27306,6 +27389,7 @@ function openSchema(db) {
   ensureRuntimeInboxDeliveryAttempts(db);
   ensureRuntimeReplyIntent(db);
   ensureRuntimeReplyIntentEnvelopeGroup(db);
+  ensureRuntimeReplyIntentCredit(db);
   ensureGroupLink(db);
   ensureMlsCustody(db);
   ensureToolGrantTables(db);
@@ -27386,6 +27470,19 @@ function ensureRuntimeReplyIntentEnvelopeGroup(db) {
     throw e;
   }
 }
+function ensureRuntimeReplyIntentCredit(db) {
+  const hasColumn = () => db.prepare("PRAGMA table_info(runtime_reply_intent)").all().some((c) => c.name === "reply_credit");
+  const cols = db.prepare("PRAGMA table_info(runtime_reply_intent)").all();
+  if (cols.length === 0 || cols.some((c) => c.name === "reply_credit"))
+    return;
+  try {
+    db.exec("ALTER TABLE runtime_reply_intent ADD COLUMN reply_credit TEXT");
+  } catch (e) {
+    if (hasColumn())
+      return;
+    throw e;
+  }
+}
 var RECALL_STATE_COLUMNS = [
   ["recall_enabled", "INTEGER NOT NULL DEFAULT 0"],
   ["recall_mode_epoch", "INTEGER NOT NULL DEFAULT 0"],
@@ -28437,8 +28534,8 @@ var SqliteMlsStateStore = class _SqliteMlsStateStore {
     this.db.prepare("DELETE FROM runtime_reply_intent WHERE identity_id=? AND updated_at < ?").run(this.id, now - RUNTIME_REPLY_INTENT_RETENTION_MS);
     const info = this.db.prepare(`INSERT OR IGNORE INTO runtime_reply_intent
          (identity_id, scope, part, in_reply_to, channel_id, reply_message_id, body_mac,
-          sealed_body, sealed_envelope, state, created_at, updated_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, NULL, 'pending', ?, ?)`).run(this.id, input.scope, input.part, input.inReplyTo, input.channelId, input.replyMessageId, input.bodyMac, sealed, now, now);
+          sealed_body, sealed_envelope, state, created_at, updated_at, reply_credit)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, NULL, 'pending', ?, ?, ?)`).run(this.id, input.scope, input.part, input.inReplyTo, input.channelId, input.replyMessageId, input.bodyMac, sealed, now, now, input.replyCredit ?? null);
     const count = this.db.prepare("SELECT COUNT(*) AS n FROM runtime_reply_intent WHERE identity_id=?").get(this.id);
     if (count.n > RUNTIME_REPLY_INTENT_MAX) {
       this.db.prepare(`DELETE FROM runtime_reply_intent
@@ -28448,7 +28545,7 @@ var SqliteMlsStateStore = class _SqliteMlsStateStore {
          )`).run(this.id, this.id, RUNTIME_REPLY_INTENT_MAX);
     }
     const row = this.db.prepare(`SELECT scope, part, in_reply_to, channel_id, reply_message_id, body_mac,
-              sealed_body, sealed_envelope, sealed_envelope_group, state, created_at
+              sealed_body, sealed_envelope, sealed_envelope_group, state, created_at, reply_credit
        FROM runtime_reply_intent WHERE identity_id=? AND scope=? AND part=?`).get(this.id, input.scope, input.part);
     if (!row)
       throw new Error("reply intent vanished after claim");
@@ -28457,7 +28554,7 @@ var SqliteMlsStateStore = class _SqliteMlsStateStore {
   /** SEC-06 #18: every intent answering `inReplyTo`, in claim order. */
   async listReplyIntents(inReplyTo) {
     const rows = this.db.prepare(`SELECT scope, part, in_reply_to, channel_id, reply_message_id, body_mac,
-              sealed_body, sealed_envelope, sealed_envelope_group, state, created_at
+              sealed_body, sealed_envelope, sealed_envelope_group, state, created_at, reply_credit
        FROM runtime_reply_intent WHERE identity_id=? AND in_reply_to=?
        ORDER BY created_at ASC, rowid ASC`).all(this.id, inReplyTo);
     const out = [];
@@ -28468,7 +28565,7 @@ var SqliteMlsStateStore = class _SqliteMlsStateStore {
   /** SEC-06 #18: re-read one intent by its key (null when absent). */
   async getReplyIntent(scope, part) {
     const row = this.db.prepare(`SELECT scope, part, in_reply_to, channel_id, reply_message_id, body_mac,
-              sealed_body, sealed_envelope, sealed_envelope_group, state, created_at
+              sealed_body, sealed_envelope, sealed_envelope_group, state, created_at, reply_credit
        FROM runtime_reply_intent WHERE identity_id=? AND scope=? AND part=?`).get(this.id, scope, part);
     return row ? this.openReplyIntent(row) : null;
   }
@@ -28542,7 +28639,8 @@ var SqliteMlsStateStore = class _SqliteMlsStateStore {
       envelope,
       envelopeGroupId: envelopeGroupFor(envelope, await openOrNull(row.sealed_envelope_group)),
       state: row.state === "sent" ? "sent" : row.state === "skipped" ? "skipped" : "pending",
-      createdAt: Number(row.created_at)
+      createdAt: Number(row.created_at),
+      replyCredit: typeof row.reply_credit === "string" ? row.reply_credit : null
     };
   }
   async recordMemory(input) {
@@ -30312,8 +30410,8 @@ function decodeReplyBody(bytes) {
   if (b?.kind === "a2a" && b.a2a && typeof b.a2a === "object") return b;
   throw new Error("reply intent body is malformed");
 }
-function replyBodyMac(key, replyId, channelId, body) {
-  return createHmac("sha256", key).update(JSON.stringify(["reply-body", replyId, channelId])).update("\0").update(body).digest("hex");
+function replyBodyMac(key, replyId, channelId, body, credit) {
+  return createHmac("sha256", key).update(JSON.stringify(credit === void 0 ? ["reply-body", replyId, channelId] : ["reply-body", replyId, channelId, credit])).update("\0").update(body).digest("hex");
 }
 function partOrdinal(part) {
   const m = /^p:(\d+)$/.exec(part);
@@ -35154,6 +35252,8 @@ function checkConfiguredPaths(skillsJson, statFn = (p) => {
   }
   const search = skillsJson.search;
   if (search?.keyFile) paths.push(search.keyFile);
+  const weather = skillsJson.weather;
+  if (weather?.keyFile) paths.push(weather.keyFile);
   return paths.map((path) => {
     let st;
     try {
@@ -35179,7 +35279,7 @@ function parseSecretPathsReport(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
   const r = raw;
   const f = r.outside_by_field;
-  if (r.mode !== "report" && r.mode !== "enforce" || !isCount(r.inside) || !isCount(r.allowlisted) || !isCount(r.outside) || !f || typeof f !== "object" || Array.isArray(f) || !isCount(f.headers_file) || !isCount(f.postgres_url_file) || !isCount(f.search_key_file) || f.sqlite !== void 0 && !isCount(f.sqlite)) return void 0;
+  if (r.mode !== "report" && r.mode !== "enforce" || !isCount(r.inside) || !isCount(r.allowlisted) || !isCount(r.outside) || !f || typeof f !== "object" || Array.isArray(f) || !isCount(f.headers_file) || !isCount(f.postgres_url_file) || !isCount(f.search_key_file) || f.sqlite !== void 0 && !isCount(f.sqlite) || f.weather_key_file !== void 0 && !isCount(f.weather_key_file)) return void 0;
   return {
     mode: r.mode,
     inside: r.inside,
@@ -35189,7 +35289,8 @@ function parseSecretPathsReport(raw) {
       headers_file: f.headers_file,
       postgres_url_file: f.postgres_url_file,
       search_key_file: f.search_key_file,
-      ...f.sqlite !== void 0 ? { sqlite: f.sqlite } : {}
+      ...f.sqlite !== void 0 ? { sqlite: f.sqlite } : {},
+      ...f.weather_key_file !== void 0 ? { weather_key_file: f.weather_key_file } : {}
     }
   };
 }
@@ -35269,6 +35370,7 @@ function readLocalReport(home, identityId) {
     has_search_key: hasSearchKey,
     has_llm_key: hasLlmKey,
     has_extract_provider: doc.has_extract_provider === true,
+    has_weather_key: doc.has_weather_key === true,
     ...ownerDmCap !== void 0 ? { owner_dm_search_cap_effective: ownerDmCap } : {},
     legacy_memory: localLegacySources(doc).map(({ path: _path, content: _content, ...source }) => source),
     secret_paths: parseSecretPathsReport(doc.secret_paths)
@@ -35370,6 +35472,19 @@ function pruneManagedMemory(home, identityId, hashes, deps = REAL_FS) {
   return removed;
 }
 
+// src/reply-credit.ts
+var REPLY_CREDIT_FEATURE = "reply_credit_v1";
+var WEATHER_CREDIT_LINE = "Weather data: WeatherAPI.com. For general information only.";
+var WEATHER_CREDIT_SUFFIX = `
+
+${WEATHER_CREDIT_LINE}`;
+function isReplyCredit(v) {
+  return v === "weatherapi";
+}
+function stripCreditSuffix(text) {
+  return text.endsWith(WEATHER_CREDIT_SUFFIX) ? text.slice(0, text.length - WEATHER_CREDIT_SUFFIX.length) : text;
+}
+
 // src/grants/binding.ts
 import { sha256 as sha25611 } from "@noble/hashes/sha256";
 
@@ -35377,9 +35492,10 @@ import { sha256 as sha25611 } from "@noble/hashes/sha256";
 import { ed25519 as ed255195 } from "@noble/curves/ed25519";
 var TOOL_GRANTS_DOMAIN = "SECURECOMS-TOOL-GRANTS-V1:";
 var MANIFEST_KNOWN_TOOLS = Object.freeze({
-  owner_dm: Object.freeze(["web_search", "web_extract", "fetch_url", "http_request", "sql_query"]),
+  owner_dm: Object.freeze(["web_search", "web_extract", "fetch_url", "http_request", "sql_query", "weather_forecast", "currency_convert"]),
   // web_extract: owner DM only, never team_room (spec §5.4, D5)
-  team_room: Object.freeze(["web_search"])
+  // Weather/currency spec §6.3 (U5): both utility tools in both audiences, each held behind utility_tools_v1 (TOOL_FEATURE).
+  team_room: Object.freeze(["web_search", "weather_forecast", "currency_convert"])
 });
 function manifestSignedBytes(manifest) {
   const domain = new TextEncoder().encode(TOOL_GRANTS_DOMAIN);
@@ -35703,20 +35819,30 @@ function bindTargets(raw, signed, equals) {
   }
   return { written, mismatches };
 }
-function signedManifestTools(manifest, audience, searchProvidersCapable) {
-  return MANIFEST_KNOWN_TOOLS[audience].filter((t) => (manifest.grants[audience] ?? []).includes(t) && (t !== "web_extract" || searchProvidersCapable));
+var NO_FEATURES = Object.freeze(/* @__PURE__ */ new Set());
+var TOOL_FEATURE = Object.freeze({
+  web_extract: "search_providers_v2",
+  weather_forecast: "utility_tools_v1",
+  currency_convert: "utility_tools_v1"
+});
+function toolAllowedByFeatures(tool, features) {
+  if (!Object.hasOwn(TOOL_FEATURE, tool)) return true;
+  return features.has(TOOL_FEATURE[tool]);
+}
+function signedManifestTools(manifest, audience, features) {
+  return MANIFEST_KNOWN_TOOLS[audience].filter((t) => (manifest.grants[audience] ?? []).includes(t) && toolAllowedByFeatures(t, features));
 }
-function manifestPolicyFor(manifest, switches, searchProvidersCapable) {
+function manifestPolicyFor(manifest, switches, features) {
   return {
     v: 1,
     manifest_tools: [.../* @__PURE__ */ new Set([
-      ...switches.ownerDm ? signedManifestTools(manifest, "owner_dm", searchProvidersCapable) : [],
-      ...switches.room ? signedManifestTools(manifest, "team_room", searchProvidersCapable) : []
+      ...switches.ownerDm ? signedManifestTools(manifest, "owner_dm", features) : [],
+      ...switches.room ? signedManifestTools(manifest, "team_room", features) : []
     ])].sort(),
     secret_path_mode: "enforce"
   };
 }
-function bindRuntimeConfig(manifest, payload, prior, switches = { ownerDm: true, room: true }, searchProvidersCapable = false) {
+function bindRuntimeConfig(manifest, payload, prior, switches = { ownerDm: true, room: true }, features = NO_FEATURES) {
   const mismatches = /* @__PURE__ */ new Set();
   const cfg = manifest.config;
   const out = {};
@@ -35745,7 +35871,8 @@ function bindRuntimeConfig(manifest, payload, prior, switches = { ownerDm: true,
   for (const name of Object.keys(files)) {
     if (name !== LLM_SOURCE && !PERSONA_FILES.includes(name)) mismatches.add("files");
   }
-  const ownerDmTools = signedManifestTools(manifest, "owner_dm", searchProvidersCapable);
+  const ownerDmTools = signedManifestTools(manifest, "owner_dm", features);
+  const ownerDmSearchTools = ownerDmTools.filter((t) => t === "web_search" || t === "web_extract");
   const sj = isObj2(payload.skills_json) ? payload.skills_json : void 0;
   const eps = bindTargets(sj?.endpoints, manifest.endpoints, endpointEquals);
   const dbs = bindTargets(sj?.databases, manifest.databases, databaseEquals);
@@ -35766,17 +35893,20 @@ function bindRuntimeConfig(manifest, payload, prior, switches = { ownerDm: true,
     const usablePrior = cfg.search !== void 0 && prior.search?.provider === cfg.search.provider ? prior.search : void 0;
     searchBlock = cfg.search === void 0 ? void 0 : usablePrior ?? Object.freeze({ provider: cfg.search.provider });
   }
+  const pw = isObj2(sj?.weather) ? sj.weather : void 0;
+  const weatherBlock = typeof pw?.keyFile === "string" && pw.keyFile !== "" ? { keyFile: pw.keyFile } : void 0;
   const skillsDoc = {
     endpoints: eps.written,
     databases: dbs.written,
     flags: [...cfg.flags],
     ...deny !== void 0 || cfg.tools_allow !== void 0 ? { tools: { ...deny !== void 0 ? { deny } : {}, ...cfg.tools_allow !== void 0 ? { allow: [...cfg.tools_allow] } : {} } } : {},
     ...searchBlock ? { search: searchBlock } : {},
+    ...weatherBlock ? { weather: weatherBlock } : {},
     // D31: the marker the runtime keys D24 (iii) on; written under every manifest, true when config.search is signed.
     search_signed: cfg.search !== void 0,
     // D36, D39: the signed owner-DM cap, only when the owner-DM switch is on and the manifest grants an owner-DM tool;
     // otherwise none, so the runtime clamps a signed raise to the default. Never read from the payload.
-    ...cfg.search?.owner_dm_daily_cap !== void 0 && switches.ownerDm && ownerDmTools.length > 0 ? { owner_dm_search_cap: cfg.search.owner_dm_daily_cap } : {}
+    ...cfg.search?.owner_dm_daily_cap !== void 0 && switches.ownerDm && ownerDmSearchTools.length > 0 ? { owner_dm_search_cap: cfg.search.owner_dm_daily_cap } : {}
   };
   out["skills.json"] = JSON.stringify(skillsDoc, null, 2) + "\n";
   const signedMemory = { mode: cfg.memory.mode, ...cfg.memory.recall_days !== void 0 ? { recall_days: cfg.memory.recall_days } : {} };
@@ -35807,7 +35937,7 @@ function bindRuntimeConfig(manifest, payload, prior, switches = { ownerDm: true,
     mismatches.add("legacy_assign");
     legacyDecisions = decisions.filter((d) => isObj2(d) && d.action === "delete");
   }
-  const policy = manifestPolicyFor(manifest, switches, searchProvidersCapable);
+  const policy = manifestPolicyFor(manifest, switches, features);
   return {
     mismatches: CONFIG_BINDING_FIELDS.filter((f) => mismatches.has(f)).sort(),
     targetMismatches: { endpoint: eps.mismatches, database: dbs.mismatches },
@@ -35950,7 +36080,11 @@ var TOOL_ROOM_CLASSES = Object.freeze({
   // D5: spends the owner's key and sends URLs out
   fetch_url: Object.freeze(["egress"]),
   sql_query: Object.freeze(["owner_credential"]),
-  http_request: Object.freeze(["owner_credential", "egress", "side_effect"])
+  http_request: Object.freeze(["owner_credential", "egress", "side_effect"]),
+  // Weather/currency (plan audit r1; supersedes spec §8's values): both send room words to an outside host, and weather
+  // spends the owner's key.
+  weather_forecast: Object.freeze(["owner_credential", "egress"]),
+  currency_convert: Object.freeze(["egress"])
 });
 var LIVE_MEMBER_STATUSES = /* @__PURE__ */ new Set(["active", "add_pending"]);
 function isLiveRow(r) {
@@ -37764,7 +37898,7 @@ var BridgeAgent = class _BridgeAgent {
     }
     let bound;
     try {
-      bound = this.grantWriters.bindRuntimeConfig(manifest, payload, { search: prior }, { ownerDm: this.ownerDmManifestGrants, room: this.roomManifestGrants }, this.searchProvidersCapable());
+      bound = this.grantWriters.bindRuntimeConfig(manifest, payload, { search: prior }, { ownerDm: this.ownerDmManifestGrants, room: this.roomManifestGrants }, this.capabilityFeatures());
     } catch (e) {
       bound = null;
       return this.bindFailed(manifest, payload.memory, e);
@@ -37785,7 +37919,7 @@ var BridgeAgent = class _BridgeAgent {
     try {
       this.grantWriters.writeManagedFiles(this.home, this.cfg.identityId, bound.files);
       if (manifest.config.llm === void 0) this.grantWriters.removeManagedLlmSource(this.home, this.cfg.identityId);
-      this.grantWriters.writeManifestPolicy(this.home, this.cfg.identityId, manifestPolicyFor(manifest, { ownerDm: this.ownerDmManifestGrants, room: this.roomManifestGrants }, this.searchProvidersCapable()));
+      this.grantWriters.writeManifestPolicy(this.home, this.cfg.identityId, manifestPolicyFor(manifest, { ownerDm: this.ownerDmManifestGrants, room: this.roomManifestGrants }, this.capabilityFeatures()));
     } catch (e) {
       this.manifestBinding = null;
       throw e;
@@ -37839,6 +37973,7 @@ var BridgeAgent = class _BridgeAgent {
   async postRuntimeConfigReport(base, version, skillsJson) {
     const local = readLocalReport(this.home, this.cfg.identityId);
     const reportedSearchProviders = this.searchProvidersCapable();
+    const reportedUtilityTools = this.utilityToolsCapable();
     const report = {
       applied_version: version,
       paths: checkConfiguredPaths(skillsJson),
@@ -37856,6 +37991,9 @@ var BridgeAgent = class _BridgeAgent {
       // Final review I-2 (controller ruling): AND the current search_providers_v2, so the web never shows extract while
       // the bridge withholds web_extract from the runtime.
       has_extract_provider: (local?.has_extract_provider ?? false) && reportedSearchProviders,
+      // Weather/currency L-1, §8 item 5: AND the current utility_tools_v1, so the web never shows a usable weather key
+      // while the bridge withholds weather_forecast from the runtime.
+      has_weather_key: (local?.has_weather_key ?? false) && reportedUtilityTools,
       // D39: the owner-DM daily cap the runtime enforces, passed through when it reported a valid one; never the signed value.
       ...local?.owner_dm_search_cap_effective !== void 0 ? { owner_dm_search_cap_effective: local.owner_dm_search_cap_effective } : {},
       // Same idea, for the BYOK LLM key file: only the runtime can see
@@ -37903,7 +38041,9 @@ var BridgeAgent = class _BridgeAgent {
         // D28 (§11.1 step 3): a separate key, never a value in the capability enum. False with no runtime attached.
         search_providers_v2: reportedSearchProviders,
         // D19 item 4: content-free; the signed provider is one the attached runtime(s) cannot honour.
-        search_provider_unsupported: this.searchProviderUnsupported(reportedSearchProviders)
+        search_provider_unsupported: this.searchProviderUnsupported(reportedSearchProviders),
+        // Weather/currency §8 item 5: a separate key, false with no runtime attached.
+        utility_tools_v1: reportedUtilityTools
       }
     };
     const reportedVerifyFailures = this.ownerVerifyFailures;
@@ -37925,6 +38065,7 @@ var BridgeAgent = class _BridgeAgent {
     }
     this.ownerVerifyFailures = Math.max(0, this.ownerVerifyFailures - reportedVerifyFailures);
     this.lastReportedSearchProviders = reportedSearchProviders;
+    this.lastReportedUtilityTools = reportedUtilityTools;
     if (version) writeServiceLog("info", "runtime_config.applied", { version });
     else writeServiceLog("info", "runtime_config.legacy_memory_reported");
   }
@@ -37994,7 +38135,7 @@ var BridgeAgent = class _BridgeAgent {
     this.startedAt = Date.now();
     await this.restoreRuntimeInbox();
     await this.loadToolGrantState();
-    this.recomputeManifestPolicy(false);
+    this.recomputeManifestPolicy(NO_FEATURES);
     try {
       this.store.pruneRoomSearchCap(utcDayOf(Date.now()));
     } catch (e) {
@@ -38977,13 +39118,13 @@ var BridgeAgent = class _BridgeAgent {
    * absent, because the id is derived.
    */
   async send(channelId, text, messageId, opts = {}) {
-    const body = { kind: "text", text };
+    const body = { kind: "text", text: opts.credit !== void 0 ? text + WEATHER_CREDIT_SUFFIX : text };
     if (this.isIdempotentSend(messageId, opts)) return this.trackReplyWork(this.sendIdempotent(channelId, body, opts));
     const id = resolveMessageId(messageId);
     const purgeEpochBeforePublish = this.store.conversationPurgeEpoch(channelId);
     const replyCapture = this.unifiedReplyCapture(channelId, opts.inReplyTo);
     await this.publishBody(channelId, body, id);
-    this.afterPublish(channelId, body, id, opts, purgeEpochBeforePublish, replyCapture);
+    this.afterPublish(channelId, body, id, opts, purgeEpochBeforePublish, replyCapture, text);
     return { message_id: id, status: "sent" };
   }
   /** PR #716 review MEDIUM-5: register reply work so close() can wait for it. */
@@ -39002,7 +39143,7 @@ var BridgeAgent = class _BridgeAgent {
     const purgeEpochBeforePublish = this.store.conversationPurgeEpoch(channelId);
     const replyCapture = this.unifiedReplyCapture(channelId, opts.inReplyTo);
     await this.publishBody(channelId, body, id);
-    this.afterPublish(channelId, body, id, opts, purgeEpochBeforePublish, replyCapture);
+    this.afterPublish(channelId, body, id, opts, purgeEpochBeforePublish, replyCapture, null);
     return { message_id: id, status: "sent" };
   }
   /**
@@ -39135,18 +39276,24 @@ var BridgeAgent = class _BridgeAgent {
     const meta = this.freshMeta(capChannel);
     if (meta && !meta.is_dm) this.enforceRateFloor("room", capChannel);
   }
-  /** Bookkeeping after a CONFIRMED publish of `body` under `id`. */
-  afterPublish(channelId, body, id, opts, purgeEpoch, replyCapture) {
+  /**
+   * Bookkeeping after a CONFIRMED publish of `body` under `id`. `recordText` (weather/currency Task 17) is what a text
+   * reply is RECORDED as: the published text minus any credit line. Every record site below reads `recorded`, never
+   * `body.text`. Every production caller passes it (pinned by reply-credit.test.ts: text, or null for an a2a body);
+   * undefined is left only for direct test calls of an uncredited body, where the published and record texts are equal.
+   */
+  afterPublish(channelId, body, id, opts, purgeEpoch, replyCapture, recordText) {
+    const recorded = recordText ?? (recordText === void 0 && body.kind === "text" ? body.text : "");
     if (opts.agentTurn !== false) this.agentHops.noteOwnSend(channelId);
     const modality = this.spokenReplyIds.has(id) ? "voice" : "text";
-    const bridgeLine = this.unifiedOn && body.kind === "text" && isBridgeMemoryLine(body.text);
+    const bridgeLine = this.unifiedOn && body.kind === "text" && isBridgeMemoryLine(recorded);
     if (opts.inReplyTo !== void 0 && this.isOwnerVerifyFailed(opts.inReplyTo)) return;
-    if (body.kind === "text" && opts.callBufferReply === true && opts.inReplyTo !== void 0 && !this.spokenReplyIds.has(id) && !isBridgeMemoryLine(body.text) && this.callBuffer.isVoiceScopedId(opts.inReplyTo)) {
-      this.callBuffer.appendAgent(channelId, body.text, "reply");
+    if (body.kind === "text" && opts.callBufferReply === true && opts.inReplyTo !== void 0 && !this.spokenReplyIds.has(id) && !isBridgeMemoryLine(recorded) && this.callBuffer.isVoiceScopedId(opts.inReplyTo)) {
+      this.callBuffer.appendAgent(channelId, recorded, "reply");
     }
     const origin = this.spokenReplyIds.has(id) ? "fast_path" : !this.taintScope(channelId) ? "reply" : opts.inReplyTo !== void 0 && this.cleanTurns.has(opts.inReplyTo) && !this.taintedTurns.has(opts.inReplyTo) ? "reply" : "untrusted";
-    if (body.kind === "text" && !bridgeLine) void recordOutboundMemory(this.memory, channelId, body.text, id, modality, purgeEpoch, origin);
-    if (this.unifiedOn && body.kind === "text" && !bridgeLine) this.spawnUnifiedReply(channelId, body.text, id, replyCapture ?? null, origin);
+    if (body.kind === "text" && !bridgeLine) void recordOutboundMemory(this.memory, channelId, recorded, id, modality, purgeEpoch, origin);
+    if (this.unifiedOn && body.kind === "text" && !bridgeLine) this.spawnUnifiedReply(channelId, recorded, id, replyCapture ?? null, origin);
   }
   /**
    * Final review bridge I-1 (ledger T25): the agent reply's U11 capture, taken BEFORE the publish await. The clear generation
@@ -39224,14 +39371,14 @@ var BridgeAgent = class _BridgeAgent {
         const k = replyIntentKey({ inReplyTo: opts.inReplyTo, idempotencyKey: opts.idempotencyKey, ordinal: () => 0 });
         if (!k) throw new Error("idempotent send without a key");
         const id = replyMessageId(this.replyIdKey, this.cfg.identityId, channelId, k);
-        const mac2 = replyBodyMac(this.replyIdKey, id, channelId, bytes);
-        const { intent } = await this.store.claimReplyIntent({ ...k, channelId, replyMessageId: id, bodyMac: mac2, body: bytes });
+        const mac2 = replyBodyMac(this.replyIdKey, id, channelId, bytes, opts.credit);
+        const { intent } = await this.store.claimReplyIntent({ ...k, channelId, replyMessageId: id, bodyMac: mac2, body: bytes, replyCredit: opts.credit ?? null });
         if (intent.bodyMac !== mac2 || intent.channelId !== channelId || intent.state === "skipped") {
           throw new IdempotencyConflictError();
         }
         return k;
       }
-      return this.claimUnkeyedPart(opts.inReplyTo, channelId, bytes, true);
+      return this.claimUnkeyedPart(opts.inReplyTo, channelId, bytes, true, opts.credit ?? null);
     });
     return this.publishIntent(key, opts);
   }
@@ -39240,22 +39387,23 @@ var BridgeAgent = class _BridgeAgent {
    * the reply to `inReplyTo`. Caller holds the scope lock. `matchRetry` false
    * after a slot collision: the body must go to a NEW part.
    */
-  async claimUnkeyedPart(inReplyTo, channelId, bytes, matchRetry) {
+  async claimUnkeyedPart(inReplyTo, channelId, bytes, matchRetry, replyCredit) {
+    const credit = replyCredit ?? void 0;
     const scope = `reply:${inReplyTo}`;
     let latest = null;
     for (const intent of await this.store.listReplyIntents(inReplyTo)) {
       const n = intent.scope === scope ? partOrdinal(intent.part) : null;
       if (n !== null && (latest === null || n > latest.ordinal)) latest = { ordinal: n, intent };
     }
-    if (matchRetry && latest && latest.intent.state !== "skipped" && latest.intent.channelId === channelId && latest.intent.bodyMac === replyBodyMac(this.replyIdKey, latest.intent.replyMessageId, channelId, bytes)) {
+    if (matchRetry && latest && latest.intent.state !== "skipped" && latest.intent.channelId === channelId && latest.intent.bodyMac === replyBodyMac(this.replyIdKey, latest.intent.replyMessageId, channelId, bytes, credit)) {
       return { scope, part: latest.intent.part, inReplyTo };
     }
     let ordinal = latest ? latest.ordinal + 1 : 0;
     for (let i = 0; i < REPLY_MAX_PART_ADVANCES; i++, ordinal++) {
       const k = { scope, part: `p:${ordinal}`, inReplyTo };
       const id = replyMessageId(this.replyIdKey, this.cfg.identityId, channelId, k);
-      const mac2 = replyBodyMac(this.replyIdKey, id, channelId, bytes);
-      const { created, intent } = await this.store.claimReplyIntent({ ...k, channelId, replyMessageId: id, bodyMac: mac2, body: bytes });
+      const mac2 = replyBodyMac(this.replyIdKey, id, channelId, bytes, credit);
+      const { created, intent } = await this.store.claimReplyIntent({ ...k, channelId, replyMessageId: id, bodyMac: mac2, body: bytes, replyCredit });
       if (created) return k;
       if (matchRetry && intent.state !== "skipped" && intent.bodyMac === mac2 && intent.channelId === channelId) return k;
       writeServiceLog("info", "reply.part_slot_taken", { attempt: i + 1 });
@@ -39300,6 +39448,12 @@ var BridgeAgent = class _BridgeAgent {
       }
       const bytes = intent.body;
       const body = decodeReplyBody(bytes);
+      const recordText = this.recordTextOf(intent.replyCredit, body);
+      if (recordText === void 0) {
+        writeServiceLog("error", "reply.intent_integrity_refused");
+        this.store.deletePendingReplyIntent(key.scope, key.part);
+        throw new ReplyIntentIntegrityError();
+      }
       const purgeEpochBeforePublish = this.store.conversationPurgeEpoch(intent.channelId);
       const replyCapture = this.unifiedReplyCapture(intent.channelId, intent.inReplyTo ?? void 0);
       try {
@@ -39328,14 +39482,17 @@ var BridgeAgent = class _BridgeAgent {
           const inReplyTo = intent.inReplyTo;
           const next = await this.withReplyLock(
             JSON.stringify(["scope", key.scope]),
-            () => this.claimUnkeyedPart(inReplyTo, intent.channelId, bytes, false)
+            () => (
+              // r2 BLOCKER 1: the colliding row's OWN credit (verified above), never `opts`.
+              this.claimUnkeyedPart(inReplyTo, intent.channelId, bytes, false, isReplyCredit(intent.replyCredit) ? intent.replyCredit : null)
+            )
           );
           return this.publishIntent(next, opts, advances + 1);
         }
         throw e;
       }
       this.store.markReplyIntentSent(key.scope, key.part);
-      this.afterPublish(intent.channelId, body, intent.replyMessageId, opts, purgeEpochBeforePublish, replyCapture);
+      this.afterPublish(intent.channelId, body, intent.replyMessageId, opts, purgeEpochBeforePublish, replyCapture, recordText);
       return { message_id: intent.replyMessageId, status: "sent" };
     });
   }
@@ -39345,9 +39502,21 @@ var BridgeAgent = class _BridgeAgent {
    */
   intentVerifies(intent) {
     if (!intent.body) return false;
+    const credit = intent.replyCredit ?? null;
+    if (credit !== null && !isReplyCredit(credit)) return false;
     const id = replyMessageId(this.replyIdKey, this.cfg.identityId, intent.channelId, intent);
     if (id !== intent.replyMessageId) return false;
-    return replyBodyMac(this.replyIdKey, intent.replyMessageId, intent.channelId, intent.body) === intent.bodyMac;
+    return replyBodyMac(this.replyIdKey, intent.replyMessageId, intent.channelId, intent.body, credit ?? void 0) === intent.bodyMac;
+  }
+  /**
+   * Weather/currency Task 17: what a verified row's reply is RECORDED as. Null credit: the decoded text unchanged (null
+   * for an a2a body). "weatherapi": the text minus the exact credit suffix. Undefined: the row is refused (an unknown
+   * credit, a credited a2a body, or a credited text without the exact suffix).
+   */
+  recordTextOf(credit, body) {
+    if (credit === null) return body.kind === "text" ? body.text : null;
+    if (!isReplyCredit(credit) || body.kind !== "text" || !body.text.endsWith(WEATHER_CREDIT_SUFFIX)) return void 0;
+    return body.text.slice(0, body.text.length - WEATHER_CREDIT_SUFFIX.length);
   }
   /**
    * SEC-06 #18 item 3: a rate-limited reply retries the PUBLISH in-process
@@ -43471,7 +43640,7 @@ var BridgeAgent = class _BridgeAgent {
               this.memory,
               m.channelId,
               m.envelope.sender_id,
-              parsed.text,
+              m.envelope.sender_id === this.cfg.identityId ? stripCreditSuffix(parsed.text) : parsed.text,
               m.messageId,
               m.voiceMode ? "voice" : "text",
               purgeEpochAtTap
@@ -44269,21 +44438,49 @@ ${channelId}`;
    */
   searchProvidersSockets = /* @__PURE__ */ new Map();
   /**
-   * The D28 value the files were last recomputed for; null until the first socket observation, so that observation
-   * always recomputes (final review I-1), even when it is non-capable.
+   * Weather/currency U6 (H-1): the same AND-over-sockets state for utility_tools_v1, kept separately per socket, so a
+   * runtime that declares search_providers_v2 but not utility_tools_v1 (0.14.0, 0.14.1) keeps web_extract and never
+   * sees a utility name.
    */
-  searchProvidersState = null;
+  utilityToolsSockets = /* @__PURE__ */ new Map();
+  /**
+   * The (search, utility) tuple the files were last recomputed for; null until the first socket observation, so that
+   * observation always recomputes (final review I-1), even when it is non-capable. One trigger keyed on BOTH values.
+   */
+  capabilityState = null;
   searchCapabilityRefetchTimer = null;
   /** When the current burst's first change happened (valid while the timer is set). */
   searchCapabilityBurstStart = 0;
   /** The D28 value in the last report posted (null until one is); a change needs a refetch to reach the web. */
   lastReportedSearchProviders = null;
+  /** U6: the utility_tools_v1 value in the last report posted (null until one is). */
+  lastReportedUtilityTools = null;
   noteSearchProvidersSocket(token, declared) {
     this.searchProvidersSockets.set(token, declared);
-    this.onSearchProvidersMaybeChanged();
+    this.onCapabilityMaybeChanged();
   }
   clearSearchProvidersSocket(token) {
-    if (this.searchProvidersSockets.delete(token)) this.onSearchProvidersMaybeChanged();
+    if (this.searchProvidersSockets.delete(token)) this.onCapabilityMaybeChanged();
+  }
+  noteUtilityToolsSocket(token, declared) {
+    this.utilityToolsSockets.set(token, declared);
+    this.onCapabilityMaybeChanged();
+  }
+  clearUtilityToolsSocket(token) {
+    if (this.utilityToolsSockets.delete(token)) this.onCapabilityMaybeChanged();
+  }
+  /** U6: every attached runtime socket declared utility_tools_v1; no socket attached means absent (false). */
+  utilityToolsCapable() {
+    if (this.utilityToolsSockets.size === 0) return false;
+    for (const v of this.utilityToolsSockets.values()) if (!v) return false;
+    return true;
+  }
+  /** U6: the features every attached runtime socket declared, for the policy functions. */
+  capabilityFeatures() {
+    const out = /* @__PURE__ */ new Set();
+    if (this.searchProvidersCapable()) out.add("search_providers_v2");
+    if (this.utilityToolsCapable()) out.add("utility_tools_v1");
+    return out;
   }
   /** D28: every attached runtime socket declared search_providers_v2; no socket attached means absent (false). */
   searchProvidersCapable() {
@@ -44310,14 +44507,14 @@ ${channelId}`;
    * D35 (P-4): on a capability change, rewrite manifest-policy.json at once from the stored manifest, the kill
    * switches and the new capability, then a debounced refetch (one per burst) only when needed.
    */
-  onSearchProvidersMaybeChanged() {
-    const capable = this.searchProvidersCapable();
-    const prev = this.searchProvidersState;
-    if (capable === prev) return;
-    this.searchProvidersState = capable;
-    this.recomputeManifestPolicy(capable);
+  onCapabilityMaybeChanged() {
+    const next = { search: this.searchProvidersCapable(), utility: this.utilityToolsCapable() };
+    const prev = this.capabilityState;
+    if (prev !== null && prev.search === next.search && prev.utility === next.utility) return;
+    this.capabilityState = next;
+    this.recomputeManifestPolicy(this.capabilityFeatures());
     if (this.closingDown) return;
-    if (prev === null && !capable) return;
+    if (prev === null && !next.search && !next.utility) return;
     const now = Date.now();
     if (this.searchCapabilityRefetchTimer !== null) clearTimeout(this.searchCapabilityRefetchTimer);
     else this.searchCapabilityBurstStart = now;
@@ -44335,7 +44532,7 @@ ${channelId}`;
   searchCapabilityRefetchNeeded() {
     if (!this.bootConfigSettled || this.closingDown) return false;
     const inForce = (this.cfg.ownerGrantPin?.pin ?? null) !== null && this.toolGrantManifest !== null;
-    return inForce || this.lastReportedSearchProviders !== this.searchProvidersCapable();
+    return inForce || this.lastReportedSearchProviders !== this.searchProvidersCapable() || this.lastReportedUtilityTools !== this.utilityToolsCapable();
   }
   /**
    * D35: the local recompute. Widening (web_extract back in) only while the binding for the in-force manifest stands,
@@ -44343,15 +44540,16 @@ ${channelId}`;
    * lists web_extract loses it at once, so an older runtime never reads it as unreadable (which drops every grant).
    * Content-free; a write failure is logged and the debounced refetch tries again.
    */
-  recomputeManifestPolicy(capable) {
+  recomputeManifestPolicy(features) {
     const pin = this.cfg.ownerGrantPin?.pin ?? null;
     const manifest = pin !== null ? this.toolGrantManifest : null;
     try {
       if (manifest !== null && this.manifestBinding !== null && this.manifestBinding.counter === manifest.counter) {
-        this.grantWriters.writeManifestPolicy(this.home, this.cfg.identityId, manifestPolicyFor(manifest, { ownerDm: this.ownerDmManifestGrants, room: this.roomManifestGrants }, capable));
+        this.grantWriters.writeManifestPolicy(this.home, this.cfg.identityId, manifestPolicyFor(manifest, { ownerDm: this.ownerDmManifestGrants, room: this.roomManifestGrants }, features));
         return;
       }
-      if (capable) return;
+      const withheld = new Set(Object.keys(TOOL_FEATURE).filter((t) => !toolAllowedByFeatures(t, features)));
+      if (withheld.size === 0) return;
       const path = join19(runtimeConfigDir(this.home, this.cfg.identityId), MANIFEST_POLICY_FILE);
       if (!existsSync5(path)) return;
       let doc;
@@ -44361,10 +44559,10 @@ ${channelId}`;
         return;
       }
       const tools = doc?.manifest_tools;
-      if (!Array.isArray(tools) || !tools.includes("web_extract")) return;
+      if (!Array.isArray(tools) || !tools.some((t) => typeof t === "string" && withheld.has(t))) return;
       this.grantWriters.writeManifestPolicy(this.home, this.cfg.identityId, {
         v: 1,
-        manifest_tools: tools.filter((t) => typeof t === "string" && t !== "web_extract"),
+        manifest_tools: tools.filter((t) => typeof t === "string" && !withheld.has(t)),
         secret_path_mode: "enforce"
       });
     } catch (e) {
@@ -44755,6 +44953,9 @@ var BRIDGE_ERRORS = {
   // C9 (spec §4.1.6 step 1): another copy of this agent took its SecureComs
   // session (WS 4409), so this copy stopped. Every local route but /healthz.
   session_superseded: { http: 503, message: "another copy of this agent took its session; this copy stopped" },
+  // Weather/currency Task 17 (OQ-P1): a send frame's credit is not the closed value, or rides an a2a frame. TERMINAL:
+  // the inbound is retired, so the model (and the weather call) never runs again for it.
+  reply_credit_unknown: { http: 400, message: "reply credit not recognised; not sent" },
   internal: { http: 500, message: "internal error" }
 };
 function errorBody(code, detail) {
@@ -44784,6 +44985,7 @@ function withConsumerGrants(m, perToolConsumer) {
 }
 var MANIFEST_GRANTS_FEATURE = "manifest_grants_v1";
 var SEARCH_PROVIDERS_FEATURE = "search_providers_v2";
+var UTILITY_TOOLS_FEATURE = "utility_tools_v1";
 var CONSTANT_TOOL_NAMES = Object.freeze({
   owner_dm: Object.freeze(["current_time", "web_search"]),
   team_room: Object.freeze(["current_time"])
@@ -44815,6 +45017,15 @@ function withSearchCapability(m, consumerHasFeature, signedProvider) {
   if (kept.length === a.tool_grants.length) return m;
   return { ...m, authorization: Object.freeze({ ...a, tool_grants: kept.length === 0 ? NO_GRANTS : Object.freeze(kept) }) };
 }
+var UTILITY_TOOL_NAMES = /* @__PURE__ */ new Set(["weather_forecast", "currency_convert"]);
+function withUtilityCapability(m, consumerHasFeature) {
+  if (consumerHasFeature) return m;
+  const a = m.authorization;
+  if (!a) return m;
+  const kept = a.tool_grants.filter((g) => !UTILITY_TOOL_NAMES.has(g.tool));
+  if (kept.length === a.tool_grants.length) return m;
+  return { ...m, authorization: Object.freeze({ ...a, tool_grants: kept.length === 0 ? NO_GRANTS : Object.freeze(kept) }) };
+}
 
 // src/http-server.ts
 function writeSse(res, msgs, onWriteError) {
@@ -44838,7 +45049,7 @@ data: ${JSON.stringify(msgs[i])}
 function deliverSseBatch(res, batch, agent, onWriteError) {
   const withheld = agent.harnessGrantsWithheld();
   const provider = agent.signedSearchProvider();
-  const left3 = writeSse(res, batch.map((m) => withSearchCapability(withManifestCapability(withHarnessGrants(withConsumerGrants(m, false), withheld), false), false, provider)), onWriteError);
+  const left3 = writeSse(res, batch.map((m) => withUtilityCapability(withSearchCapability(withManifestCapability(withHarnessGrants(withConsumerGrants(m, false), withheld), false), false, provider), false)), onWriteError);
   const leftIds = new Set(left3.map((message) => message.message_id));
   agent.ackRuntimeMessages(batch.filter((message) => !leftIds.has(message.message_id)).map((message) => message.message_id));
   if (left3.length) agent.requeueFront(batch.filter((message) => leftIds.has(message.message_id)));
@@ -44870,7 +45081,7 @@ var OTHER_CAP = 8 * 1024;
 var a2aSchema = z3.object({
   a2a_version: z3.string().min(1),
   kind: z3.enum(["message", "task", "artifact"]),
-  object: z3.record(z3.unknown())
+  object: z3.record(z3.string(), z3.unknown())
 });
 var sendAttachmentSchema = z3.object({
   channel_id: z3.string().min(1),
@@ -45112,7 +45323,7 @@ function createHttpServer(agent, opts) {
         const drained = await agent.drain(channel, wait);
         const withheld = agent.harnessGrantsWithheld();
         const provider = agent.signedSearchProvider();
-        return json(res, 200, drained.map((m) => withSearchCapability(withManifestCapability(withHarnessGrants(withConsumerGrants(m, false), withheld), false), false, provider)));
+        return json(res, 200, drained.map((m) => withUtilityCapability(withSearchCapability(withManifestCapability(withHarnessGrants(withConsumerGrants(m, false), withheld), false), false, provider), false)));
       }
       if (method === "GET" && path === "/v1/events") {
         const channel = url.searchParams.get("channel_id") ?? void 0;
@@ -45287,6 +45498,7 @@ function attachAgentWebSocket(server, agent, opts) {
       perToolGrants: false,
       manifestGrants: false,
       searchProviders: false,
+      utilityTools: false,
       // helloWaitMs 0 keeps today's synchronous initial flush exactly (the opt-out the existing tests use).
       deliveryOpen: helloWaitMs <= 0,
       deliveryToken: /* @__PURE__ */ new Map(),
@@ -45340,14 +45552,14 @@ function attachAgentWebSocket(server, agent, opts) {
             continue;
           }
           const out = withConsumerNotes(
-            withSearchCapability(
+            withUtilityCapability(withSearchCapability(
               withManifestCapability(
                 withHarnessGrants(withConsumerGrants(batch[i], session.perToolGrants), !session.perToolGrants && agent.harnessGrantsWithheld()),
                 session.manifestGrants
               ),
               session.searchProviders,
               agent.signedSearchProvider()
-            ),
+            ), session.utilityTools),
             batch[i],
             session,
             agent
@@ -45404,6 +45616,7 @@ function attachAgentWebSocket(server, agent, opts) {
       if (session.perToolGrants) agent.clearPerToolConsumer(session);
       if (session.manifestGrants) agent.clearManifestConsumer(session);
       agent.clearSearchProvidersSocket(session);
+      agent.clearUtilityToolsSocket(session);
     };
     current = { sock, cleanup, sweepStale };
     sock.on("close", cleanup);
@@ -45444,7 +45657,10 @@ function sendJson(sock, body) {
   } catch {
   }
 }
+var ReplyCreditUnknownError = class extends Error {
+};
 function sendErrorCode(e) {
+  if (e instanceof ReplyCreditUnknownError) return "reply_credit_unknown";
   if (e instanceof ChannelPendingError) return "channel_pending";
   if (e instanceof RateLimitedError) return "rate_limited";
   if (e instanceof AgentPausedSendError) return "agent_paused";
@@ -45505,6 +45721,8 @@ async function handleInbound(sock, agent, data, inflight, flush, session) {
     agent.noteConsumerCapability(manifest ? "ok" : session.harnessClaimed ? "harness_consumer" : "missing");
     session.searchProviders = session.consumer === "runtime" && session.harnessClaimed !== true && perTool && Array.isArray(m.features) && m.features.includes(SEARCH_PROVIDERS_FEATURE);
     agent.noteSearchProvidersSocket(session, session.searchProviders);
+    session.utilityTools = session.consumer === "runtime" && session.harnessClaimed !== true && perTool && Array.isArray(m.features) && m.features.includes(UTILITY_TOOLS_FEATURE);
+    agent.noteUtilityToolsSocket(session, session.utilityTools);
     if (session.consumer === "runtime" && session.harnessClaimed !== true && Array.isArray(m.features) && m.features.includes(MEMORY_NOTES_FEATURE)) {
       agent.noteNotesConsumer();
     }
@@ -45512,7 +45730,7 @@ async function handleInbound(sock, agent, data, inflight, flush, session) {
     if (session.recallConsumer) agent.noteRecallConsumer();
     session.unifiedConsumer = agent.unifiedFeatureOn() && session.consumer === "runtime" && session.harnessClaimed !== true && Array.isArray(m.features) && m.features.includes(MEMORY_UNIFIED_FEATURE);
     if (session.unifiedConsumer) agent.noteUnifiedConsumer();
-    sendJson(sock, { type: "hello", features: ["nack", MEMORY_NOTES_FEATURE, MEMORY_RECALL_FEATURE, ...agent.unifiedFeatureOn() ? [MEMORY_UNIFIED_FEATURE] : [], MANIFEST_GRANTS_FEATURE, SEARCH_PROVIDERS_FEATURE] });
+    sendJson(sock, { type: "hello", features: ["nack", MEMORY_NOTES_FEATURE, MEMORY_RECALL_FEATURE, ...agent.unifiedFeatureOn() ? [MEMORY_UNIFIED_FEATURE] : [], MANIFEST_GRANTS_FEATURE, SEARCH_PROVIDERS_FEATURE, REPLY_CREDIT_FEATURE] });
     if (!session.deliveryOpen) {
       session.deliveryOpen = true;
       flush();
@@ -45541,7 +45759,8 @@ async function handleInbound(sock, agent, data, inflight, flush, session) {
   }
   const replyFailed = (e, inReplyTo) => {
     const code = sendErrorCode(e);
-    if ((code === "agent_paused" || code === "send_forbidden") && typeof inReplyTo === "string") {
+    const terminal = code === "agent_paused" || code === "send_forbidden" || code === "reply_credit_unknown";
+    if (terminal && typeof inReplyTo === "string") {
       inflight.delete(inReplyTo);
       session.deliveryToken.delete(inReplyTo);
       session.shownRecall.delete(inReplyTo);
@@ -45549,7 +45768,7 @@ async function handleInbound(sock, agent, data, inflight, flush, session) {
       agent.ackRuntimeMessages([inReplyTo]);
     }
     sendJson(sock, { ...wsErrorFrame(code), ...typeof inReplyTo === "string" ? { in_reply_to: inReplyTo } : {} });
-    if (code === "agent_paused" || code === "send_forbidden") flush();
+    if (terminal) flush();
   };
   if (m.type === "send") {
     if (typeof m.channel_id !== "string" || !m.channel_id) {
@@ -45566,8 +45785,14 @@ async function handleInbound(sock, agent, data, inflight, flush, session) {
     }
     const record = typeof m.in_reply_to === "string" ? inflight.get(m.in_reply_to) : void 0;
     const callBufferReply = session.consumer === "runtime" && session.perToolGrants === true && session.harnessClaimed !== true && typeof m.in_reply_to === "string" && record !== void 0 && session.deliveryToken.get(m.in_reply_to) !== void 0 && record.channel_id === m.channel_id && !agent.isRuntimeMessageRetired(m.in_reply_to);
+    if (m.credit !== void 0 && (m.a2a !== void 0 || !isReplyCredit(m.credit))) {
+      writeServiceLog("error", "reply.credit_unknown");
+      replyFailed(new ReplyCreditUnknownError(), m.in_reply_to);
+      return;
+    }
     const sendOpts = {
       agentTurn: isAgentTurn(agent, m),
+      ...isReplyCredit(m.credit) ? { credit: m.credit } : {},
       ...typeof m.in_reply_to === "string" ? { inReplyTo: m.in_reply_to } : {},
       ...typeof m.idempotency_key === "string" ? { idempotencyKey: m.idempotency_key } : {},
       ...callBufferReply ? { callBufferReply: true } : {}